mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-30 18:10:27 +02:00
MG: further clientrect bugfixes
git-svn-id: trunk@918 -
This commit is contained in:
lazarus
parent
9586e66633
commit
3d86abcb40
@ -106,10 +106,14 @@ begin
|
||||
SizeChanged:= (FWidth <> AWidth) or (FHeight <> AHeight);
|
||||
PosChanged:= (FLeft <> ALeft) or (FTop <> ATop);
|
||||
if SizeChanged or PosChanged then begin
|
||||
{$IFDEF ClientRectBugFix}
|
||||
DoSetBounds(ALeft,ATop,AWidth,AHeight);
|
||||
{$ELSE}
|
||||
FLeft:= ALeft;
|
||||
FTop:= ATop;
|
||||
FWidth:= AWidth;
|
||||
FHeight:= AHeight;
|
||||
{$ENDIF}
|
||||
if SizeChanged then Invalidate;
|
||||
// UpdateAnchorRules;
|
||||
BoundsChanged;
|
||||
@ -152,6 +156,22 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
{$IFDEF ClientRectBugFix}
|
||||
{-------------------------------------------------------------------------------
|
||||
TControl.DoSetBounds
|
||||
Params: ALeft, ATop, AWidth, AHeight : integer
|
||||
|
||||
store bounds in private variables
|
||||
-------------------------------------------------------------------------------}
|
||||
procedure TControl.DoSetBounds(ALeft, ATop, AWidth, AHeight : integer);
|
||||
begin
|
||||
FLeft:= ALeft;
|
||||
FTop:= ATop;
|
||||
FWidth:= AWidth;
|
||||
FHeight:= AHeight;
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
{------------------------------------------------------------------------------}
|
||||
{ TControl.ChangeScale
|
||||
}
|
||||
@ -264,7 +284,8 @@ end;
|
||||
{------------------------------------------------------------------------------}
|
||||
{ TControl.ConstrainedResize }
|
||||
{------------------------------------------------------------------------------}
|
||||
procedure TControl.ConstrainedResize(var MinWidth, MinHeight, MaxWidth, MaxHeight : TConstraintSize);
|
||||
procedure TControl.ConstrainedResize(var MinWidth, MinHeight,
|
||||
MaxWidth, MaxHeight : TConstraintSize);
|
||||
begin
|
||||
if Assigned(FOnConstrainedResize) then
|
||||
FOnConstrainedResize(Self, MinWidth, MinHeight, MaxWidth, MaxHeight);
|
||||
@ -287,11 +308,15 @@ begin
|
||||
|
||||
ConstrainedResize(MinWidth, MinHeight, MaxWidth, MaxHeight);
|
||||
|
||||
if (MinWidth > 0) and (NewWidth < MinWidth) then NewWidth:= MinWidth
|
||||
else if (MaxWidth > 0) and (NewWidth > MaxWidth) then NewWidth:= MaxWidth;
|
||||
if (MinWidth > 0) and (NewWidth < MinWidth) then
|
||||
NewWidth:= MinWidth
|
||||
else if (MaxWidth > 0) and (NewWidth > MaxWidth) then
|
||||
NewWidth:= MaxWidth;
|
||||
|
||||
if (MinHeight > 0) and (NewHeight < MinHeight) then NewHeight:= MinHeight
|
||||
else if (MaxHeight > 0) and (NewHeight > MaxHeight) then NewHeight:= MaxHeight;
|
||||
if (MinHeight > 0) and (NewHeight < MinHeight) then
|
||||
NewHeight:= MinHeight
|
||||
else if (MaxHeight > 0) and (NewHeight > MaxHeight) then
|
||||
NewHeight:= MaxHeight;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------}
|
||||
@ -630,7 +655,7 @@ begin
|
||||
end;
|
||||
end
|
||||
else begin
|
||||
if Message.MSg = CM_VISIBLECHANGED
|
||||
if Message.Msg = CM_VISIBLECHANGED
|
||||
then with Message do SendDockNotification(Msg,WParam,LParam);
|
||||
end;
|
||||
end;
|
||||
@ -1132,16 +1157,26 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------}
|
||||
{ TControl Resize }
|
||||
{------------------------------------------------------------------------------}
|
||||
{------------------------------------------------------------------------------
|
||||
TControl Resize
|
||||
|
||||
Calls OnResize
|
||||
-------------------------------------------------------------------------------}
|
||||
procedure TControl.Resize;
|
||||
begin
|
||||
//writeln('[TControl.Resize] ',ClassName);
|
||||
if (csLoading in ComponentState) then exit;
|
||||
if (FLastResizeWidth<>Width) or (FLastResizeHeight<>Height) then begin
|
||||
if (FLastResizeWidth<>Width) or (FLastResizeHeight<>Height)
|
||||
or (FLastResizeClientWidth<>ClientWidth)
|
||||
or (FLastResizeClientHeight<>ClientHeight) then begin
|
||||
{writeln('[TControl.Resize] ',Name,':',ClassName,
|
||||
' Last=',FLastResizeWidth,',',FLastResizeHeight,
|
||||
' LastClient=',FLastResizeClientWidth,',',FLastResizeClientHeight,
|
||||
' New=',Width,',',Height,
|
||||
' NewClient=',ClientWidth,',',ClientHeight);}
|
||||
FLastResizeWidth:=Width;
|
||||
FLastResizeHeight:=Height;
|
||||
FLastResizeClientWidth:=ClientWidth;
|
||||
FLastResizeClientHeight:=ClientHeight;
|
||||
if Assigned(FOnResize) then FOnResize(Self);
|
||||
end;
|
||||
end;
|
||||
@ -1553,6 +1588,8 @@ begin
|
||||
CNSendMessage(LM_CREATE, Self, nil);
|
||||
end;
|
||||
|
||||
{$IFDEF ClientRectBugFix}
|
||||
{$ELSE}
|
||||
{------------------------------------------------------------------------------}
|
||||
{ TControl DoEvents }
|
||||
{------------------------------------------------------------------------------}
|
||||
@ -1561,6 +1598,7 @@ begin
|
||||
// used to make sure that events are handled while in long loops.
|
||||
InterfaceObject.DoEvents;
|
||||
end;
|
||||
{$ENDIF}
|
||||
|
||||
{------------------------------------------------------------------------------}
|
||||
{ TControl Destroy Component }
|
||||
@ -1622,17 +1660,17 @@ end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
Method: TControl.WMSize
|
||||
Params: Msg: The message
|
||||
Params: Message : TLMSize
|
||||
Returns: nothing
|
||||
|
||||
event handler.
|
||||
|
||||
Message.SizeType=Size_Restored is the default. All other values will force a
|
||||
ReAlign.
|
||||
Message.SizeType=Size_Restored is the default. All other values will result in
|
||||
a ReAlign.
|
||||
------------------------------------------------------------------------------}
|
||||
procedure TControl.WMSize(Var Message : TLMSize);
|
||||
begin
|
||||
if (Message.SizeType = Size_Restored)
|
||||
if (Message.SizeType = Size_Restored)
|
||||
and (FWidth = Message.Width) and (FHeight = Message.Height) then exit;
|
||||
|
||||
{$IFDEF CHECK_POSITION}
|
||||
@ -1673,6 +1711,9 @@ end;
|
||||
|
||||
{ =============================================================================
|
||||
$Log$
|
||||
Revision 1.47 2002/05/09 12:41:28 lazarus
|
||||
MG: further clientrect bugfixes
|
||||
|
||||
Revision 1.46 2002/04/24 16:11:17 lazarus
|
||||
MG: started new client rectangle
|
||||
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
// included by menus.pp
|
||||
|
||||
{******************************************************************************
|
||||
TMenu
|
||||
******************************************************************************}
|
||||
@ -27,7 +29,7 @@ procedure TMenu.CreateHandle;
|
||||
begin
|
||||
InterfaceObject.IntSendMessage3(LM_CREATE, Self, nil); // CreateComponent(nil);
|
||||
// initiate creation of subitems
|
||||
// Note: FItems is a MenuItem, by using Creathandle all subitems will be
|
||||
// Note: FItems is a MenuItem, by using Createhandle all subitems will be
|
||||
// created.
|
||||
FItems.CreateHandle;
|
||||
end;
|
||||
@ -52,9 +54,9 @@ end;
|
||||
|
||||
|
||||
------------------------------------------------------------------------------}
|
||||
function TMenu.FIndItem(value : Integer; Kind : TFindItemKind): TMenuItem;
|
||||
function TMenu.FindItem(Value: Integer; Kind: TFindItemKind): TMenuItem;
|
||||
begin
|
||||
//TODO: FINISH TMEnu:FINDITEM
|
||||
//TODO: FINISH TMenu:FINDITEM
|
||||
Result:=nil;
|
||||
end;
|
||||
|
||||
@ -91,26 +93,30 @@ end;
|
||||
------------------------------------------------------------------------------}
|
||||
procedure TMenu.HandleNeeded;
|
||||
begin
|
||||
if not HandleAllocated
|
||||
then CreateHandle;
|
||||
if not HandleAllocated then CreateHandle;
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
Function: TMenu.IsRighttoLeft
|
||||
Function: TMenu.IsRightToLeft
|
||||
Params:
|
||||
Returns:
|
||||
|
||||
|
||||
------------------------------------------------------------------------------}
|
||||
function TMenu.IsRighttoLeft : Boolean;
|
||||
function TMenu.IsRightToLeft : Boolean;
|
||||
Begin
|
||||
//TODO: Make sure it should return FALSE!!!!!!!!!!
|
||||
Result := False;
|
||||
//TODO: Make sure it should return FALSE!!!!!!!!!!
|
||||
Result := False;
|
||||
end;
|
||||
|
||||
// included by menus.pp
|
||||
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.4 2002/05/09 12:41:28 lazarus
|
||||
MG: further clientrect bugfixes
|
||||
|
||||
Revision 1.3 2001/03/12 12:17:01 lazarus
|
||||
MG: fixed random function results
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user