diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-24 00:34:57 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-25 00:52:47 +0200 |
| commit | 5738b34c5d1ecc798f7d84d915c8b17e47d63f58 (patch) | |
| tree | c8388da0c97dae066502b6278905d9f7635cebfb | |
| parent | 8b8322ea5f3f62e5d1a20788c631d7c18e19055b (diff) | |
Fix text wrapping in nag dialog (especially on macOS) (#1978).
| -rw-r--r-- | src/wx/nag_dialog.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc index 417b5f94c..1fb15f2d0 100644 --- a/src/wx/nag_dialog.cc +++ b/src/wx/nag_dialog.cc @@ -28,12 +28,16 @@ using std::shared_ptr; using namespace boost::placeholders; #endif + +static constexpr int width = 400; + + NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel) - : wxDialog (parent, wxID_ANY, _("Important notice"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) + : wxDialog (parent, wxID_ANY, _("Important notice")) , _nag (nag) { auto sizer = new wxBoxSizer (wxVERTICAL); - _text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize (400, 300)); + _text = new StaticText (this, wxEmptyString, wxDefaultPosition, wxSize(width, 300)); sizer->Add (_text, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); auto b = new CheckBox (this, _("Don't show this message again")); @@ -49,16 +53,12 @@ NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder()); } + _text->SetLabelMarkup (message); + _text->Wrap (width); + SetSizer (sizer); sizer->Layout (); sizer->SetSizeHints (this); - - _text->SetLabelMarkup (message); - - Bind (wxEVT_SIZE, [this](wxSizeEvent& ev) { - Layout(); - ev.Skip(); - }); } void |