diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-11-15 21:25:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-11-15 21:25:09 +0100 |
| commit | 5b4b0381872a81821f216fb407c73710c77b5d7a (patch) | |
| tree | cc99e4e0ea255e6a08c008b247e7353f6479b382 /src | |
| parent | f2cdcb636523959c2dd0f0c803001c4c81e539b4 (diff) | |
Improve text panel layout with GTK3's enormous spin controls.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/text_panel.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index cf6807b9e..e7f5741bb 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -242,9 +242,14 @@ TextPanel::add_to_grid () add_label_to_sizer (offset, _x_offset_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); offset->Add (_x_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); offset->Add (_x_offset_pc_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2); +#ifdef __WXGTK3__ + _grid->Add (offset, wxGBPosition(r, 1)); + ++r; + offset = new wxBoxSizer (wxHORIZONTAL); +#endif add_label_to_sizer (offset, _y_offset_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); - offset->Add (_y_offset, 0); - add_label_to_sizer (offset, _y_offset_pc_label, false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + offset->Add (_y_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + add_label_to_sizer (offset, _y_offset_pc_label, false, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL); _grid->Add (offset, wxGBPosition (r, 1)); ++r; @@ -253,9 +258,14 @@ TextPanel::add_to_grid () add_label_to_sizer (scale, _x_scale_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); scale->Add (_x_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); scale->Add (_x_scale_pc_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2); +#ifdef __WXGTK3__ + _grid->Add (scale, wxGBPosition(r, 1)); + ++r; + scale = new wxBoxSizer (wxHORIZONTAL); +#endif add_label_to_sizer (scale, _y_scale_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); - scale->Add (_y_scale, 0); - add_label_to_sizer (scale, _y_scale_pc_label, false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + scale->Add (_y_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + add_label_to_sizer (scale, _y_scale_pc_label, false, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL); _grid->Add (scale, wxGBPosition (r, 1)); ++r; |