paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-20 11:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 62217-62218 #4116396ac9-#4116396ac9 from trunk:

Browse Source 
Qt: Alt+Shift+[0..9] does not work under x11. issue #36274
........
Qt5: Alt+Shift+[0..9] does not work under x11. issue #36274
........

git-svn-id: branches/fixes_2_0@62265 -
This commit is contained in:
maxim 2019-11-17 21:45:06 +00:00
parent b0498e2b23
commit 902ab3eff7
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lcl/interfaces/qt/qtwidgets.pas
View File

@ -3325,6 +3325,20 @@ begin
if (Modifiers = QtShiftModifier or QtControlModifier) then
Text := '';
end;
end else
if (Modifiers = QtShiftModifier or QtAltModifier) then
begin
ScanCode := QKeyEvent_nativeScanCode(QKeyEventH(Event));
if (length(Text) = 1) and (ScanCode in [10..19]) then
begin
if ScanCode = 19 then
ScanCode := 48
else
ScanCode := ScanCode + 39;
KeyMsg.CharCode := Word(ScanCode);
if (Modifiers = QtShiftModifier or QtAltModifier) then
Text := '';
end;
end;
{$ENDIF}
{$ENDIF}

14
lcl/interfaces/qt5/qtwidgets.pas
View File

@ -3335,6 +3335,20 @@ begin
if (Modifiers = QtShiftModifier or QtControlModifier) then
Text := '';
end;
end else
if (Modifiers = QtShiftModifier or QtAltModifier) then
begin
ScanCode := QKeyEvent_nativeScanCode(QKeyEventH(Event));
if (length(Text) = 1) and (ScanCode in [10..19]) then
begin
if ScanCode = 19 then
ScanCode := 48
else
ScanCode := ScanCode + 39;
KeyMsg.CharCode := Word(ScanCode);
if (Modifiers = QtShiftModifier or QtAltModifier) then
Text := '';
end;
end;
{$ENDIF}
{$ENDIF}