summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjurkan <jurkan@gmx.de>2012-07-06 22:17:42 +0200
committerjurkan <jurkan@gmx.de>2012-07-06 22:17:42 +0200
commit49f3d93a5f6033a0bb26b3e40728e4e3b8cda414 (patch)
tree931315759953c4e193f19c2fe05ca79efe427e74
parentd754a64e3839b3888d489046546195792e4ecc34 (diff)
downloadmana-client-49f3d93a5f6033a0bb26b3e40728e4e3b8cda414.tar.gz
mana-client-49f3d93a5f6033a0bb26b3e40728e4e3b8cda414.tar.bz2
mana-client-49f3d93a5f6033a0bb26b3e40728e4e3b8cda414.tar.xz
mana-client-49f3d93a5f6033a0bb26b3e40728e4e3b8cda414.zip
LPC gui theming (replaced windows through scrolls)
-rw-r--r--data/graphics/gui/lpc_window.pngbin0 -> 12568 bytes
-rw-r--r--data/graphics/gui/scrololol.pngbin0 -> 26172 bytes
-rw-r--r--data/graphics/gui/window.xml20
-rw-r--r--src/gui/widgets/resizegrip.cpp12
-rw-r--r--src/gui/widgets/window.cpp6
5 files changed, 19 insertions, 19 deletions
diff --git a/data/graphics/gui/lpc_window.png b/data/graphics/gui/lpc_window.png
new file mode 100644
index 00000000..ddcef395
--- /dev/null
+++ b/data/graphics/gui/lpc_window.png
Binary files differ
diff --git a/data/graphics/gui/scrololol.png b/data/graphics/gui/scrololol.png
new file mode 100644
index 00000000..e0bd67d3
--- /dev/null
+++ b/data/graphics/gui/scrololol.png
Binary files 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 @@
-<skinset name="Default" image="window.png">
+<skinset name="Default" image="lpc_window.png">
<widget type="Window">
<!-- Top Row -->
- <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
- <part type="top-edge" xpos="4" ypos="0" width="32" height="4" />
- <part type="top-right-corner" xpos="36" ypos="0" width="4" height="4" />
+ <part type="top-left-corner" xpos="0" ypos="0" width="32" height="13" />
+ <part type="top-edge" xpos="32" ypos="0" width="33" height="13" />
+ <part type="top-right-corner" xpos="65" ypos="0" width="32" height="13" />
<!-- Middle Row -->
- <part type="left-edge" xpos="0" ypos="4" width="4" height="216" />
- <part type="bg-quad" xpos="4" ypos="4" width="32" height="216" />
- <part type="right-edge" xpos="36" ypos="4" width="4" height="216" />
+ <part type="left-edge" xpos="0" ypos="13" width="32" height="7" />
+ <part type="bg-quad" xpos="32" ypos="13" width="33" height="7" />
+ <part type="right-edge" xpos="65" ypos="13" width="32" height="7" />
<!-- Bottom Row -->
- <part type="bottom-left-corner" xpos="0" ypos="220" width="4" height="4" />
- <part type="bottom-edge" xpos="4" ypos="220" width="32" height="4" />
- <part type="bottom-right-corner" xpos="36" ypos="220" width="4" height="4" />
+ <part type="bottom-left-corner" xpos="0" ypos="20" width="32" height="12" />
+ <part type="bottom-edge" xpos="32" ypos="20" width="33" height="12" />
+ <part type="bottom-right-corner" xpos="65" ypos="20" width="32" height="12" />
</widget>
</skinset>
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*>(graphics)->drawImage(gripImage, 0, 0);
+ //static_cast<Graphics*>(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