mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-26 12:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better handling of auto-scroll cases with BrushPreview boundaries

Browse Source 
When auto-scroll is disabled, we can even paint moving the mouse
outside the editor viewport bounds, we should keep moving the brush
preview cursor anyway.

When we touch the editor viewport bounds, this patch:
1) Avoids flickering the cursor in auto-scroll mode, and
2) keeps the cursor moving when auto-scroll move is disabled
This commit is contained in:
David Capello 2024-12-01 21:29:11 -03:00
parent db56bb9657
commit 9b5920eef3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/ui/editor/editor.cpp
View File

@ -2050,8 +2050,6 @@ bool Editor::onProcessMessage(Message* msg)
}
case kMouseEnterMessage:
m_brushPreview.hide();
// Do not update tool loop modifiers when the mouse exits and/re-enters
// the editor area while we are inside the same tool loop (hasCapture()).
// E.g. This avoids starting to rotate a rectangular marquee (Alt key
@ -2064,7 +2062,9 @@ bool Editor::onProcessMessage(Message* msg)
break;
case kMouseLeaveMessage:
m_brushPreview.hide();
if (!hasCapture())
m_brushPreview.hide();
StatusBar::instance()->showDefaultText();
// Hide autoguides
@ -2122,7 +2122,7 @@ bool Editor::onProcessMessage(Message* msg)
updateToolByTipProximity(mouseMsg->pointerType());
updateAutoCelGuides(msg);
return m_state->onMouseMove(this, static_cast<MouseMessage*>(msg));
return m_state->onMouseMove(this, mouseMsg);
}
break;
@ -2142,6 +2142,14 @@ bool Editor::onProcessMessage(Message* msg)
updateToolLoopModifiersIndicators();
updateQuicktool();
setCursor(mouseMsg->position());
// In case we didn't hide the BrushPreview on the
// kMouseLeaveMessage message (because we had the mouse
// captured), we can hide the BrushPreview now if the mouse
// is outside the widget.
if (!hasMouse()) {
m_brushPreview.hide();
}
}
if (result)
@ -2553,8 +2561,6 @@ void Editor::onBeforeLayerVisibilityChange(DocEvent& ev, bool newState)
void Editor::setCursor(const gfx::Point& mouseDisplayPos)
{
Rect vp = View::getView(this)->viewportBounds();
if (!vp.contains(mouseDisplayPos))
return;
bool used = false;
if (m_sprite)