omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update scrollbar scroller on tick, fix Transform mode recursive loop

Browse Source
This commit is contained in:
omigamedev
2019-02-02 14:24:50 +01:00
parent 8e5a8eec1b
commit fe7c357bcc
4 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/canvas_modes.cpp
View File

@@ -926,9 +926,14 @@ void CanvasModeTransform::enter(kCanvasMode prev)
return;
}
// avoid recursive loop, store the last different mode not using Transform
static kCanvasMode last_prev = kCanvasMode::Draw;
if (prev != kCanvasMode::Copy && prev != kCanvasMode::Cut && prev != kCanvasMode::Import)
last_prev = prev;
if (prev != kCanvasMode::MaskFree && prev != kCanvasMode::MaskLine)
{
Canvas::set_mode(prev);
Canvas::set_mode(last_prev);
return;
}
@@ -936,7 +941,7 @@ void CanvasModeTransform::enter(kCanvasMode prev)
if (m->m_points2d.size() < 3)
{
Canvas::set_mode(prev);
Canvas::set_mode(last_prev);
return;
}