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

Qt: unset taskbar button only when showintaskbar=stNever.

Browse Source 
git-svn-id: trunk@48777 -
This commit is contained in:
zeljko 2015-04-19 10:53:24 +00:00
parent 8250ced275
commit d2ddc67301
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 if (NewParent = nil) and (FPopupMode <> pmNone) and
not FShowOnTaskBar and not IsMainForm then not FShowOnTaskBar and not IsMainForm then
NewParent := TQtMainWindow(Application.MainForm.Handle).Widget; 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); ChangeParent(NewParent);
end; end;

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

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