FP8: Implement "Control-Link"

[ardour.git] / gtk2_ardour / time_axis_view.cc

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 67e487f648462601876ebb61cc8667aea4a867e7..c1ec7767e55c8cf4de6607f472666ced5f6a8015 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -590,9 +590,7 @@ TimeAxisView::set_height (uint32_t h, TrackHeightMode m)
        TOP_LEVEL_WIDGET.property_height_request () = h;
        height = h;
 
-       char buf[32];
-       snprintf (buf, sizeof (buf), "%u", height);
-       set_gui_property ("height", buf);
+       set_gui_property ("height", height);
 
        for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
                (*i)->set_height ();
@@ -631,12 +629,12 @@ TimeAxisView::begin_name_edit ()
         */
 
        int x, y;
-        int wx, wy;
+       int wx, wy;
 
-        name_label.translate_coordinates (*toplevel, 0, 0, x, y);
-        toplevel->get_window()->get_origin (wx, wy);
+       name_label.translate_coordinates (*toplevel, 0, 0, x, y);
+       toplevel->get_window()->get_origin (wx, wy);
 
-        fte->move (wx + x, wy + y);
+       fte->move (wx + x, wy + y);
        fte->present ();
 }
 
@@ -771,19 +769,9 @@ TimeAxisView::set_selected (bool yn)
                time_axis_vbox.set_name (controls_base_unselected_name);
 
                hide_selection ();
-
-               /* children will be set for the yn=true case. but when deselecting
-                  the editor only has a list of top-level trackviews, so we
-                  have to do this here.
-               */
-
-               for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-                       (*i)->set_selected (false);
-               }
        }
 
        time_axis_frame.show();
-
 }
 
 void
@@ -1307,10 +1295,9 @@ TimeAxisView::reset_visual_state ()
 {
        /* this method is not required to trigger a global redraw */
 
-       string str = gui_property ("height");
-
-       if (!str.empty()) {
-               set_height (atoi (str));
+       uint32_t height;
+       if (get_gui_property ("height", height)) {
+               set_height (height);
        } else {
                set_height (preset_height (HeightNormal));
        }