summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-17 22:57:42 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-17 22:57:42 +0300
commit21f4d82b367750543ebfbc65df23e0863bf48c38 (patch)
tree63dfa3cda72741badf9810b6e215f912a44f5a8f /src/gui
parent3154e878e1f4c937807dfc94d1308049e94f9e65 (diff)
downloadmv-21f4d82b367750543ebfbc65df23e0863bf48c38.tar.gz
mv-21f4d82b367750543ebfbc65df23e0863bf48c38.tar.bz2
mv-21f4d82b367750543ebfbc65df23e0863bf48c38.tar.xz
mv-21f4d82b367750543ebfbc65df23e0863bf48c38.zip
Fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/gui.cpp11
-rw-r--r--src/gui/viewport.cpp3
2 files changed, 8 insertions, 6 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 50a0a6a28..c4c69afa1 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1170,12 +1170,12 @@ void Gui::handleMouseWheelMovedDown(const MouseInput& mouseInput)
if (mFocusHandler->getDraggedWidget())
sourceWidget = mFocusHandler->getDraggedWidget();
- int sourceWidgetX = 0;
- int sourceWidgetY = 0;
if (sourceWidget)
{
- sourceWidget->getAbsolutePosition(sourceWidgetX, sourceWidgetY);
+ int sourceWidgetX = 0;
+ int sourceWidgetY = 0;
+ sourceWidget->getAbsolutePosition(sourceWidgetX, sourceWidgetY);
distributeMouseEvent(sourceWidget,
MouseEventType::WHEEL_MOVED_DOWN,
mouseInput.getButton(),
@@ -1192,10 +1192,11 @@ void Gui::handleMouseWheelMovedUp(const MouseInput& mouseInput)
if (mFocusHandler->getDraggedWidget())
sourceWidget = mFocusHandler->getDraggedWidget();
- int sourceWidgetX;
- int sourceWidgetY;
if (sourceWidget)
{
+ int sourceWidgetX;
+ int sourceWidgetY;
+
sourceWidget->getAbsolutePosition(sourceWidgetX, sourceWidgetY);
distributeMouseEvent(sourceWidget,
MouseEventType::WHEEL_MOVED_UP,
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 2ef6b836d..ca301d8e8 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -680,7 +680,8 @@ void Viewport::walkByMouse(const MouseEvent &event)
const int clickY = event.getY() + mPixelViewY - 16;
destY = event.getY() + mPixelViewY;
int newDiffY = 1000000;
- const int heightTiles = mainGraphics->mHeight / mMap->getTileHeight();
+ const int heightTiles = mainGraphics->mHeight
+ / mMap->getTileHeight();
const int tileViewY = mPixelViewY / 32;
for (int f = tileViewY; f < tileViewY + heightTiles; f ++)
{