diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-10-11 17:35:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-10-11 18:00:22 +0300 |
| commit | 52c7195a8ee91f95ef134d9798a47ea313df16c8 (patch) | |
| tree | ca1f32cfadce611a1820b50f5386c02cd2ce06ae /src/gui/widgets/scrollarea.cpp | |
| parent | f1b82c1b06604c2c1eed750a6c980aa0b5355560 (diff) | |
| download | manaplus-52c7195a8ee91f95ef134d9798a47ea313df16c8.tar.gz manaplus-52c7195a8ee91f95ef134d9798a47ea313df16c8.tar.bz2 manaplus-52c7195a8ee91f95ef134d9798a47ea313df16c8.tar.xz manaplus-52c7195a8ee91f95ef134d9798a47ea313df16c8.zip | |
Second part of checks from Parasoft C++ Test.
Diffstat (limited to 'src/gui/widgets/scrollarea.cpp')
| -rw-r--r-- | src/gui/widgets/scrollarea.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 3d79a2a2e..b537dd2ed 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -857,7 +857,7 @@ gcn::Rectangle ScrollArea::getHorizontalBarDimension() const if (!mHBarVisible) return gcn::Rectangle(0, 0, 0, 0); - const int width = (mHBarVisible && mShowButtons) ? mScrollbarWidth : 0; + const int width = mShowButtons ? mScrollbarWidth : 0; if (mVBarVisible) { return gcn::Rectangle(width, @@ -879,7 +879,7 @@ gcn::Rectangle ScrollArea::getVerticalMarkerDimension() int length, pos; int height; - const int h2 = (mVBarVisible && mShowButtons) + const int h2 = mShowButtons ? mScrollbarWidth : mMarkerSize / 2; const gcn::Widget *content; if (!mWidgets.empty()) @@ -937,7 +937,7 @@ gcn::Rectangle ScrollArea::getHorizontalMarkerDimension() int length, pos; int width; - const int w2 = (mHBarVisible && mShowButtons) + const int w2 = mShowButtons ? mScrollbarWidth : mMarkerSize / 2; const gcn::Widget *content; if (!mWidgets.empty()) |