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

More fixes related to scintilla & Unicode...

Browse source 
Originally committed to SVN as r618.
This commit is contained in:
Rodrigo Braz Monteiro 2006-12-26 01:20:58 +00:00
parent 8b055489eb
commit ac36d6f0cd
4 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/dialog_search_replace.cpp
View file

@ -412,7 +412,7 @@ void SearchReplaceEngine::ReplaceNext(bool DoReplace) {
grid->MakeCellVisible(curLine,0); grid->MakeCellVisible(curLine,0);
if (field == 0) { if (field == 0) {
grid->editBox->SetToLine(curLine); grid->editBox->SetToLine(curLine);
grid->editBox->TextEdit->SetSelection(pos,pos+replaceLen); grid->editBox->TextEdit->SetSelectionU(pos,pos+replaceLen);
} }
grid->EndBatch(); grid->EndBatch();

4
core/subs_edit_box.cpp
View file

@ -1041,13 +1041,13 @@ void SubsEditBox::SetOverride (wxString tagname,wxString preValue,int forcePos)
// Shift selection // Shift selection
selstart = origStart; selstart = origStart;
TextEdit->SetSelection(origStart+shift,selend+shift); TextEdit->SetSelectionU(origStart+shift,selend+shift);
} }
// Commit changes and shift selection // Commit changes and shift selection
TextEdit->SetTextTo(line->Text); TextEdit->SetTextTo(line->Text);
line->ClearBlocks(); line->ClearBlocks();
TextEdit->SetSelection(selstart+shift,selend+shift); TextEdit->SetSelectionU(selstart+shift,selend+shift);
TextEdit->SetFocus(); TextEdit->SetFocus();
} }

20
core/subs_edit_ctrl.cpp
View file

@ -263,10 +263,18 @@ int SubsTextEditCtrl::GetUnicodePosition(int pos) {
/////////////////////////////////////// ///////////////////////////////////////
// Reverse unicode-compatible position // Reverse unicode-compatible position
int SubsTextEditCtrl::GetReverseUnicodePosition(int pos) { int SubsTextEditCtrl::GetReverseUnicodePosition(int pos) {
// Get UTF8
wxCharBuffer buffer = GetText().mb_str(wxConvUTF8); wxCharBuffer buffer = GetText().mb_str(wxConvUTF8);
// Limit position to it
if (pos > (signed)strlen(buffer)) pos = strlen(buffer);
// Get UTF8 substring
char *buf2 = new char[pos+1]; char *buf2 = new char[pos+1];
memcpy(buf2,buffer,pos); memcpy(buf2,buffer,pos);
buf2[pos] = 0; buf2[pos] = 0;
// Convert back and return its length
wxString buf3(buf2,wxConvUTF8); wxString buf3(buf2,wxConvUTF8);
return buf3.Length(); return buf3.Length();
} }
@ -399,7 +407,7 @@ void SubsTextEditCtrl::SetTextTo(const wxString _text) {
UpdateStyle(); UpdateStyle();
// Restore selection // Restore selection
SetSelection(from,to); SetSelectionU(GetReverseUnicodePosition(from),GetReverseUnicodePosition(to));
// Finish // Finish
Thaw(); Thaw();
@ -733,7 +741,7 @@ void SubsTextEditCtrl::OnUseSuggestion(wxCommandEvent &event) {
SetText(text.Left(MAX(0,start)) + suggestion + text.Mid(end+1)); SetText(text.Left(MAX(0,start)) + suggestion + text.Mid(end+1));
// Set selection // Set selection
SetSelection(GetUnicodePosition(start),GetUnicodePosition(start+suggestion.Length())); SetSelectionU(start,start+suggestion.Length());
SetFocus(); SetFocus();
} }
@ -760,6 +768,12 @@ void SubsTextEditCtrl::OnUseThesaurusSuggestion(wxCommandEvent &event) {
SetText(text.Left(MAX(0,start)) + suggestion + text.Mid(end+1)); SetText(text.Left(MAX(0,start)) + suggestion + text.Mid(end+1));
// Set selection // Set selection
SetSelection(GetUnicodePosition(start),GetUnicodePosition(start+suggestion.Length())); SetSelectionU(start,start+suggestion.Length());
SetFocus(); SetFocus();
} }
// Set selection, unicode-aware
void SubsTextEditCtrl::SetSelectionU(int start, int end) {
SetSelection(GetUnicodePosition(start),GetUnicodePosition(end));
}

1
core/subs_edit_ctrl.h
View file

@ -89,6 +89,7 @@ public:
SubsTextEditCtrl(wxWindow* parent, wxWindowID id, const wxString& value = _T(""), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr); SubsTextEditCtrl(wxWindow* parent, wxWindowID id, const wxString& value = _T(""), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr);
~SubsTextEditCtrl(); ~SubsTextEditCtrl();
void SetSelectionU(int start,int end);
void SetTextTo(const wxString text); void SetTextTo(const wxString text);
void UpdateStyle(int start=0,int length=-1); void UpdateStyle(int start=0,int length=-1);
void StyleSpellCheck(int start=0,int length=-1); void StyleSpellCheck(int start=0,int length=-1);