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

Merged revision(s) 48875 #2f05933d7f, 48879 #02fecee255 from trunk:

Browse Source 
Qt: fixed regression with focus of controls on mdichild forms. issue #27982
........
Qt: do not assume that parent of TQtPage is TQtTabWidget.
........

git-svn-id: branches/fixes_1_4@48906 -
This commit is contained in:
maxim 2015-04-29 21:39:37 +00:00
parent 83923daf14
commit 1329963926
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/interfaces/qt/qtobject.inc
View File

@ -1009,10 +1009,11 @@ begin
OldWidget := nil OldWidget := nil
else else
OldWidget := GetFirstQtObjectFromWidgetH(aold); OldWidget := GetFirstQtObjectFromWidgetH(aold);
if (ANew <> nil) and not QWidget_isVisible(ANew) then
NewWidget := nil if (ANew <> nil) then
NewWidget := GetFirstQtObjectFromWidgetH(anew)
else else
NewWidget := GetFirstQtObjectFromWidgetH(anew); NewWidget := nil;
if OldWidget = NewWidget then if OldWidget = NewWidget then
begin begin

4
lcl/interfaces/qt/qtpagecontrol.inc
View File

@ -69,8 +69,8 @@ begin
if not Assigned(APage.Parent) or not APage.Parent.HandleAllocated then if not Assigned(APage.Parent) or not APage.Parent.HandleAllocated then
exit; exit;
AParent := TQtWidget(APage.Parent.Handle); AParent := TQtWidget(APage.Parent.Handle);
if AParent.ChildOfComplexWidget = ccwTTabControl then if not (AParent is TQtTabWidget) then
exit; exit;
ATabWidget := TQtTabWidget(AParent); ATabWidget := TQtTabWidget(AParent);
AColor.Alpha := 0; AColor.Alpha := 0;