From 5fc6dccf5c22f7245d03094fab908e1afb2b22b8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Aug 2014 14:41:19 +0300 Subject: Use public text popup in minimap. --- src/gui/windows/minimap.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/gui/windows/minimap.cpp') diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 16e18fe35..50e78666f 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -60,14 +60,11 @@ Minimap::Minimap() : mWidthProportion(0.5), mHeightProportion(0.5), mMapImage(nullptr), - mTextPopup(new TextPopup), mMapOriginX(0), mMapOriginY(0), mCustomMapImage(false), mAutoResize(config.getBoolValue("autoresizeminimaps")) { - mTextPopup->postInit(); - setWindowName("Minimap"); mShow = config.getValueBool(getWindowName() + "Show", true); @@ -97,7 +94,6 @@ Minimap::~Minimap() config.removeListeners(this); CHECKLISTENERS deleteMapImage(); - delete2(mTextPopup); } void Minimap::deleteMapImage() @@ -472,13 +468,13 @@ void Minimap::mouseMoved(MouseEvent &event) const int x = event.getX(); const int y = event.getY(); const Rect &rect = mDimension; - mTextPopup->show(x + rect.x, y + rect.y, mCaption); + textPopup->show(x + rect.x, y + rect.y, mCaption); } void Minimap::mouseExited(MouseEvent &event) { Window::mouseExited(event); - mTextPopup->hide(); + textPopup->hide(); } void Minimap::screenToMap(int &x, int &y) -- cgit v1.2.3-70-g09d2