mail[Wesnoth-commits] r33857 - in /trunk: changelog src/text.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on March 19, 2009 - 21:22:
Author: mordante
Date: Thu Mar 19 21:22:01 2009
New Revision: 33857

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33857&view=rev
Log:
Remove a no longer valid assert.

Due to the ellipses on the right side the assert is no longer valid and
thus removed. Fixes bug #13217. Also discoved a small cursor glitch with
the ellipses, but don't know the sanest solution so left a reminder.

Modified:
    trunk/changelog
    trunk/src/text.cpp

Modified: trunk/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=33857&r1=33856&r2=33857&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Thu Mar 19 21:22:01 2009
@@ -1,3 +1,7 @@
+Version 1.6a:
+ * User interface:
+   * Remove a no longer valid assert (bug #13217)
+
 Version 1.6:
  * Campaigns:
    * Under the Burning Suns:

Modified: trunk/src/text.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/text.cpp?rev=33857&r1=33856&r2=33857&view=diff
==============================================================================
--- trunk/src/text.cpp (original)
+++ trunk/src/text.cpp Thu Mar 19 21:22:01 2009
@@ -226,13 +226,20 @@
 
        // Now convert this offset to a column, this way is a bit hacky but 
haven't
        // found a better solution yet.
+
+       /** 
+        * @todo There's still a bug left. When you select a text which is in 
the
+        * ellipses on the right side the text gets reformatted with ellipses 
on
+        * the left and the selected character is not the one under the 
cursor.
+        * Other widget toolkits don't show ellipses and have no indication 
more
+        * text is available. Haven't found what the best thing to do would 
be.
+        * Until that time leave it as is.
+        */
        for(size_t i = 0; ; ++i) {
                const int pos = get_cursor_position(i, line).x;
 
                if(pos == offset) {
                        return  gui2::tpoint(i, line);
-               } else if(pos == 0) {
-                       assert(i == 0);
                }
        }
 }




Related Messages


Powered by MHonArc, Updated Thu Mar 19 22:00:29 2009