Merge branch 'dev' into waveform

2020-08-16 10:08:28 +02:00
parent e67b02da8b 4888cb76f2
commit c5ace05df8
54 changed files with 2532 additions and 1630 deletions
--- a/rtgui/histogrampanel.h
+++ b/rtgui/histogrampanel.h
@@ -24,6 +24,7 @@

 #include <cairomm/cairomm.h>

+#include "delayed.h"
 #include "guiutils.h"
 #include "pointermotionlistener.h"

@@ -243,6 +244,8 @@ public:

 class HistogramPanel final : public Gtk::Grid, public PointerMotionListener, public DrawModeListener, public rtengine::NonCopyable
 {
+private:
+    DelayedCall<bool, Glib::ustring, Glib::ustring, int, int, int> pointer_moved_delayed_call;

 protected: