From f2f420e15fb1b7f1e8e9897550bbc0abbca438c8 Mon Sep 17 00:00:00 2001 From: VelocityRa Date: Sun, 2 Apr 2017 01:34:15 +0300 Subject: GRAPHICS: Skeleton of MacTextWindow Needed to add 2 helper methods to MacWindowManager to make it cleaner --- graphics/macgui/macwindowmanager.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'graphics/macgui/macwindowmanager.cpp') diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp index 53299599f7..b64ff1048f 100644 --- a/graphics/macgui/macwindowmanager.cpp +++ b/graphics/macgui/macwindowmanager.cpp @@ -178,20 +178,25 @@ MacWindow *MacWindowManager::addWindow(bool scrollable, bool resizable, bool edi _windows.push_back(w); _windowStack.push_back(w); - setActive(_lastId); - - _lastId++; + setActive(getNextId()); return w; } +void MacWindowManager::addWindowInitialized(MacWindow *macwindow) { + _windows.push_back(macwindow); + _windowStack.push_back(macwindow); +} + +int MacWindowManager::getNextId() { + return _lastId++; +} + MacMenu *MacWindowManager::addMenu() { - _menu = new MacMenu(_lastId, _screen->getBounds(), this); + _menu = new MacMenu(getNextId(), _screen->getBounds(), this); _windows.push_back(_menu); - _lastId++; - return _menu; } -- cgit v1.2.3