0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove a no longer valid assert.

Browse source 
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.
This commit is contained in:
Mark de Wever 2009-03-19 20:22:01 +00:00
parent d3947d5c19
commit 582a220bb6
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -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:

11
src/text.cpp
View file

@ -226,13 +226,20 @@ gui2::tpoint ttext::get_column_line(const gui2::tpoint& position) const
// 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);
}
}
}