From e451d915b8cfd9d33a4e6fe37998db5bfb469de0 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Thu, 2 Mar 2017 06:56:45 +0100 Subject: [PATCH] Revert "widgets, MW move, remove trick used to get public prop" This reverts commit a899c73bc87e52d2ad9cf86ed5507fe52cae73c2. --- src/ce_main.lfm | 2 +- src/ce_main.pas | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ce_main.lfm b/src/ce_main.lfm index 91a5ef0d..7bb7ee45 100644 --- a/src/ce_main.lfm +++ b/src/ce_main.lfm @@ -1468,7 +1468,7 @@ object CEMainForm: TCEMainForm OnCloseQuery = FormCloseQuery OnDropFiles = FormDropFiles ShowHint = True - LCLVersion = '1.6.4.0' + LCLVersion = '1.6.2.0' object mainMenu: TMainMenu Images = imgList top = 1 diff --git a/src/ce_main.pas b/src/ce_main.pas index 800f07f7..49ac231a 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -22,6 +22,11 @@ type TCEApplicationOptions = class; + TAnchorDockSplitterEx = class(TAnchorDockSplitter) + public + property OnMouseWheel; + end; + TAsyncWait = (awNo, awYes, awCustom); TRunnableToFolderCondition = ( @@ -1343,6 +1348,7 @@ begin accept := GetKeyShiftState = [ssCtrl]; end; +//TODO-cdocking: remove the usage of TAnchorDockSplitterEx from Laz 1.8 RC1 (OnMouseWheel public) procedure TCEMainForm.DockSplitterMw(Sender: TObject; Shift: TShiftState; WheelDelta: Integer; MousePos: TPoint; var Handled: Boolean); var offs: integer; @@ -1378,10 +1384,10 @@ begin if site is TAnchorDockHostSite then begin if TAnchorDockHostSite(site).BoundSplitter.isNotNil then - TSplitter(TAnchorDockHostSite(site).BoundSplitter).OnMouseWheel:=@DockSplitterMw; + TAnchorDockSplitterEx(TAnchorDockHostSite(site).BoundSplitter).OnMouseWheel:=@DockSplitterMw; end else if site is TAnchorDockSplitter then - TSplitter(TAnchorDockSplitter(site)).OnMouseWheel:=@DockSplitterMw; + TAnchorDockSplitterEx(TAnchorDockSplitter(site)).OnMouseWheel:=@DockSplitterMw; end; end; end;