Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ellipsis character instead of "..." approximation

Browse Source 
This way editor button label will be shorter.
This commit is contained in:
Artur Wieczorek
2020-04-04 18:07:46 +02:00
parent c7b789d351
commit 372a609e82
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/editors.cpp
View File

@@ -1979,6 +1979,7 @@ wxWindow* wxPropertyGrid::GenerateEditorButton( const wxPoint& pos, const wxSize
wxPGProperty* selected = GetSelection(); wxPGProperty* selected = GetSelection();
wxASSERT(selected); wxASSERT(selected);
const wxString label = wxString::FromUTF8("\xe2\x80\xa6"); // "Horizontal ellipsis" character
#ifdef __WXMAC__ #ifdef __WXMAC__
// Decorations are chunky on Mac, and we can't make the button square, so // Decorations are chunky on Mac, and we can't make the button square, so
// do things a bit differently on this platform. // do things a bit differently on this platform.
@@ -1987,7 +1988,7 @@ wxWindow* wxPropertyGrid::GenerateEditorButton( const wxPoint& pos, const wxSize
wxSize s(25, wxDefaultCoord); wxSize s(25, wxDefaultCoord);
wxButton* but = new wxButton(); wxButton* but = new wxButton();
but->Create(GetPanel(),wxID_ANY,wxS("..."),p,s,wxWANTS_CHARS); but->Create(GetPanel(),wxID_ANY,label,p,s,wxWANTS_CHARS);
// Now that we know the size, move to the correct position // Now that we know the size, move to the correct position
p.x = pos.x + sz.x - but->GetSize().x - 2; p.x = pos.x + sz.x - but->GetSize().x - 2;
@@ -2012,15 +2013,8 @@ wxWindow* wxPropertyGrid::GenerateEditorButton( const wxPoint& pos, const wxSize
#ifdef __WXMSW__ #ifdef __WXMSW__
but->Hide(); but->Hide();
#endif #endif
but->Create(GetPanel(),wxID_ANY,wxS("..."),p,s,wxWANTS_CHARS); but->Create(GetPanel(),wxID_ANY,label,p,s,wxWANTS_CHARS);
#ifdef __WXGTK__
wxFont font = GetFont();
font.SetFractionalPointSize(font.GetFractionalPointSize()-2);
but->SetFont(font);
#else
but->SetFont(GetFont()); but->SetFont(GetFont());
#endif
#endif #endif
if ( selected->HasFlag(wxPG_PROP_READONLY) && !selected->HasFlag(wxPG_PROP_ACTIVE_BTN) ) if ( selected->HasFlag(wxPG_PROP_READONLY) && !selected->HasFlag(wxPG_PROP_ACTIVE_BTN) )