From 023a2e3849eb657e3010b7c628b1231f23646cce Mon Sep 17 00:00:00 2001 From: "james.k.crook@gmail.com" Date: Sat, 25 Oct 2014 16:45:26 +0000 Subject: [PATCH] Simpler version of centering preferences on app. Simplifies r13489 --- src/widgets/Meter.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp index accbe6dcc..88ecb999f 100644 --- a/src/widgets/Meter.cpp +++ b/src/widgets/Meter.cpp @@ -1473,7 +1473,9 @@ void Meter::OnPreferences(wxCommandEvent & WXUNUSED(event)) wxRadioButton *horizontal; wxRadioButton *vertical; - wxDialog dlg(GetParent(), wxID_ANY, wxString(_("Meter Preferences"))); + // Dialog is a child of the project, rather than of the toolbar. + // This determines where it pops up. + wxDialog dlg(GetActiveProject(), wxID_ANY, wxString(_("Meter Preferences"))); ShuttleGui S(&dlg, eIsCreating); S.StartVerticalLay(); { @@ -1551,13 +1553,7 @@ void Meter::OnPreferences(wxCommandEvent & WXUNUSED(event)) dlg.Layout(); dlg.Fit(); - //Old code to center on meter. - //dlg.CenterOnParent(); - //New code to center on app. - wxRect r = GetActiveProject()->GetRect(); - wxSize size_difference = r.GetSize()- dlg.GetSize(); - wxPoint pt = r.GetTopLeft() + size_difference / 2; - dlg.Move( pt ); + dlg.CenterOnParent(); if (dlg.ShowModal() == wxID_OK) {