diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-05 20:31:56 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-05-05 20:31:56 +0000 |
| commit | 2e78bf8ceb7612d305c90de49595046def6cf97d (patch) | |
| tree | 691d92cf16907319acc2db53ecd7a24446e1fb2c /gtk2_ardour/time_axis_view.cc | |
| parent | 20157d04f8a5f8f7e24bd450f3a2961b4e251570 (diff) | |
fixes for 2 of 3 "fit-tracks" problems; new feature: 12 "view-states" and bindings etc. to support them
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3313 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index d90698db0e..c7373f5b2e 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -91,7 +91,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie _hidden = false; height = 0; effective_height = 0; - height_scaling_factor = 1.0; parent = rent; _has_state = false; last_name_entry_key_press_event = 0; @@ -342,13 +341,6 @@ TimeAxisView::hide () } void -TimeAxisView::set_height_scaling_factor (double hsf) -{ - height_scaling_factor = hsf; - set_height (height); -} - -void TimeAxisView::step_height (bool bigger) { if (bigger) { @@ -376,8 +368,9 @@ void TimeAxisView::set_height(uint32_t h) { height = h; + controls_frame.set_size_request (-1, current_height() + ((order == 0) ? 1 : 0)); - //cerr << "TimeAxisView::set_height_pixels() called h = " << h << endl;//DEBUG + if (canvas_item_visible (selection_group)) { /* resize the selection rect */ show_selection (editor.get_selection().time); @@ -534,7 +527,6 @@ TimeAxisView::conditionally_add_to_selection () Selection& s (editor.get_selection()); if (!s.selected (this)) { - cerr << "set selected track\n"; editor.set_selected_track (*this, Selection::Set); } } @@ -930,8 +922,6 @@ TimeAxisView::get_state () snprintf (buf, sizeof(buf), "%u", height); node->add_property ("height", buf); - snprintf (buf, sizeof(buf), "%f", height_scaling_factor); - node->add_property ("height_scaling_factor", buf); node->add_property ("marked_for_display", (_marked_for_display ? "1" : "0")); return *node; } @@ -945,10 +935,6 @@ TimeAxisView::set_state (const XMLNode& node) _marked_for_display = (prop->value() == "1"); } - if ((prop = node.property ("height_scaling_factor")) != 0) { - height_scaling_factor = atof (prop->value()); - } - if ((prop = node.property ("track_height")) != 0) { if (prop->value() == "largest") { |