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

Merge pull request #6278 from Beep6581/preview-widget-fixes

Browse Source 
More preview widget fixes
This commit is contained in:
Lawrence37
2021-06-13 11:49:47 -07:00
committed by GitHub
parent 869ac54242 c13cc02768
commit 166538dbcb
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/cropwindow.cc
View File

@@ -794,6 +794,13 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y)
iarea->setToolHand (); iarea->setToolHand ();
} }
if (state != SEditDrag1 && state != SEditDrag2 && state != SEditDrag3) {
iarea->deltaImage.set(0, 0);
iarea->deltaScreen.set(0, 0);
iarea->deltaPrevImage.set(0, 0);
iarea->deltaPrevScreen.set(0, 0);
}
if (cropgl && (state == SCropSelecting || state == SResizeH1 || state == SResizeH2 || state == SResizeW1 || state == SResizeW2 || state == SResizeTL || state == SResizeTR || state == SResizeBL || state == SResizeBR || state == SCropMove)) { if (cropgl && (state == SCropSelecting || state == SResizeH1 || state == SResizeH2 || state == SResizeW1 || state == SResizeW2 || state == SResizeTL || state == SResizeTR || state == SResizeBL || state == SResizeBR || state == SCropMove)) {
cropgl->cropManipReady (); cropgl->cropManipReady ();
iarea->setToolHand (); iarea->setToolHand ();

6
rtgui/spot.cc
View File

@@ -428,6 +428,11 @@ void Spot::updateGeometry()
sourceCircle.setVisible(draggedSide != DraggedSide::SOURCE); sourceCircle.setVisible(draggedSide != DraggedSide::SOURCE);
targetCircle.setVisible(draggedSide != DraggedSide::TARGET); targetCircle.setVisible(draggedSide != DraggedSide::TARGET);
} else { } else {
targetCircle.state = Geometry::NORMAL;
sourceCircle.state = Geometry::NORMAL;
targetFeatherCircle.state = Geometry::NORMAL;
sourceFeatherCircle.state = Geometry::NORMAL;
targetCircle.setActive (false); targetCircle.setActive (false);
targetMODisc.setActive (false); targetMODisc.setActive (false);
sourceIcon.setActive (false); sourceIcon.setActive (false);
@@ -667,6 +672,7 @@ bool Spot::button3Pressed (int modifierKey)
return true; return true;
} else if (! (modifierKey & (GDK_SHIFT_MASK | GDK_SHIFT_MASK))) { } else if (! (modifierKey & (GDK_SHIFT_MASK | GDK_SHIFT_MASK))) {
EditSubscriber::action = EditSubscriber::Action::PICKING; EditSubscriber::action = EditSubscriber::Action::PICKING;
return true;
} }
return false; return false;