Merge branch 'dev' into hidpi-icons

2018-10-25 20:43:41 +02:00
parent 4eb8a8f70c fef2f73aa7
commit 785a0e6a46
216 changed files with 2636 additions and 1327 deletions
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -370,7 +370,7 @@ void WhiteBalance::enabledChanged()
 }


-void WhiteBalance::adjusterChanged (Adjuster* a, double newval)
+void WhiteBalance::adjusterChanged(Adjuster* a, double newval)
 {
    int tVal = (int)temp->getValue();
    double gVal = green->getValue();
@@ -433,6 +433,10 @@ void WhiteBalance::adjusterChanged (Adjuster* a, double newval)
    }
 }

+void WhiteBalance::adjusterAutoToggled(Adjuster* a, bool newval)
+{
+}
+
 void WhiteBalance::optChanged ()
 {
    Gtk::TreeModel::Row row = getActiveMethod();