From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 9 Feb 2011 19:52:10 +0000 (+0000)
Subject: Don't shorten text too much in wxControl::Ellipsize().
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/508fc76d0c40e505ec2be7a2d6d985a39383acb1

Don't shorten text too much in wxControl::Ellipsize().

If the allowed width is so small that nothing reasonable can fit it,
overlap it. Ellipsized text must always contain "..." to indicate that
it was shortened, it isn't acceptable to omit it.

See #11360.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/interface/wx/control.h b/interface/wx/control.h
index 3c77c72a9a..1f98daebe0 100644
--- a/interface/wx/control.h
+++ b/interface/wx/control.h
@@ -179,11 +179,11 @@ public:     // static functions
 
     /**
         Replaces parts of the @a label string with ellipsis, if needed, so
-        that it doesn't exceed @a maxWidth.
-        
-        Note that this functions is guaranteed to always returns a string
-        whose rendering on the given DC takes less than @a maxWidth pixels
-        in horizontal.
+        that it fits into @a maxWidth pixels if possible.
+
+        Note that this function does @em not guarantee that the returned string
+        will always be shorter than @a maxWidth; if @a maxWidth is extremely
+        small, ellipsized text may be larger.
 
         @param label
             The string to ellipsize
diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 444e0163e8..d08cb255dc 100755
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -397,20 +397,7 @@ wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxD
     wxString ret(curLine);
     ret.erase(initialCharToRemove, nCharsToRemove);
 
-    int removedPx;
-    if (initialCharToRemove >= 1)
-        removedPx = charOffsetsPx[initialCharToRemove+nCharsToRemove-1] - charOffsetsPx[initialCharToRemove-1];
-    else
-        removedPx = charOffsetsPx[initialCharToRemove+nCharsToRemove-1];
-    wxASSERT(removedPx >= excessPx);
-
-    // if there is space for the replacement dots, add them
-    if ((int)totalWidthPx-removedPx+replacementWidthPx <= maxFinalWidthPx)
-        ret.insert(initialCharToRemove, wxELLIPSE_REPLACEMENT);
-
-    // if everything was ok, we should have shortened this line
-    // enough to make it fit in maxFinalWidthPx:
-    wxASSERT(dc.GetTextExtent(ret).GetWidth() <= maxFinalWidthPx);
+    ret.insert(initialCharToRemove, wxELLIPSE_REPLACEMENT);
 
     return ret;
 }