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

Remove "safety margin" from wxControl::Ellipsize().

Browse Source 
When ellipsizing kicks in, the text is much shorter than the available
space -- there's a "safety margin" of one character's width that is
always left unused. This appears to be some kludge that worked around
algorithm defects, not something that should really be needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2011-02-09 19:51:47 +00:00
parent 90fae9d2cf
commit 1d065710d3
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/control.h
View File

@@ -168,7 +168,7 @@ protected:
// Ellipsize() helper: // Ellipsize() helper:
static wxString DoEllipsizeSingleLine(const wxString& label, const wxDC& dc, static wxString DoEllipsizeSingleLine(const wxString& label, const wxDC& dc,
wxEllipsizeMode mode, int maxWidth, wxEllipsizeMode mode, int maxWidth,
int replacementWidth, int marginWidth); int replacementWidth);
// this field contains the label in wx format, i.e. with '&' mnemonics, // this field contains the label in wx format, i.e. with '&' mnemonics,
// as it was passed to the last SetLabel() call // as it was passed to the last SetLabel() call

15
src/common/ctrlcmn.cpp
View File

@@ -239,10 +239,9 @@ wxControlBase::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(va
/* static and protected */ /* static and protected */
wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxDC& dc, wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxDC& dc,
wxEllipsizeMode mode, int maxFinalWidthPx, wxEllipsizeMode mode, int maxFinalWidthPx,
int replacementWidthPx, int marginWidthPx) int replacementWidthPx)
{ {
wxASSERT_MSG(replacementWidthPx > 0 && marginWidthPx > 0, wxASSERT_MSG(replacementWidthPx > 0, "Invalid parameters");
"Invalid parameters");
wxASSERT_LEVEL_2_MSG(!curLine.Contains('\n'), wxASSERT_LEVEL_2_MSG(!curLine.Contains('\n'),
"Use Ellipsize() instead!"); "Use Ellipsize() instead!");
@@ -269,8 +268,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
return curLine; // we don't need to do any ellipsization! return curLine; // we don't need to do any ellipsization!
int excessPx = wxMin(totalWidthPx - maxFinalWidthPx + int excessPx = wxMin(totalWidthPx - maxFinalWidthPx +
replacementWidthPx + replacementWidthPx,
marginWidthPx, // security margin
totalWidthPx); totalWidthPx);
wxASSERT(excessPx>0); // excessPx should be in the [1;totalWidthPx] range wxASSERT(excessPx>0); // excessPx should be in the [1;totalWidthPx] range
@@ -407,12 +405,12 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
wxASSERT(removedPx >= excessPx); wxASSERT(removedPx >= excessPx);
// if there is space for the replacement dots, add them // if there is space for the replacement dots, add them
if ((int)totalWidthPx-removedPx+replacementWidthPx < maxFinalWidthPx) if ((int)totalWidthPx-removedPx+replacementWidthPx <= maxFinalWidthPx)
ret.insert(initialCharToRemove, wxELLIPSE_REPLACEMENT); ret.insert(initialCharToRemove, wxELLIPSE_REPLACEMENT);
// if everything was ok, we should have shortened this line // if everything was ok, we should have shortened this line
// enough to make it fit in maxFinalWidthPx: // enough to make it fit in maxFinalWidthPx:
wxASSERT_LEVEL_2(dc.GetTextExtent(ret).GetWidth() <= maxFinalWidthPx); wxASSERT(dc.GetTextExtent(ret).GetWidth() <= maxFinalWidthPx);
return ret; return ret;
} }
@@ -428,7 +426,6 @@ wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc,
// change because of e.g. a font change; however we calculate them only once // change because of e.g. a font change; however we calculate them only once
// when ellipsizing multiline labels: // when ellipsizing multiline labels:
int replacementWidth = dc.GetTextExtent(wxELLIPSE_REPLACEMENT).GetWidth(); int replacementWidth = dc.GetTextExtent(wxELLIPSE_REPLACEMENT).GetWidth();
int marginWidth = dc.GetCharWidth();
// NB: we must handle correctly labels with newlines: // NB: we must handle correctly labels with newlines:
wxString curLine; wxString curLine;
@@ -437,7 +434,7 @@ wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc,
if ( pc == label.end() || *pc == wxS('\n') ) if ( pc == label.end() || *pc == wxS('\n') )
{ {
curLine = DoEllipsizeSingleLine(curLine, dc, mode, maxFinalWidth, curLine = DoEllipsizeSingleLine(curLine, dc, mode, maxFinalWidth,
replacementWidth, marginWidth); replacementWidth);
// add this (ellipsized) row to the rest of the label // add this (ellipsized) row to the rest of the label
ret << curLine; ret << curLine;