amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

cursor handling now correct in the precense of <sep> and <atom> (finally)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@238 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-03-25 00:22:44 +00:00
parent 114c03b6e1
commit d37adbbb94
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/tagged_string.cpp
+18 -3
View File
@@ -193,9 +193,6 @@ size_t index_to_cursor(const String& str, size_t index, Movement dir) {
return cursor;
} else if (dir == MOVE_RIGHT) {
return cursor + 1;
} else if (dir == MOVE_MID) {
// take the closest side
return cursor + ((int)(after - index) < (int)(index - before));
} else if (dir == MOVE_LEFT_OPT) {
// is there any non-tag after index?
bool empty = true;
@@ -222,6 +219,22 @@ size_t index_to_cursor(const String& str, size_t index, Movement dir) {
i = skip_tag(str, i);
}
return cursor + 1; // yes it is
} else if (dir == MOVE_MID) {
// count number of actual characters before/after
int before_c = 0;
int after_c = 0;
while (i < close) {
c = str.GetChar(i);
if (c == _('<')) {
i = skip_tag(str, i);
} else {
if (i < index) before_c++;
else after_c++;
++i;
}
}
// take the closest side
return before_c <= after_c ? cursor : cursor + 1;
}
}
i = after;
@@ -250,6 +263,8 @@ void cursor_to_index_range(const String& str, size_t cursor, size_t& start, size
if (c == _('<')) {
// a tag
if (is_substr(str, i, _("<atom")) || is_substr(str, i, _("<sep"))) {
// never move the end over an atom/sep
if (cur >= cursor) break;
// skip tag contents, tag counts as a single 'character'
i = match_close_tag_end(str, i);
} else {