mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-09 18:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't send paint messages when we are closing the app

Browse Source
This commit is contained in:
David Capello 2021-03-03 09:53:52 -03:00
parent 1193bf18fc
commit 6b89075b26
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ui/manager.cpp
View File

@ -63,6 +63,7 @@ enum class RedrawState {
Normal, Normal,
AWindowHasJustBeenClosed, AWindowHasJustBeenClosed,
RedrawDelayed, RedrawDelayed,
ClosingApp,
}; };
RedrawState redrawState = RedrawState::Normal; RedrawState redrawState = RedrawState::Normal;
@ -702,11 +703,14 @@ void Manager::dispatchMessages()
// returns a number greater than 0, it means that we've processed // returns a number greater than 0, it means that we've processed
// some messages, so we've to redraw the screen. // some messages, so we've to redraw the screen.
if (pumpQueue() > 0 || redrawState == RedrawState::RedrawDelayed) { if (pumpQueue() > 0 || redrawState == RedrawState::RedrawDelayed) {
if (redrawState == RedrawState::ClosingApp) {
// Do nothing, we don't flush nor process paint messages
}
// If a window has just been closed with Manager::_closeWindow() // If a window has just been closed with Manager::_closeWindow()
// after processing messages, we'll wait the next event generation // after processing messages, we'll wait the next event generation
// to process painting events (so the manager doesn't lost the // to process painting events (so the manager doesn't lost the
// DIRTY flag right now). // DIRTY flag right now).
if (redrawState == RedrawState::AWindowHasJustBeenClosed) { else if (redrawState == RedrawState::AWindowHasJustBeenClosed) {
redrawState = RedrawState::RedrawDelayed; redrawState = RedrawState::RedrawDelayed;
} }
else { else {
@ -1080,6 +1084,10 @@ void Manager::dirtyRect(const gfx::Rect& bounds)
// Configures the window for begin the loop // Configures the window for begin the loop
void Manager::_openWindow(Window* window) void Manager::_openWindow(Window* window)
{ {
// Opening other window in the "close app" state, ok, let's back to normal.
if (redrawState == RedrawState::ClosingApp)
redrawState = RedrawState::Normal;
// Free all widgets of special states. // Free all widgets of special states.
if (window->isWantFocus()) { if (window->isWantFocus()) {
freeCapture(); freeCapture();
@ -1172,7 +1180,13 @@ void Manager::_closeWindow(Window* window, bool redraw_background)
// recently closed window). // recently closed window).
updateMouseWidgets(ui::get_mouse_position()); updateMouseWidgets(ui::get_mouse_position());
redrawState = RedrawState::AWindowHasJustBeenClosed; if (children().empty()) {
// All windows were closed...
redrawState = RedrawState::ClosingApp;
}
else {
redrawState = RedrawState::AWindowHasJustBeenClosed;
}
} }
bool Manager::onProcessMessage(Message* msg) bool Manager::onProcessMessage(Message* msg)
@ -1494,6 +1508,10 @@ bool Manager::sendMessageToWidget(Message* msg, Widget* widget)
if (widget->hasFlags(HIDDEN)) if (widget->hasFlags(HIDDEN))
return false; return false;
// Ignore all paint messages when we are closing the app
if (redrawState == RedrawState::ClosingApp)
return false;
PaintMessage* paintMsg = static_cast<PaintMessage*>(msg); PaintMessage* paintMsg = static_cast<PaintMessage*>(msg);
// Restore overlays in the region that we're going to paint. // Restore overlays in the region that we're going to paint.