X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=4131b77b7ab98f309d9c969d7b48dd192dcabaad;hb=9acb5bc09cfde3943739876154ddedd6f43cfc7a;hp=12ce73d55dd1d5f6ebb749bae4778e922e13a1e3;hpb=00b6e5c74c9582ee056f928bb4cc3350486c1c1c;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index 12ce73d..4131b77 100644
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -357,14 +358,14 @@ StateDraw_Context::StateDraw_Context(CanvasView* canvas_view):
 	options_table.attach(check_min_pressure, 0, 2, 6, 7, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 	options_table.attach(spin_min_pressure, 0, 2, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 
-	options_table.attach(*manage(new Gtk::Label(_("Feather"))), 0, 1, 7, 8, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(*manage(new Gtk::Label(_("Feather"))), 0, 1, 8, 9, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 	options_table.attach(spin_feather, 1, 2, 8, 9, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 
 	options_table.attach(check_localerror, 0, 2, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-	options_table.attach(*manage(new Gtk::Label(_("Smooth"))), 0, 1, 9, 10, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	options_table.attach(*manage(new Gtk::Label(_("Smooth"))), 0, 1, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 	options_table.attach(spin_globalthres, 1, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 
-	//options_table.attach(button_fill_last_stroke, 0, 2, 10, 11, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+	//options_table.attach(button_fill_last_stroke, 0, 2, 11, 12, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 
 	button_fill_last_stroke.signal_pressed().connect(sigc::mem_fun(*this,&StateDraw_Context::fill_last_stroke));
 	check_localerror.signal_toggled().connect(sigc::mem_fun(*this,&StateDraw_Context::UpdateErrorBox));
@@ -394,8 +395,8 @@ StateDraw_Context::StateDraw_Context(CanvasView* canvas_view):
 	prev_table_status=get_canvas_view()->tables_are_visible();
 	//if(prev_table_status)get_canvas_view()->hide_tables();
 
-	// Hide the time bar
-	get_canvas_view()->hide_timebar();
+	// Disable the time bar
+	get_canvas_view()->set_sensitive_timebar(false);
 
 	// Connect a signal
 	//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateDraw_Context::on_user_click));
@@ -468,9 +469,8 @@ StateDraw_Context::~StateDraw_Context()
 	// Restore duck clicking
 	get_work_area()->allow_duck_clicks=true;
 
-	// Show the time bar
-	if(get_canvas_view()->get_canvas()->rend_desc().get_time_start()!=get_canvas_view()->get_canvas()->rend_desc().get_time_end())
-		get_canvas_view()->show_timebar();
+	// Enable the time bar
+	get_canvas_view()->set_sensitive_timebar(true);
 
 	// Bring back the tables if they were out before
 	if(prev_table_status)get_canvas_view()->show_tables();
@@ -661,13 +661,13 @@ StateDraw_Context::process_stroke(StrokeData stroke_data, WidthData width_data,
 
 		// Add the widths of the two points
 		{
-			Real width(bline.front().get_width()+width);
-			width=width<=1?width:1;
-			bline.front().set_width(width);
+			Real tmp_width(bline.front().get_width()+width);
+			tmp_width=tmp_width<=1?tmp_width:1;
+			bline.front().set_width(tmp_width);
 		}
 	}
 
-	// If the bline only has once blinepoint, then there is nothing to do.
+	// If the bline only has one blinepoint, then there is nothing to do.
 	if(bline.size()<=1)
 		return Smach::RESULT_OK;