diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-05 18:41:34 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-11-05 18:41:34 +0000 |
| commit | dd96213cdf64c5481c8d07dbd39ce1247f42d04e (patch) | |
| tree | 453c4aa1dcb9fb1ee1852fdba106f697d16af17f /src/gui | |
| parent | f1b06fb279c460691a88c8143084390e435d6bf9 (diff) | |
| download | mana-dd96213cdf64c5481c8d07dbd39ce1247f42d04e.tar.gz mana-dd96213cdf64c5481c8d07dbd39ce1247f42d04e.tar.bz2 mana-dd96213cdf64c5481c8d07dbd39ce1247f42d04e.tar.xz mana-dd96213cdf64c5481c8d07dbd39ce1247f42d04e.zip | |
Merged the definition of ImageRect into graphics.h.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/button.cpp | 2 | ||||
| -rw-r--r-- | src/gui/playerbox.cpp | 2 | ||||
| -rw-r--r-- | src/gui/progressbar.cpp | 2 | ||||
| -rw-r--r-- | src/gui/scrollarea.cpp | 2 | ||||
| -rw-r--r-- | src/gui/textfield.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/dropdown.cpp | 24 | ||||
| -rw-r--r-- | src/gui/window.cpp | 2 |
7 files changed, 11 insertions, 25 deletions
diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 9d01095b..31f38593 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -29,8 +29,6 @@ #include "../graphics.h" -#include "../graphic/imagerect.h" - #include "../resources/image.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index 46cd7e85..568c3350 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -26,8 +26,6 @@ #include "../being.h" #include "../graphics.h" -#include "../graphic/imagerect.h" - #include "../resources/image.h" #include "../resources/resourcemanager.h" #include "../resources/spriteset.h" diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index 5f047c6a..2bdfc856 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -25,8 +25,6 @@ #include "../graphics.h" -#include "../graphic/imagerect.h" - #include "../resources/image.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp index 18a1dfb4..903ec95d 100644 --- a/src/gui/scrollarea.cpp +++ b/src/gui/scrollarea.cpp @@ -25,8 +25,6 @@ #include "../graphics.h" -#include "../graphic/imagerect.h" - #include "../resources/image.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/textfield.cpp b/src/gui/textfield.cpp index 2e083d5a..adf41a9a 100644 --- a/src/gui/textfield.cpp +++ b/src/gui/textfield.cpp @@ -27,8 +27,6 @@ #include "../graphics.h" -#include "../graphic/imagerect.h" - #include "../resources/image.h" #include "../resources/resourcemanager.h" diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 34c6b93a..0bf0e673 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -25,8 +25,6 @@ #include "../../graphics.h" -#include "../../graphic/imagerect.h" - #include "../../resources/image.h" #include "../../resources/resourcemanager.h" @@ -138,17 +136,17 @@ void DropDown::draw(gcn::Graphics* graphics) drawButton(graphics); - if (mDroppedDown) - { - drawChildren(graphics); - - // Draw two lines separating the ListBox with se selected - // element view. - graphics->setColor(highlightColor); - graphics->drawLine(0, h, getWidth(), h); - graphics->setColor(shadowColor); - graphics->drawLine(0, h + 1,getWidth(),h + 1); - } + if (mDroppedDown) + { + drawChildren(graphics); + + // Draw two lines separating the ListBox with se selected + // element view. + graphics->setColor(highlightColor); + graphics->drawLine(0, h, getWidth(), h); + graphics->setColor(shadowColor); + graphics->drawLine(0, h + 1,getWidth(),h + 1); + } } void DropDown::drawBorder(gcn::Graphics *graphics) diff --git a/src/gui/window.cpp b/src/gui/window.cpp index c7860021..13d42c78 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -33,8 +33,6 @@ #include "../graphics.h" #include "../log.h" -#include "../graphic/imagerect.h" - #include "../resources/image.h" #include "../resources/resourcemanager.h" |