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

Fix a problem not showing the "modified" state in tabs correctly after the first DrawingState.

Browse Source
This commit is contained in:
David Capello 2012-06-15 21:55:32 -03:00
parent 3bbf7af991
commit 805a0333d7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/editor/drawing_state.cpp
View File

@ -58,10 +58,7 @@ DrawingState::DrawingState(tools::ToolLoop* toolLoop, Editor* editor, Message* m
DrawingState::~DrawingState()
{
delete m_toolLoopManager;
delete m_toolLoop;
m_toolLoopManager = NULL;
m_toolLoop = NULL;
destroyLoop();
}
bool DrawingState::onMouseDown(Editor* editor, Message* msg)
@ -75,9 +72,7 @@ bool DrawingState::onMouseDown(Editor* editor, Message* msg)
// Cancel drawing loop
if (m_toolLoopManager->isCanceled()) {
m_toolLoopManager->releaseLoop(pointer_from_msg(msg));
delete m_toolLoopManager;
m_toolLoopManager = NULL;
destroyLoop();
// Change to standby state
editor->backToPreviousState();
@ -96,6 +91,7 @@ bool DrawingState::onMouseUp(Editor* editor, Message* msg)
return true;
m_toolLoopManager->releaseLoop(pointer_from_msg(msg));
destroyLoop();
// Back to standby state.
editor->backToPreviousState();
@ -162,3 +158,11 @@ bool DrawingState::onUpdateStatusBar(Editor* editor)
// method called by the ToolLoopManager.
return false;
}
void DrawingState::destroyLoop()
{
delete m_toolLoopManager;
delete m_toolLoop;
m_toolLoopManager = NULL;
m_toolLoop = NULL;
}

2
src/widgets/editor/drawing_state.h
View File

@ -45,6 +45,8 @@ public:
virtual bool requirePenPreview() OVERRIDE { return false; }
private:
void destroyLoop();
// The tool-loop.
tools::ToolLoop* m_toolLoop;