paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 23:58:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gtk3: always pass right widget to the paint proc.

Browse Source
This commit is contained in:
zeljan1 2025-03-26 13:42:54 +01:00
parent 737d206718
commit b290493023
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lcl/interfaces/gtk3/gtk3widgets.pas
View File

@ -1757,10 +1757,7 @@ begin
with PaintData do
begin
if GetContainerWidget = nil then
PaintWidget := Widget
else
PaintWidget := GetContainerWidget;
PaintWidget := Sender;
ClipRegion := nil;
gdk_cairo_get_clip_rectangle(AContext, @AClipRect);
@ -10423,6 +10420,8 @@ var
AClipRect: TGdkRectangle;
localClip:TRect;
P: TPoint;
AScrolledWin: PGtkScrolledWindow;
HScrollPolicy, VScrollPolicy: TGtkPolicyType;
begin
Result := gtk_false;
@ -10438,10 +10437,7 @@ begin
with PaintData do
begin
if GetContainerWidget = nil then
PaintWidget := Widget
else
PaintWidget := GetContainerWidget;
PaintWidget := Sender;
ClipRegion := nil;
gdk_cairo_get_clip_rectangle(AContext, @AClipRect);
localClip:=RectFromGdkRect(AClipRect);
@ -10459,11 +10455,30 @@ begin
TGtk3DeviceContext(Msg.DC).translate(P);
try
try
if wtScrollingWinControl in WidgetType then
begin
P := getClientOffset;
AScrolledWin := TGtk3ScrollingWinControl(Self).GetScrolledWindow;
AScrolledWin^.get_policy(@HScrollPolicy, @VScrollPolicy);
if HScrollPolicy < GTK_POLICY_NEVER then
P.X := P.X + Round(AScrolledWin^.get_hadjustment^.get_value);
if VScrollPolicy < GTK_POLICY_NEVER then
P.Y := P.Y + Round(AScrolledWin^.get_vadjustment^.get_value);
cairo_translate(AContext, -P.X, -P.Y);
with TGtk3DeviceContext(Msg.DC).fncOrigin do
begin
X := X - P.X;
Y := Y - P.Y;
end;
end;
//DoBeforeLCLPaint;
{$IFDEF GTK3DEBUGDESIGNER}
writeln('>TGtk3DesignWidget.Paint DC=',dbgHex(Msg.DC),' offset=',dbgs(P),' surface=',cairo_surface_get_type(cairo_get_target(AContext)));
{$ENDIF}
LCLObject.WindowProc(TLMessage(Msg));
if wtScrollingWinControl in WidgetType then
cairo_translate(AContext, P.X, P.Y);
{$IFDEF GTK3DEBUGDESIGNER}
writeln('<TGtk3DesignWidget.Paint');
{$ENDIF}

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

@ -27,7 +27,7 @@ begin
Widget := TGtk3Widget(Handle);
if Widget <> nil then
begin
GtkWidget := Widget.GetContainerWidget;
GtkWidget := Widget.PaintData.PaintWidget;
if Widget.CairoContext <> nil then
DC := TGtk3DeviceContext.CreateFromCairo(GtkWidget, Widget.CairoContext)
else