ardour/livetrax
13
0
Fork 0
Code

handle old-version pane positions by ignoring them

Browse Source
This commit is contained in:
Paul Davis 2016-05-29 13:43:56 -04:00
parent fae3aee849
commit 2562b4a2f0
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/editor.cc
View File

@ -724,19 +724,21 @@ Editor::Editor ()
edit_pane.set_child_minsize (_the_notebook, 30); /* rough guess at width of notebook tabs */
editor_summary_pane.set_drag_cursor (*_cursors->expand_up_down);
if (!settings || (prop = settings->property ("edit-horizontal-pane-pos")) == 0) {
float fract;
if (!settings || ((prop = settings->property ("edit-horizontal-pane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
/* initial allocation is 90% to canvas, 10% to notebook */
edit_pane.set_divider (0, 0.90);
} else {
edit_pane.set_divider (0, atof (prop->value()));
edit_pane.set_divider (0, fract);
}
if (!settings || (prop = settings->property ("edit-vertical-pane-pos")) == 0) {
if (!settings || ((prop = settings->property ("edit-vertical-pane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
/* initial allocation is 90% to canvas, 10% to summary */
editor_summary_pane.set_divider (0, 0.90);
} else {
editor_summary_pane.set_divider (0, atof (prop->value()));
editor_summary_pane.set_divider (0, fract);
}
top_hbox.pack_start (toolbar_frame);

15
gtk2_ardour/mixer_ui.cc
View File

@ -265,23 +265,24 @@ Mixer_UI::Mixer_UI ()
XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
XMLProperty const * prop;
float fract;
if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0)) {
if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
rhs_pane1.set_divider (0, 0.6f);
} else {
rhs_pane1.set_divider (0, atof (prop->value()));
rhs_pane1.set_divider (0, fract);
}
if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0)) {
if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
rhs_pane2.set_divider (0, 0.7f);
} else {
rhs_pane2.set_divider (0, atof (prop->value()));
rhs_pane2.set_divider (0, fract);
}
if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0)) {
if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
list_hpane.set_divider (0, 0.2f);
} else {
list_hpane.set_divider (0, atof (prop->value()));
list_hpane.set_divider (0, fract);
}
if (!settings || ((prop = settings->property ("mixer-inner-pos")) == 0)) {
if (!settings || ((prop = settings->property ("mixer-inner-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
inner_pane.set_divider (0, 0.8f);
} else {
inner_pane.set_divider (0, atof (prop->value()));