diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-05 22:06:41 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-05 22:06:41 +0200 |
| commit | 0b3d08694d1a53ad6759fa8fea4207a2fd6dde2e (patch) | |
| tree | 8e307dd3f318c43bc4cfc8fc4c31ba797c7454cc /src | |
| parent | 71fefe8f5d72c1d029eab7584c04066c1a5ff041 (diff) | |
Fix very wide J2K bandwidth spinbutton on GTK3.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/dcp_panel.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 8109741fb..838ccee18 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -18,17 +18,18 @@ */ -#include "dcp_panel.h" -#include "wx_util.h" #include "audio_dialog.h" -#include "focus_manager.h" #include "check_box.h" -#include "static_text.h" #include "check_box.h" +#include "dcp_panel.h" #include "dcpomatic_button.h" -#include "markers_dialog.h" +#include "dcpomatic_spin_ctrl.h" +#include "focus_manager.h" #include "interop_metadata_dialog.h" +#include "markers_dialog.h" #include "smpte_metadata_dialog.h" +#include "static_text.h" +#include "wx_util.h" #include "lib/ratio.h" #include "lib/config.h" #include "lib/dcp_content_type.h" @@ -727,7 +728,12 @@ DCPPanel::make_video_panel () _three_d = new CheckBox (panel, _("3D")); _j2k_bandwidth_label = create_label (panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true); - _j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY); +#ifdef __WXGTK3__ + int const spin_width = 118; +#else + int const spin_width = 56; +#endif + _j2k_bandwidth = new SpinCtrl (panel, spin_width); _mbits_label = create_label (panel, _("Mbit/s"), false); _reencode_j2k = new CheckBox (panel, _("Re-encode JPEG2000 data from input")); @@ -797,7 +803,7 @@ DCPPanel::add_video_panel_to_grid () auto s = new wxBoxSizer (wxHORIZONTAL); s->Add (_j2k_bandwidth, 0, wxALIGN_CENTER_VERTICAL); add_label_to_sizer (s, _mbits_label, false, 0, wxLEFT | wxALIGN_CENTER_VERTICAL); - _video_grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND); + _video_grid->Add (s, wxGBPosition(r, 1), wxDefaultSpan); ++r; _video_grid->Add (_reencode_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2)); } |