ardour/livetrax
13
0
Fork 0
Code

arrangement ruler: move arrangement ruler to the bottom

Browse Source
This commit is contained in:
Ben Loftis 2023-08-29 22:39:41 -05:00
parent 2e9432e281
commit 14792a0aee
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gtk2_ardour/editor_rulers.cc
View File

@ -178,9 +178,9 @@ Editor::initialize_rulers ()
lab_children.push_back (Element(range_mark_label, PACK_SHRINK, PACK_START)); lab_children.push_back (Element(range_mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START)); lab_children.push_back (Element(transport_mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(cd_mark_label, PACK_SHRINK, PACK_START)); lab_children.push_back (Element(cd_mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(section_mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START)); lab_children.push_back (Element(mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(cue_mark_label, PACK_SHRINK, PACK_START)); lab_children.push_back (Element(cue_mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(section_mark_label, PACK_SHRINK, PACK_START));
lab_children.push_back (Element(videotl_label, PACK_SHRINK, PACK_START)); lab_children.push_back (Element(videotl_label, PACK_SHRINK, PACK_START));
/* 1 event handler to bind them all ... */ /* 1 event handler to bind them all ... */
@ -624,26 +624,6 @@ Editor::update_ruler_visibility ()
update_marker_display(); update_marker_display();
} }
if (ruler_section_action->get_active()) {
old_unit_pos = section_marker_group->position().y;
if (tbpos != old_unit_pos) {
section_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
section_marker_group->show();
section_mark_label.show();
section_marker_bar->set_outline(false);
tbpos += timebar_height;
tbgpos += timebar_height;
visible_timebars++;
update_marker_display();
} else {
section_marker_group->hide();
section_mark_label.hide();
update_marker_display();
}
if (ruler_marker_action->get_active()) { if (ruler_marker_action->get_active()) {
old_unit_pos = marker_group->position().y; old_unit_pos = marker_group->position().y;
if (tbpos != old_unit_pos) { if (tbpos != old_unit_pos) {
@ -680,6 +660,26 @@ Editor::update_ruler_visibility ()
cue_mark_label.hide(); cue_mark_label.hide();
} }
if (ruler_section_action->get_active()) {
old_unit_pos = section_marker_group->position().y;
if (tbpos != old_unit_pos) {
section_marker_group->move (ArdourCanvas::Duple (0.0, tbpos - old_unit_pos));
}
section_marker_group->show();
section_mark_label.show();
section_marker_bar->set_outline(false);
tbpos += timebar_height;
tbgpos += timebar_height;
visible_timebars++;
update_marker_display();
} else {
section_marker_group->hide();
section_mark_label.hide();
update_marker_display();
}
if (ruler_video_action->get_active()) { if (ruler_video_action->get_active()) {
old_unit_pos = videotl_group->position().y; old_unit_pos = videotl_group->position().y;
if (tbpos != old_unit_pos) { if (tbpos != old_unit_pos) {

4
gtk2_ardour/ruler_dialog.cc
View File

@ -38,9 +38,9 @@ RulerDialog::RulerDialog ()
get_vbox()->pack_start (range_button); get_vbox()->pack_start (range_button);
get_vbox()->pack_start (loop_punch_button); get_vbox()->pack_start (loop_punch_button);
get_vbox()->pack_start (cdmark_button); get_vbox()->pack_start (cdmark_button);
get_vbox()->pack_start (section_button);
get_vbox()->pack_start (mark_button); get_vbox()->pack_start (mark_button);
get_vbox()->pack_start (cuemark_button); get_vbox()->pack_start (cuemark_button);
get_vbox()->pack_start (section_button);
get_vbox()->pack_start (video_button); get_vbox()->pack_start (video_button);
get_vbox()->show_all (); get_vbox()->show_all ();
@ -55,8 +55,8 @@ RulerDialog::RulerDialog ()
connect_action (range_button, "range-ruler"); connect_action (range_button, "range-ruler");
connect_action (mark_button, "marker-ruler"); connect_action (mark_button, "marker-ruler");
connect_action (cdmark_button, "cd-marker-ruler"); connect_action (cdmark_button, "cd-marker-ruler");
connect_action (section_button, "arrangement-ruler");
connect_action (cuemark_button, "cue-marker-ruler"); connect_action (cuemark_button, "cue-marker-ruler");
connect_action (section_button, "arrangement-ruler");
connect_action (video_button, "video-ruler"); connect_action (video_button, "video-ruler");
} }