mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the "new_windows" var from ui::Manager impl

Browse Source 
Fix regression bug introduced in
66e9cee3e6 where new opened windows
weren't painted.
This commit is contained in:
David Capello 2017-01-09 12:44:04 -03:00
parent 7c6d927eb1
commit 8fa5d2dff1
1 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/ui/manager.cpp
View File

@ -62,7 +62,6 @@ typedef std::list<Filter*> Filters;
Manager* Manager::m_defaultManager = NULL;
gfx::Region Manager::m_dirtyRegion;
static WidgetsList new_windows; // Windows that we should show
static WidgetsList mouse_widgets_list; // List of widgets to send mouse events
static Messages msg_queue; // Messages queue
static Filters msg_filters[NFILTERS]; // Filters for every enqueued message
@ -124,7 +123,6 @@ Manager::Manager()
if (!m_defaultManager) {
// Empty lists
ASSERT(msg_queue.empty());
ASSERT(new_windows.empty());
mouse_widgets_list.clear();
// Reset variables
@ -168,7 +166,6 @@ Manager::~Manager()
// Shutdown system
ASSERT(msg_queue.empty());
ASSERT(new_windows.empty());
mouse_widgets_list.clear();
}
}
@ -230,30 +227,6 @@ bool Manager::generateMessages()
if (children().empty())
return false;
// New windows to show?
if (!new_windows.empty()) {
for (auto window : new_windows) {
// Relayout
window->layout();
// Dirty the entire window and show it
window->setVisible(true);
window->invalidate();
// Attract the focus to the magnetic widget...
// 1) get the magnetic widget
Widget* magnet = findMagneticWidget(window->window());
// 2) if magnetic widget exists and it doesn't have the focus
if (magnet && !magnet->hasFocus())
setFocus(magnet);
// 3) if not, put the focus in the first child
else if (static_cast<Window*>(window)->isWantFocus())
focusFirstChild(window);
}
new_windows.clear();
}
generateMessagesFromSheEvents();
// Generate messages for timers
@ -998,12 +971,27 @@ void Manager::_openWindow(Window* window)
insertChild(0, window);
// Broadcast the open message.
Message* msg = new Message(kOpenMessage);
msg->addRecipient(window);
enqueueMessage(msg);
{
base::UniquePtr<Message> msg(new Message(kOpenMessage));
window->sendMessage(msg);
}
// Update the new windows list to show.
new_windows.push_back(window);
// Relayout
window->layout();
// Dirty the entire window and show it
window->setVisible(true);
window->invalidate();
// Attract the focus to the magnetic widget...
// 1) get the magnetic widget
Widget* magnet = findMagneticWidget(window);
// 2) if magnetic widget exists and it doesn't have the focus
if (magnet && !magnet->hasFocus())
setFocus(magnet);
// 3) if not, put the focus in the first child
else if (window->isWantFocus())
focusFirstChild(window);
// Update mouse widget (as it can be a widget below the
// recently opened window).
@ -1051,9 +1039,10 @@ void Manager::_closeWindow(Window* window, bool redraw_background)
window->setVisible(false);
// Close message.
Message* msg = new Message(kCloseMessage);
msg->addRecipient(window);
enqueueMessage(msg);
{
base::UniquePtr<Message> msg(new Message(kCloseMessage));
window->sendMessage(msg);
}
// Update manager list stuff.
removeChild(window);
@ -1061,12 +1050,6 @@ void Manager::_closeWindow(Window* window, bool redraw_background)
// Redraw background.
invalidateRegion(reg1);
// Maybe the window is in the "new_windows" list.
WidgetsList::iterator it =
std::find(new_windows.begin(), new_windows.end(), window);
if (it != new_windows.end())
new_windows.erase(it);
// Update mouse widget (as it can be a widget below the
// recently closed window).
Widget* widget = pick(ui::get_mouse_position());