system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 17:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGUI: Don't call on_escape_pressed from EditingEngines

Browse source 
The call will be handled in `TextEditor::keydown_event`, just after that
`EditingEngine::on_key()` is called.
This commit is contained in:
Lucas CHOLLET 2023-07-09 14:35:41 -04:00 committed by Andreas Kling
parent 4aa0ef9f98
commit 201890e109
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibGUI/RegularEditingEngine.cpp
View file

@ -20,12 +20,6 @@ bool RegularEditingEngine::on_key(KeyEvent const& event)
if (EditingEngine::on_key(event))
return true;
if (event.key() == KeyCode::Key_Escape) {
if (m_editor->on_escape_pressed)
m_editor->on_escape_pressed();
return true;
}
if (event.alt() && event.shift() && event.key() == KeyCode::Key_S) {
sort_selected_lines();
return true;

12
Userland/Libraries/LibGUI/VimEditingEngine.cpp
View file

@ -948,9 +948,7 @@ bool VimEditingEngine::on_key_in_normal_mode(KeyEvent const& event)
// Handle first any key codes that are to be applied regardless of modifiers.
switch (event.key()) {
case (KeyCode::Key_Escape):
if (m_editor->on_escape_pressed)
m_editor->on_escape_pressed();
return true;
return false;
default:
break;
}
@ -1136,9 +1134,7 @@ bool VimEditingEngine::on_key_in_visual_mode(KeyEvent const& event)
switch (event.key()) {
case (KeyCode::Key_Escape):
switch_to_normal_mode();
if (m_editor->on_escape_pressed)
m_editor->on_escape_pressed();
return true;
return false;
default:
break;
}
@ -1268,9 +1264,7 @@ bool VimEditingEngine::on_key_in_visual_line_mode(KeyEvent const& event)
switch (event.key()) {
case (KeyCode::Key_Escape):
switch_to_normal_mode();
if (m_editor->on_escape_pressed)
m_editor->on_escape_pressed();
return true;
return false;
default:
break;
}