Qt: unset taskbar button only when showintaskbar=stNever.

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

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;

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