From 885de94a17a39314fd2c1fd97a8df953eb3d4031 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 29 Oct 2016 00:25:15 +0100 Subject: [PATCH] Tweak layout of KDM from/until line under OS X (#926). --- src/wx/kdm_timing_panel.cc | 17 +++++++++++++---- src/wx/time_picker.cc | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc index 613b62cbf..53f674e2e 100644 --- a/src/wx/kdm_timing_panel.cc +++ b/src/wx/kdm_timing_panel.cc @@ -37,18 +37,27 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent) wxDateTime from; from.SetToCurrent (); _from_date = new wxDatePickerCtrl (this, wxID_ANY, from); - table->Add (_from_date); + table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL); _from_time = new TimePicker (this, from); - table->Add (_from_time); +#ifdef DCPOMATIC_OSX + /* Hack to tweak alignment, which I can't get right by "proper" means for some reason */ + table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL | wxTOP, 4); +#else + table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL); +#endif add_label_to_sizer (table, this, _("until"), true); wxDateTime to = from; /* 1 week from now */ to.Add (wxDateSpan (0, 0, 1, 0)); _until_date = new wxDatePickerCtrl (this, wxID_ANY, to); - table->Add (_until_date); + table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL); _until_time = new TimePicker (this, to); - table->Add (_until_time); +#ifdef DCPOMATIC_OSX + table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL | wxTOP, 4); +#else + table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL); +#endif overall_sizer->Add (table); diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc index ee591023b..65b72f4ef 100644 --- a/src/wx/time_picker.cc +++ b/src/wx/time_picker.cc @@ -43,10 +43,10 @@ TimePicker::TimePicker (wxWindow* parent, wxDateTime time) wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL); _hours = new wxSpinCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size); - sizer->Add (_hours, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP); + sizer->Add (_hours, 1, wxEXPAND | wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); sizer->Add (new wxStaticText (this, wxID_ANY, wxT (":")), 0, wxALIGN_CENTER_VERTICAL); _minutes = new wxSpinCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size); - sizer->Add (_minutes, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); + sizer->Add (_minutes, 1, wxEXPAND | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP); SetSizerAndFit (sizer); -- 2.30.2