diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-03 00:22:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-04 18:43:00 +0100 |
| commit | 047f152c76f439d31ed13a0ac2a0f882d270c9aa (patch) | |
| tree | a121151f8edf3a1a7cf945f688cf3d62b5653c0e /src | |
| parent | e0860839f664c6269261563d11be0495e756ff06 (diff) | |
Tweak vertical spacing of wxChoice on macOS (#2747).
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_disk.cc | 4 | ||||
| -rw-r--r-- | src/wx/kdm_cpl_panel.cc | 6 | ||||
| -rw-r--r-- | src/wx/wx_util.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc index 74ab30f8e..c907a73b0 100644 --- a/src/tools/dcpomatic_disk.cc +++ b/src/tools/dcpomatic_disk.cc @@ -150,9 +150,9 @@ public: add_label_to_sizer (grid, overall_panel, _("Drive"), true, wxGBPosition(r, 0)); auto drive_sizer = new wxBoxSizer (wxHORIZONTAL); _drive = new wxChoice (overall_panel, wxID_ANY); - drive_sizer->Add (_drive, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_X_GAP); + drive_sizer->Add(_drive, 1, wxTOP, 2); _drive_refresh = new wxButton (overall_panel, wxID_ANY, _("Refresh")); - drive_sizer->Add (_drive_refresh, 0); + drive_sizer->Add(_drive_refresh, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); grid->Add (drive_sizer, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND); ++r; diff --git a/src/wx/kdm_cpl_panel.cc b/src/wx/kdm_cpl_panel.cc index 4699582aa..4e1eb8f34 100644 --- a/src/wx/kdm_cpl_panel.cc +++ b/src/wx/kdm_cpl_panel.cc @@ -41,11 +41,11 @@ KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls) /* CPL choice */ auto s = new wxBoxSizer (wxHORIZONTAL); - add_label_to_sizer (s, this, _("CPL"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + add_label_to_sizer (s, this, _("CPL"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _cpl = new wxChoice (this, wxID_ANY); - s->Add (_cpl, 1, wxEXPAND); + s->Add (_cpl, 1, wxTOP | wxEXPAND, DCPOMATIC_CHOICE_TOP_PAD); _cpl_browse = new Button (this, _("Browse...")); - s->Add (_cpl_browse, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + s->Add (_cpl_browse, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); /* CPL details */ diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 66b01640c..dcf5bbc18 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -74,7 +74,7 @@ class PasswordEntry; /** Amount by which you need to top-pad a choice to make it line up, in some cases */ #ifdef DCPOMATIC_OSX -#define DCPOMATIC_CHOICE_TOP_PAD 1 +#define DCPOMATIC_CHOICE_TOP_PAD 2 #else #define DCPOMATIC_CHOICE_TOP_PAD 0 #endif |
