X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=5f3e38931c0ecb31ad70eaa3c3079dc9f859ae3d;hb=fb20cf41b1fa50d2c1dad398f23431e3dd719638;hp=92882f70c781f90e6bd02121c4bbe62d00bb3f2a;hpb=3a2a20f4d04c9a1791b6e1997e75d729326a422b;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 92882f7..5f3e389 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -41,6 +41,7 @@
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/treemodelsort.h>
 #include <gtkmm/buttonbox.h>
+#include <gtkmm/separator.h>
 
 #include <gtk/gtktreestore.h>
 #include <gtk/gtkversion.h>
@@ -1099,7 +1100,7 @@ CanvasView::create_status_bar()
 Gtk::Widget*
 CanvasView::create_display_bar()
 {
-	displaybar = manage(new class Gtk::Table(1, 1, false));
+	displaybar = manage(new class Gtk::Table(1, 3, false));
 
 	// Setup the ToggleDuckDial widget
 	toggleducksdial = Gtk::manage(new class ToggleDucksDial());
@@ -1128,7 +1129,6 @@ CanvasView::create_display_bar()
 	toggleducksdial->show();
 
 	// Set up the ResolutionDial widget
-
 	resolutiondial=Gtk::manage(new class ResolutionDial());
 
 	resolutiondial->update_lowres(work_area->get_low_resolution_flag());
@@ -1140,8 +1140,13 @@ CanvasView::create_display_bar()
 			sigc::mem_fun(*this, &studio::CanvasView::toggle_low_res_pixel_flag));
 	resolutiondial->show();
 
-	displaybar->attach(*resolutiondial, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	// Set up a separator
+	Gtk::VSeparator *separator = Gtk::manage(new class Gtk::VSeparator());
+	separator->show();
+
+	displaybar->attach(*resolutiondial, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
 	displaybar->attach(*toggleducksdial, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK);
+	displaybar->attach(*separator, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
 	displaybar->show();
 
 	return displaybar;
@@ -3738,6 +3743,21 @@ CanvasView::toggle_duck_mask(Duckmatic::Type type)
 	work_area->queue_draw();
 	try
 	{
+		// Update the toggle ducks actions
+		Glib::RefPtr<Gtk::ToggleAction> action;
+		action = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(action_group->get_action("mask-position-ducks"));
+		action->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_POSITION));
+		action = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(action_group->get_action("mask-tangent-ducks"));
+		action->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_TANGENT));
+		action = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(action_group->get_action("mask-vertex-ducks"));
+		action->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_VERTEX));
+		action = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(action_group->get_action("mask-radius-ducks"));
+		action->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_RADIUS));
+		action = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(action_group->get_action("mask-width-ducks"));
+		action->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_WIDTH));
+		action = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(action_group->get_action("mask-angle-ducks"));
+		action->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_ANGLE));
+		// Update toggle ducks buttons
 		toggleducksdial->update_toggles(work_area->get_type_mask());
 	}
 	catch(...)