summaryrefslogtreecommitdiff
path: root/src/gui/emotepopup.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-02-18 02:06:44 +0300
committerAndrei Karas <akaras@inbox.ru>2012-02-18 02:06:44 +0300
commit2257406db0fd374e929def04525671c2826306c2 (patch)
tree0df3ef6435664fc962b772302e716adf01855825 /src/gui/emotepopup.cpp
parent4cd44430deb5a7efc030839a133fe8510327fc24 (diff)
downloadmanaplus-2257406db0fd374e929def04525671c2826306c2.tar.gz
manaplus-2257406db0fd374e929def04525671c2826306c2.tar.bz2
manaplus-2257406db0fd374e929def04525671c2826306c2.tar.xz
manaplus-2257406db0fd374e929def04525671c2826306c2.zip
Fix code style.
Diffstat (limited to 'src/gui/emotepopup.cpp')
-rw-r--r--src/gui/emotepopup.cpp9
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);
}