liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoids Locallab spot to disapear when mouse right-clicking

Browse Source 
This commit also avoids Locallab spot to disapear when adding lockable
color picker, pressing toolbar "hand" button, pressing h/H key. However,
if another tool button (ex: resizing tool) is pressed, this action is
considered
This commit is contained in:
Pandagrapher
2019-04-03 21:00:54 +02:00
parent 0225a7f109
commit 690df79ef2
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/toolbar.cc
View File

@@ -107,7 +107,7 @@ void ToolBar::setTool (ToolMode tool)
ConnectionBlocker cropBlocker(cropConn);
ConnectionBlocker wbWasBlocked(wbTool, wbConn), cpWasBlocked(colPickerTool, cpConn);
stopEdit = tool == TMHand && handTool->get_active() && editingMode;
stopEdit = tool == TMHand && handTool->get_active() && editingMode && !blockEdit;
handTool->set_active (false);
@@ -204,7 +204,7 @@ void ToolBar::hand_pressed ()
ConnectionBlocker cropBlocker(cropConn);
ConnectionBlocker wbWasBlocked(wbTool, wbConn), cpWasBlocked(colPickerTool, cpConn);
if (editingMode) {
if (editingMode && !blockEdit) {
stopEditMode();
if (listener) {
listener->editModeSwitchedOff ();
@@ -289,7 +289,7 @@ void ToolBar::colPicker_pressed (GdkEventButton* event)
if (current != TMColorPicker) {
// Disabling all other tools, enabling the Picker tool and entering the "visible pickers" mode
if (editingMode) {
if (editingMode && !blockEdit) {
stopEditMode();
if (listener) {
listener->editModeSwitchedOff ();