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

LCL-GTK3: Rework Frame3d. Issue #36588, patch from CudaText man.

Browse Source 
git-svn-id: trunk@62565 -
This commit is contained in:
juha 2020-01-16 16:15:02 +00:00
parent 9a9605685f
commit 345161ed31
1 changed files with 54 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
lcl/interfaces/gtk3/gtk3winapi.inc
View File

@ -1591,107 +1591,70 @@ end;
function TGtk3WidgetSet.Frame3d(DC: HDC; var ARect: TRect;
const FrameWidth: integer; const Style: TBevelCut): Boolean;
const
PixelOffset = 0.5;
NColorLight = clWindow;
NColorDark = clBtnShadow;
var
AStyleWidget: PGtkWidget;
c1: TGdkRGBA;
c2: TGdkRGBA;
AWidth: Integer;
i: Integer;
Color1, Color2: TGdkRGBA;
cr: Pcairo_t;
i: Integer;
begin
{$IFDEF GTK3DEBUGNOTIMPLEMENTED}
// DebugLn('WARNING: TGtk3WidgetSet.Frame3D not implemented ...');
{$ENDIF}
Result := False; // inherited Frame3d(DC, ARect, FrameWidth, Style);
// need style widgets. Must implement them first and/or create them on demand
// AStyle := gtk_widget_get_default_style;
// PGtkWidget(nil)^.get_style^.light;
Result := False;
if not IsValidDC(DC) then
exit;
cr := TGtk3DeviceContext(DC).Widget;
AStyleWidget := GetStyleWidget(lgsButton);
if Gtk3IsWidget(AStyleWidget) then
begin
AStyleWidget^.get_style_context^.get_background_color(GTK_STATE_NORMAL, @c1);
AStyleWidget^.get_style_context^.get_border_color(GTK_STATE_NORMAL, @c2);
// writeln('Frame3d style ',Style,' border ',FrameWidth);
// DebugLn('Button bg R ',dbgs(c1.red * 255),' G ',dbgs(c1.green * 255),' B ',dbgs(c1.blue * 255),
// ' fg R ',dbgs(c2.red),' G ',dbgs(c2.green),' B ',dbgs(c2.blue));
AWidth := FrameWidth;
Exit;
Result := True;
if FrameWidth <= 0 then
Exit;
case Style of
bvNone:
begin
InflateRect(ARect, -AWidth, -AWidth);
Exit;
end;
bvLowered:
bvSpace:
begin
// AStyleWidget^.get_style_context^.get_color(GTK_STATE_NORMAL, @c2);
AStyleWidget^.get_style_context^.get_background_color(GTK_STATE_NORMAL, @c2);
AStyleWidget^.get_style_context^.get_border_color(GTK_STATE_NORMAL, @c1);
// AStyleWidget^.get_style_context^.lookup_color('red', @c1);
// AStyleWidget^.get_style_context^.get_color(GTK_STATE_NORMAL, @c1);
// gc1 := TheStyle^.dark_gc[GTK_STATE_NORMAL];
// gc2 := TheStyle^.light_gc[GTK_STATE_NORMAL];
InflateRect(ARect, -FrameWidth, -FrameWidth);
Exit;
end;
bvRaised:
begin
// AStyleWidget^.get_style_context^.get_color(GTK_STATE_NORMAL, @c1);
AStyleWidget^.get_style_context^.get_background_color(GTK_STATE_NORMAL, @c1);
AStyleWidget^.get_style_context^.get_border_color(GTK_STATE_NORMAL, @c2);
// AStyleWidget^.get_style_context^.lookup_color('red', @c2);
// AStyleWidget^.get_style_context^.get_color(GTK_STATE_NORMAL, @c2);
// gc1 := TheStyle^.light_gc[GTK_STATE_NORMAL];
// gc2 := TheStyle^.dark_gc[GTK_STATE_NORMAL];
Color1 := TColorToTGdkRGBA(ColorToRGB(NColorLight));
Color2 := TColorToTGdkRGBA(ColorToRGB(NColorDark));
end;
bvSpace:
bvLowered:
begin
InflateRect(ARect, -AWidth, -AWidth);
Exit;
Color1 := TColorToTGdkRGBA(ColorToRGB(NColorDark));
Color2 := TColorToTGdkRGBA(ColorToRGB(NColorLight));
end;
end;
cr := TGtk3DeviceContext(DC).Widget;
cairo_save(cr);
for i := 1 to AWidth do
begin
cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
try
cairo_set_line_width(cr, 1);
cairo_set_line_cap(cr, cairo_line_cap_t.CAIRO_LINE_CAP_ROUND);
cairo_set_line_join(cr, cairo_line_join_t.CAIRO_LINE_JOIN_ROUND);
cairo_set_source_rgb(cr, c1.red, c1.green, c1.blue);
cairo_move_to(cr,ARect.Left, ARect.Top);
cairo_line_to(cr,ARect.Right {- 2}, ARect.Top);
cairo_move_to(cr,ARect.Left, ARect.Top);
cairo_line_to(cr,ARect.Left, ARect.Bottom {- 2});
cairo_stroke(cr);
cairo_set_source_rgb(cr, c2.red, c2.green, c2.blue);
cairo_move_to(cr,ARect.Left, ARect.Bottom {- 1});
cairo_line_to(cr,ARect.Right {- 1}, ARect.Bottom {- 1});
cairo_move_to(cr,ARect.Right {- 1}, ARect.Top);
cairo_line_to(cr,ARect.Right {- 1}, ARect.Bottom {- 1});
cairo_stroke(cr);
(*
gdk_draw_line(Drawable, gc1, ARect.Left + Offset.x, ARect.Top + Offset.y,
ARect.Right + Offset.x - 2, ARect.Top + Offset.y);
gdk_draw_line(Drawable, gc1, ARect.Left + Offset.x, ARect.Top + Offset.y,
ARect.Left + Offset.x, ARect.Bottom + Offset.y - 2);
gdk_draw_line(Drawable, gc2, ARect.Left + Offset.x, ARect.Bottom + Offset.y - 1,
ARect.Right + Offset.x - 1, ARect.Bottom + Offset.y - 1);
gdk_draw_line(Drawable, gc2, ARect.Right + Offset.x - 1, ARect.Top + Offset.y,
ARect.Right + Offset.x - 1, ARect.Bottom + Offset.y - 1);
*)
// inflate the rectangle (! ARect will be returned to the user with this)
for i := 1 to FrameWidth do
begin
cairo_set_source_rgb(cr, Color1.red, Color1.green, Color1.blue);
cairo_move_to(cr, ARect.Left+PixelOffset, ARect.Top+PixelOffset);
cairo_line_to(cr, ARect.Right+PixelOffset-1, ARect.Top+PixelOffset);
cairo_move_to(cr, ARect.Left+PixelOffset, ARect.Top+PixelOffset);
cairo_line_to(cr, ARect.Left+PixelOffset, ARect.Bottom+PixelOffset-1);
cairo_stroke(cr);
cairo_set_source_rgb(cr, Color2.red, Color2.green, Color2.blue);
cairo_move_to(cr, ARect.Left+PixelOffset, ARect.Bottom+PixelOffset-1);
cairo_line_to(cr, ARect.Right+PixelOffset-1, ARect.Bottom+PixelOffset-1);
cairo_move_to(cr, ARect.Right+PixelOffset-1, ARect.Top+PixelOffset);
cairo_line_to(cr, ARect.Right+PixelOffset-1, ARect.Bottom+PixelOffset-1);
cairo_stroke(cr);
InflateRect(ARect, -1, -1);
end;
finally
cairo_restore(cr);
end else
DebugLn('TGtk3WidgetSet.Frame3d failed to get style widget lgsButton');
end;
end;
function TGtk3WidgetSet.FrameRect(DC: HDC; const ARect: TRect; hBr: HBRUSH): Integer;