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

IDE: less with-blocks for FPC 3.1.1

Browse Source 
git-svn-id: trunk@50314 -
This commit is contained in:
mattias 2015-11-12 10:24:07 +00:00
parent 68b558f8d5
commit 9e47be687c
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
designer/designer.pp
View File

@ -2000,6 +2000,7 @@ var
Button: TMouseButton; Button: TMouseButton;
Handled: Boolean; Handled: Boolean;
MouseDownControl: TControl; MouseDownControl: TControl;
p: types.TPoint;
begin begin
FHintTimer.Enabled := False; FHintTimer.Enabled := False;
FHintWindow.Visible := False; FHintWindow.Visible := False;
@ -2060,13 +2061,13 @@ begin
if (MouseDownComponent <> nil) and (MouseDownComponent is TControl) then if (MouseDownComponent <> nil) and (MouseDownComponent is TControl) then
begin begin
MouseDownControl:=TControl(MouseDownComponent); MouseDownControl:=TControl(MouseDownComponent);
with MouseDownControl.ScreenToClient(Form.ClientToScreen(MouseDownPos)) do p:=MouseDownControl.ScreenToClient(Form.ClientToScreen(MouseDownPos));
if (csDesignInteractive in MouseDownControl.ControlStyle) if (csDesignInteractive in MouseDownControl.ControlStyle)
or (MouseDownControl.Perform(CM_DESIGNHITTEST, TheMessage.Keys, Longint(SmallPoint(X, Y))) > 0) then or (MouseDownControl.Perform(CM_DESIGNHITTEST, TheMessage.Keys, Longint(SmallPoint(p.X, p.Y))) > 0) then
begin begin
TControlAccess(MouseDownComponent).MouseDown(Button, Shift, X, Y); TControlAccess(MouseDownComponent).MouseDown(Button, Shift, p.X, p.Y);
Exit; Exit;
end; end;
end; end;
if Mediator<>nil then begin if Mediator<>nil then begin
@ -2380,6 +2381,7 @@ var
i, j: Integer; i, j: Integer;
SelectedPersistent: TSelectedControl; SelectedPersistent: TSelectedControl;
MouseDownControl: TControl; MouseDownControl: TControl;
p: types.TPoint;
begin begin
FHintTimer.Enabled := False; FHintTimer.Enabled := False;
FHintWindow.Visible := False; FHintWindow.Visible := False;
@ -2418,13 +2420,13 @@ begin
if (MouseDownComponent <> nil) and (MouseDownComponent is TControl) then if (MouseDownComponent <> nil) and (MouseDownComponent is TControl) then
begin begin
MouseDownControl:=TControl(MouseDownComponent); MouseDownControl:=TControl(MouseDownComponent);
with MouseDownControl.ScreenToClient(Form.ClientToScreen(MouseUpPos)) do p:=MouseDownControl.ScreenToClient(Form.ClientToScreen(MouseUpPos));
if (csDesignInteractive in MouseDownControl.ControlStyle) if (csDesignInteractive in MouseDownControl.ControlStyle)
or (MouseDownControl.Perform(CM_DESIGNHITTEST, TheMessage.Keys, Longint(SmallPoint(X, Y))) > 0) then or (MouseDownControl.Perform(CM_DESIGNHITTEST, TheMessage.Keys, Longint(SmallPoint(p.X, p.Y))) > 0) then
begin begin
TControlAccess(MouseDownComponent).MouseUp(Button, Shift, X, Y); TControlAccess(MouseDownComponent).MouseUp(Button, Shift, p.X, p.Y);
Exit; Exit;
end; end;
end; end;
if Mediator<>nil then if Mediator<>nil then
@ -2545,6 +2547,7 @@ var
Handled: Boolean; Handled: Boolean;
MouseMoveComponent: TComponent; MouseMoveComponent: TComponent;
MouseMoveControl: TControl; MouseMoveControl: TControl;
p: types.TPoint;
begin begin
GetMouseMsgShift(TheMessage, Shift, Button); GetMouseMsgShift(TheMessage, Shift, Button);
@ -2573,13 +2576,13 @@ begin
if (MouseMoveComponent <> nil) and (MouseMoveComponent is TControl) then if (MouseMoveComponent <> nil) and (MouseMoveComponent is TControl) then
begin begin
MouseMoveControl:=TControl(MouseMoveComponent); MouseMoveControl:=TControl(MouseMoveComponent);
with MouseMoveControl.ScreenToClient(Form.ClientToScreen(LastMouseMovePos)) do p:=MouseMoveControl.ScreenToClient(Form.ClientToScreen(LastMouseMovePos));
if (csDesignInteractive in MouseMoveControl.ControlStyle) if (csDesignInteractive in MouseMoveControl.ControlStyle)
or (MouseMoveControl.Perform(CM_DESIGNHITTEST, TheMessage.Keys, Longint(SmallPoint(X, Y))) > 0) then or (MouseMoveControl.Perform(CM_DESIGNHITTEST, TheMessage.Keys, Longint(SmallPoint(p.X, p.Y))) > 0) then
begin begin
TControlAccess(MouseMoveComponent).MouseMove(Shift, X, Y); TControlAccess(MouseMoveComponent).MouseMove(Shift, p.X, p.Y);
Exit; Exit;
end; end;
end; end;
if Mediator <> nil then if Mediator <> nil then