From 4b9e2b6c41e740a3eac10078d5fa4fbc63788bbe Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 11 Apr 2008 13:31:52 +0000
Subject: Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch,
 but because of quite a bit of GUI differences there were additional changes
 and probably additional issues. You have been warned. ;)

Merged revisions 4045-4049,4051-4059 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines

  Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for
  gcn::TabbedArea usage)
........
  r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines

  Fixed problem with row height in shop list box.
........
---
 src/gui/widgets/dropdown.cpp | 15 +++++++--------
 src/gui/widgets/dropdown.h   |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 6863aa01..b33a55cf 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -42,7 +42,7 @@ DropDown::DropDown(gcn::ListModel *listModel,
                    gcn::DropDown::DropDown(listModel,
                    scrollArea, listBox)
 {
-    setBorderSize(2);
+    setFrameSize(2);
 
     // Initialize graphics
     if (instances == 0)
@@ -103,7 +103,7 @@ void DropDown::draw(gcn::Graphics* graphics)
 
     if (mDroppedDown)
     {
-        h = mOldH;
+        h = mFoldedUpHeight;
     }
     else
     {
@@ -151,19 +151,18 @@ void DropDown::draw(gcn::Graphics* graphics)
     }
 }
 
-void DropDown::drawBorder(gcn::Graphics *graphics)
+void DropDown::drawFrame(gcn::Graphics *graphics)
 {
-    int w, h, bs;
-    bs = getBorderSize();
-    w = getWidth() + bs * 2;
-    h = getHeight() + bs * 2;
+    const int bs = getFrameSize();
+    const int w = getWidth() + bs * 2;
+    const int h = getHeight() + bs * 2;
 
     static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin);
 }
 
 void DropDown::drawButton(gcn::Graphics *graphics)
 {
-    int height = mDroppedDown ? mOldH : getHeight();
+    int height = mDroppedDown ? mFoldedUpHeight : getHeight();
 
     static_cast<Graphics*>(graphics)->
         drawImage(buttons[mDroppedDown][mPushed], getWidth() - height, 1);
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index 37e754af..d0dab7d2 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -64,7 +64,7 @@ class DropDown : public gcn::DropDown
 
         void draw(gcn::Graphics* graphics);
 
-        void drawBorder(gcn::Graphics* graphics);
+        void drawFrame(gcn::Graphics* graphics);
 
 
     protected:
-- 
cgit v1.2.3-70-g09d2