X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdialog_setup.cpp;h=c22992f183831f4e90f01d058ec287151df88b4a;hb=20c15bbaf1fb9325c3d6d4a58c7cd9883ef9cebe;hp=525bc7cb9f8e272bc04d2298a7aec07783200b93;hpb=22a64c6070122f43a0a5cbd7f7328a758137e76b;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
index 525bc7c..c22992f 100644
--- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp
@@ -2,7 +2,7 @@
 /*!	\file dialog_setup.cpp
 **	\brief Template File
 **
-**	$Id: dialog_setup.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -255,18 +255,20 @@ Dialog_Setup::on_red_blue_level_change()
 void
 Dialog_Setup::refresh()
 {
+	// Refresh the temporary gamma; do this before adjusting the sliders,
+	// or variables will be used before their initialisation.
+	gamma_pattern.set_gamma_r(App::gamma.get_gamma_r());
+	gamma_pattern.set_gamma_g(App::gamma.get_gamma_g());
+	gamma_pattern.set_gamma_b(App::gamma.get_gamma_b());
+	gamma_pattern.set_black_level(App::gamma.get_black_level());
+	gamma_pattern.set_red_blue_level(App::gamma.get_red_blue_level());
+
 	adj_gamma_r.set_value(1.0/App::gamma.get_gamma_r());
 	adj_gamma_g.set_value(1.0/App::gamma.get_gamma_g());
 	adj_gamma_b.set_value(1.0/App::gamma.get_gamma_b());
 	black_level_selector.set_value(App::gamma.get_black_level());
 	red_blue_level_selector.set_value(App::gamma.get_red_blue_level());
 
-	// Refresh the temporary gamma
-	gamma_pattern.set_gamma_r(1.0/adj_gamma_r.get_value());
-	gamma_pattern.set_gamma_g(1.0/adj_gamma_g.get_value());
-	gamma_pattern.set_gamma_b(1.0/adj_gamma_b.get_value());
-	gamma_pattern.set_black_level(black_level_selector.get_value());
-	gamma_pattern.set_red_blue_level(red_blue_level_selector.get_value());
 	gamma_pattern.refresh();
 
 	adj_recent_files.set_value(App::get_max_recent_files());
@@ -278,7 +280,6 @@ Dialog_Setup::refresh()
 
 	// Refresh the status of the use_colorspace_gamma flag
 	toggle_use_colorspace_gamma.set_active(App::use_colorspace_gamma);
-
 }
 
 GammaPattern::GammaPattern():
@@ -337,7 +338,7 @@ GammaPattern::refresh()
 }
 
 bool
-GammaPattern::redraw(GdkEventExpose*bleh)
+GammaPattern::redraw(GdkEventExpose */*bleh*/)
 {
 	static const char hlines[] = { 3, 0 };
 
@@ -410,7 +411,7 @@ BlackLevelSelector::~BlackLevelSelector()
 }
 
 bool
-BlackLevelSelector::redraw(GdkEventExpose*bleh)
+BlackLevelSelector::redraw(GdkEventExpose */*bleh*/)
 {
 	const int w(get_width()),h(get_height());
 
@@ -535,7 +536,7 @@ RedBlueLevelSelector::~RedBlueLevelSelector()
 }
 
 bool
-RedBlueLevelSelector::redraw(GdkEventExpose*bleh)
+RedBlueLevelSelector::redraw(GdkEventExpose */*bleh*/)
 {
 	const int w(get_width()),h(get_height());