diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-07-20 18:32:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-07-20 21:40:23 +0300 |
| commit | f3850f2cf7f4428eed3be0efe9a7c440b9e4d950 (patch) | |
| tree | cba59ab97c58ef387af91f7af9b7523b3d44c4f7 /src/gui/widgets/dropdown.cpp | |
| parent | 916433cb8ec57510af08fb5e1549076a7cb420d8 (diff) | |
| download | mv-f3850f2cf7f4428eed3be0efe9a7c440b9e4d950.tar.gz mv-f3850f2cf7f4428eed3be0efe9a7c440b9e4d950.tar.bz2 mv-f3850f2cf7f4428eed3be0efe9a7c440b9e4d950.tar.xz mv-f3850f2cf7f4428eed3be0efe9a7c440b9e4d950.zip | |
Fix code style.
Diffstat (limited to 'src/gui/widgets/dropdown.cpp')
| -rw-r--r-- | src/gui/widgets/dropdown.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 8b5f81e6b..a52f70926 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -45,7 +45,7 @@ int DropDown::instances = 0; Image *DropDown::buttons[2][2]; -ImageRect DropDown::skin; +ImageRect DropDown::skinRect; float DropDown::mAlpha = 1.0; static std::string const dropdownFiles[2] = @@ -96,7 +96,7 @@ DropDown::DropDown(gcn::ListModel *listModel, gcn::ActionListener* listener, // get the border skin if (Theme::instance()) - Theme::instance()->loadRect(skin, "dropdown_background.xml"); + Theme::instance()->loadRect(skinRect, "dropdown_background.xml"); } instances++; @@ -126,7 +126,7 @@ DropDown::~DropDown() } } if (Theme::instance()) - Theme::instance()->unloadRect(skin); + Theme::instance()->unloadRect(skinRect); } delete mScrollArea; mScrollArea = nullptr; @@ -152,8 +152,8 @@ void DropDown::updateAlpha() for (int a = 0; a < 9; a++) { - if (skin.grid[a]) - skin.grid[a]->setAlpha(mAlpha); + if (skinRect.grid[a]) + skinRect.grid[a]->setAlpha(mAlpha); } } } @@ -208,7 +208,7 @@ void DropDown::drawFrame(gcn::Graphics *graphics) const int w = getWidth() + bs * 2; const int h = getHeight() + bs * 2; - static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skin); + static_cast<Graphics*>(graphics)->drawImageRect(0, 0, w, h, skinRect); } void DropDown::drawButton(gcn::Graphics *graphics) |