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

designer, ideintf: rename TPropHookType htMouse* to htDesignerMouse*

Browse Source 
git-svn-id: trunk@51156 -
This commit is contained in:
ondrej 2016-01-03 13:35:38 +00:00
parent 3d8e4a6646
commit 7fcc772645
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
components/ideintf/propedits.pp
View File

@ -1244,8 +1244,6 @@ type
htGetAncestorInstProp, htGetAncestorInstProp,
htAddClicked, // user selected a component class and clicked on a form to add a component htAddClicked, // user selected a component class and clicked on a form to add a component
htComponentRenamed, htComponentRenamed,
htMouseDown,
htMouseUp,
// persistent selection // persistent selection
htBeforeAddPersistent, htBeforeAddPersistent,
htPersistentAdded, htPersistentAdded,
@ -1265,6 +1263,9 @@ type
htRefreshPropertyValues, htRefreshPropertyValues,
// dependencies // dependencies
htAddDependency, htAddDependency,
// designer
htDesignerMouseDown,
htDesignerMouseUp,
// other // other
htGetCheckboxForBoolean htGetCheckboxForBoolean
); );
@ -1334,9 +1335,9 @@ type
procedure Unselect(const APersistent: TPersistent); procedure Unselect(const APersistent: TPersistent);
function IsSelected(const APersistent: TPersistent): boolean; function IsSelected(const APersistent: TPersistent): boolean;
procedure SelectOnlyThis(const APersistent: TPersistent); procedure SelectOnlyThis(const APersistent: TPersistent);
procedure MouseDown(Sender: TObject; Button: TMouseButton; procedure DesignerMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); Shift: TShiftState; X, Y: Integer);
procedure MouseUp(Sender: TObject; Button: TMouseButton; procedure DesignerMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer); Shift: TShiftState; X, Y: Integer);
// persistent objects // persistent objects
function GetObject(const aName: ShortString): TPersistent; function GetObject(const aName: ShortString): TPersistent;
@ -1418,13 +1419,13 @@ type
const OnGetAncestorInstProp: TPropHookGetAncestorInstProp); const OnGetAncestorInstProp: TPropHookGetAncestorInstProp);
procedure RemoveHandlerGetAncestorInstProp( procedure RemoveHandlerGetAncestorInstProp(
const OnGetAncestorInstProp: TPropHookGetAncestorInstProp); const OnGetAncestorInstProp: TPropHookGetAncestorInstProp);
procedure AddHandlerMouseDown( procedure AddHandlerDesignerMouseDown(
const OnMouseDown: TMouseEvent); const OnMouseDown: TMouseEvent);
procedure RemoveHandlerMouseDown( procedure RemoveHandlerDesignerMouseDown(
const OnMouseDown: TMouseEvent); const OnMouseDown: TMouseEvent);
procedure AddHandlerMouseUp( procedure AddHandlerDesignerMouseUp(
const OnMouseUp: TMouseEvent); const OnMouseUp: TMouseEvent);
procedure RemoveHandlerMouseUp( procedure RemoveHandlerDesignerMouseUp(
const OnMouseUp: TMouseEvent); const OnMouseUp: TMouseEvent);
// component create, delete, rename // component create, delete, rename
procedure AddHandlerComponentRenamed( procedure AddHandlerComponentRenamed(
@ -6122,30 +6123,30 @@ begin
end; end;
end; end;
procedure TPropertyEditorHook.MouseDown(Sender: TObject; Button: TMouseButton; procedure TPropertyEditorHook.DesignerMouseDown(Sender: TObject;
Shift: TShiftState; X, Y: Integer); Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
var var
i: Integer; i: Integer;
Handler: TMouseEvent; Handler: TMouseEvent;
begin begin
i := GetHandlerCount(htMouseDown); i := GetHandlerCount(htDesignerMouseDown);
while GetNextHandlerIndex(htMouseDown, i) do while GetNextHandlerIndex(htDesignerMouseDown, i) do
begin begin
Handler := TMouseEvent(FHandlers[htMouseDown][i]); Handler := TMouseEvent(FHandlers[htDesignerMouseDown][i]);
Handler(Sender, Button, Shift, X, Y); Handler(Sender, Button, Shift, X, Y);
end; end;
end; end;
procedure TPropertyEditorHook.MouseUp(Sender: TObject; Button: TMouseButton; procedure TPropertyEditorHook.DesignerMouseUp(Sender: TObject;
Shift: TShiftState; X, Y: Integer); Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
var var
i: Integer; i: Integer;
Handler: TMouseEvent; Handler: TMouseEvent;
begin begin
i := GetHandlerCount(htMouseUp); i := GetHandlerCount(htDesignerMouseUp);
while GetNextHandlerIndex(htMouseUp, i) do while GetNextHandlerIndex(htDesignerMouseUp, i) do
begin begin
Handler := TMouseEvent(FHandlers[htMouseUp][i]); Handler := TMouseEvent(FHandlers[htDesignerMouseUp][i]);
Handler(Sender, Button, Shift, X, Y); Handler(Sender, Button, Shift, X, Y);
end; end;
end; end;
@ -6541,15 +6542,16 @@ begin
AddHandler(htModified,TMethod(OnModified)); AddHandler(htModified,TMethod(OnModified));
end; end;
procedure TPropertyEditorHook.AddHandlerMouseDown(const OnMouseDown: TMouseEvent procedure TPropertyEditorHook.AddHandlerDesignerMouseDown(
); const OnMouseDown: TMouseEvent);
begin begin
AddHandler(htMouseDown,TMethod(OnMouseDown)); AddHandler(htDesignerMouseDown,TMethod(OnMouseDown));
end; end;
procedure TPropertyEditorHook.AddHandlerMouseUp(const OnMouseUp: TMouseEvent); procedure TPropertyEditorHook.AddHandlerDesignerMouseUp(
const OnMouseUp: TMouseEvent);
begin begin
AddHandler(htMouseUp,TMethod(OnMouseUp)); AddHandler(htDesignerMouseUp,TMethod(OnMouseUp));
end; end;
procedure TPropertyEditorHook.RemoveHandlerModified( procedure TPropertyEditorHook.RemoveHandlerModified(
@ -6558,16 +6560,16 @@ begin
RemoveHandler(htModified,TMethod(OnModified)); RemoveHandler(htModified,TMethod(OnModified));
end; end;
procedure TPropertyEditorHook.RemoveHandlerMouseDown( procedure TPropertyEditorHook.RemoveHandlerDesignerMouseDown(
const OnMouseDown: TMouseEvent); const OnMouseDown: TMouseEvent);
begin begin
RemoveHandler(htMouseDown,TMethod(OnMouseDown)); RemoveHandler(htDesignerMouseDown,TMethod(OnMouseDown));
end; end;
procedure TPropertyEditorHook.RemoveHandlerMouseUp(const OnMouseUp: TMouseEvent procedure TPropertyEditorHook.RemoveHandlerDesignerMouseUp(
); const OnMouseUp: TMouseEvent);
begin begin
RemoveHandler(htMouseUp,TMethod(OnMouseUp)); RemoveHandler(htDesignerMouseUp,TMethod(OnMouseUp));
end; end;
procedure TPropertyEditorHook.AddHandlerRevert(const OnRevert: TPropHookRevert); procedure TPropertyEditorHook.AddHandlerRevert(const OnRevert: TPropHookRevert);

4
designer/designer.pp
View File

@ -2143,7 +2143,7 @@ begin
end; end;
if PropertyEditorHook<>nil then if PropertyEditorHook<>nil then
PropertyEditorHook.MouseDown(Sender, Button, Shift, p.X, p.Y); PropertyEditorHook.DesignerMouseDown(Sender, Button, Shift, p.X, p.Y);
if not ControlSelection.OnlyVisualComponentsSelected and ShowComponentCaptions then if not ControlSelection.OnlyVisualComponentsSelected and ShowComponentCaptions then
Form.Invalidate; Form.Invalidate;
@ -2533,7 +2533,7 @@ begin
MouseDownSender:=nil; MouseDownSender:=nil;
if PropertyEditorHook<>nil then if PropertyEditorHook<>nil then
PropertyEditorHook.MouseUp(Sender, Button, Shift, p.X, p.Y); PropertyEditorHook.DesignerMouseUp(Sender, Button, Shift, p.X, p.Y);
{$IFDEF VerboseDesigner} {$IFDEF VerboseDesigner}
DebugLn('[TDesigner.MouseUpOnControl] END'); DebugLn('[TDesigner.MouseUpOnControl] END');