paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 18:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

carbon: implemented theme tree item drawing. changed highlight colors

Browse Source 
git-svn-id: trunk@24852 -
This commit is contained in:
dmitry 2010-04-23 13:56:40 +00:00
parent 2947939f60
commit 92b400b9d8
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lcl/interfaces/carbon/carbonthemes.pas
View File

@ -19,7 +19,7 @@ uses
// lcl
LCLType, LCLProc, LCLIntf, Graphics, Themes, TmSchema,
// widgetset
CarbonProc, CarbonCanvas;
CarbonProc, CarbonCanvas, CarbonGDIObjects;
type
{ TCarbonThemeServices }
@ -284,26 +284,36 @@ function TCarbonThemeServices.DrawTreeviewElement(DC: TCarbonDeviceContext;
var
ButtonDrawInfo: HIThemeButtonDrawInfo;
LabelRect: HIRect;
b: TCarbonBrush;
begin
if Details.Part in [TVP_GLYPH, TVP_HOTGLYPH] then
begin
ButtonDrawInfo.version := 0;
ButtonDrawInfo.State := GetDrawState(Details);
ButtonDrawInfo.kind := kThemeDisclosureTriangle;
if Details.State = GLPS_CLOSED then
ButtonDrawInfo.value := kThemeDisclosureRight
else
ButtonDrawInfo.value := kThemeDisclosureDown;
case Details.Part of
TVP_TREEITEM:
begin
b:=TCarbonBrush.Create(False);
b.SetColor( ColorToRGB(clHighlight), True);
DC.FillRect(R, b);
b.Free;
end;
TVP_GLYPH, TVP_HOTGLYPH:
begin
ButtonDrawInfo.version := 0;
ButtonDrawInfo.State := GetDrawState(Details);
ButtonDrawInfo.kind := kThemeDisclosureTriangle;
if Details.State = GLPS_CLOSED then
ButtonDrawInfo.value := kThemeDisclosureRight
else
ButtonDrawInfo.value := kThemeDisclosureDown;
ButtonDrawInfo.adornment := kThemeAdornmentNone;
LabelRect := RectToCGRect(R);
ButtonDrawInfo.adornment := kThemeAdornmentNone;
LabelRect := RectToCGRect(R);
OSError(
HIThemeDrawButton(LabelRect, ButtonDrawInfo, DC.CGContext,
kHIThemeOrientationNormal, @LabelRect),
Self, 'DrawTreeviewElement', 'HIThemeDrawButton');
OSError(
HIThemeDrawButton(LabelRect, ButtonDrawInfo, DC.CGContext,
kHIThemeOrientationNormal, @LabelRect),
Self, 'DrawTreeviewElement', 'HIThemeDrawButton');
Result := CGRectToRect(LabelRect);
Result := CGRectToRect(LabelRect);
end;
end;
end;

7
lcl/interfaces/carbon/carbonwinapi.inc
View File

@ -1908,9 +1908,12 @@ begin
COLOR_APPWORKSPACE:
R := GetThemeBrushAsColor(kThemeBrushUtilityWindowBackgroundActive, Depth, True, C);
COLOR_HIGHLIGHT:
R := GetThemeBrushAsColor(kThemeBrushPrimaryHighlightColor, Depth, True, C);
// kThemeBrushAlternatePrimaryHighlightColor is used as highlight in Finder
R := GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, Depth, True, C);
//R := GetThemeBrushAsColor(kThemeBrushPrimaryHighlightColor, Depth, True, C);
COLOR_HIGHLIGHTTEXT:
R := GetThemeTextColor(kThemeTextColorPushButtonPressed, Depth, True, C);
R := GetThemeTextColor(kThemeTextColorWhite, Depth, True, C);
//R := GetThemeTextColor(kThemeTextColorPushButtonPressed, Depth, True, C);
COLOR_SCROLLBAR, COLOR_BTNFACE:
R := GetThemeBrushAsColor(kThemeBrushButtonFaceActive, Depth, True, C);
COLOR_BTNSHADOW: