paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 01:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt,Qt5,Qt6: fixed wierd focus behaviour. issue #10155

Browse Source
This commit is contained in:
Željan Rikalo 2024-03-08 20:33:35 +01:00
parent d2e0bdee01
commit 559078741e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5002,7 +5002,7 @@ end;
procedure TQtWidget.setFocus; procedure TQtWidget.setFocus;
begin begin
if getFocusPolicy <> QtNoFocus then if getFocusPolicy <> QtNoFocus then
QWidget_setFocus(Widget, QtTabFocusReason) QWidget_setFocus(Widget, QtOtherFocusReason) {issue #10155}
else else
QWidget_setFocus(Widget); QWidget_setFocus(Widget);
end; end;
@ -12615,7 +12615,7 @@ begin
begin begin
// issue #40089 // issue #40089
if {(ViewStyle < 0) and} (QEvent_type(Event) = QEventFocusIn) and if {(ViewStyle < 0) and} (QEvent_type(Event) = QEventFocusIn) and
(QFocusEvent_reason(QFocusEventH(Event)) = QtTabFocusReason) and (QFocusEvent_reason(QFocusEventH(Event)) >= QtTabFocusReason) and
(TCustomListBox(LCLObject).ItemIndex = -1) then (TCustomListBox(LCLObject).ItemIndex = -1) then
begin begin
Result := True; Result := True;

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

@ -5093,7 +5093,7 @@ end;
procedure TQtWidget.setFocus; procedure TQtWidget.setFocus;
begin begin
if getFocusPolicy <> QtNoFocus then if getFocusPolicy <> QtNoFocus then
QWidget_setFocus(Widget, QtTabFocusReason) QWidget_setFocus(Widget, QtOtherFocusReason) {issue #10155}
else else
QWidget_setFocus(Widget); QWidget_setFocus(Widget);
end; end;
@ -12900,7 +12900,7 @@ begin
begin begin
// issue #40089 // issue #40089
if {(ViewStyle < 0) and} (QEvent_type(Event) = QEventFocusIn) and if {(ViewStyle < 0) and} (QEvent_type(Event) = QEventFocusIn) and
(QFocusEvent_reason(QFocusEventH(Event)) = QtTabFocusReason) and (QFocusEvent_reason(QFocusEventH(Event)) >= QtTabFocusReason) and
(TCustomListBox(LCLObject).ItemIndex = -1) then (TCustomListBox(LCLObject).ItemIndex = -1) then
begin begin
Result := True; Result := True;

4
lcl/interfaces/qt6/qtwidgets.pas
View File

@ -5100,7 +5100,7 @@ end;
procedure TQtWidget.setFocus; procedure TQtWidget.setFocus;
begin begin
if getFocusPolicy <> QtNoFocus then if getFocusPolicy <> QtNoFocus then
QWidget_setFocus(Widget, QtTabFocusReason) QWidget_setFocus(Widget, QtOtherFocusReason) {issue #10155}
else else
QWidget_setFocus(Widget); QWidget_setFocus(Widget);
end; end;
@ -12932,7 +12932,7 @@ begin
begin begin
// issue #40089 // issue #40089
if {(ViewStyle < 0) and} (QEvent_type(Event) = QEventFocusIn) and if {(ViewStyle < 0) and} (QEvent_type(Event) = QEventFocusIn) and
(QFocusEvent_reason(QFocusEventH(Event)) = QtTabFocusReason) and (QFocusEvent_reason(QFocusEventH(Event)) >= QtTabFocusReason) and
(TCustomListBox(LCLObject).ItemIndex = -1) then (TCustomListBox(LCLObject).ItemIndex = -1) then
begin begin
Result := True; Result := True;