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

VTV: fix selected node when tsUseExplorerTheme is disabled. Issue #37404, patch by Matteo Salvi.

Browse Source 
git-svn-id: trunk@63658 -
This commit is contained in:
pascal 2020-07-27 06:19:30 +00:00
parent c5d98711e5
commit 638a405de0
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/virtualtreeview/laz.virtualtrees.pas
View File

@ -14491,9 +14491,11 @@ begin
end;
{$ifdef ThemeSupport}
// if Theme <> 0 then
// CloseThemeData(Theme);
{$ifdef Windows}
if tsUseThemes in FStates then
CloseThemeData(Theme);
{$endif}
{$endif ThemeSupport}
end;
//----------------------------------------------------------------------------------------------------------------------
@ -24715,9 +24717,7 @@ begin
RowRect.Right := Max(ClientWidth, RowRect.Right);
if toShowVertGridLines in FOptions.PaintOptions then
Dec(RowRect.Right);
end
else
Theme := 0;
end;
{$endif}
{$endif ThemeSupport}
@ -24813,7 +24813,7 @@ begin
if not IsRectEmpty(InnerRect) then
{$ifdef ThemeSupport}
{$ifdef Windows}
if Theme <> 0 then
if tsUseExplorerTheme in FStates then
begin
// If the node is also hot, its background will be drawn later.
if not (toHotTrack in FOptions.FPaintOptions) or (Node <> FCurrentHotNode) or
@ -24834,7 +24834,7 @@ begin
{$ifdef ThemeSupport}
{$ifdef Windows}
if (Theme <> 0) and (toHotTrack in FOptions.FPaintOptions) and (Node = FCurrentHotNode) and
if (tsUseExplorerTheme in FStates) and (toHotTrack in FOptions.FPaintOptions) and (Node = FCurrentHotNode) and
((Column = FCurrentHotColumn) or (toFullRowSelect in FOptions.FSelectionOptions)) then
DrawBackground(IfThen((vsSelected in Node.States) and not (toAlwaysHideSelection in FOptions.FPaintOptions),
TREIS_HOTSELECTED, TREIS_HOT));
@ -24859,7 +24859,7 @@ begin
{$ifdef ThemeSupport}
{$ifdef Windows}
if not (toExtendedFocus in FOptions.FSelectionOptions) and (toFullRowSelect in FOptions.FSelectionOptions) and
(Theme <> 0) then
(tsUseExplorerTheme in FStates) then
FocusRect := RowRect
else
{$endif}
@ -24894,11 +24894,10 @@ begin
end;
end;
{$ifdef ThemeSupport}
//todo
{
if Theme <> 0 then
{$ifdef Windows}
if tsUseExplorerTheme in FStates then
CloseThemeData(Theme);
}
{$endif}
{$endif ThemeSupport}
end;