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

Merged revision(s) 58432 #6bb3d9800a from trunk:

Browse Source 
Fix for bug #32366 (TForm.ShowModal on WinCE loops itself). Patch by Lacak
........

git-svn-id: branches/fixes_1_8@58727 -
This commit is contained in:
maxim 2018-08-16 22:41:31 +00:00
parent 2e62d0daaa
commit 7fde9865f0
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lcl/interfaces/wince/wincewsforms.pp
View File

@ -405,13 +405,37 @@ end;
class procedure TWinCEWSCustomForm.SetShowInTaskbar(const AForm: TCustomForm;
const AValue: TShowInTaskbar);
var
OldStyle, NewStyle: DWord;
Visible, Active: Boolean;
begin
if not WSCheckHandleAllocated(AForm, 'SetShowInTaskbar') then
Exit;
if (Application <> nil) and (AForm = Application.MainForm) then
if Assigned(Application) and (AForm = Application.MainForm) then
Exit;
RecreateWnd(AForm);
OldStyle := GetWindowLong(AForm.Handle, GWL_EXSTYLE);
if AValue = stAlways then
NewStyle := OldStyle or WS_EX_APPWINDOW
else
NewStyle := OldStyle and not WS_EX_APPWINDOW;
if OldStyle = NewStyle then exit;
// to apply this changes we need either to hide window or recreate it. Hide is
// less difficult
Visible := IsWindowVisible(AForm.Handle);
Active := GetForegroundWindow = AForm.Handle;
if Visible then
ShowWindow(AForm.Handle, SW_HIDE);
SetWindowLong(AForm.Handle, GWL_EXSTYLE, NewStyle);
// now we need to restore window visibility with saving focus
if Visible then
if Active then
ShowWindow(AForm.Handle, SW_SHOW)
else
ShowWindow(AForm.Handle, SW_SHOWNA);
end;
class procedure TWinCEWSCustomForm.ShowModal(const ACustomForm: TCustomForm);