From 2bd86d0695fa2d2a8e009c2d5de5c96190e0b932 Mon Sep 17 00:00:00 2001 From: Henrique Santiago Date: Sun, 27 Jan 2013 14:40:27 -0200 Subject: [PATCH] Fix minimap zoom, blue name --- modules/game_minimap/minimap.otui | 10 +++++----- src/client/creature.cpp | 1 - src/client/uiminimap.h | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/game_minimap/minimap.otui b/modules/game_minimap/minimap.otui index 831b0912..bf79d07e 100644 --- a/modules/game_minimap/minimap.otui +++ b/modules/game_minimap/minimap.otui @@ -21,12 +21,12 @@ FloorUpControl < MapControl FloorDownControl < MapControl icon-source: /images/game/minimap/floor_down -ZoomOutControl < MapControl - //image-source: /images/game/minimap/zoom_out - ZoomInControl < MapControl //image-source: /images/game/minimap/zoom_in +ZoomOutControl < MapControl + //image-source: /images/game/minimap/zoom_out + MiniWindow id: minimapWindow !text: tr('Minimap') @@ -75,7 +75,7 @@ MiniWindow enabled: true @onClick: onButtonClick(self:getId()) - ZoomOutControl + ZoomInControl id: zoomIn text: + font: terminus-14px-bold @@ -86,7 +86,7 @@ MiniWindow enabled: true @onClick: onButtonClick(self:getId()) - ZoomInControl + ZoomOutControl id: zoomOut text: - anchors.right: parent.right diff --git a/src/client/creature.cpp b/src/client/creature.cpp index 13833505..d2943972 100644 --- a/src/client/creature.cpp +++ b/src/client/creature.cpp @@ -263,7 +263,6 @@ void Creature::drawInformation(const Point& point, bool useGray, const Rect& par else g_painter->setColor(fillColor); - g_painter->setColor(fillColor); g_painter->drawFilledRect(healthRect); m_nameCache.draw(textRect); diff --git a/src/client/uiminimap.h b/src/client/uiminimap.h index 91cb4c9a..dcf72ae4 100644 --- a/src/client/uiminimap.h +++ b/src/client/uiminimap.h @@ -33,8 +33,8 @@ public: void drawSelf(Fw::DrawPane drawPane); - bool zoomIn() { return setZoom(m_zoom-1); } - bool zoomOut() { return setZoom(m_zoom+1); } + bool zoomIn() { return setZoom(m_zoom+1); } + bool zoomOut() { return setZoom(m_zoom-1); } bool setZoom(int zoom); void setMinZoom(int minZoom) { m_minZoom = minZoom; }