From 0062a0ad4e8bde2866cd42404ea103ed29fa59db Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 16 Jan 2023 23:57:16 +0100 Subject: [PATCH] Add DCPOMATIC_SUBHEADING_TOP_PAD. --- src/tools/dcpomatic_kdm.cc | 4 ++-- src/wx/dkdm_dialog.cc | 2 +- src/wx/kdm_dialog.cc | 2 +- src/wx/self_dkdm_dialog.cc | 2 +- src/wx/wx_util.h | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 673c54f78..aeb1cf2de 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -166,7 +166,7 @@ public: h = new StaticText (overall_panel, _("DKDM")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _dkdm_search = new wxSearchCtrl(overall_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height())); #ifndef __WXGTK3__ @@ -218,7 +218,7 @@ public: h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _output = new KDMOutputPanel (overall_panel); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc index c7503048c..75e4e1aa1 100644 --- a/src/wx/dkdm_dialog.cc +++ b/src/wx/dkdm_dialog.cc @@ -106,7 +106,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) /* Sub-heading: Output */ h = new StaticText (this, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _output = new DKDMOutputPanel (this); right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 268573e6c..79f78b232 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -108,7 +108,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr film) /* Sub-heading: Output */ h = new StaticText (this, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _output = new KDMOutputPanel (this); right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc index 89a35803f..c8587e7ee 100644 --- a/src/wx/self_dkdm_dialog.cc +++ b/src/wx/self_dkdm_dialog.cc @@ -75,7 +75,7 @@ SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, std::shared_ptr fi /* Sub-heading: output */ h = new StaticText (this, _("Output")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + vertical->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _internal = new wxRadioButton (this, wxID_ANY, _("Save to KDM Creator tool's list")); vertical->Add (_internal, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP); diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index be3be0d1a..1143c5b53 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -70,6 +70,8 @@ class PasswordEntry; #define DCPOMATIC_CHECKBOX_BOTTOM_PAD 0 #endif +#define DCPOMATIC_SUBHEADING_TOP_PAD 16 + /** 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 -- 2.30.2