diff options
| author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
| commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
| tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/gui/emotepopup.cpp | |
| parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
| parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
| download | mv-490862919d79369112c75955a9c36ff8a081efd3.tar.gz mv-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 mv-490862919d79369112c75955a9c36ff8a081efd3.tar.xz mv-490862919d79369112c75955a9c36ff8a081efd3.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/emotepopup.cpp')
| -rw-r--r-- | src/gui/emotepopup.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp index a286f78e8..39017ac91 100644 --- a/src/gui/emotepopup.cpp +++ b/src/gui/emotepopup.cpp @@ -197,12 +197,15 @@ void EmotePopup::recalculateSize() ++mRowCount; if (mRowCount) + { mColumnCount = emoteCount / mRowCount; + if (emoteCount % mRowCount > 0) + ++ mColumnCount; + } else + { mColumnCount = 1; - - if (emoteCount % mRowCount > 0) - ++mColumnCount; + } setContentSize(mColumnCount * gridWidth, mRowCount * gridHeight); } |