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

Bugfix: Pickers wasn't displayed after a Detail window move

Browse Source 
See issue #1812
This commit is contained in:
Hombre
2016-10-07 14:38:22 +02:00
parent 1c8d8c6dce
commit 222b8a7562
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtgui/cropwindow.cc
View File

@@ -613,6 +613,10 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y)
} }
needRedraw = true; needRedraw = true;
} else if (state == SCropWinMove) {
if (iarea->showColorPickers () && !colorPickers.empty()) {
needRedraw = true;
}
} else if (state == SCropImgMove) { } else if (state == SCropImgMove) {
cropHandler.update (); cropHandler.update ();
@@ -1275,6 +1279,8 @@ void CropWindow::expose (Cairo::RefPtr<Cairo::Context> cr)
{ {
MyMutex::MyLock lock(cropHandler.cimg); MyMutex::MyLock lock(cropHandler.cimg);
bool isPreviewImg = false;
if (decorated) { if (decorated) {
drawDecoration (cr); drawDecoration (cr);
} }
@@ -1787,6 +1793,8 @@ void CropWindow::expose (Cairo::RefPtr<Cairo::Context> cr)
} }
} }
isPreviewImg = true;
} else { } else {
// cropHandler.cropPixbuf is null // cropHandler.cropPixbuf is null
int cropX, cropY; int cropX, cropY;
@@ -1821,7 +1829,7 @@ void CropWindow::expose (Cairo::RefPtr<Cairo::Context> cr)
} }
} }
if ((state == SNormal || state == SDragPicker) && iarea->showColorPickers()) { if ((state == SNormal || state == SDragPicker) && isPreviewImg && iarea->showColorPickers()) {
for (auto colorPicker : colorPickers) { for (auto colorPicker : colorPickers) {
colorPicker->draw(cr); colorPicker->draw(cr);
} }