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

Call eyedropper with right-click only when we have the mouse capture (fix #706)

Browse Source
This commit is contained in:
David Capello 2015-08-19 18:05:03 -03:00
parent 2b4c531e8e
commit 1bee62ce8a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/ui/editor/standby_state.cpp
View File

@ -218,6 +218,7 @@ bool StandbyState::onMouseDown(Editor* editor, MouseMessage* msg)
// Call the eyedropper command // Call the eyedropper command
if (clickedInk->isEyedropper()) { if (clickedInk->isEyedropper()) {
editor->captureMouse();
callEyedropper(editor); callEyedropper(editor);
return true; return true;
} }
@ -290,8 +291,10 @@ bool StandbyState::onMouseMove(Editor* editor, MouseMessage* msg)
// We control eyedropper tool from here. TODO move this to another place // We control eyedropper tool from here. TODO move this to another place
if (msg->left() || msg->right()) { if (msg->left() || msg->right()) {
tools::Ink* clickedInk = editor->getCurrentEditorInk(); tools::Ink* clickedInk = editor->getCurrentEditorInk();
if (clickedInk->isEyedropper()) if (clickedInk->isEyedropper() &&
editor->hasCapture()) {
callEyedropper(editor); callEyedropper(editor);
}
} }
editor->showBrushPreview(msg->position()); editor->showBrushPreview(msg->position());