summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-07-11 03:12:22 +0300
committerAndrei Karas <akaras@inbox.ru>2012-07-13 01:02:41 +0300
commitc3b31b434fa392e22783d4a4b7fb007245c605db (patch)
tree5a25af0d8603364f77e9da98860a27284ec1caf3
parent1df2b0fb0bc00991eb506ed8915be4b7674e534d (diff)
downloadManaVerse-c3b31b434fa392e22783d4a4b7fb007245c605db.tar.gz
ManaVerse-c3b31b434fa392e22783d4a4b7fb007245c605db.tar.bz2
ManaVerse-c3b31b434fa392e22783d4a4b7fb007245c605db.tar.xz
ManaVerse-c3b31b434fa392e22783d4a4b7fb007245c605db.zip
Change resize grip theming.
-rw-r--r--data/graphics/gui/CMakeLists.txt2
-rw-r--r--data/graphics/gui/Makefile.am2
-rw-r--r--data/graphics/gui/resize.pngbin443 -> 0 bytes
-rw-r--r--data/graphics/gui/resize.xml5
-rw-r--r--src/gui/theme.cpp1
-rw-r--r--src/gui/widgets/resizegrip.cpp8
-rw-r--r--src/gui/widgets/resizegrip.h2
7 files changed, 9 insertions, 11 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index 0fe74e18c..00acf90f9 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -22,7 +22,7 @@ SET (FILES
radioin_highlight.png
radioout.png
radioout_highlight.png
- resize.png
+ resize.xml
scroll.xml
scroll_background.xml
scroll_highlighted.xml
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 0e99c8a98..1567f2752 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -25,7 +25,7 @@ gui_DATA = \
radioin_highlight.png \
radioout.png \
radioout_highlight.png \
- resize.png \
+ resize.xml \
scroll.xml \
scroll_background.xml \
scroll_highlighted.xml \
diff --git a/data/graphics/gui/resize.png b/data/graphics/gui/resize.png
deleted file mode 100644
index 6b31ac64b..000000000
--- a/data/graphics/gui/resize.png
+++ /dev/null
Binary files differ
diff --git a/data/graphics/gui/resize.xml b/data/graphics/gui/resize.xml
new file mode 100644
index 000000000..8a21b7382
--- /dev/null
+++ b/data/graphics/gui/resize.xml
@@ -0,0 +1,5 @@
+<skinset name="Default" image="window.png">
+ <widget type="Window">
+ <part type="standart" xpos="160" ypos="0" width="15" height="12" />
+ </widget>
+</skinset>
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index fb1dfa086..6b9ac023b 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -363,7 +363,6 @@ struct SkinHelper
{
for (unsigned f = 0; f < size; f ++)
{
- logger->log("%s vs %s", partType.c_str(), params[f].name.c_str());
if (partType == params[f].name)
{
rect->grid[params[f].index] = image->getSubImage(
diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp
index 4a6adadb6..98df17d12 100644
--- a/src/gui/widgets/resizegrip.cpp
+++ b/src/gui/widgets/resizegrip.cpp
@@ -43,7 +43,7 @@ ResizeGrip::ResizeGrip(const std::string &image)
if (mInstances == 0)
{
// Load the grip image
- gripImage = Theme::getImageFromTheme(image);
+ gripImage = Theme::getImageFromThemeXml(image);
if (gripImage)
gripImage->setAlpha(mAlpha);
}
@@ -65,12 +65,6 @@ ResizeGrip::ResizeGrip(const std::string &image)
ResizeGrip::~ResizeGrip()
{
mInstances--;
-
- if (mInstances == 0 && gripImage)
- {
- gripImage->decRef();
- gripImage = nullptr;
- }
}
void ResizeGrip::draw(gcn::Graphics *graphics)
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index ce4eb0770..af94854a3 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -40,7 +40,7 @@ class ResizeGrip : public gcn::Widget
/**
* Constructor.
*/
- ResizeGrip(const std::string &image = "resize.png");
+ ResizeGrip(const std::string &image = "resize.xml");
/**
* Destructor.