amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Call ev.Skip() for unhandled char events in card editor. Fixes #65 (and maybe also #53)

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-06-01 13:47:44 +02:00
parent 41de22b182
commit 7952a889c9
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/card_editor.cpp
+5 -1
View File
@@ -453,7 +453,11 @@ void DataEditor::onChar(wxKeyEvent& ev) {
GetParent()->HandleWindowEvent(evt);
}
} else if (current_editor) {
current_editor->onChar(ev);
if (!current_editor->onChar(ev)) {
ev.Skip();
}
} else {
ev.Skip();
}
}
src/gui/value/editor.hpp
+1 -1
View File
@@ -50,7 +50,7 @@ public:
virtual void onMouseLeave (const RealPoint& pos, wxMouseEvent& ev) {}
virtual bool onMouseWheel (const RealPoint& pos, wxMouseEvent& ev) { return false; }
/// Key events
/// Key events. Returns true if event was handled
virtual bool onChar(wxKeyEvent& ev) { return false; }
/// a context menu is requested, add extra items to the menu m
src/gui/value/text.cpp
+9 -9
View File
@@ -416,7 +416,7 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
} else {
moveSelection(TYPE_CURSOR, prevCharBoundary(selection_end), !ev.ShiftDown(), MOVE_LEFT);
}
break;
return true;
case WXK_RIGHT:
// move left (selection?)
if (ev.ControlDown()) {
@@ -424,11 +424,11 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
} else {
moveSelection(TYPE_CURSOR, nextCharBoundary(selection_end), !ev.ShiftDown(), MOVE_RIGHT);
}
break;
return true;
case WXK_UP:
if ( wordListDropDown(findWordList(selection_end_i)) ) break;
moveSelection(TYPE_INDEX, v.moveLine(selection_end_i, -1), !ev.ShiftDown(), MOVE_LEFT_OPT);
break;
return true;
case WXK_DOWN:
if ( wordListDropDown(findWordList(selection_end_i)) ) break;
moveSelection(TYPE_INDEX, v.moveLine(selection_end_i, +1), !ev.ShiftDown(), MOVE_RIGHT_OPT);
@@ -440,7 +440,7 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
} else {
moveSelection(TYPE_INDEX, v.lineStart(selection_end_i), !ev.ShiftDown(), MOVE_LEFT_OPT);
}
break;
return true;
case WXK_END:
// move to end of line / all (if control)
if (ev.ControlDown()) {
@@ -448,7 +448,7 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
} else {
moveSelection(TYPE_INDEX, v.lineEnd(selection_end_i), !ev.ShiftDown(), MOVE_RIGHT_OPT);
}
break;
return true;
case WXK_BACK:
if (selection_start == selection_end) {
// if no selection, select previous character
@@ -460,7 +460,7 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
}
}
replaceSelection(wxEmptyString, _ACTION_("backspace"));
break;
return true;
case WXK_DELETE:
if (selection_start == selection_end) {
// if no selection select next
@@ -471,7 +471,7 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
}
}
replaceSelection(wxEmptyString, _ACTION_("delete"));
break;
return true;
case WXK_RETURN:
if (field().multi_line) {
if (ev.ShiftDown()) {
@@ -481,7 +481,7 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
replaceSelection(_("\n"), _ACTION_("enter"));
}
}
break;
return true;
default:
#ifdef __WXMSW__
if (ev.GetKeyCode() >= _(' ') && ev.GetKeyCode() == (int)ev.GetRawKeyCode()) {
@@ -498,11 +498,11 @@ bool TextValueEditor::onChar(wxKeyEvent& ev) {
#else
replaceSelection(escape(String((Char)ev.GetKeyCode(), 1)), _ACTION_("typing"), true);
#endif
return true;
} else {
return false;
}
}
return true;
}
// ----------------------------------------------------------------------------- : Spellchecking