From cfdbbbb410310a1eb589c788d34dcd11a3f76ef4 Mon Sep 17 00:00:00 2001 From: juha Date: Mon, 8 Dec 2014 20:22:31 +0000 Subject: [PATCH] IDE: Do not trigger palette update with OnComponentVisibleChanged and OnPageVisibleChanged events. Will be triggered by other means. git-svn-id: trunk@47140 - --- components/ideintf/componentreg.pas | 11 +++-------- designer/designer.pp | 7 ++++++- ide/componentpalette.pas | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/ideintf/componentreg.pas b/components/ideintf/componentreg.pas index 020552f0ea..113b16a6b9 100644 --- a/components/ideintf/componentreg.pas +++ b/components/ideintf/componentreg.pas @@ -229,7 +229,7 @@ type function FindButton(Button: TComponent): TRegisteredComponent; function CreateNewClassName(const Prefix: string): string; function IndexOfPageComponent(AComponent: TComponent): integer; - procedure Update; virtual; + procedure Update; virtual; abstract; procedure IterateRegisteredClasses(Proc: TGetComponentClassEvent); procedure RegisterCustomIDEComponents( const RegisterProc: RegisterUnitComponentProc); virtual; abstract; @@ -669,17 +669,12 @@ end; procedure TBaseComponentPalette.OnComponentVisibleChanged(AComponent: TRegisteredComponent); begin - DoChange; + ; end; procedure TBaseComponentPalette.OnPageVisibleChanged(APage: TBaseComponentPage); begin - DoChange; -end; - -procedure TBaseComponentPalette.Update; -begin - + ; end; function TBaseComponentPalette.VoteCompVisibility(AComponent: TRegisteredComponent): Boolean; diff --git a/designer/designer.pp b/designer/designer.pp index ae5b591bc5..8c0fa1133b 100644 --- a/designer/designer.pp +++ b/designer/designer.pp @@ -2939,7 +2939,12 @@ begin LM_MOUSEMOVE: MouseMoveOnControl(Sender, TLMMouse(TheMessage)); LM_SIZE: Result:=SizeControl(Sender, TLMSize(TheMessage)); LM_MOVE: Result:=MoveControl(Sender, TLMMove(TheMessage)); - LM_ACTIVATE: Result:=DoFormActivated(TLMActivate(TheMessage).Active=WA_ACTIVE); + LM_ACTIVATE: begin + {$IFDEF VerboseComponentPalette} + DebugLn('TDesigner.IsDesignMsg: Got LM_ACTIVATE message.'); + {$ENDIF} + Result:=DoFormActivated(TLMActivate(TheMessage).Active=WA_ACTIVE); + end; LM_CLOSEQUERY: Result:=DoFormCloseQuery; LM_SETCURSOR: Result:=HandleSetCursor(TheMessage); LM_CONTEXTMENU: HandlePopupMenu(Sender, TLMContextMenu(TheMessage)); diff --git a/ide/componentpalette.pas b/ide/componentpalette.pas index ebd533210b..99836191e7 100644 --- a/ide/componentpalette.pas +++ b/ide/componentpalette.pas @@ -966,9 +966,9 @@ end; procedure TComponentPalette.Update; begin - inherited Update; {$IFDEF VerboseComponentPalette} - DebugLn('TComponentPalette.Update, calling UpdateNoteBookButtons'); + DebugLn(['TComponentPalette.Update, calling UpdateNoteBookButtons, fUpdatingPageControl=', + fUpdatingPageControl, ', fNoteBookNeedsUpdate=', fNoteBookNeedsUpdate]); {$ENDIF} UpdateNoteBookButtons; end;