paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-03 17:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Opkman, VST: On desktops with a dark theme the online package manager text font appears black and unreadable, it is not using the theme color. Issue #36398, patch by Zeljko.

Browse Source 
git-svn-id: trunk@62325 -
This commit is contained in:
balazs 2019-12-05 06:44:44 +00:00
parent d7177ae196
commit 0545e7c3cf
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/onlinepackagemanager/opkman_mainfrm.lfm
View File

@ -38,7 +38,6 @@ object MainFrm: TMainFrm
BevelOuter = bvNone
Caption = 'No items to show'
Font.CharSet = ANSI_CHARSET
Font.Color = clBlack
Font.Height = -16
Font.Name = 'Verdana'
Font.Pitch = fpVariable
@ -258,6 +257,7 @@ object MainFrm: TMainFrm
Color = clBtnFace
ParentColor = False
TabOrder = 3
Visible = False
OnResize = pnReturnResize
object bReturn: TButton
Left = 384

2
components/onlinepackagemanager/opkman_visualtree.pas
View File

@ -1618,6 +1618,8 @@ procedure TVisualTree.VSTPaintText(Sender: TBaseVirtualTree;
function GetTextColor(const ADefColor: TColor; AIsFocusedNode: Boolean): TColor;
begin
Result := ADefColor;
if Result = clDefault then
Result := Sender.GetDefaultColor(dctFont);
if AIsFocusedNode then
{$IFDEF WINDOWS}
Result := clWhite;

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

@ -6122,6 +6122,8 @@ begin
DoPaintText(Node, Self.Canvas, Column, ttNormal);
//force the default hint font color
Canvas.Font.Color := Screen.HintFont.Color;
if Canvas.Font.Color = clDefault then
Canvas.Font.Color := clInfoText;
end;
//let THintWindow do the job
@ -8315,7 +8317,7 @@ begin
else
TextColor := FHeader.Treeview.FColors.HeaderFontColor;
if TextColor = clDefault then
TextColor := clBtnText;
TextColor := FHeader.Treeview.GetDefaultColor(dctFont);
SetTextColor(DC, ColorToRGB(TextColor));
DrawText(DC, PChar(Caption), Length(Caption), Bounds, DrawFormat);
end;
@ -9617,6 +9619,9 @@ begin
// Use shortcuts for the images and the font.
Images := FHeader.FImages;
Font := FHeader.FFont;
if Font.Color = clDefault then
Font.Color := FHeader.Treeview.GetDefaultColor(dctFont);
{$IF LCL_FullVersion >= 2000000}
if Images <> nil then
ImagesRes := Images.ResolutionForPPI[FHeader.ImagesWidth, Font.PixelsPerInch, Header.TreeView.GetCanvasScaleFactor];
@ -33622,7 +33627,7 @@ begin
end;
end;
if Canvas.Font.Color = clDefault then
Canvas.Font.Color := clWindowText;
Canvas.Font.Color := GetDefaultColor(dctFont);
end;
end;
@ -33736,6 +33741,8 @@ begin
with PaintInfo do
begin
Canvas.Font := Font;
if Font.Color = clDefault then
Canvas.Font.Color := GetDefaultColor(dctFont);
if toFullRowSelect in FOptions.FSelectionOptions then
begin
if Node = FDropTargetNode then
@ -33749,10 +33756,12 @@ begin
if vsSelected in Node.States then
begin
if Focused or (toPopupMode in FOptions.FPaintOptions) then
Canvas.Font.Color := FColors.SelectionTextColor
Canvas.Font.Color := FColors.SelectionTextColor
else
Canvas.Font.Color := FColors.NodeFontColor;
end;
if Canvas.Font.Color = clDefault then
Canvas.Font.Color := GetDefaultColor(dctFont);
end;
DrawFormat := DT_NOPREFIX or DT_VCENTER or DT_SINGLELINE;