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

Merged revision(s) 48777 #d2ddc67301 from trunk:

Browse Source 
Qt: unset taskbar button only when showintaskbar=stNever.
........

git-svn-id: branches/fixes_1_4@48791 -
This commit is contained in:
maxim 2015-04-20 22:07:49 +00:00
parent 577e3f5147
commit 49c902d658
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6717,6 +6717,11 @@ begin
if (NewParent = nil) and (FPopupMode <> pmNone) and
not FShowOnTaskBar and not IsMainForm then
NewParent := TQtMainWindow(Application.MainForm.Handle).Widget;
{$IFDEF MSWINDOWS}
if (NewParent = nil) and (FPopupMode = pmNone) and
not FShowOnTaskBar and not IsMainForm then
NewParent := TQtMainWindow(Application.MainForm.Handle).Widget;
{$ENDIF}
ChangeParent(NewParent);
end;

2
lcl/interfaces/qt/qtwsforms.pp
View File

@ -200,7 +200,7 @@ begin
(Application.MainForm.HandleAllocated) and
(Application.MainForm <> AForm) then
begin
if (AForm.ShowInTaskBar in [stDefault, stNever])
if (AForm.ShowInTaskBar = stNever)
{$ifdef HASX11}
{QtTool have not minimize button !}
and (not (AForm.BorderStyle in [bsSizeToolWin, bsToolWindow]) and