Fix minimap zoom, blue name
This commit is contained in:
parent
bcb3db4cdc
commit
2bd86d0695
|
@ -21,12 +21,12 @@ FloorUpControl < MapControl
|
||||||
FloorDownControl < MapControl
|
FloorDownControl < MapControl
|
||||||
icon-source: /images/game/minimap/floor_down
|
icon-source: /images/game/minimap/floor_down
|
||||||
|
|
||||||
ZoomOutControl < MapControl
|
|
||||||
//image-source: /images/game/minimap/zoom_out
|
|
||||||
|
|
||||||
ZoomInControl < MapControl
|
ZoomInControl < MapControl
|
||||||
//image-source: /images/game/minimap/zoom_in
|
//image-source: /images/game/minimap/zoom_in
|
||||||
|
|
||||||
|
ZoomOutControl < MapControl
|
||||||
|
//image-source: /images/game/minimap/zoom_out
|
||||||
|
|
||||||
MiniWindow
|
MiniWindow
|
||||||
id: minimapWindow
|
id: minimapWindow
|
||||||
!text: tr('Minimap')
|
!text: tr('Minimap')
|
||||||
|
@ -75,7 +75,7 @@ MiniWindow
|
||||||
enabled: true
|
enabled: true
|
||||||
@onClick: onButtonClick(self:getId())
|
@onClick: onButtonClick(self:getId())
|
||||||
|
|
||||||
ZoomOutControl
|
ZoomInControl
|
||||||
id: zoomIn
|
id: zoomIn
|
||||||
text: +
|
text: +
|
||||||
font: terminus-14px-bold
|
font: terminus-14px-bold
|
||||||
|
@ -86,7 +86,7 @@ MiniWindow
|
||||||
enabled: true
|
enabled: true
|
||||||
@onClick: onButtonClick(self:getId())
|
@onClick: onButtonClick(self:getId())
|
||||||
|
|
||||||
ZoomInControl
|
ZoomOutControl
|
||||||
id: zoomOut
|
id: zoomOut
|
||||||
text: -
|
text: -
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
|
|
@ -263,7 +263,6 @@ void Creature::drawInformation(const Point& point, bool useGray, const Rect& par
|
||||||
else
|
else
|
||||||
g_painter->setColor(fillColor);
|
g_painter->setColor(fillColor);
|
||||||
|
|
||||||
g_painter->setColor(fillColor);
|
|
||||||
g_painter->drawFilledRect(healthRect);
|
g_painter->drawFilledRect(healthRect);
|
||||||
|
|
||||||
m_nameCache.draw(textRect);
|
m_nameCache.draw(textRect);
|
||||||
|
|
|
@ -33,8 +33,8 @@ public:
|
||||||
|
|
||||||
void drawSelf(Fw::DrawPane drawPane);
|
void drawSelf(Fw::DrawPane drawPane);
|
||||||
|
|
||||||
bool zoomIn() { return setZoom(m_zoom-1); }
|
bool zoomIn() { return setZoom(m_zoom+1); }
|
||||||
bool zoomOut() { return setZoom(m_zoom+1); }
|
bool zoomOut() { return setZoom(m_zoom-1); }
|
||||||
|
|
||||||
bool setZoom(int zoom);
|
bool setZoom(int zoom);
|
||||||
void setMinZoom(int minZoom) { m_minZoom = minZoom; }
|
void setMinZoom(int minZoom) { m_minZoom = minZoom; }
|
||||||
|
|
Loading…
Reference in New Issue