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

Qt: set proper focus policy for TCustomForm handle. Fixed stalled capture on hidden abstractscrollarea viewport. issue #28880

Browse Source 
git-svn-id: trunk@50125 -
This commit is contained in:
zeljko 2015-10-20 13:09:55 +00:00
parent 5ea0c54c00
commit 52d7205b6e
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2067,6 +2067,9 @@ begin
end; end;
end else end else
begin begin
if (Self is TQtMainWindow) then
setFocusPolicy(QtTabFocus) // issue #28880
else
if (csNoFocus in LCLObject.ControlStyle) then if (csNoFocus in LCLObject.ControlStyle) then
begin begin
if LCLObject.TabStop then if LCLObject.TabStop then
@ -6430,7 +6433,7 @@ begin
BeginEventProcessing; BeginEventProcessing;
try try
if (QEvent_Type(Event) in [QEventContextMenu, QEventHoverEnter, QEventPaint, if (QEvent_Type(Event) in [QEventContextMenu, QEventHoverEnter, QEventPaint,
QEventHoverMove, QEventHoverLeave]) then QEventHoverMove, QEventHoverLeave, QEventHide]) then
begin begin
Result := inherited EventFilter(Sender, Event); Result := inherited EventFilter(Sender, Event);
end else end else
@ -16143,8 +16146,24 @@ end;
function TQtAbstractScrollArea.EventFilter(Sender: QObjectH; Event: QEventH function TQtAbstractScrollArea.EventFilter(Sender: QObjectH; Event: QEventH
): Boolean; cdecl; ): Boolean; cdecl;
var
w: QWidgetH;
begin begin
Result := False; Result := False;
if (QEvent_type(Event) = QEventHide) then
begin
// issue #28880
w := QWidget_mouseGrabber;
if w <> nil then
begin
if w = Widget then
ReleaseCapture
else
if w = viewportWidget then
ReleaseCapture;
end;
end else
if (QEvent_type(Event) = QEventResize) then if (QEvent_type(Event) = QEventResize) then
// DebugLn('***TQtAbstractScrollArea.EventFilter QEventResize(',dbgsName(LCLObject),') EAT !') // DebugLn('***TQtAbstractScrollArea.EventFilter QEventResize(',dbgsName(LCLObject),') EAT !')
else else