diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-25 22:56:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-25 22:56:39 +0100 |
| commit | 918907387e3ec895c6b6342afc639d974714a024 (patch) | |
| tree | d16b758997fcf05f8744529844b3a1c4488b205a /src | |
| parent | 74290866105aba61719c147250a49f3c53e1fdf6 (diff) | |
Copy DCP name layout fix from master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/dcp_panel.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 5957dc9d0..18ffb8b3b 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -77,9 +77,15 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f) ++r; } - add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0)); - _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); - grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND); + /* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see + http://trac.wxwidgets.org/ticket/12539 + */ + _dcp_name = new wxStaticText ( + _panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, + wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE + ); + + grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND); ++r; add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0)); @@ -496,13 +502,7 @@ DCPPanel::edit_isdcf_button_clicked () void DCPPanel::setup_dcp_name () { - string s = _film->dcp_name (true); - if (s.length() > 28) { - _dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("...")); - _dcp_name->SetToolTip (std_to_wx (s)); - } else { - _dcp_name->SetLabel (std_to_wx (s)); - } + _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true))); } void |