libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-15 08:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: Crash-proof window management.

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-10-14 21:30:17 +02:00
parent dfc0a5127e
commit 5acaaed860
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
graphics/macgui/macwindowmanager.cpp
View File

@ -184,8 +184,8 @@ MacWindowManager::MacWindowManager() {
}
MacWindowManager::~MacWindowManager() {
for (int i = 0; i < _lastId; i++)
delete _windows[i];
for (Common::HashMap<uint, BaseMacWindow *>::iterator it = _windows.begin(); it != _windows.end(); it++)
delete it->_value;
delete _fontMan;
delete _screenCopy;
@ -223,14 +223,14 @@ MacTextWindow *MacWindowManager::addTextWindow(const MacFont *font, int fgcolor,
void MacWindowManager::addWindowInitialized(MacWindow *macwindow) {
_windows.push_back(macwindow);
_windows[macwindow->getId()] = macwindow;
_windowStack.push_back(macwindow);
}
MacMenu *MacWindowManager::addMenu() {
_menu = new MacMenu(getNextId(), _screen->getBounds(), this);
_windows.push_back(_menu);
_windows[_menu->getId()] = _menu;
return _menu;
}
@ -431,7 +431,13 @@ void MacWindowManager::removeMarked() {
}
_windowsToRemove.clear();
_needsRemoval = false;
_lastId = _windows.size();
// Do we need compact lastid?
_lastId = 0;
for (Common::HashMap<uint, BaseMacWindow *>::iterator lit = _windows.begin(); lit != _windows.end(); lit++) {
if (lit->_key > (uint)_lastId)
_lastId = lit->_key;
}
}
void MacWindowManager::removeFromStack(BaseMacWindow *target) {
@ -445,14 +451,13 @@ void MacWindowManager::removeFromStack(BaseMacWindow *target) {
}
void MacWindowManager::removeFromWindowList(BaseMacWindow *target) {
int size = _windows.size();
int ndx = 0;
for (int i = 0; i < size; i++) {
if (_windows[i] == target) {
ndx = i;
// _windows.erase(target->getId()); // Is applicable?
for (Common::HashMap<uint, BaseMacWindow *>::iterator it = _windows.begin(); it != _windows.end(); it++) {
if (it->_value == target) {
_windows.erase(it);
break;
}
}
_windows.remove_at(ndx);
}
/////////////////

4
graphics/macgui/macwindowmanager.h
View File

@ -23,7 +23,7 @@
#ifndef GRAPHICS_MACGUI_MACWINDOWMANAGER_H
#define GRAPHICS_MACGUI_MACWINDOWMANAGER_H
#include "common/array.h"
#include "common/hashmap.h"
#include "common/list.h"
#include "common/events.h"
@ -243,7 +243,7 @@ public:
private:
Common::List<BaseMacWindow *> _windowStack;
Common::Array<BaseMacWindow *> _windows;
Common::HashMap<uint, BaseMacWindow *> _windows;
Common::List<BaseMacWindow *> _windowsToRemove;
bool _needsRemoval;