ardour/livetrax
13
0
Fork 0
Code

part three of using LocaleGuard with pane sizes

Browse Source
This commit is contained in:
Paul Davis 2016-06-02 08:17:20 -04:00
parent bac7a13d0f
commit 3835b782b3
2 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk2_ardour/editor.cc
View File

@ -726,19 +726,23 @@ Editor::Editor ()
float fract; 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 */ LocaleGuard lg;
edit_pane.set_divider (0, 0.90);
} else {
edit_pane.set_divider (0, fract);
}
if (!settings || ((prop = settings->property ("edit-vertical-pane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { if (!settings || ((prop = settings->property ("edit-horizontal-pane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
/* initial allocation is 90% to canvas, 10% to summary */ /* initial allocation is 90% to canvas, 10% to notebook */
editor_summary_pane.set_divider (0, 0.90); edit_pane.set_divider (0, 0.90);
} else { } else {
edit_pane.set_divider (0, fract);
}
editor_summary_pane.set_divider (0, fract); 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, fract);
}
} }
top_hbox.pack_start (toolbar_frame); top_hbox.pack_start (toolbar_frame);

42
gtk2_ardour/mixer_ui.cc
View File

@ -267,25 +267,29 @@ Mixer_UI::Mixer_UI ()
XMLProperty const * prop; XMLProperty const * prop;
float fract; float fract;
if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { {
rhs_pane1.set_divider (0, 0.6f); LocaleGuard lg;
} else {
rhs_pane1.set_divider (0, fract); if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
} rhs_pane1.set_divider (0, 0.6f);
if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { } else {
rhs_pane2.set_divider (0, 0.7f); rhs_pane1.set_divider (0, fract);
} else { }
rhs_pane2.set_divider (0, fract); if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
} rhs_pane2.set_divider (0, 0.7f);
if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { } else {
list_hpane.set_divider (0, 0.2f); rhs_pane2.set_divider (0, fract);
} else { }
list_hpane.set_divider (0, fract); if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
} list_hpane.set_divider (0, 0.2f);
if (!settings || ((prop = settings->property ("mixer-inner-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { } else {
inner_pane.set_divider (0, 0.8f); list_hpane.set_divider (0, fract);
} else { }
inner_pane.set_divider (0, atof (prop->value())); 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()));
}
} }
rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down); rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down);