mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Go through TextSelectionController rather than hitting the text edit directly in SubsEditBox

Browse source
This commit is contained in:
Thomas Goyne 2012-10-08 17:02:09 -07:00
parent a948924850
commit 44f0fcce07
1 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
aegisub/src/subs_edit_box.cpp
View file

@ -82,17 +82,6 @@ struct field_setter : public std::binary_function<AssDialogue*, T, void> {
} }
}; };
/// @brief Get the selection from a text edit
/// @return Pair of selection start and end positions
std::pair<int, int> get_selection(SubsTextEditCtrl *TextEdit) {
int start, end;
TextEdit->GetSelection(&start, &end);
int len = TextEdit->GetText().size();
return std::make_pair(
mid(0, TextEdit->GetReverseUnicodePosition(start), len),
mid(0, TextEdit->GetReverseUnicodePosition(end), len));
}
/// @brief Get the value of a tag at a specified position in a line /// @brief Get the value of a tag at a specified position in a line
/// @param line Line to get the value from /// @param line Line to get the value from
/// @param blockn Block number in the line /// @param blockn Block number in the line
@ -611,8 +600,9 @@ void SubsEditBox::SetTag(wxString tag, wxString value, bool atEnd) {
if (line->Blocks.empty()) if (line->Blocks.empty())
line->ParseASSTags(); line->ParseASSTags();
std::pair<int, int> sel = get_selection(TextEdit); int sel_start = c->textSelectionController->GetSelectionStart();
int start = atEnd ? sel.second : sel.first; int sel_end = c->textSelectionController->GetSelectionEnd();
int start = atEnd ? sel_end : sel_start;
int blockn = block_at_pos(line->Text, start); int blockn = block_at_pos(line->Text, start);
AssDialogueBlockPlain *plain = 0; AssDialogueBlockPlain *plain = 0;
@ -680,7 +670,7 @@ void SubsEditBox::SetTag(wxString tag, wxString value, bool atEnd) {
assert(false); assert(false);
TextEdit->SetTextTo(line->Text); TextEdit->SetTextTo(line->Text);
if (!atEnd) TextEdit->SetSelectionU(sel.first+shift,sel.second+shift); if (!atEnd) c->textSelectionController->SetSelection(sel_start + shift, sel_end + shift);
TextEdit->SetFocus(); TextEdit->SetFocus();
} }
@ -689,13 +679,14 @@ void SubsEditBox::OnFlagButton(bool (AssStyle::*field), const char *tag, wxStrin
bool state = style ? style->*field : AssStyle().*field; bool state = style ? style->*field : AssStyle().*field;
line->ParseASSTags(); line->ParseASSTags();
std::pair<int, int> sel = get_selection(TextEdit); int sel_start = c->textSelectionController->GetSelectionStart();
int blockn = block_at_pos(line->Text, sel.first); int sel_end = c->textSelectionController->GetSelectionEnd();
int blockn = block_at_pos(line->Text, sel_start);
state = get_value(*line, blockn, state, tag); state = get_value(*line, blockn, state, tag);
SetTag(tag, state ? "0" : "1"); SetTag(tag, state ? "0" : "1");
if (sel.first != sel.second) if (sel_start != sel_end)
SetTag(tag, state ? "1" : "0", true); SetTag(tag, state ? "1" : "0", true);
line->ClearBlocks(); line->ClearBlocks();
@ -705,7 +696,7 @@ void SubsEditBox::OnFlagButton(bool (AssStyle::*field), const char *tag, wxStrin
void SubsEditBox::OnFontButton() { void SubsEditBox::OnFontButton() {
line->ParseASSTags(); line->ParseASSTags();
int blockn = block_at_pos(line->Text, get_selection(TextEdit).first); int blockn = block_at_pos(line->Text, c->textSelectionController->GetInsertionPoint());
AssStyle *style = c->ass->GetStyle(line->Style); AssStyle *style = c->ass->GetStyle(line->Style);
AssStyle defStyle; AssStyle defStyle;
@ -750,8 +741,9 @@ void SubsEditBox::OnColorButton(AssColor (AssStyle::*field), const char *tag, co
line->ParseASSTags(); line->ParseASSTags();
std::pair<int, int> sel = get_selection(TextEdit); int sel_start = c->textSelectionController->GetSelectionStart();
int blockn = block_at_pos(line->Text, sel.first); int sel_end = c->textSelectionController->GetSelectionEnd();
int blockn = block_at_pos(line->Text, sel_start);
color = get_value(*line, blockn, color, colorTag, alt); color = get_value(*line, blockn, color, colorTag, alt);
wxColor newColor = GetColorFromUser<SubsEditBox, &SubsEditBox::SetColorCallback>(c->parent, color, this); wxColor newColor = GetColorFromUser<SubsEditBox, &SubsEditBox::SetColorCallback>(c->parent, color, this);
@ -760,7 +752,7 @@ void SubsEditBox::OnColorButton(AssColor (AssStyle::*field), const char *tag, co
if (!newColor.IsOk()) { if (!newColor.IsOk()) {
c->ass->Undo(); c->ass->Undo();
TextEdit->SetSelectionU(sel.first, sel.second); c->textSelectionController->SetSelection(sel_start, sel_end);
} }
} }