diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 21:59:21 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 22:00:09 +0100 |
| commit | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (patch) | |
| tree | 03c296d1f89859aae35336dfe2f58df09d256fd3 /src/gui/shortcutcontainer.cpp | |
| parent | fa8a4bf49100c0a1d5b96e00803f43bbbb861100 (diff) | |
| parent | 347452b9b69ef3af29c577b7751082822e900c01 (diff) | |
| download | Mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.gz Mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.bz2 Mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.xz Mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.zip | |
Merge branch 'aethyra/master'
Conflicts:
Many files.
Diffstat (limited to 'src/gui/shortcutcontainer.cpp')
| -rw-r--r-- | src/gui/shortcutcontainer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/shortcutcontainer.cpp b/src/gui/shortcutcontainer.cpp index f149266b..901095e5 100644 --- a/src/gui/shortcutcontainer.cpp +++ b/src/gui/shortcutcontainer.cpp @@ -42,13 +42,12 @@ void ShortcutContainer::widgetResized(const gcn::Event &event) if (mGridWidth < 1) mGridWidth = 1; + setHeight((mMaxItems / mGridWidth) * mBoxHeight); + mGridHeight = getHeight() / mBoxHeight; if (mGridHeight < 1) mGridHeight = 1; - - setHeight((mMaxItems / mGridWidth + - (mMaxItems % mGridWidth > 0 ? 1 : 0)) * mBoxHeight); } int ShortcutContainer::getIndexFromGrid(int pointX, int pointY) const |