From 222b8a7562606312761c97dabbe6063c2f7d8c12 Mon Sep 17 00:00:00 2001
From: Hombre <natureh.510@gmail.com>
Date: Fri, 7 Oct 2016 14:38:22 +0200
Subject: [PATCH] Bugfix: Pickers wasn't displayed after a Detail window move

See issue #1812
---
 rtgui/cropwindow.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc
index d40486627..f59f9eb81 100644
--- a/rtgui/cropwindow.cc
+++ b/rtgui/cropwindow.cc
@@ -613,6 +613,10 @@ void CropWindow::buttonRelease (int button, int num, int bstate, int x, int y)
         }
 
         needRedraw = true;
+    } else if (state == SCropWinMove) {
+        if (iarea->showColorPickers () && !colorPickers.empty()) {
+            needRedraw = true;
+        }
     } else if (state == SCropImgMove) {
         cropHandler.update ();
 
@@ -1275,6 +1279,8 @@ void CropWindow::expose (Cairo::RefPtr<Cairo::Context> cr)
 {
     MyMutex::MyLock lock(cropHandler.cimg);
 
+    bool isPreviewImg = false;
+
     if (decorated) {
         drawDecoration (cr);
     }
@@ -1787,6 +1793,8 @@ void CropWindow::expose (Cairo::RefPtr<Cairo::Context> cr)
                 }
 
             }
+
+            isPreviewImg = true;
         } else {
             // cropHandler.cropPixbuf is null
             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) {
             colorPicker->draw(cr);
         }