From 1b094a084a2886a0f299f19cc688d8f7866ba8c4 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Wed, 13 Jun 2018 13:02:10 +0200
Subject: [PATCH] Show/hide contrast mask, still wrong icon on button

---
 rtgui/imagearea.cc            |  8 ++++++++
 rtgui/imagearea.h             |  1 +
 rtgui/imageareatoollistener.h |  1 +
 rtgui/indclippedpanel.cc      |  1 +
 rtgui/toolpanelcoord.cc       | 10 ++++++++++
 rtgui/toolpanelcoord.h        |  1 +
 6 files changed, 22 insertions(+)

diff --git a/rtgui/imagearea.cc b/rtgui/imagearea.cc
index 038e04629..56d81a686 100644
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -560,6 +560,14 @@ void ImageArea::spotWBSelected (int x, int y)
     }
 }
 
+void ImageArea::sharpMaskSelected (bool sharpMask)
+{
+
+    if (listener) {
+        listener->sharpMaskSelected (sharpMask);
+    }
+}
+
 void ImageArea::getScrollImageSize (int& w, int& h)
 {
 
diff --git a/rtgui/imagearea.h b/rtgui/imagearea.h
index 65fc14cce..de9ba1f71 100644
--- a/rtgui/imagearea.h
+++ b/rtgui/imagearea.h
@@ -131,6 +131,7 @@ public:
     void setToolHand        ();
     void straightenReady    (double rotDeg);
     void spotWBSelected     (int x, int y);
+    void sharpMaskSelected  (bool sharpMask);
     int  getSpotWBRectSize  ();
     void redraw             ();
 
diff --git a/rtgui/imageareatoollistener.h b/rtgui/imageareatoollistener.h
index b7d5cec94..d11ec2e6f 100644
--- a/rtgui/imageareatoollistener.h
+++ b/rtgui/imageareatoollistener.h
@@ -29,6 +29,7 @@ class ImageAreaToolListener
 public:
     virtual ~ImageAreaToolListener() {}
     virtual void spotWBselected (int x, int y, Thumbnail* thm = nullptr) {}
+    virtual void sharpMaskSelected (bool sharpMask) {}
     virtual int  getSpotWBRectSize ()
     {
         return 8;
diff --git a/rtgui/indclippedpanel.cc b/rtgui/indclippedpanel.cc
index 35cfa843d..1ccc79edf 100644
--- a/rtgui/indclippedpanel.cc
+++ b/rtgui/indclippedpanel.cc
@@ -127,6 +127,7 @@ void IndicateClippedPanel::buttonToggled (Gtk::ToggleButton* tb)
             indClippedH->set_active(false);
         }
         previewFocusMask->set_active(false);
+        imageArea->sharpMaskSelected(previewSharpMask->get_active());
     } else {
         previewFocusMask->set_active(false);
         previewSharpMask->set_active(false);
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 2899625fe..8ed9fc6e2 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -656,6 +656,16 @@ void ToolPanelCoordinator::spotWBselected (int x, int y, Thumbnail* thm)
     }
 }
 
+void ToolPanelCoordinator::sharpMaskSelected(bool sharpMask)
+{
+
+    if (!ipc) {
+        return;
+    }
+    ipc->beginUpdateParams ();
+    ipc->setSharpMask(sharpMask);
+    ipc->endUpdateParams (rtengine::EvShrEnabled);
+}
 
 
 
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index 5b9822ef2..eca868b5e 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -280,6 +280,7 @@ public:
 
     // imageareatoollistener interface
     void spotWBselected (int x, int y, Thumbnail* thm = nullptr);
+    void sharpMaskSelected (bool sharpMask);
     void cropSelectionReady ();
     void rotateSelectionReady (double rotate_deg, Thumbnail* thm = nullptr);
     ToolBar* getToolBar ()