ardour/livetrax
13
0
Fork 0
Code

Fix vertical pane resizing during fullscreen/unfullscreen

Browse Source 
(#4119).


git-svn-id: svn://localhost/ardour2/branches/3.0@9889 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-07-17 18:22:43 +00:00
parent 7e8e8b4e72
commit 8786d5c9c2
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk2_ardour/editor.cc
View File

@ -3940,12 +3940,16 @@ Editor::maximise_editing_space ()
edit_pane.set_position (post_maximal_horizontal_pane_position);
}
if (post_maximal_editor_height) {
editor_summary_pane.set_position (post_maximal_vertical_pane_position -
abs(post_maximal_editor_height - pre_maximal_editor_height));
} else {
editor_summary_pane.set_position (post_maximal_vertical_pane_position);
}
/* Hack: we must do this in an idle handler for it to work; see comment in
restore_editing_space()
*/
Glib::signal_idle().connect (
sigc::bind (
sigc::mem_fun (*this, &Editor::idle_reset_vertical_pane_position),
post_maximal_vertical_pane_position
)
);
if (Config->get_keep_tearoffs()) {
_mouse_mode_tearoff->set_visible (true);
@ -3957,6 +3961,13 @@ Editor::maximise_editing_space ()
}
bool
Editor::idle_reset_vertical_pane_position (int p)
{
editor_summary_pane.set_position (p);
return false;
}
void
Editor::restore_editing_space ()
{
@ -3981,7 +3992,17 @@ Editor::restore_editing_space ()
post_maximal_editor_height = this->get_height();
edit_pane.set_position (pre_maximal_horizontal_pane_position + abs(this->get_width() - pre_maximal_editor_width));
editor_summary_pane.set_position (pre_maximal_vertical_pane_position + abs(this->get_height() - pre_maximal_editor_height));
/* This is a bit of a hack, but it seems that if you set the vertical pane position
here it gets reset to some wrong value after this method has finished. Doing
the setup in an idle callback seems to work.
*/
Glib::signal_idle().connect (
sigc::bind (
sigc::mem_fun (*this, &Editor::idle_reset_vertical_pane_position),
pre_maximal_vertical_pane_position
)
);
}
/**

2
gtk2_ardour/editor.h
View File

@ -538,6 +538,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
Gtk::HPaned edit_pane;
Gtk::VPaned editor_summary_pane;
bool idle_reset_vertical_pane_position (int);
Gtk::EventBox meter_base;
Gtk::HBox meter_box;
Gtk::EventBox marker_base;