ardour/livetrax
13
0
Fork 0
Code

extend API for tabbable visibility management

Browse Source
This commit is contained in:
Paul Davis 2015-07-25 09:18:32 -04:00
parent 1bdf6d8a68
commit 077bb13e94
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/gtkmm2ext/gtkmm2ext/tabbable.h
View File

@ -57,15 +57,15 @@ class LIBGTKMM2EXT_API Tabbable : public WindowProxy {
virtual Gtk::Window* use_own_window (bool and_pack_it);
bool has_own_window () const;
bool is_tabbed () const;
void set_default_tabbed (bool yn);
virtual void show_window ();
bool window_visible ();
bool window_visible () const;
bool tabbed() const;
bool tabbed_by_default () const;
Gtk::Window* current_toplevel () const;
Gtk::Notebook* tab_root_drop ();

18
libs/gtkmm2ext/tabbable.cc
View File

@ -96,9 +96,9 @@ Tabbable::use_own_window (bool and_pack_it)
}
bool
Tabbable::window_visible ()
Tabbable::window_visible () const
{
if (!own_window()) {
if (!_window) {
return false;
}
@ -155,6 +155,8 @@ Tabbable::show_own_window (bool and_pack_it)
_window->set_default_size (alloc.get_width(), alloc.get_height());
}
tab_requested_by_state = false;
_window->show_all ();
_window->present ();
}
@ -271,15 +273,13 @@ Tabbable::delete_event_handler (GdkEventAny *ev)
}
bool
Tabbable::is_tabbed () const
Tabbable::tabbed () const
{
Window* toplevel = (Window*) _contents.get_toplevel();
if (_window && (toplevel == _window)) {
if (_window && (current_toplevel() == _window)) {
return false;
}
if (_parent_notebook && _contents.get_parent()) {
if (_parent_notebook && (_parent_notebook->page_num (_contents) >= 0)) {
return true;
}
@ -320,9 +320,9 @@ Tabbable::xml_node_name()
}
bool
Tabbable::tabbed () const
Tabbable::tabbed_by_default() const
{
return _parent_notebook && (_parent_notebook->page_num (_contents) >= 0);
return tab_requested_by_state;
}
XMLNode&