allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Revert "Use dropdown instead of trigger-page sidebar notebook tabs"

Browse Source 
This reverts commit e7ac13a834.
This commit is contained in:
Robin Gareus
2025-01-22 14:54:03 +01:00
parent e08dfcba5e
commit 82993157e5
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/trigger_page.cc
View File

@@ -129,9 +129,10 @@ TriggerPage::TriggerPage ()
_strip_group_box.pack_start (_strip_scroller, true, true);
/* sidebar */
_sidebar_notebook.set_show_tabs (false);
_sidebar_notebook.set_show_tabs (true);
_sidebar_notebook.set_scrollable (true);
_sidebar_notebook.popup_disable ();
_sidebar_notebook.set_tab_pos (Gtk::POS_RIGHT);
add_sidebar_page (_("Clips"), _trigger_clip_picker);
add_sidebar_page (_("Tracks"), _trigger_route_list.widget ());
@@ -159,17 +160,11 @@ TriggerPage::TriggerPage ()
_parameter_box.pack_start (*table);
_parameter_box.show ();
_sidebar_pager.disable_scrolling ();
_sidebar_notebook.signal_switch_page().connect ([this](GtkNotebookPage*, guint page) { _sidebar_pager.set_text (_sidebar_notebook.get_tab_label_text (*_sidebar_notebook.get_nth_page (page))); });
_sidebar_vbox.pack_start (_sidebar_pager, false, false, 2);
_sidebar_vbox.pack_start (_sidebar_notebook);
/* Top-level Layout */
content_app_bar.add (_application_bar);
content_main.add (_strip_group_box);
content_att_bottom.add (_parameter_box);
content_att_right.add (_sidebar_vbox);
content_att_right.add (_sidebar_notebook);
/* Show all */
_strip_group_box.show ();
@@ -178,7 +173,7 @@ TriggerPage::TriggerPage ()
_cue_area_frame.show_all ();
_trigger_clip_picker.show ();
_no_strips.show ();
_sidebar_vbox.show_all ();
_sidebar_notebook.show_all ();
/* setup keybidings */
contents().set_data ("ardour-bindings", bindings);
@@ -404,9 +399,12 @@ TriggerPage::update_title ()
void
TriggerPage::add_sidebar_page (string const & name, Gtk::Widget& widget)
{
_sidebar_notebook.append_page (widget, name);
using namespace Menu_Helpers;
_sidebar_pager.AddMenuElem (MenuElem (name, [this, &widget]() {_sidebar_notebook.set_current_page (_sidebar_notebook.page_num (widget)); }));
EventBox* b = manage (new EventBox);
Label* l = manage (new Label (name));
l->set_angle (-90);
b->add (*l);
b->show_all ();
_sidebar_notebook.append_page (widget, *b);
}
void

27
gtk2_ardour/trigger_page.h
View File

@@ -25,7 +25,6 @@
#include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/cairo_widget.h"
#include "widgets/ardour_dropdown.h"
#include "widgets/pane.h"
#include "widgets/tabbable.h"
@@ -111,20 +110,18 @@ private:
Gtkmm2ext::Bindings* bindings;
Gtk::HBox _strip_group_box;
Gtk::ScrolledWindow _strip_scroller;
Gtk::HBox _strip_packer;
Gtk::EventBox _no_strips;
Gtk::Alignment _cue_area_frame;
Gtk::VBox _cue_area_box;
Gtk::HBox _parameter_box;
Gtk::VBox _sidebar_vbox;
ArdourWidgets::ArdourDropdown _sidebar_pager;
Gtk::Notebook _sidebar_notebook;
TriggerClipPicker _trigger_clip_picker;
TriggerSourceList _trigger_source_list;
TriggerRegionList _trigger_region_list;
TriggerRouteList _trigger_route_list;
Gtk::HBox _strip_group_box;
Gtk::ScrolledWindow _strip_scroller;
Gtk::HBox _strip_packer;
Gtk::EventBox _no_strips;
Gtk::Alignment _cue_area_frame;
Gtk::VBox _cue_area_box;
Gtk::HBox _parameter_box;
Gtk::Notebook _sidebar_notebook;
TriggerClipPicker _trigger_clip_picker;
TriggerSourceList _trigger_source_list;
TriggerRegionList _trigger_region_list;
TriggerRouteList _trigger_route_list;
CueBoxWidget _cue_box;
FittedCanvasWidget _master_widget;