diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-02 08:17:20 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-06-02 08:17:20 -0400 |
commit | 3835b782b370940ba1c96bcb212338e86e30e590 (patch) | |
tree | c020f87fd52b80b4de21dbfe77ff454a7245c32c | |
parent | bac7a13d0f5866ce6e771616f9faf8fb9fc73260 (diff) |
part three of using LocaleGuard with pane sizes
-rw-r--r-- | gtk2_ardour/editor.cc | 26 | ||||
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 42 |
2 files changed, 38 insertions, 30 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 05146077e2..69b6314639 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -726,19 +726,23 @@ Editor::Editor () 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, fract); - } + { + LocaleGuard lg; - 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 { + 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, 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); + editor_summary_pane.set_divider (0, fract); + } } top_hbox.pack_start (toolbar_frame); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index f69eceb96a..1d0f2be115 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -267,25 +267,29 @@ Mixer_UI::Mixer_UI () XMLProperty const * prop; 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); - } else { - rhs_pane1.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); - } else { - rhs_pane2.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); - } else { - list_hpane.set_divider (0, fract); - } - 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())); + { + LocaleGuard lg; + + 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, fract); + } + 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, fract); + } + 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, fract); + } + 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); |