File tree 1 file changed +1
-28
lines changed
1 file changed +1
-28
lines changed Original file line number Diff line number Diff line change @@ -56,14 +56,7 @@ ProcessResult ChordComposer::ProcessFunctionKey(const KeyEvent& key_event) {
56
56
raw_sequence_.clear ();
57
57
}
58
58
ClearChord ();
59
- } else if (ch == XK_BackSpace) {
60
- // invalidate raw sequence
61
- raw_sequence_.clear ();
62
- ClearChord ();
63
- if (DeleteLastSyllable ()) {
64
- return kAccepted ;
65
- }
66
- } else if (ch == XK_Escape) {
59
+ } else if (ch == XK_BackSpace || ch == XK_Escape) {
67
60
// clear the raw sequence
68
61
raw_sequence_.clear ();
69
62
ClearChord ();
@@ -195,26 +188,6 @@ void ChordComposer::ClearChord() {
195
188
}
196
189
}
197
190
198
- bool ChordComposer::DeleteLastSyllable () {
199
- if (!engine_)
200
- return false ;
201
- Context* ctx = engine_->context ();
202
- Composition& comp = ctx->composition ();
203
- const string& input (ctx->input ());
204
- size_t start = comp.empty () ? 0 : comp.back ().start ;
205
- size_t caret_pos = ctx->caret_pos ();
206
- if (input.empty () || caret_pos <= start)
207
- return false ;
208
- size_t deleted = 0 ;
209
- for (; caret_pos > start; --caret_pos, ++deleted) {
210
- if (deleted > 0 &&
211
- delimiter_.find (input[caret_pos - 1 ]) != string::npos)
212
- break ;
213
- }
214
- ctx->PopInput (deleted);
215
- return true ;
216
- }
217
-
218
191
void ChordComposer::OnContextUpdate (Context* ctx) {
219
192
if (ctx->IsComposing () && ctx->input () != kZeroWidthSpace ) {
220
193
composing_ = true ;
You can’t perform that action at this time.
0 commit comments