diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-03-24 00:20:24 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-03-24 00:20:24 +0300 |
commit | 5a5de75f298bea6f2b861dc1fb9aaf1f3d35d07c (patch) | |
tree | 0d184c893ccedf2d0f422556e57c91c05879a495 /src/gui/windows/ministatuswindow.cpp | |
parent | 937518a2587c2c63649c2e011c33338b7eafe87c (diff) | |
download | manaplus-5a5de75f298bea6f2b861dc1fb9aaf1f3d35d07c.tar.gz manaplus-5a5de75f298bea6f2b861dc1fb9aaf1f3d35d07c.tar.bz2 manaplus-5a5de75f298bea6f2b861dc1fb9aaf1f3d35d07c.tar.xz manaplus-5a5de75f298bea6f2b861dc1fb9aaf1f3d35d07c.zip |
Use window as base class for ministatuswindow.
Diffstat (limited to 'src/gui/windows/ministatuswindow.cpp')
-rw-r--r-- | src/gui/windows/ministatuswindow.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 216d33f42..d8f28535f 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -52,7 +52,7 @@ extern volatile int tick_time; typedef std::vector <ProgressBar*>::const_iterator ProgressBarVectorCIter; MiniStatusWindow::MiniStatusWindow() : - Popup("MiniStatus", "ministatus.xml"), + Window("MiniStatus", false, nullptr, "ministatus.xml"), InventoryListener(), mBars(), mBarNames(), @@ -134,7 +134,7 @@ MiniStatusWindow::MiniStatusWindow() : loadBars(); updateBars(); - setVisible(config.getValueBool(getPopupName() + "Visible", true)); + setVisible(true); addMouseListener(this); Inventory *const inv = PlayerInfo::getInventory(); if (inv) @@ -194,7 +194,7 @@ void MiniStatusWindow::updateBars() int x = 0; const ProgressBar *lastBar = nullptr; FOR_EACH (ProgressBarVectorCIter, it, mBars) - safeRemove(*it); + remove(*it); FOR_EACH (ProgressBarVectorCIter, it, mBars) { @@ -296,7 +296,7 @@ void MiniStatusWindow::updateStatus() void MiniStatusWindow::logic() { BLOCK_START("MiniStatusWindow::logic") - Popup::logic(); + Window::logic(); for (size_t i = 0, sz = mIcons.size(); i < sz; i++) { @@ -316,7 +316,7 @@ void MiniStatusWindow::draw(Graphics *graphics) void MiniStatusWindow::mouseMoved(MouseEvent &event) { - Popup::mouseMoved(event); + Window::mouseMoved(event); const int x = event.getX(); const int y = event.getY(); @@ -454,7 +454,7 @@ void MiniStatusWindow::mousePressed(MouseEvent &event) void MiniStatusWindow::mouseExited(MouseEvent &event) { - Popup::mouseExited(event); + Window::mouseExited(event); mTextPopup->hide(); mStatusPopup->hide(); |