ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

the return of the time_axis_vbox

This commit is contained in:
Robin Gareus 2014-08-31 19:43:32 +02:00
parent 50c3177a5e
commit f7e5d4eba2
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/time_axis_view.cc
View File

@ -178,6 +178,15 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
time_axis_frame.add(controls_ebox);
time_axis_frame.show();
HSeparator* separator = manage (new HSeparator());
separator->set_name("TrackSeparator");
separator->set_size_request(-1, 1);
separator->show();
time_axis_vbox.pack_start (time_axis_frame, true, true);
time_axis_vbox.pack_end (*separator, false, false);
time_axis_vbox.show();
ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler));
GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
@ -258,11 +267,11 @@ guint32
TimeAxisView::show_at (double y, int& nth, VBox *parent)
{
if (control_parent) {
control_parent->reorder_child (time_axis_frame, nth);
control_parent->reorder_child (time_axis_vbox, nth);
} else {
control_parent = parent;
parent->pack_start (time_axis_frame, false, false);
parent->reorder_child (time_axis_frame, nth);
parent->pack_start (time_axis_vbox, false, false);
parent->reorder_child (time_axis_vbox, nth);
}
_order = nth;
@ -520,7 +529,7 @@ TimeAxisView::set_height (uint32_t h)
h = preset_height (HeightSmall);
}
time_axis_frame.property_height_request () = h;
time_axis_vbox.property_height_request () = h;
height = h;
char buf[32];
@ -767,11 +776,13 @@ TimeAxisView::set_selected (bool yn)
time_axis_frame.set_name ("MixerStripSelectedFrame");
controls_ebox.set_name (controls_base_selected_name);
controls_vbox.set_name (controls_base_selected_name);
time_axis_vbox.set_name (controls_base_selected_name);
} else {
time_axis_frame.set_shadow_type (Gtk::SHADOW_OUT);
time_axis_frame.set_name (controls_base_unselected_name);
controls_ebox.set_name (controls_base_unselected_name);
controls_vbox.set_name (controls_base_unselected_name);
time_axis_vbox.set_name (controls_base_unselected_name);
hide_selection ();

1
gtk2_ardour/time_axis_view.h
View File

@ -206,6 +206,7 @@ class TimeAxisView : public virtual AxisView
Glib::RefPtr<Gtk::SizeGroup> controls_button_size_group;
Gtk::EventBox controls_ebox;
Gtk::VBox controls_vbox;
Gtk::VBox time_axis_vbox;
Gtk::Frame time_axis_frame;
Gtk::HBox name_hbox;
Gtk::HBox top_hbox;