forked from mia/Aegisub
Originally committed to SVN as r613.
This commit is contained in:
parent
ab98702591
commit
929a914024
1 changed files with 29 additions and 3 deletions
|
@ -474,6 +474,13 @@ void SubsTextEditCtrl::ShowPopupMenu(int activePos) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Has suggestions
|
||||||
|
if (result.size()) {
|
||||||
|
wxFont font;
|
||||||
|
font.SetStyle(wxFONTSTYLE_ITALIC);
|
||||||
|
menu.Append(EDIT_MENU_THESAURUS,wxString::Format(_("Thesaurus suggestions for \"%s\":"),currentWord.c_str()))->SetFont(font);
|
||||||
|
}
|
||||||
|
|
||||||
// Build menu
|
// Build menu
|
||||||
int curThesEntry = 0;
|
int curThesEntry = 0;
|
||||||
for (unsigned int i=0;i<result.size();i++) {
|
for (unsigned int i=0;i<result.size();i++) {
|
||||||
|
@ -542,9 +549,28 @@ void SubsTextEditCtrl::GetBoundsOfWordAtPosition(int pos,int &_start,int &_end)
|
||||||
else next = 0;
|
else next = 0;
|
||||||
|
|
||||||
// Depth
|
// Depth
|
||||||
if (cur == '{') depth++;
|
if (cur == '{') {
|
||||||
if (cur == '}') depth--;
|
if (i >= pos) {
|
||||||
if (depth != 0) continue;
|
firstDelimAfter = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
depth++;
|
||||||
|
}
|
||||||
|
if (cur == '}') {
|
||||||
|
if (i < pos) {
|
||||||
|
lastDelimBefore = i;
|
||||||
|
}
|
||||||
|
depth--;
|
||||||
|
}
|
||||||
|
if (depth != 0) {
|
||||||
|
// Picked a location in invalid depth
|
||||||
|
if (pos == i) {
|
||||||
|
lastDelimBefore = -1;
|
||||||
|
firstDelimAfter = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Line breaks
|
// Line breaks
|
||||||
if (cur == '\\' && (next == 'N' || next == 'n' || next == 'h')) {
|
if (cur == '\\' && (next == 'N' || next == 'n' || next == 'h')) {
|
||||||
|
|
Loading…
Reference in a new issue