paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 21:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL-GTK3: Simplify property access more. Issue #36463, patch from CudaText man.

Browse Source 
git-svn-id: trunk@62429 -
This commit is contained in:
juha 2019-12-22 10:36:22 +00:00
parent 64abb45aee
commit 3119271702
2 changed files with 12 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/gtk3/gtk3lclintf.inc
View File

@ -276,7 +276,7 @@ begin
ADesc.LineOrder := riloTopToBottom;
ADesc.LineEnd := rileDWordBoundary;
ADesc.Depth := CairoImageFormatToDepth[Image.getFormat];
ADesc.Depth := CairoImageFormatToDepth[Image.Format];
ADesc.BitsPerPixel := ADesc.Depth;
if ADesc.BitsPerPixel = 24 then
ADesc.BitsPerPixel := 32;

84
lcl/interfaces/gtk3/gtk3objects.pas
View File

@ -59,13 +59,12 @@ type
FLogFont: TLogFont;
FFontName: String;
FHandle: PPangoFontDescription;
procedure SetFontName(const AValue: String);
public
constructor Create(ACairo: Pcairo_t; AWidget: PGtkWidget = nil);
constructor Create(ALogFont: TLogFont; const ALongFontName: String);
destructor Destroy; override;
procedure UpdateLogFont;
property FontName: String read FFontName write SetFontName;
property FontName: String read FFontName write FFontName;
property Handle: PPangoFontDescription read FHandle;
property Layout: PPangoLayout read FLayout;
property LogFont: TLogFont read FLogFont;
@ -78,15 +77,13 @@ type
FColor: TColor;
FContext: TGtk3DeviceContext;
FStyle: LongWord;
function GetColor: TColor;
procedure SetColor(AValue: TColor);
procedure SetStyle(AValue: cardinal);
public
LogBrush: TLogBrush;
constructor Create; override;
property Color: TColor read GetColor write SetColor;
property Color: TColor read FColor write SetColor;
property Context: TGtk3DeviceContext read FContext write FContext;
property Style: LongWord read FStyle write SetStyle;
property Style: LongWord read FStyle write FStyle;
end;
{ TGtk3Pen }
@ -102,28 +99,22 @@ type
FColor: TColor;
FContext: TGtk3DeviceContext;
FIsExtPen: Boolean;
function GetColor: TColor;
function GetWidth: Integer;
procedure SetColor(AValue: TColor);
procedure setCosmetic(b: Boolean);
procedure SetEndCap(AValue: TPenEndCap);
procedure SetJoinStyle(AValue: TPenJoinStyle);
procedure SetPenMode(AValue: TPenMode);
procedure SetStyle(AValue: TFPPenStyle);
procedure setWidth(p1: Integer);
public
LogPen: TLogPen;
constructor Create; override;
property Color: TColor read GetColor write SetColor;
property Color: TColor read FColor write SetColor;
property Context: TGtk3DeviceContext read FContext write FContext;
property Cosmetic: Boolean read FCosmetic write SetCosmetic;
property EndCap: TPenEndCap read FEndCap write SetEndCap;
property EndCap: TPenEndCap read FEndCap write FEndCap;
property IsExtPen: Boolean read FIsExtPen write FIsExtPen;
property JoinStyle: TPenJoinStyle read FJoinStyle write SetJoinStyle;
property Mode: TPenMode read FPenMode write SetPenMode;
property Style: TFPPenStyle read FStyle write SetStyle;
property Width: Integer read GetWidth write SetWidth;
property JoinStyle: TPenJoinStyle read FJoinStyle write FJoinStyle;
property Mode: TPenMode read FPenMode write FPenMode;
property Style: TFPPenStyle read FStyle write FStyle;
property Width: Integer read FWidth write SetWidth;
end;
{ TGtk3Region }
@ -164,7 +155,7 @@ type
function bits: PByte;
function numBytes: LongWord;
function bytesPerLine: Integer;
function getFormat: cairo_format_t;
property Format: cairo_format_t read FFormat;
property Handle: PGdkPixbuf read FHandle;
end;
@ -418,12 +409,6 @@ end;
{ TGtk3Font }
procedure TGtk3Font.SetFontName(const AValue: String);
begin
if FFontName=AValue then Exit;
FFontName:=AValue;
end;
procedure TGtk3Font.UpdateLogFont;
var
sz:integer;
@ -806,23 +791,8 @@ begin
Result := FHandle^.rowstride;
end;
function TGtk3Image.getFormat: cairo_format_t;
begin
Result := FFormat;
end;
{ TGtk3Pen }
function TGtk3Pen.GetColor: TColor;
begin
Result := FColor;
end;
function TGtk3Pen.GetWidth: Integer;
begin
Result := FWidth;
end;
procedure TGtk3Pen.SetColor(AValue: TColor);
var
ARed, AGreen, ABlue: Double;
@ -833,27 +803,6 @@ begin
cairo_set_source_rgb(FContext.Widget, ARed, AGreen, ABlue);
end;
procedure TGtk3Pen.SetEndCap(AValue: TPenEndCap);
begin
FEndCap := AValue;
end;
procedure TGtk3Pen.SetJoinStyle(AValue: TPenJoinStyle);
begin
FJoinStyle:=AValue;
end;
procedure TGtk3Pen.SetPenMode(AValue: TPenMode);
begin
if FPenMode=AValue then Exit;
FPenMode:=AValue;
end;
procedure TGtk3Pen.SetStyle(AValue: TFPPenStyle);
begin
FStyle := AValue;
end;
constructor TGtk3Pen.Create;
begin
inherited Create;
@ -890,11 +839,6 @@ end;
{ TGtk3Brush }
function TGtk3Brush.GetColor: TColor;
begin
Result := FColor;
end;
procedure TGtk3Brush.SetColor(AValue: TColor);
var
ARed, AGreen, ABlue: Double;
@ -905,12 +849,6 @@ begin
cairo_set_source_rgb(FContext.Widget, ARed, AGreen, ABlue);
end;
procedure TGtk3Brush.SetStyle(AValue: cardinal);
begin
if FStyle=AValue then Exit;
FStyle:=AValue;
end;
constructor TGtk3Brush.Create;
begin
inherited Create;
@ -1897,7 +1835,7 @@ begin
if FOwnsSurface and (CairoSurface <> nil) then
cairo_surface_destroy(CairoSurface);
CairoSurface := cairo_image_surface_create_for_data(APixBuf^.pixels,
AImage.getFormat,
AImage.Format,
APixBuf^.get_width,
APixBuf^.get_height,
APixBuf^.rowstride);