addressing req changes

1- removed toggle ruler 2- removed unneeded set_ruler_show_toggle 3- changed `set_ruler_visible` to `set_show_rulers`
synfig · Aug 26, 2022 · 51d29e1 · 51d29e1
1 parent 75647c6
commit 51d29e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/synfig-studio/src/gui/canvasview.cpp b/synfig-studio/src/gui/canvasview.cpp
@@ -1579,7 +1579,7 @@ CanvasView::init_menus()
 
 		rulers_show_toggle = Gtk::ToggleAction::create("toggle-rulers-show", _("Show Rulers"));
 		rulers_show_toggle->set_active(work_area->get_show_rulers());
-		work_area->set_rulers_visible(work_area->get_show_rulers());
+		work_area->set_show_rulers(work_area->get_show_rulers());
 		action_group->add(rulers_show_toggle, sigc::mem_fun(*this, &CanvasView::toggle_show_ruler));
 
 		grid_show_toggle = Gtk::ToggleAction::create("toggle-grid-show", _("Show Grid"));
@@ -2709,9 +2709,10 @@ CanvasView::set_onion_skins()
 void
 CanvasView::toggle_show_ruler()
 {
-	work_area->toggle_rulers();
+	bool visible = !(work_area->get_show_rulers());
+	work_area->set_show_rulers(visible);
 	// Update the toggle ruler show action
-	set_rulers_show_toggle(work_area->get_show_rulers());
+//	set_rulers_show_toggle(work_area->get_show_rulers());
 }
 
 void

diff --git a/synfig-studio/src/gui/canvasview.h b/synfig-studio/src/gui/canvasview.h
@@ -225,7 +225,6 @@ class CanvasView : public Dockable, public etl::shared_object
 
 	void set_grid_snap_toggle(bool flag) { grid_snap_toggle->set_active(flag); }
 	void set_grid_show_toggle(bool flag) { grid_show_toggle->set_active(flag); }
-	void set_rulers_show_toggle(bool flag) { rulers_show_toggle->set_active(flag); }
 	void set_guides_snap_toggle(bool flag) { guides_snap_toggle->set_active(flag); }
 	void set_guides_show_toggle(bool flag) { guides_show_toggle->set_active(flag); }
 	void set_onion_skin_toggle(bool flag) { onion_skin_toggle->set_active(flag); }

diff --git a/synfig-studio/src/gui/workarea.cpp b/synfig-studio/src/gui/workarea.cpp
@@ -813,18 +813,12 @@ WorkArea::set_background_rendering(bool x)
 }
 
 void
-WorkArea::set_rulers_visible(bool visible)
+WorkArea::set_show_rulers(bool visible)
 {
+	show_rulers = visible;
 	hruler->set_visible(visible);
 	vruler->set_visible(visible);
 	menubutton_box->set_visible(visible);
-}
-
-void
-WorkArea::toggle_rulers()
-{
-	show_rulers = !show_rulers;
-	set_rulers_visible(show_rulers);
 	save_meta_data();
 }
 

diff --git a/synfig-studio/src/gui/workarea.h b/synfig-studio/src/gui/workarea.h
@@ -353,8 +353,7 @@ class WorkArea : public Gtk::Grid, public Duckmatic
 
 	void refresh_dimension_info();
 
-	void toggle_rulers();
-	void set_rulers_visible(bool visible);
+	void set_show_rulers(bool visible);
 
 	//! Enables showing of the grid
 	void enable_grid();