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

Removes the custom drawers, they really should not exist

Browse Source 
git-svn-id: trunk@32719 -
This commit is contained in:
sekelsenmat 2011-10-06 10:18:31 +00:00
parent afc9b17919
commit a97f49381e
1 changed files with 7 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
components/customdrawn/customdrawnextras.pas
View File

@ -162,7 +162,6 @@ type
TCDButtonDrawer = class; TCDButtonDrawer = class;
TCDButtonDrawerCustom = class;
TCDButtonDrawerWinCE = class; TCDButtonDrawerWinCE = class;
TCDButtonDrawerAndroid = class; TCDButtonDrawerAndroid = class;
TCDButtonDrawerXPTB = class; TCDButtonDrawerXPTB = class;
@ -173,7 +172,6 @@ type
private private
FDrawStyle: TCDDrawStyle; FDrawStyle: TCDDrawStyle;
FCurrentDrawer: TCDButtonDrawer; FCurrentDrawer: TCDButtonDrawer;
FDrawerCustom: TCDButtonDrawerCustom;
FDrawerWinCE: TCDButtonDrawerWinCE; FDrawerWinCE: TCDButtonDrawerWinCE;
FDrawerAndroid: TCDButtonDrawerAndroid; FDrawerAndroid: TCDButtonDrawerAndroid;
FDrawerXPTB: TCDButtonDrawerXPTB; FDrawerXPTB: TCDButtonDrawerXPTB;
@ -252,16 +250,6 @@ type
FState: TBitmappedButtonState); virtual; abstract; FState: TBitmappedButtonState); virtual; abstract;
end; end;
{ TCDButtonDrawerCustom }
TCDButtonDrawerCustom = class(TCDButtonDrawer)
public
procedure SetClientRectPos(CDButton: TCDButton); override;
procedure DrawToIntfImage(ADest: TFPImageCanvas; CDButton: TCDButton); override;
procedure DrawToCanvas(ADest: TCanvas; CDButton: TCDButton;
FState: TBitmappedButtonState); override;
end;
{ TCDButtonDrawerWinCE } { TCDButtonDrawerWinCE }
TCDButtonDrawerWinCE = class(TCDButtonDrawer) TCDButtonDrawerWinCE = class(TCDButtonDrawer)
@ -310,7 +298,6 @@ type
} }
TCDGroupBoxDrawer = class; TCDGroupBoxDrawer = class;
TCDGroupBoxDrawerCustom = class;
TCDGroupBoxDrawerWinCE = class; TCDGroupBoxDrawerWinCE = class;
{ TCDGroupBox } { TCDGroupBox }
@ -319,7 +306,6 @@ type
private private
FDrawStyle: TCDDrawStyle; FDrawStyle: TCDDrawStyle;
FCurrentDrawer: TCDGroupBoxDrawer; FCurrentDrawer: TCDGroupBoxDrawer;
FDrawerCustom: TCDGroupBoxDrawerCustom;
FDrawerWinCE: TCDGroupBoxDrawerWinCE; FDrawerWinCE: TCDGroupBoxDrawerWinCE;
procedure PrepareCurrentDrawer(); procedure PrepareCurrentDrawer();
procedure SetDrawStyle(const AValue: TCDDrawStyle); procedure SetDrawStyle(const AValue: TCDDrawStyle);
@ -345,16 +331,6 @@ type
procedure DrawToCanvas(ADest: TCanvas; CDGroupBox: TCDGroupBox); virtual; abstract; procedure DrawToCanvas(ADest: TCanvas; CDGroupBox: TCDGroupBox); virtual; abstract;
end; end;
{ TCDGroupBoxDrawerCustom }
TCDGroupBoxDrawerCustom = class(TCDGroupBoxDrawer)
public
FCaptionMiddle: integer;
procedure SetClientRectPos(CDGroupBox: TCDGroupBox); override;
procedure DrawToIntfImage(ADest: TFPImageCanvas; CDGroupBox: TCDGroupBox); override;
procedure DrawToCanvas(ADest: TCanvas; CDGroupBox: TCDGroupBox); override;
end;
{ TCDGroupBoxDrawerWinCE } { TCDGroupBoxDrawerWinCE }
TCDGroupBoxDrawerWinCE = class(TCDGroupBoxDrawer) TCDGroupBoxDrawerWinCE = class(TCDGroupBoxDrawer)
@ -592,7 +568,6 @@ type
{ TCDPageControl } { TCDPageControl }
TCDPageControlDrawer = class; TCDPageControlDrawer = class;
TCDPageControlDrawerCustom = class;
TCDPageControlDrawerWinCE = class; TCDPageControlDrawerWinCE = class;
{ TCDPageControlEditor } { TCDPageControlEditor }
@ -614,10 +589,7 @@ type
FCaptionHeight: integer; FCaptionHeight: integer;
FActivePage: TCDTabSheet; FActivePage: TCDTabSheet;
FCurrentDrawer: TCDPageControlDrawer; FCurrentDrawer: TCDPageControlDrawer;
FDrawerCustom: TCDPageControlDrawerCustom;
FDrawerWinCE: TCDPageControlDrawerWinCE; FDrawerWinCE: TCDPageControlDrawerWinCE;
FGrad: boolean;
FShowTabs: boolean;
FStartIndex: integer; //FEndIndex FStartIndex: integer; //FEndIndex
RButtHeight: integer; RButtHeight: integer;
FPages: TTabItemList; FPages: TTabItemList;
@ -638,8 +610,6 @@ type
procedure SetDrawStyle(const AValue: TCDDrawStyle); procedure SetDrawStyle(const AValue: TCDDrawStyle);
procedure SetCaptionHeight(Value: integer); procedure SetCaptionHeight(Value: integer);
procedure DrawCaptionBar(ADest: TCanvas; lRect: TRect; CL: TColor); procedure DrawCaptionBar(ADest: TCanvas; lRect: TRect; CL: TColor);
procedure SetPageGradient(Value: boolean);
procedure SetShowTabs(Value: boolean);
procedure SetActivePage(Value: TCDTabSheet); procedure SetActivePage(Value: TCDTabSheet);
procedure SetPageIndex(Value: integer); procedure SetPageIndex(Value: integer);
procedure UpdateAllDesignerFlags; procedure UpdateAllDesignerFlags;
@ -663,6 +633,7 @@ type
procedure SetCDPages(Value: TTabItemList); procedure SetCDPages(Value: TTabItemList);
procedure InsertPage(aIndex: integer; S: string); procedure InsertPage(aIndex: integer; S: string);
procedure RemovePage(aIndex: integer); procedure RemovePage(aIndex: integer);
public
procedure AddPage(S: string); procedure AddPage(S: string);
published published
property ActivePage: TCDTabSheet read FActivePage write SetActivePage; property ActivePage: TCDTabSheet read FActivePage write SetActivePage;
@ -671,14 +642,12 @@ type
property CaptionHeight: integer read FCaptionHeight write SetCaptionHeight; property CaptionHeight: integer read FCaptionHeight write SetCaptionHeight;
property Color; property Color;
property Font; property Font;
property Gradient: boolean read FGrad write SetPageGradient;
//property PageCount: integer read FPageCount; //property PageCount: integer read FPageCount;
property PageIndex: integer read FPageIndex write SetPageIndex; property PageIndex: integer read FPageIndex write SetPageIndex;
property Pages: TTabItemList read FPages write SetCDPages; property Pages: TTabItemList read FPages write SetCDPages;
property PageCount: integer read GetPageCount; property PageCount: integer read GetPageCount;
property ParentColor; property ParentColor;
property ParentFont; property ParentFont;
property ShowTabs: boolean read FShowTabs write SetShowTabs;
property StartIndex: integer read FStartIndex write SetStartIndex; property StartIndex: integer read FStartIndex write SetStartIndex;
//property EndIndex: integer read FEndIndex write SetEndIndex; //property EndIndex: integer read FEndIndex write SetEndIndex;
property TabStop default True; property TabStop default True;
@ -695,16 +664,6 @@ type
virtual; abstract; virtual; abstract;
end; end;
{ TCDPageControlDrawerCustom }
TCDPageControlDrawerCustom = class(TCDPageControlDrawer)
public
procedure SetClientRectPos(CDPageControl: TCDPageControl); override;
procedure DrawToIntfImage(ADest: TFPImageCanvas; FPImg: TLazIntfImage;
CDPageControl: TCDPageControl); override;
procedure DrawToCanvas(ADest: TCanvas; CDPageControl: TCDPageControl); override;
end;
TCDPageControlDrawerWinCE = class(TCDPageControlDrawer) TCDPageControlDrawerWinCE = class(TCDPageControlDrawer)
public public
procedure SetClientRectPos(CDPageControl: TCDPageControl); override; procedure SetClientRectPos(CDPageControl: TCDPageControl); override;
@ -1095,13 +1054,12 @@ constructor TCDButton.Create(AOwner: TComponent);
begin begin
inherited Create(AOwner); inherited Create(AOwner);
TabStop := True; TabStop := True;
FDrawerCustom := TCDButtonDrawerCustom.Create;
FDrawerWinCE := TCDButtonDrawerWinCE.Create; FDrawerWinCE := TCDButtonDrawerWinCE.Create;
CustomDrawer := FDrawerWinCE; // Dummy to avoid designer crashes
FDrawerAndroid := TCDButtonDrawerAndroid.Create; FDrawerAndroid := TCDButtonDrawerAndroid.Create;
FDrawerXPTB := TCDButtonDrawerXPTB.Create; FDrawerXPTB := TCDButtonDrawerXPTB.Create;
FDrawerGrad := TCDButtonDrawerGrad.Create; FDrawerGrad := TCDButtonDrawerGrad.Create;
FDrawerWin2k := TCDButtonDrawerWin2k.Create; FDrawerWin2k := TCDButtonDrawerWin2k.Create;
CustomDrawer:=FDrawerCustom;
Width := 120; Width := 120;
Height := 43; Height := 43;
//Color := clTeal; //Color := clTeal;
@ -1238,41 +1196,6 @@ begin
{$endif} {$endif}
end; end;
{ TCDButtonDrawerCustom }
procedure TCDButtonDrawerCustom.SetClientRectPos(CDButton: TCDButton);
var
lRect: TRect;
begin
lRect := Rect(1, 1, CDButton.Width - 1, CDButton.Height - 1);
CDButton.AdjustClientRect(lRect);
end;
procedure TCDButtonDrawerCustom.DrawToIntfImage(ADest: TFPImageCanvas;
CDButton: TCDButton);
begin
end;
procedure TCDButtonDrawerCustom.DrawToCanvas(ADest: TCanvas;
CDButton: TCDButton; FState: TBitmappedButtonState);
var
Str: string;
begin
ADest.Brush.Color := CDButton.Color;
ADest.Brush.Style := bsSolid;
ADest.Rectangle(0, 0, CDButton.Width, CDButton.Height);
ADest.Font.Assign(CDButton.Font);
ADest.Brush.Style := bsClear;
ADest.Pen.Style := psSolid;
Str := CDButton.Name;
ADest.TextOut((CDButton.Width - ADest.TextWidth(Str)) div 2,
(CDButton.Height) div 2 - ADest.TextHeight(Str), Str);
ADest.TextOut((CDButton.Width - ADest.TextWidth(Str)) div 2,
(CDButton.Height) div 2, 'dsCustom');
end;
{ TCDButtonDrawerWinCE } { TCDButtonDrawerWinCE }
procedure TCDButtonDrawerWinCE.SetClientRectPos(CDButton: TCDButton); procedure TCDButtonDrawerWinCE.SetClientRectPos(CDButton: TCDButton);
@ -1584,9 +1507,8 @@ begin
Width := 100; Width := 100;
Height := 100; Height := 100;
TabStop := False; TabStop := False;
FDrawerCustom := TCDGroupBoxDrawerCustom.Create;
FDrawerWinCE := TCDGroupBoxDrawerWinCE.Create; FDrawerWinCE := TCDGroupBoxDrawerWinCE.Create;
CustomDrawer := FDrawerCustom; CustomDrawer := FDrawerWinCE; // Dummy to avoid designer crashes
ControlStyle := [csAcceptsControls, csCaptureMouse, csClickEvents, ControlStyle := [csAcceptsControls, csCaptureMouse, csClickEvents,
csDoubleClicks, csReplicatable]; csDoubleClicks, csReplicatable];
end; end;
@ -1632,41 +1554,6 @@ begin
end; end;
end; end;
{ TCDGroupBoxDrawerCustom }
procedure TCDGroupBoxDrawerCustom.SetClientRectPos(CDGroupBox: TCDGroupBox);
var
lRect: TRect;
lCaptionHeight: integer;
begin
lCaptionHeight := 10;
lRect := Rect(1, lCaptionHeight, CDGroupBox.Width - 1, CDGroupBox.Height - 1);
CDGroupBox.AdjustClientRect(lRect);
end;
procedure TCDGroupBoxDrawerCustom.DrawToIntfImage(ADest: TFPImageCanvas;
CDGroupBox: TCDGroupBox);
begin
end;
procedure TCDGroupBoxDrawerCustom.DrawToCanvas(ADest: TCanvas;
CDGroupBox: TCDGroupBox);
var
Str: string;
begin
ADest.Brush.Color := clWhite;
ADest.Brush.Style := bsSolid;
ADest.Rectangle(0, 0, CDGroupBox.Width, CDGroupBox.Height);
ADest.Brush.Style := bsClear;
ADest.Pen.Style := psSolid;
Str := CDGroupBox.Name;
ADest.TextOut((CDGroupBox.Width - ADest.TextWidth(Str)) div 2,
(CDGroupBox.Height) div 2 - ADest.TextHeight(Str), Str);
ADest.TextOut((CDGroupBox.Width - ADest.TextWidth(Str)) div 2,
(CDGroupBox.Height) div 2, 'dsCustom');
end;
{ TCDGroupBoxDrawerWinCE } { TCDGroupBoxDrawerWinCE }
procedure TCDGroupBoxDrawerWinCE.SetClientRectPos(CDGroupBox: TCDGroupBox); procedure TCDGroupBoxDrawerWinCE.SetClientRectPos(CDGroupBox: TCDGroupBox);
@ -2588,10 +2475,6 @@ end;
procedure TCDTabSheetDrawerGraph.DrawToIntfImage(ADest: TFPImageCanvas; procedure TCDTabSheetDrawerGraph.DrawToIntfImage(ADest: TFPImageCanvas;
FPImg: TLazIntfImage; CDTabSheet: TCDTabSheet); FPImg: TLazIntfImage; CDTabSheet: TCDTabSheet);
begin begin
if TCDPageControl(CDTabSheet.Parent).Gradient then
GradientFillRect(clWhite, GetUColor(CDTabSheet.Color, 96), ADest,
Rect(0, 0, CDTabSheet.Width - 1, CDTabSheet.Height - 1))
else
ADest.Rectangle(0, 0, CDTabSheet.Width - 1, CDTabSheet.Height - 1); ADest.Rectangle(0, 0, CDTabSheet.Width - 1, CDTabSheet.Height - 1);
end; end;
@ -2874,18 +2757,15 @@ begin
Width := 232; Width := 232;
Height := 184; Height := 184;
TabStop := False; TabStop := False;
FDrawerCustom := TCDPageControlDrawerCustom.Create;
FDrawerWinCE := TCDPageControlDrawerWinCE.Create; FDrawerWinCE := TCDPageControlDrawerWinCE.Create;
CustomDrawer := FDrawerCustom; CustomDrawer := FDrawerWinCE; // Dummy to avoid designer crashes
FCaptionHeight := 28; FCaptionHeight := 28;
ParentColor := True; ParentColor := True;
parentFont := True; parentFont := True;
FGrad := True;
ControlStyle := [csCaptureMouse, csClickEvents, csDoubleClicks, ControlStyle := [csCaptureMouse, csClickEvents, csDoubleClicks,
csDesignInteractive]; csDesignInteractive];
FPages := TTabItemList.Create(TTabItem); FPages := TTabItemList.Create(TTabItem);
//FPageCount := 0; //FPageCount := 0;
FShowTabs := True;
RButtHeight := CaptionHeight - 4; RButtHeight := CaptionHeight - 4;
FStartIndex := 0; FStartIndex := 0;
MaskHeadBmp := TBitmap.Create; MaskHeadBmp := TBitmap.Create;
@ -2991,18 +2871,6 @@ begin
invalidate; invalidate;
end; end;
procedure TCDPageControl.SetPageGradient(Value: boolean);
begin
FGrad := Value;
invalidate;
end;
procedure TCDPageControl.SetShowTabs(Value: boolean);
begin
FShowTabs := Value;
invalidate;
end;
procedure TCDPageControl.DrawCaptionBar(ADest: TCanvas; lRect: TRect; CL: TColor); procedure TCDPageControl.DrawCaptionBar(ADest: TCanvas; lRect: TRect; CL: TColor);
var var
aRect, bRect, cRect: TRect; aRect, bRect, cRect: TRect;
@ -3263,47 +3131,6 @@ begin
invalidate; invalidate;
end; end;
{ TCDPageControlDrawerCustom }
procedure TCDPageControlDrawerCustom.SetClientRectPos(
CDPageControl: TCDPageControl);
var
lRect: TRect;
lCaptionHeight: integer;
begin
lCaptionHeight := CDPageControl.CaptionHeight;
lRect := Rect(10, lCaptionHeight + 1, CDPageControl.Width - 10,
CDPageControl.Height - 1);
CDPageControl.AdjustClientRect(lRect);
end;
procedure TCDPageControlDrawerCustom.DrawToIntfImage(ADest: TFPImageCanvas;
FPImg: TLazIntfImage; CDPageControl: TCDPageControl);
begin
end;
procedure TCDPageControlDrawerCustom.DrawToCanvas(ADest: TCanvas;
CDPageControl: TCDPageControl);
var
Str: string;
begin
if CDPageControl.Color=clDefault then
ADest.Brush.Color := clWhite
else
ADest.Brush.Color := CDPageControl.Color;
ADest.Brush.Style := bsSolid;
ADest.Rectangle(0, 0, CDPageControl.Width, CDPageControl.Height);
ADest.Font.Assign(CDPageControl.Font);
ADest.Brush.Style := bsClear;
ADest.Pen.Style := psSolid;
Str := CDPageControl.Name;
ADest.TextOut((CDPageControl.Width - ADest.TextWidth(Str)) div 2,
(CDPageControl.Height) div 2 - ADest.TextHeight(Str), Str);
ADest.TextOut((CDPageControl.Width - ADest.TextWidth(Str)) div 2,
(CDPageControl.Height) div 2, 'dsCustom');
end;
{ TCDPageControlDrawerWinCE } { TCDPageControlDrawerWinCE }
procedure TCDPageControlDrawerWinCE.SetClientRectPos(CDPageControl: TCDPageControl); procedure TCDPageControlDrawerWinCE.SetClientRectPos(CDPageControl: TCDPageControl);
@ -3327,10 +3154,6 @@ begin
ADest.Rectangle(0, 0, CDPageControl.Width, CDPageControl.Height); ADest.Rectangle(0, 0, CDPageControl.Width, CDPageControl.Height);
ADest.Font.Name := CDPageControl.Font.Name; ADest.Font.Name := CDPageControl.Font.Name;
ADest.Font.Size := CDPageControl.Font.Size; ADest.Font.Size := CDPageControl.Font.Size;
if CDPageControl.Gradient then
GradientFillRect(clWhite, GetUColor(CDPageControl.Color, 96), ADest,
Rect(0, CDPageControl.CaptionHeight, CDPageControl.Width, CDPageControl.Height))
else
ADest.Rectangle(0, CDPageControl.CaptionHeight, CDPageControl.Width, ADest.Rectangle(0, CDPageControl.CaptionHeight, CDPageControl.Width,
CDPageControl.Height); CDPageControl.Height);
ADest.Colors[CDPageControl.Width - 1, CDPageControl.CaptionHeight] := ADest.Colors[CDPageControl.Width - 1, CDPageControl.CaptionHeight] :=