diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-06-07 00:15:16 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-06-07 00:48:12 +0200 |
| commit | cab4c177cd68fb1c81027450cbcd422876f92fb2 (patch) | |
| tree | 9c5ae5c013392874d4eef1108e9138e8f4a061fc /src | |
| parent | 2a616640a07662410d6e5f986a692281fdc3c744 (diff) | |
macOS alignment fixes (#2045).
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/kdm_output_panel.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 92aa86bf3..0147a0b8a 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -75,17 +75,25 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY)); _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC)); } - type->Add (_type, 1, wxEXPAND); + type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); _type->SetSelection (0); wxButton* advanced = new Button (this, _("Advanced...")); type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); - table->Add (type, 1, wxEXPAND); + table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); - add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT); + add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT); _container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), ""); table->Add (_container_name_format->panel(), 1, wxEXPAND); - add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT); + auto format = create_label (this, _("Filename format"), true); + auto align = new wxBoxSizer (wxHORIZONTAL); +#ifdef DCPOMATIC_OSX + align->Add (format, 0, wxTOP, 2); + table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2); +#else + align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP - 2); + table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); +#endif dcp::NameFormat::Map titles; titles['f'] = wx_to_std (_("film name")); titles['c'] = wx_to_std (_("cinema")); |