Assorted macOS layout tweaks.

6 files changed, 22 insertions, 21 deletions

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 0a0bd5aab..1687704ec 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -798,9 +798,9 @@ DCPPanel::add_video_panel_to_grid ()
 
 	add_label_to_sizer (_video_grid, _j2k_bandwidth_label, true, wxGBPosition (r, 0));
 	wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-	s->Add (_j2k_bandwidth, 1);
-	add_label_to_sizer (s, _mbits_label, false);
-	_video_grid->Add (s, wxGBPosition (r, 1));
+	s->Add (_j2k_bandwidth, 0, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer (s, _mbits_label, false, 0, wxALIGN_CENTER_VERTICAL);
+	_video_grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
 	++r;
 	_video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2));
 }
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 03ade7598..4f925873d 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -83,7 +83,7 @@ JobView::setup ()
 	_notify = new CheckBox (_container, _("Notify when complete"));
 	_notify->Bind (wxEVT_CHECKBOX, bind (&JobView::notify_clicked, this));
 	_notify->SetValue (Config::instance()->default_notify());
-	_controls->Add (_notify);
+	_controls->Add (_notify, 0, wxTOP, DCPOMATIC_BUTTON_STACK_GAP);
 
 	_table->Insert (n, _controls, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
 
diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc
index 241b3880c..88c73ed11 100644
--- a/src/wx/kdm_cpl_panel.cc
+++ b/src/wx/kdm_cpl_panel.cc
@@ -43,7 +43,7 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
 	_cpl = new wxChoice (this, wxID_ANY);
 	s->Add (_cpl, 1, wxEXPAND);
 	_cpl_browse = new Button (this, _("Browse..."));
-	s->Add (_cpl_browse, 0, wxALIGN_CENTER_VERTICAL);
+	s->Add (_cpl_browse, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
 	vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2);
 
 	/* CPL details */
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 35ce4fc27..961a27fc2 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -78,7 +78,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 	type->Add (_type, 1, wxEXPAND);
 	_type->SetSelection (0);
 	wxButton* advanced = new Button (this, _("Advanced..."));
-	type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL);
+	type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
 	table->Add (type, 1, wxEXPAND);
 
 	add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index ae31e36c3..998cd5a81 100644
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -47,11 +47,16 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 #endif
 
 	wxSizer* table = new wxBoxSizer (wxHORIZONTAL);
-	add_label_to_sizer (table, this, _("From"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+	add_label_to_sizer (table, this, _("From"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	wxDateTime from;
 	from.SetToCurrent ();
 	_from_date = new wxDatePickerCtrl (this, wxID_ANY, from, wxDefaultPosition, size);
+#ifdef DCPOMATIC_OSX
+	/* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
+	table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, 4);
+#else
 	table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL);
+#endif
 
 #ifdef __WXGTK3__
 	_from_time = new TimePickerText (this, from);
@@ -59,19 +64,19 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 	_from_time = new TimePickerSpin (this, from);
 #endif
 
-#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, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+	add_label_to_sizer (table, this, _("until"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	wxDateTime to = from;
 	/* 1 week from now */
 	to.Add (wxDateSpan (0, 0, 1, 0));
 	_until_date = new wxDatePickerCtrl (this, wxID_ANY, to, wxDefaultPosition, size);
+#ifdef DCPOMATIC_OSX
+	/* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
+	table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, 4);
+#else
 	table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL);
+#endif
 
 #ifdef __WXGTK3__
 	_until_time = new TimePickerText (this, to);
@@ -79,13 +84,9 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 	_until_time = new TimePickerSpin (this, to);
 #endif
 
-#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);
+	overall_sizer->Add (table, 0, wxTOP, DCPOMATIC_SIZER_GAP);
 
 	_warning = new StaticText (this, wxT(""));
 	overall_sizer->Add (_warning, 0, wxTOP, DCPOMATIC_SIZER_GAP);
diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index 63d6d4f84..0d9668d7b 100644
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -52,10 +52,10 @@ TimePickerSpin::TimePickerSpin (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 (new StaticText (this, wxT (":")), 0, wxALIGN_CENTER_VERTICAL);
+	sizer->Add (_hours, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+	sizer->Add (new StaticText(this, 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, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
 
 	SetSizerAndFit (sizer);