Move some variables to better scope.

3 files changed, 7 insertions, 8 deletions

diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 630f7e9bf..b67ea756a 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -953,7 +953,7 @@ Rect ScrollArea::getVerticalBarDimension() const
     if (!mVBarVisible)
         return Rect(0, 0, 0, 0);
 
-    const int height = (mVBarVisible && mShowButtons) ? mScrollbarWidth : 0;
+    const int height = mShowButtons ? mScrollbarWidth : 0;
     if (mHBarVisible)
     {
         return Rect(mDimension.width - mScrollbarWidth,
@@ -1122,10 +1122,10 @@ Rect ScrollArea::getDownButtonDimension() const
     if (!mVBarVisible || !mShowButtons)
         return Rect(0, 0, 0, 0);
 
-    if (mVBarVisible && mHBarVisible)
+    if (mHBarVisible)
     {
         return Rect(mDimension.width - mScrollbarWidth,
-            mDimension.height - mScrollbarWidth*2,
+            mDimension.height - mScrollbarWidth * 2,
             mScrollbarWidth,
             mScrollbarWidth);
     }
@@ -1150,7 +1150,7 @@ Rect ScrollArea::getRightButtonDimension() const
     if (!mHBarVisible || !mShowButtons)
         return Rect(0, 0, 0, 0);
 
-    if (mVBarVisible && mHBarVisible)
+    if (mVBarVisible)
     {
         return Rect(mDimension.width - mScrollbarWidth*2,
             mDimension.height - mScrollbarWidth,
diff --git a/src/gui/widgets/tabs/chat/whispertab.cpp b/src/gui/widgets/tabs/chat/whispertab.cpp
index d8672b22d..73b73a17c 100644
--- a/src/gui/widgets/tabs/chat/whispertab.cpp
+++ b/src/gui/widgets/tabs/chat/whispertab.cpp
@@ -71,11 +71,11 @@ void WhisperTab::handleCommandStr(const std::string &msg)
 
     const size_t pos = msg.find(' ');
     const std::string type(msg, 0, pos);
-    const std::string args(msg, pos == std::string::npos
-        ? msg.size() : pos + 1);
 
     if (type == "me")
     {
+        const std::string args(msg, pos == std::string::npos
+            ? msg.size() : pos + 1);
         std::string str = textToMe(args);
         chatHandler->privateMessage(mNick, str);
         if (localPlayer != nullptr)
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 9d9385f8d..b192bad35 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -642,8 +642,6 @@ void Window::setResizable(const bool r)
 
 void Window::widgetResized(const Event &event A_UNUSED)
 {
-    const Rect area = getChildrenArea();
-
     if (mGrip != nullptr)
     {
         mGripRect.x = mDimension.width - mGrip->getWidth() - mGripPadding;
@@ -652,6 +650,7 @@ void Window::widgetResized(const Event &event A_UNUSED)
 
     if (mLayout != nullptr)
     {
+        const Rect area = getChildrenArea();
         int w = area.width;
         int h = area.height;
         mLayout->reflow(w, h);