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

lcl:

Browse Source 
- call resizing without checking for the state change
- don't all resizing when the change does not come from the interface

git-svn-id: trunk@42106 -
This commit is contained in:
paul 2013-07-16 09:19:07 +00:00
parent 7d31d49396
commit 0286c2485a
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lcl/include/customform.inc
View File

@ -694,7 +694,7 @@ end;
------------------------------------------------------------------------------}
procedure TCustomForm.WMSize(var message: TLMSize);
var
NewState, OldState: TWindowState;
NewState: TWindowState;
begin
{$IFDEF CHECK_POSITION}
DebugLn(['[TCustomForm.WMSize] ',DbgSName(Self),' Message.SizeType=',Message.SizeType,' Message.Width=',Message.Width,' Message.Height=',Message.Height,' AutoSizeDelayed=',AutoSizeDelayed]);
@ -712,26 +712,21 @@ begin
end;
//DebugLn('Trace:WMSIZE in TCustomForm');
OldState := FWindowState;
NewState := OldState;
case (Message.SizeType and not SIZE_SourceIsInterface) of
SIZE_RESTORED:
if Showing then
if (Message.SizeType and SIZE_SourceIsInterface) <> 0 then
begin
NewState := FWindowState;
case (Message.SizeType xor SIZE_SourceIsInterface) of
SIZE_RESTORED:
NewState := wsNormal;
SIZE_MINIMIZED:
begin
if Showing then
SIZE_MINIMIZED:
NewState := wsMinimized;
end;
SIZE_MAXIMIZED:
if Showing then
SIZE_MAXIMIZED:
NewState := wsMaximized;
SIZE_FULLSCREEN:
if Showing then
SIZE_FULLSCREEN:
NewState := wsFullScreen;
end;
if OldState <> NewState then
end;
Resizing(NewState);
end;
inherited WMSize(Message);
@ -1146,18 +1141,21 @@ procedure TCustomForm.Resizing(State: TWindowState);
var
OldState: TWindowState;
begin
if not (csDesigning in ComponentState) then
if Showing and not (csDesigning in ComponentState) then
begin
OldState := FWindowState;
FWindowState := State;
if (State = wsMinimized) and (Application.MainForm = Self) and
(WidgetSet.GetLCLCapability(lcNeedMininimizeAppWithMainForm) <> LCL_CAPABILITY_NO) then
Application.Minimize;
if (OldState = wsMinimized) and (Application.MainForm = Self) and
(WidgetSet.GetLCLCapability(lcNeedMininimizeAppWithMainForm) <> LCL_CAPABILITY_NO) then
Application.Restore;
if Assigned(OnWindowStateChange) then
OnWindowStateChange(Self);
if OldState <> State then
begin
if (State = wsMinimized) and (Application.MainForm = Self) and
(WidgetSet.GetLCLCapability(lcNeedMininimizeAppWithMainForm) <> LCL_CAPABILITY_NO) then
Application.Minimize;
if (OldState = wsMinimized) and (Application.MainForm = Self) and
(WidgetSet.GetLCLCapability(lcNeedMininimizeAppWithMainForm) <> LCL_CAPABILITY_NO) then
Application.Restore;
if Assigned(OnWindowStateChange) then
OnWindowStateChange(Self);
end;
end;
end;