From 49f3d93a5f6033a0bb26b3e40728e4e3b8cda414 Mon Sep 17 00:00:00 2001 From: jurkan Date: Fri, 6 Jul 2012 22:17:42 +0200 Subject: LPC gui theming (replaced windows through scrolls) --- data/graphics/gui/lpc_window.png | Bin 0 -> 12568 bytes data/graphics/gui/scrololol.png | Bin 0 -> 26172 bytes data/graphics/gui/window.xml | 20 ++++++++++---------- src/gui/widgets/resizegrip.cpp | 12 ++++++------ src/gui/widgets/window.cpp | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 data/graphics/gui/lpc_window.png create mode 100644 data/graphics/gui/scrololol.png diff --git a/data/graphics/gui/lpc_window.png b/data/graphics/gui/lpc_window.png new file mode 100644 index 00000000..ddcef395 Binary files /dev/null and b/data/graphics/gui/lpc_window.png differ diff --git a/data/graphics/gui/scrololol.png b/data/graphics/gui/scrololol.png new file mode 100644 index 00000000..e0bd67d3 Binary files /dev/null and b/data/graphics/gui/scrololol.png differ diff --git a/data/graphics/gui/window.xml b/data/graphics/gui/window.xml index f27dbc7f..3310cd89 100644 --- a/data/graphics/gui/window.xml +++ b/data/graphics/gui/window.xml @@ -1,18 +1,18 @@ - + - - - + + + - - - + + + - - - + + + diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index da97ac69..7b37b282 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -58,11 +58,11 @@ ResizeGrip::~ResizeGrip() void ResizeGrip::draw(gcn::Graphics *graphics) { - if (config.getFloatValue("guialpha") != mAlpha) - { - mAlpha = config.getFloatValue("guialpha"); - gripImage->setAlpha(mAlpha); - } + //if (config.getFloatValue("guialpha") != mAlpha) + //{ + // mAlpha = config.getFloatValue("guialpha"); + // gripImage->setAlpha(mAlpha); + //} - static_cast(graphics)->drawImage(gripImage, 0, 0); + //static_cast(graphics)->drawImage(gripImage, 0, 0); } diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index c8788c75..406f55ef 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -68,8 +68,8 @@ Window::Window(const std::string &caption, bool modal, Window *parent, instances++; setFrameSize(0); - setPadding(3); - setTitleBarHeight(20); + setPadding(5); + setTitleBarHeight(25); // Loads the skin mSkin = Theme::instance()->load(skin); @@ -123,7 +123,7 @@ void Window::draw(gcn::Graphics *graphics) { g->setColor(Theme::getThemeColor(Theme::TEXT)); g->setFont(getFont()); - g->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT); + g->drawText(getCaption(), 7, 10, gcn::Graphics::LEFT); } // Draw Close Button -- cgit v1.2.3-60-g2f50