mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-25 18:10:06 +02:00
lcl: remove CLX colors. They are nowhere defined, nowhere used and nobody wants to support them for years
git-svn-id: trunk@17458 -
This commit is contained in:
paul
parent
f9f9c4996b
commit
ffa494672e
168
lcl/graphics.pp
168
lcl/graphics.pp
@ -309,83 +309,6 @@ const
|
||||
clMask = clWhite;
|
||||
clDontMask = clBlack;
|
||||
|
||||
// CLX base, mapped, pseudo, rgb values
|
||||
clForeground = TColor(-1);
|
||||
clButton = TColor(-2);
|
||||
clLight = TColor(-3);
|
||||
clMidlight = TColor(-4);
|
||||
clDark = TColor(-5);
|
||||
clMid = TColor(-6);
|
||||
clText = TColor(-7);
|
||||
clBrightText = TColor(-8);
|
||||
clButtonText = TColor(-9);
|
||||
clBase = TColor(-10);
|
||||
clxBackground = TColor(-11); // only used as base for the CLX colors
|
||||
clShadow = TColor(-12);
|
||||
clxHighlight = TColor(-13); // only used as base for the CLX colors
|
||||
clHighlightedText = TColor(-14);
|
||||
|
||||
// CLX mapped role offsets
|
||||
cloNormal = 32;
|
||||
cloDisabled = 64;
|
||||
cloActive = 96;
|
||||
|
||||
// CLX normal, mapped, pseudo, rgb values
|
||||
clNormalForeground = TColor(clForeground - cloNormal);
|
||||
clNormalButton = TColor(clButton - cloNormal);
|
||||
clNormalLight = TColor(clLight - cloNormal);
|
||||
clNormalMidlight = TColor(clMidlight - cloNormal);
|
||||
clNormalDark = TColor(clDark - cloNormal);
|
||||
clNormalMid = TColor(clMid - cloNormal);
|
||||
clNormalText = TColor(clText - cloNormal);
|
||||
clNormalBrightText = TColor(clBrightText - cloNormal);
|
||||
clNormalButtonText = TColor(clButtonText - cloNormal);
|
||||
clNormalBase = TColor(clBase - cloNormal);
|
||||
clNormalBackground = TColor(clxBackground - cloNormal);
|
||||
clNormalShadow = TColor(clShadow - cloNormal);
|
||||
clNormalHighlight = TColor(clxHighlight - cloNormal);
|
||||
clNormalHighlightedText = TColor(clHighlightedText - cloNormal);
|
||||
|
||||
// CLX disabled, mapped, pseudo, rgb values
|
||||
clDisabledForeground = TColor(clForeground - cloDisabled);
|
||||
clDisabledButton = TColor(clButton - cloDisabled);
|
||||
clDisabledLight = TColor(clLight - cloDisabled);
|
||||
clDisabledMidlight = TColor(clMidlight - cloDisabled);
|
||||
clDisabledDark = TColor(clDark - cloDisabled);
|
||||
clDisabledMid = TColor(clMid - cloDisabled);
|
||||
clDisabledText = TColor(clText - cloDisabled);
|
||||
clDisabledBrightText = TColor(clBrightText - cloDisabled);
|
||||
clDisabledButtonText = TColor(clButtonText - cloDisabled);
|
||||
clDisabledBase = TColor(clBase - cloDisabled);
|
||||
clDisabledBackground = TColor(clxBackground - cloDisabled);
|
||||
clDisabledShadow = TColor(clShadow - cloDisabled);
|
||||
clDisabledHighlight = TColor(clxHighlight - cloDisabled);
|
||||
clDisabledHighlightedText = TColor(clHighlightedText - cloDisabled);
|
||||
|
||||
// CLX active, mapped, pseudo, rgb values
|
||||
clActiveForeground = TColor(clForeground - cloActive);
|
||||
clActiveButton = TColor(clButton - cloActive);
|
||||
clActiveLight = TColor(clLight - cloActive);
|
||||
clActiveMidlight = TColor(clMidlight - cloActive);
|
||||
clActiveDark = TColor(clDark - cloActive);
|
||||
clActiveMid = TColor(clMid - cloActive);
|
||||
clActiveText = TColor(clText - cloActive);
|
||||
clActiveBrightText = TColor(clBrightText - cloActive);
|
||||
clActiveButtonText = TColor(clButtonText - cloActive);
|
||||
clActiveBase = TColor(clBase - cloActive);
|
||||
clActiveBackground = TColor(clxBackground - cloActive);
|
||||
clActiveShadow = TColor(clShadow - cloActive);
|
||||
clActiveHighlight = TColor(clxHighlight - cloActive);
|
||||
clActiveHighlightedText = TColor(clHighlightedText - cloActive);
|
||||
|
||||
type
|
||||
TMappedColor = clActiveHighlightedText..clNormalForeground;
|
||||
|
||||
TColorGroup = (cgInactive, cgDisabled, cgActive);
|
||||
TColorRole = (crForeground, crButton, crLight, crMidlight, crDark, crMid,
|
||||
crText, crBrightText, crButtonText, crBase, crBackground, crShadow,
|
||||
crHighlight, crHighlightText, crNoRole);
|
||||
|
||||
const
|
||||
cmBlackness = BLACKNESS;
|
||||
cmDstInvert = DSTINVERT;
|
||||
@ -403,7 +326,6 @@ const
|
||||
cmSrcPaint = SRCPAINT;
|
||||
cmWhiteness = WHITENESS;
|
||||
|
||||
|
||||
type
|
||||
TCanvas = class;
|
||||
|
||||
@ -2100,7 +2022,7 @@ type
|
||||
{ Color mapping routines }
|
||||
|
||||
const
|
||||
Colors: array[0..106] of TIdentMapEntry = (
|
||||
Colors: array[0..52] of TIdentMapEntry = (
|
||||
// standard colors
|
||||
(Value: clBlack; Name: 'clBlack'),
|
||||
(Value: clMaroon; Name: 'clMaroon'),
|
||||
@ -2161,72 +2083,10 @@ const
|
||||
(Value: clHotLight; Name: 'clHotLight'),
|
||||
(Value: clGradientActiveCaption; Name: 'clGradientActiveCaption'),
|
||||
(Value: clGradientInactiveCaption; Name: 'clGradientInactiveCaption'),
|
||||
(Value: clForm; Name: 'clForm'),
|
||||
|
||||
// CLX base, mapped, pseudo, rgb values
|
||||
(Value: clForeground; Name: 'clForeground'),
|
||||
(Value: clButton; Name: 'clButton'),
|
||||
(Value: clLight; Name: 'clLight'),
|
||||
(Value: clMidlight; Name: 'clMidlight'),
|
||||
(Value: clDark; Name: 'clDark'),
|
||||
(Value: clMid; Name: 'clMid'),
|
||||
(Value: clText; Name: 'clText'),
|
||||
(Value: clBrightText; Name: 'clBrightText'),
|
||||
(Value: clButtonText; Name: 'clButtonText'),
|
||||
(Value: clBase; Name: 'clBase'),
|
||||
//clBackground
|
||||
(Value: clShadow; Name: 'clShadow'),
|
||||
//clHighlight
|
||||
(Value: clHighlightedText; Name: 'clHighlightedText'),
|
||||
|
||||
// CLX normal, mapped, pseudo, rgb values
|
||||
(Value: clNormalForeground; Name: 'clNormalForeground'),
|
||||
(Value: clNormalButton; Name: 'clNormalButton'),
|
||||
(Value: clNormalLight; Name: 'clNormalLight'),
|
||||
(Value: clNormalMidlight; Name: 'clNormalMidlight'),
|
||||
(Value: clNormalDark; Name: 'clNormalDark'),
|
||||
(Value: clNormalMid; Name: 'clNormalMid'),
|
||||
(Value: clNormalText; Name: 'clNormalText'),
|
||||
(Value: clNormalBrightText; Name: 'clNormalBrightText'),
|
||||
(Value: clNormalButtonText; Name: 'clNormalButtonText'),
|
||||
(Value: clNormalBase; Name: 'clNormalBase'),
|
||||
(Value: clNormalBackground; Name: 'clNormalBackground'),
|
||||
(Value: clNormalShadow; Name: 'clNormalShadow'),
|
||||
(Value: clNormalHighlight; Name: 'clNormalHighlight'),
|
||||
(Value: clNormalHighlightedText; Name: 'clNormalHighlightedText'),
|
||||
|
||||
// CLX disabled, mapped, pseudo, rgb values
|
||||
(Value: clDisabledForeground; Name: 'clDisabledForeground'),
|
||||
(Value: clDisabledButton; Name: 'clDisabledButton'),
|
||||
(Value: clDisabledLight; Name: 'clDisabledLight'),
|
||||
(Value: clDisabledMidlight; Name: 'clDisabledMidlight'),
|
||||
(Value: clDisabledDark; Name: 'clDisabledDark'),
|
||||
(Value: clDisabledMid; Name: 'clDisabledMid'),
|
||||
(Value: clDisabledText; Name: 'clDisabledText'),
|
||||
(Value: clDisabledBrightText; Name: 'clDisabledBrightText'),
|
||||
(Value: clDisabledButtonText; Name: 'clDisabledButtonText'),
|
||||
(Value: clDisabledBase; Name: 'clDisabledBase'),
|
||||
(Value: clDisabledBackground; Name: 'clDisabledBackground'),
|
||||
(Value: clDisabledShadow; Name: 'clDisabledShadow'),
|
||||
(Value: clDisabledHighlight; Name: 'clDisabledHighlight'),
|
||||
(Value: clDisabledHighlightedText; Name: 'clDisabledHighlightedText'),
|
||||
|
||||
// CLX active, mapped, pseudo, rgb values
|
||||
(Value: clActiveForeground; Name: 'clActiveForeground'),
|
||||
(Value: clActiveButton; Name: 'clActiveButton'),
|
||||
(Value: clActiveLight; Name: 'clActiveLight'),
|
||||
(Value: clActiveMidlight; Name: 'clActiveMidlight'),
|
||||
(Value: clActiveDark; Name: 'clActiveDark'),
|
||||
(Value: clActiveMid; Name: 'clActiveMid'),
|
||||
(Value: clActiveText; Name: 'clActiveText'),
|
||||
(Value: clActiveBrightText; Name: 'clActiveBrightText'),
|
||||
(Value: clActiveButtonText; Name: 'clActiveButtonText'),
|
||||
(Value: clActiveBase; Name: 'clActiveBase'),
|
||||
(Value: clActiveBackground; Name: 'clActiveBackground'),
|
||||
(Value: clActiveShadow; Name: 'clActiveShadow'),
|
||||
(Value: clActiveHighlight; Name: 'clActiveHighlight'),
|
||||
(Value: clActiveHighlightedText; Name: 'clActiveHighlightedText')
|
||||
);
|
||||
// one our special color
|
||||
(Value: clForm; Name: 'clForm')
|
||||
);
|
||||
|
||||
function IdentEntry(Entry: Longint; var MapEntry: TIdentMapEntry): boolean;
|
||||
begin
|
||||
@ -2264,22 +2124,10 @@ end;
|
||||
|
||||
function SysColorToSysColorIndex(Color: TColor): integer;
|
||||
begin
|
||||
if (Cardinal(Color) and Cardinal(SYS_COLOR_BASE)) <> 0 then begin
|
||||
case Color of
|
||||
clHighlightedText..clForeground:
|
||||
Result:=clForeground+COLOR_clForeground-Color;
|
||||
clNormalHighlightedText..clNormalForeground:
|
||||
Result:=clNormalForeground+COLOR_clNormalForeground-Color;
|
||||
clDisabledHighlightedText..clDisabledForeground:
|
||||
Result:=clDisabledForeground+COLOR_clDisabledForeground-Color;
|
||||
clActiveHighlightedText..clActiveForeground:
|
||||
Result:=clActiveForeground+COLOR_clActiveForeground-Color;
|
||||
else
|
||||
Result:=Color and $FF;
|
||||
end;
|
||||
end else begin
|
||||
Result:=-1;
|
||||
end;
|
||||
if (Cardinal(Color) and Cardinal(SYS_COLOR_BASE)) <> 0 then
|
||||
Result := Color and $FF
|
||||
else
|
||||
Result := -1;
|
||||
end;
|
||||
|
||||
function ColorToRGB(Color: TColor): TColor;
|
||||
|
||||
@ -158,69 +158,7 @@ const
|
||||
$808080, {COLOR_GRADIENTINACTIVECAPTION}
|
||||
$800000, {COLOR_MENUHILIGHT}
|
||||
$D0D0D0, {COLOR_MENUBAR}
|
||||
$D0D0D0, {COLOR_FORM}
|
||||
|
||||
// CLX base, mapped, pseudo, rgb values
|
||||
$000000, // COLOR_clForeground
|
||||
$000000, // COLOR_clButton
|
||||
$000000, // COLOR_clLight
|
||||
$000000, // COLOR_clMidlight
|
||||
$000000, // COLOR_clDark
|
||||
$000000, // COLOR_clMid
|
||||
$000000, // COLOR_clText
|
||||
$000000, // COLOR_clBrightText
|
||||
$000000, // COLOR_clButtonText
|
||||
$000000, // COLOR_clBase
|
||||
$000000, // COLOR_clShadow
|
||||
$000000, // COLOR_clHighlightedText
|
||||
|
||||
// CLX normal, mapped, pseudo, rgb values
|
||||
$000000, // COLOR_clNormalForeground
|
||||
$000000, // COLOR_clNormalButton
|
||||
$000000, // COLOR_clNormalLight
|
||||
$000000, // COLOR_clNormalMidlight
|
||||
$000000, // COLOR_clNormalDark
|
||||
$000000, // COLOR_clNormalMid
|
||||
$000000, // COLOR_clNormalText
|
||||
$000000, // COLOR_clNormalBrightText
|
||||
$000000, // COLOR_clNormalButtonText
|
||||
$000000, // COLOR_clNormalBase
|
||||
$000000, // COLOR_clNormalBackground
|
||||
$000000, // COLOR_clNormalShadow
|
||||
$000000, // COLOR_clNormalHighlight
|
||||
$000000, // COLOR_clNormalHighlightedText
|
||||
|
||||
// CLX disabled, mapped, pseudo, rgb values
|
||||
$000000, // COLOR_clDisabledForeground
|
||||
$000000, // COLOR_clDisabledButton
|
||||
$000000, // COLOR_clDisabledLight
|
||||
$000000, // COLOR_clDisabledMidlight
|
||||
$000000, // COLOR_clDisabledDark
|
||||
$000000, // COLOR_clDisabledMid
|
||||
$000000, // COLOR_clDisabledText
|
||||
$000000, // COLOR_clDisabledBrightText
|
||||
$000000, // COLOR_clDisabledButtonText
|
||||
$000000, // COLOR_clDisabledBase
|
||||
$000000, // COLOR_clDisabledBackground
|
||||
$000000, // COLOR_clDisabledShadow
|
||||
$000000, // COLOR_clDisabledHighlight
|
||||
$000000, // COLOR_clDisabledHighlightedText
|
||||
|
||||
// CLX active, mapped, pseudo, rgb values
|
||||
$000000, // COLOR_clActiveForeground
|
||||
$000000, // COLOR_clActiveButton
|
||||
$000000, // COLOR_clActiveLight
|
||||
$000000, // COLOR_clActiveMidlight
|
||||
$000000, // COLOR_clActiveDark
|
||||
$000000, // COLOR_clActiveMid
|
||||
$000000, // COLOR_clActiveText
|
||||
$000000, // COLOR_clActiveBrightText
|
||||
$000000, // COLOR_clActiveButtonText
|
||||
$000000, // COLOR_clActiveBase
|
||||
$000000, // COLOR_clActiveBackground
|
||||
$000000, // COLOR_clActiveShadow
|
||||
$000000, // COLOR_clActiveHighlight
|
||||
$000000 // COLOR_clActiveHighlightedText
|
||||
$D0D0D0 {COLOR_FORM}
|
||||
); {end _SysColors}
|
||||
|
||||
const
|
||||
|
||||
@ -1043,7 +1043,7 @@ begin
|
||||
Dec(ClientRect.Bottom, 1);
|
||||
QPainter_save(QtDC.Widget);
|
||||
try
|
||||
ColorDark := ColorToRGB(clDark);
|
||||
ColorDark := ColorToRGB(clBtnShadow);
|
||||
ColorLight := ColorToRGB(clBtnHighlight);
|
||||
if grfFlags and BF_FLAT <> 0 then
|
||||
ColorLight := clSilver;
|
||||
@ -1057,7 +1057,7 @@ begin
|
||||
InternalDrawEdge(True, Rect);
|
||||
InflateRect(ClientRect, -1, -1);
|
||||
if grfFlags and BF_MONO = 0 then
|
||||
ColorDark := ColorToRGB(clMid);
|
||||
ColorDark := ColorToRGB(clBtnFace);
|
||||
if Edge and (BDR_SUNKENINNER or BDR_RAISEDINNER) <> 0 then
|
||||
begin
|
||||
InternalDrawEdge(False, ClientRect);
|
||||
@ -1068,7 +1068,7 @@ begin
|
||||
|
||||
if grfFlags and BF_MIDDLE <> 0 then
|
||||
begin
|
||||
Brush := CreateSolidBrush(clButton);
|
||||
Brush := CreateSolidBrush(clBtnFace);
|
||||
try
|
||||
FillRect(DC, ClientRect, Brush);
|
||||
finally
|
||||
@ -2800,15 +2800,6 @@ begin
|
||||
COLOR_GRADIENTACTIVECAPTION : Result:=GetColor(QPaletteActive, QPaletteHighlight);
|
||||
COLOR_GRADIENTINACTIVECAPTION : Result:=GetColor(QPaletteInactive, QPaletteBase);
|
||||
COLOR_FORM : Result:=GetColor(QPaletteActive, QPaletteWindow);
|
||||
|
||||
COLOR_clForeground..COLOR_clHighlightedText
|
||||
: Result:=GetColor(QPaletteActive, nIndex - COLOR_clForeground);
|
||||
COLOR_clNormalForeground..COLOR_clNormalHighlightedText
|
||||
: Result:=GetColor(QPaletteInactive, nIndex - COLOR_clNormalForeground);
|
||||
COLOR_clDisabledForeground..COLOR_clDisabledHighlightedText
|
||||
: Result:=GetColor(QPaletteDisabled, nIndex - COLOR_clDisabledForeground);
|
||||
COLOR_clActiveForeground..COLOR_clActiveHighlightedText
|
||||
: Result:=GetColor(QPaletteActive, nIndex - COLOR_clActiveForeground);
|
||||
else
|
||||
Result:=0;
|
||||
end;
|
||||
|
||||
@ -1393,71 +1393,7 @@ const
|
||||
|
||||
COLOR_FORM = 31;
|
||||
|
||||
// CLX base, mapped, pseudo, rgb values
|
||||
COLOR_clForeground = 32;
|
||||
COLOR_clButton = COLOR_clForeground+1;
|
||||
COLOR_clLight = COLOR_clForeground+2;
|
||||
COLOR_clMidlight = COLOR_clForeground+3;
|
||||
COLOR_clDark = COLOR_clForeground+4;
|
||||
COLOR_clMid = COLOR_clForeground+5;
|
||||
COLOR_clText = COLOR_clForeground+6;
|
||||
COLOR_clBrightText = COLOR_clForeground+7;
|
||||
COLOR_clButtonText = COLOR_clForeground+8;
|
||||
COLOR_clBase = COLOR_clForeground+9;
|
||||
//clBackground
|
||||
COLOR_clShadow = COLOR_clForeground+10;
|
||||
//clHighlight
|
||||
COLOR_clHighlightedText = COLOR_clForeground+11;
|
||||
|
||||
// CLX normal, mapped, pseudo, rgb values
|
||||
COLOR_clNormalForeground = 44;
|
||||
COLOR_clNormalButton = COLOR_clNormalForeground+1;
|
||||
COLOR_clNormalLight = COLOR_clNormalForeground+2;
|
||||
COLOR_clNormalMidlight = COLOR_clNormalForeground+3;
|
||||
COLOR_clNormalDark = COLOR_clNormalForeground+4;
|
||||
COLOR_clNormalMid = COLOR_clNormalForeground+5;
|
||||
COLOR_clNormalText = COLOR_clNormalForeground+6;
|
||||
COLOR_clNormalBrightText = COLOR_clNormalForeground+7;
|
||||
COLOR_clNormalButtonText = COLOR_clNormalForeground+8;
|
||||
COLOR_clNormalBase = COLOR_clNormalForeground+9;
|
||||
COLOR_clNormalBackground = COLOR_clNormalForeground+10;
|
||||
COLOR_clNormalShadow = COLOR_clNormalForeground+11;
|
||||
COLOR_clNormalHighlight = COLOR_clNormalForeground+12;
|
||||
COLOR_clNormalHighlightedText = COLOR_clNormalForeground+13;
|
||||
|
||||
// CLX disabled, mapped, pseudo, rgb values
|
||||
COLOR_clDisabledForeground = 58;
|
||||
COLOR_clDisabledButton = COLOR_clDisabledForeground+1;
|
||||
COLOR_clDisabledLight = COLOR_clDisabledForeground+2;
|
||||
COLOR_clDisabledMidlight = COLOR_clDisabledForeground+3;
|
||||
COLOR_clDisabledDark = COLOR_clDisabledForeground+4;
|
||||
COLOR_clDisabledMid = COLOR_clDisabledForeground+5;
|
||||
COLOR_clDisabledText = COLOR_clDisabledForeground+6;
|
||||
COLOR_clDisabledBrightText = COLOR_clDisabledForeground+7;
|
||||
COLOR_clDisabledButtonText = COLOR_clDisabledForeground+8;
|
||||
COLOR_clDisabledBase = COLOR_clDisabledForeground+9;
|
||||
COLOR_clDisabledBackground = COLOR_clDisabledForeground+10;
|
||||
COLOR_clDisabledShadow = COLOR_clDisabledForeground+11;
|
||||
COLOR_clDisabledHighlight = COLOR_clDisabledForeground+12;
|
||||
COLOR_clDisabledHighlightedText = COLOR_clDisabledForeground+13;
|
||||
|
||||
// CLX active, mapped, pseudo, rgb values
|
||||
COLOR_clActiveForeground = 72;
|
||||
COLOR_clActiveButton = COLOR_clActiveForeground+1;
|
||||
COLOR_clActiveLight = COLOR_clActiveForeground+2;
|
||||
COLOR_clActiveMidlight = COLOR_clActiveForeground+3;
|
||||
COLOR_clActiveDark = COLOR_clActiveForeground+4;
|
||||
COLOR_clActiveMid = COLOR_clActiveForeground+5;
|
||||
COLOR_clActiveText = COLOR_clActiveForeground+6;
|
||||
COLOR_clActiveBrightText = COLOR_clActiveForeground+7;
|
||||
COLOR_clActiveButtonText = COLOR_clActiveForeground+8;
|
||||
COLOR_clActiveBase = COLOR_clActiveForeground+9;
|
||||
COLOR_clActiveBackground = COLOR_clActiveForeground+10;
|
||||
COLOR_clActiveShadow = COLOR_clActiveForeground+11;
|
||||
COLOR_clActiveHighlight = COLOR_clActiveForeground+12;
|
||||
COLOR_clActiveHighlightedText = COLOR_clActiveForeground+13;
|
||||
|
||||
COLOR_ENDCOLORS = COLOR_clActiveHighlightedText;
|
||||
COLOR_ENDCOLORS = COLOR_FORM;
|
||||
|
||||
COLOR_DESKTOP = COLOR_BACKGROUND;
|
||||
COLOR_3DFACE = COLOR_BTNFACE;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user