forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix problem with inputing of { and } in German locale, windows

This commit is contained in:
Vadim Lopatin 2015-12-09 15:55:54 +03:00
parent 94bc5d23b3
commit 167cc17d22
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dlangui/platforms/windows/winapp.d
View File

@ -700,14 +700,16 @@ class Win32Window : Window {
updateKeyFlags((GetKeyState(VK_MENU) & 0x8000) != 0 ? KeyAction.KeyDown : KeyAction.KeyUp, KeyFlag.Alt); updateKeyFlags((GetKeyState(VK_MENU) & 0x8000) != 0 ? KeyAction.KeyDown : KeyAction.KeyUp, KeyFlag.Alt);
break; break;
} }
//updateKeyFlags((GetKeyState(VK_CONTROL) & 0x8000) != 0 ? KeyAction.KeyDown : KeyAction.KeyUp, KeyFlag.Control);
//updateKeyFlags((GetKeyState(VK_SHIFT) & 0x8000) != 0 ? KeyAction.KeyDown : KeyAction.KeyUp, KeyFlag.Shift);
//updateKeyFlags((GetKeyState(VK_MENU) & 0x8000) != 0 ? KeyAction.KeyDown : KeyAction.KeyUp, KeyFlag.Alt);
if (keyCode == 0xBF) if (keyCode == 0xBF)
keyCode = KeyCode.KEY_DIVIDE; keyCode = KeyCode.KEY_DIVIDE;
event = new KeyEvent(action, keyCode, _keyFlags); event = new KeyEvent(action, keyCode, _keyFlags);
} else if (action == KeyAction.Text && character != 0) { } else if (action == KeyAction.Text && character != 0) {
if (_keyFlags & (KeyFlag.Control | KeyFlag.Alt)) { bool ctrlAZKeyCode = (character >= 1 && character <= 26);
if (character >= 1 && character <= 26) { if ((_keyFlags & (KeyFlag.Control | KeyFlag.Alt)) && ctrlAZKeyCode) {
event = new KeyEvent(action, KeyCode.KEY_A + character - 1, _keyFlags); event = new KeyEvent(action, KeyCode.KEY_A + character - 1, _keyFlags);
}
} else { } else {
dchar[] text; dchar[] text;
text ~= character; text ~= character;

3
src/dlangui/widgets/editors.d
View File

@ -1410,7 +1410,8 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
/// handle keys /// handle keys
override bool onKeyEvent(KeyEvent event) { override bool onKeyEvent(KeyEvent event) {
if (focused) startCaretBlinking(); if (focused) startCaretBlinking();
if (event.action == KeyAction.Text && event.text.length && !(event.flags & (KeyFlag.Control | KeyFlag.Alt))) { bool ctrlOrAltPressed = false; //(event.flags & (KeyFlag.Control /* | KeyFlag.Alt */));
if (event.action == KeyAction.Text && event.text.length && !ctrlOrAltPressed) {
Log.d("text entered: ", event.text); Log.d("text entered: ", event.text);
if (readOnly) if (readOnly)
return true; return true;