ardour/livetrax
13
0
Fork 0
Code

Compare commits

base: ardour:2de5f8efd5fea09e77d6ba61b2467fca16fc54c5
Branches Tags
ardour:master
ardour:livetrax+10.1
...
compare: ardour:2065646c484a24b21c69ce7283a4a25d1bcb3bf9
Branches Tags
ardour:master
ardour:livetrax+10.1

5 Commits
2de5f8efd5 ... 2065646c48

Author SHA1 Message Date
Ben Loftis
2065646c48 L: do not assign actions to unmapped buttons 
fixes: gtk_accel_group_from_accel_closure assertion warning
 2024-05-21 07:39:32 -05:00
Ben Loftis
6ba1d6314f L: fix the size of the toolbars to the visible ruler height 2024-05-21 07:39:32 -05:00
Ben Loftis
a22de38566 L: merge fix: allow arrangement-ruler on livetrax 2024-05-21 07:39:32 -05:00
Ben Loftis
b69c90156d L: Trax has a fixed set of rulers; you cannot hide or show them 2024-05-21 07:39:32 -05:00
Ben Loftis
375b3e45a3 L: tweak padding around input-meters 2024-05-21 07:39:32 -05:00
5 changed files with 13 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -577,7 +577,7 @@ ARDOUR_UI::livetrax_setup_windows ()
livetrax_meters = manage (new LiveTraxMeters);
livetrax_meters->show_all ();
// livetrax_meter_bar.set_border_width (4);
livetrax_meter_bar.pack_start (*livetrax_meters, true, true, 0);
livetrax_meter_bar.pack_start (*livetrax_meters, true, true, 12);
hb = manage (new HBox);
livetrax_edit_vscrollbar = manage (new VScrollbar (editor->vertical_adjustment));

5
gtk2_ardour/editor.cc
View File

@ -675,8 +675,9 @@ Editor::Editor ()
tsizer->attach(*spcr, 5,6, 1,2, SHRINK, SHRINK); //approx offset
VBox *tbar_packer = manage(new VBox());
tbar_packer->pack_end(*tsizer, true, true);
tbar_packer->pack_end(*marker_hbox, true, true, 4);
tbar_packer->pack_end(*tsizer, FILL|EXPAND, FILL|EXPAND);
tbar_packer->pack_end(*marker_hbox, true, true);
tbar_packer->pack_end(*manage (new Label()), true, true);
time_bars_event_box.add (*tbar_packer);
#else
time_bars_event_box.add (time_bars_vbox);

9
gtk2_ardour/editor_rulers.cc
View File

@ -193,6 +193,9 @@ Editor::initialize_rulers ()
bool
Editor::ruler_label_button_release (GdkEventButton* ev)
{
#ifdef LIVETRAX
return true;
#endif
if (Gtkmm2ext::Keyboard::is_context_menu_event (ev)) {
if (!ruler_dialog) {
ruler_dialog = new RulerDialog ();
@ -636,7 +639,7 @@ Editor::update_ruler_visibility ()
mark_label.hide();
}
if (!Profile->get_livetrax() && ruler_section_action->get_active()) {
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));
@ -701,8 +704,8 @@ Editor::update_ruler_visibility ()
ruler_separator->set_y_position (ruler_separator_y);
time_bars_vbox.set_size_request (-1, ruler_separator_y);
#ifdef LIVETRAX
time_bars_hbox.set_size_request (-1, ruler_separator_y);
time_bars_hbox.set_border_width (4);
time_bars_event_box.set_size_request (-1, ruler_separator_y);
time_bars_event_box.set_border_width (4);
#endif
/* move hv_scroll_group (trackviews) to the end of the timebars */

2
gtk2_ardour/livetrax_meters.cc
View File

@ -21,7 +21,7 @@ LiveTraxMeters::LiveTraxMeters ()
Gtk::Alignment* container = manage (new Gtk::Alignment (.5, .5, 0, 0));
_meter_box.set_border_width (PX_SCALE (10));
_meter_box.set_border_width (PX_SCALE (0));
_meter_box.set_spacing (PX_SCALE (10));
container->add (_meter_box);

2
gtk2_ardour/ruler_dialog.cc
View File

@ -42,6 +42,7 @@ RulerDialog::RulerDialog ()
get_vbox()->show_all ();
#ifndef LIVETRAX
connect_action (samples_button, "samples-ruler");
connect_action (timecode_button, "timecode-ruler");
connect_action (minsec_button, "minsec-ruler");
@ -52,6 +53,7 @@ RulerDialog::RulerDialog ()
connect_action (mark_button, "marker-ruler");
connect_action (section_button, "arrangement-ruler");
connect_action (video_button, "video-ruler");
#endif
}
RulerDialog::~RulerDialog ()