From 7a497ae1ce591fa8e5d075ef1d10fdbce48b8ca3 Mon Sep 17 00:00:00 2001 From: blikblum Date: Mon, 7 May 2012 01:00:34 +0000 Subject: [PATCH] * reverse rev 2200: not working properly git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2417 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../branches/4.8/VirtualTrees.pas | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas index 9f6e5952f..500eaa22c 100644 --- a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas +++ b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas @@ -8489,9 +8489,6 @@ end; //---------------------------------------------------------------------------------------------------------------------- -type - THeaderItemPosition = (thpLeft, thpCenter, thpRight); - procedure TVirtualTreeColumns.PaintHeader(DC: HDC; const R: TRect; HOffset: Integer); // Main paint method to draw the header. @@ -8501,9 +8498,6 @@ const (3, 5) {ascending}, (2, 4) {descending} ); - HotThemedHeaders: array[THeaderItemPosition] of TThemedHeader = (thHeaderItemLeftHot, thHeaderItemHot, thHeaderItemRightHot); - PressedThemedHeaders: array[THeaderItemPosition] of TThemedHeader = (thHeaderItemLeftPressed, thHeaderItemPressed, thHeaderItemRightPressed); - NormalThemedHeaders: array[THeaderItemPosition] of TThemedHeader = (thHeaderItemLeftNormal, thHeaderItemNormal, thHeaderItemRightNormal); var I, Y, SortIndex: Integer; @@ -8522,8 +8516,7 @@ var WrapCaption, AdvancedOwnerDraw: Boolean; {$ifdef ThemeSupport} - Details: TThemedElementDetails; - HeaderItemPosition: THeaderItemPosition; + Details: TThemedElementDetails; {$endif ThemeSupport} PaintInfo: THeaderPaintInfo; @@ -8715,18 +8708,13 @@ begin {$ifdef ThemeSupport} if tsUseThemes in FHeader.Treeview.FStates then begin - if I = GetFirstVisibleColumn then - HeaderItemPosition := thpLeft - else - HeaderItemPosition := thpCenter; - //todo?: handle autoresize header. LastColumn.HeaderItemPosition := thpRight if IsDownIndex then - Details := ThemeServices.GetElementDetails(PressedThemedHeaders[HeaderItemPosition]) + Details := ThemeServices.GetElementDetails(thHeaderItemPressed) else if IsHoverIndex then - Details := ThemeServices.GetElementDetails(HotThemedHeaders[HeaderItemPosition]) + Details := ThemeServices.GetElementDetails(thHeaderItemHot) else - Details := ThemeServices.GetElementDetails(NormalThemedHeaders[HeaderItemPosition]); + Details := ThemeServices.GetElementDetails(thHeaderItemNormal); ThemeServices.DrawElement(Handle, Details, PaintRectangle, @PaintRectangle); end else