smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

Update Tabbable c'tor to allow member as top-level widget

Browse source 
Derived classes cannot use `Tabbable (_content_vbox,..)`
`_content_vbox` is a member of Tabbable (which has not
yet been initialized) at the point of construction.

This breaks internal API, hence the omnibus commit
This commit is contained in:
Robin Gareus 2024-11-06 01:28:48 +01:00
parent 8ca9e6bcdd
commit b2e4dd91b9
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
7 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

50
libs/widgets/tabbable.cc
View file

@ -37,13 +37,17 @@ using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ArdourWidgets;
Tabbable::Tabbable (Gtk::Widget& w, const string& visible_name, string const & nontranslatable_name, bool tabbed_by_default)
Tabbable::Tabbable (const string& visible_name, string const & nontranslatable_name, Widget* w, bool tabbed_by_default)
: WindowProxy (visible_name, nontranslatable_name)
, _contents (w)
, _parent_notebook (0)
, tab_requested_by_state (tabbed_by_default)
{
default_layout ();
if (w) {
_contents = w;
} else {
_contents = &_content_vbox;
default_layout ();
}
}
Tabbable::~Tabbable ()
@ -119,13 +123,13 @@ Tabbable::use_own_window (bool and_pack_it)
Gtk::Window* win = get (true);
if (and_pack_it) {
Gtk::Container* parent = _contents.get_parent();
Gtk::Container* parent = _contents->get_parent();
if (parent) {
_contents.hide ();
parent->remove (_contents);
_contents->hide ();
parent->remove (*_contents);
}
_own_notebook.append_page (_contents);
_contents.show ();
_own_notebook.append_page (*_contents);
_contents->show ();
}
return win;
@ -179,7 +183,7 @@ Tabbable::get (bool create)
void
Tabbable::show_own_window (bool and_pack_it)
{
Gtk::Widget* parent = _contents.get_parent();
Gtk::Widget* parent = _contents->get_parent();
Gtk::Allocation alloc;
if (parent) {
@ -231,7 +235,7 @@ void
Tabbable::change_visibility ()
{
if (tabbed()) {
_parent_notebook->set_current_page (_parent_notebook->page_num (_contents));
_parent_notebook->set_current_page (_parent_notebook->page_num (*_contents));
return;
}
@ -299,22 +303,22 @@ Tabbable::attach ()
save_pos_and_size ();
_contents.hide ();
_contents.get_parent()->remove (_contents);
_contents->hide ();
_contents->get_parent()->remove (*_contents);
/* leave the window around */
_window->hide ();
}
_parent_notebook->append_page (_contents);
_parent_notebook->set_tab_detachable (_contents);
_parent_notebook->set_tab_reorderable (_contents);
_parent_notebook->set_current_page (_parent_notebook->page_num (_contents));
_parent_notebook->append_page (*_contents);
_parent_notebook->set_tab_detachable (*_contents);
_parent_notebook->set_tab_reorderable (*_contents);
_parent_notebook->set_current_page (_parent_notebook->page_num (*_contents));
signal_tabbed_changed (true);
_contents.show ();
_contents->show ();
/* have to force this on, which is semantically correct, since
* the user has effectively asked for it.
@ -339,7 +343,7 @@ Tabbable::tabbed () const
return false;
}
if (_parent_notebook && (_parent_notebook->page_num (_contents) >= 0)) {
if (_parent_notebook && (_parent_notebook->page_num (*_contents) >= 0)) {
return true;
}
@ -350,8 +354,8 @@ void
Tabbable::hide_tab ()
{
if (tabbed()) {
_contents.hide();
_parent_notebook->remove_page (_contents);
_contents->hide();
_parent_notebook->remove_page (*_contents);
StateChange (*this);
}
}
@ -360,12 +364,12 @@ void
Tabbable::show_tab ()
{
if (!window_visible() && _parent_notebook) {
if (_contents.get_parent() == 0) {
if (_contents->get_parent() == 0) {
tab_requested_by_state = true;
add_to_notebook (*_parent_notebook);
}
_parent_notebook->set_current_page (_parent_notebook->page_num (_contents));
_contents.show ();
_parent_notebook->set_current_page (_parent_notebook->page_num (*_contents));
_contents->show ();
current_toplevel()->present ();
}
}

7
libs/widgets/widgets/tabbable.h
View file

@ -48,7 +48,7 @@ namespace ArdourWidgets {
class LIBWIDGETS_API Tabbable : public Gtkmm2ext::WindowProxy
{
public:
Tabbable (Gtk::Widget&, const std::string& user_visible_name, std::string const & untranslated_name, bool tabbed_by_default = true);
Tabbable (const std::string& user_visible_name, std::string const & untranslated_name, Gtk::Widget* top = NULL, bool tabbed_by_default = true);
~Tabbable ();
void add_to_notebook (Gtk::Notebook& notebook);
@ -58,7 +58,7 @@ public:
void attach ();
void detach ();
Gtk::Widget& contents() const { return _contents; }
Gtk::Widget& contents() const { return *_contents; }
/* this is where ArdourUI packs the tab switchers
* (record/cues/edit/mix) into my toolbar area,
@ -127,7 +127,6 @@ protected:
EventBoxExt content_att_bottom; /* a placeholder for the property box, if you want one */
/* clang-format on */
/* visibility controls */
ArdourWidgets::ArdourButton left_attachment_button;
ArdourWidgets::ArdourButton right_attachment_button;
@ -143,7 +142,7 @@ private:
void window_unmapped ();
Gtk::VBox _content_vbox; /* this is the root widget for a full-featured tabbable, which contains: */
Gtk::Widget& _contents; /* for most Tabbables this will be content_vbox; but rc_options, for example, does something different. */
Gtk::Widget* _contents; /* for most Tabbables this will be content_vbox; but rc_options, for example, does something different. */
Gtk::Notebook _own_notebook;
Gtk::Notebook* _parent_notebook;
bool tab_requested_by_state;