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

Gtk3: optimize calling of content resize only when needed, avoid size + scrollbar width/height for gtkLayout.

Browse Source
This commit is contained in:
zeljan1 2025-03-21 10:44:39 +01:00
parent 0a372369ec
commit 18199d8e8b
1 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4013,6 +4013,47 @@ var
(aPageSize < aVisibleSize div 2)) and (aMaxValue >= aPageSize); (aPageSize < aVisibleSize div 2)) and (aMaxValue >= aPageSize);
end; end;
procedure UpdateContentSize;
var
uWidth, uHeight: guint;
begin
if (AControl is TGtk3ScrollableWin) and (wtContainer in AControl.WidgetType) then
begin
//hah
if SbStyle = SB_VERT then
TGtk3ScrollableWin(AControl).GetContainerWidget^.set_size_request(TGtk3ScrollableWin(AControl).GetContainerWidget^.get_allocated_width, Round(adjustment^.upper))
else
if SBStyle = SB_HORZ then
TGtk3ScrollableWin(AControl).GetContainerWidget^.set_size_request(Round(adjustment^.upper), TGtk3ScrollableWin(AControl).GetContainerWidget^.get_allocated_height);
end else
if (AControl is TGtk3ScrollableWin) and (wtLayout in AControl.WidgetType) then
begin
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.get_size(@uWidth, @uHeight);
if SbStyle = SB_VERT then
begin
if Round(adjustment^.upper) <> uHeight then
begin
if HaveLogicalValues and (ScrollInfo.nPage = ScrollInfo.nMax) and (ScrollInfo.nMax > 0) then
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.set_size(uWidth, ScrollInfo.nMax)
else
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.set_size(uWidth, Round(adjustment^.upper) + 1 { GetSystemMetrics(SM_CYVSCROLL)});
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.queue_resize;
end;
end else
if SBStyle = SB_HORZ then
begin
if Round(adjustment^.upper) <> uWidth then
begin
if HaveLogicalValues and (ScrollInfo.nPage = ScrollInfo.nMax) and (ScrollInfo.nMax > 0) then
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.set_size(ScrollInfo.nMax, uHeight)
else
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.set_size(Round(adjustment^.upper) + 1 {GetSystemMetrics(SM_CYVSCROLL)}, uHeight);
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.queue_resize;
end;
end;
end;
end;
procedure UpdateAdjustment; procedure UpdateAdjustment;
var var
ATarget: gdouble; ATarget: gdouble;
@ -4034,44 +4075,8 @@ var
Adjustment^.lower := ATarget; Adjustment^.lower := ATarget;
ATarget := Adjustment^.upper; ATarget := Adjustment^.upper;
SetGDouble(ATarget, ScrollInfo.nMax - ScrollInfo.nMin + 1, HasChanged); SetGDouble(ATarget, ScrollInfo.nMax - ScrollInfo.nMin, HasChanged);
Adjustment^.upper := ATarget; Adjustment^.upper := ATarget;
if (AControl is TGtk3ScrollableWin) and (wtContainer in AControl.WidgetType) then
begin
//hah
if SbStyle = SB_VERT then
TGtk3ScrollableWin(AControl).GetContainerWidget^.set_size_request(TGtk3ScrollableWin(AControl).GetContainerWidget^.get_allocated_width, Round(ATarget))
else
if SBStyle = SB_HORZ then
TGtk3ScrollableWin(AControl).GetContainerWidget^.set_size_request(Round(ATarget), TGtk3ScrollableWin(AControl).GetContainerWidget^.get_allocated_height);
end else
if (AControl is TGtk3ScrollableWin) and (wtLayout in AControl.WidgetType) then
begin
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.get_size(@uWidth, @uHeight);
if SbStyle = SB_VERT then
begin
if Round(aTarget) <> uHeight then
begin
if HaveLogicalValues and (ScrollInfo.nPage = ScrollInfo.nMax) and (ScrollInfo.nMax > 0) then
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.set_size(uWidth, ScrollInfo.nMax)
else
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.set_size(uWidth, Round(ATarget) + GetSystemMetrics(SM_CYVSCROLL));
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.queue_resize;
end;
end else
if SBStyle = SB_HORZ then
begin
if Round(aTarget) <> uWidth then
begin
if HaveLogicalValues and (ScrollInfo.nPage = ScrollInfo.nMax) and (ScrollInfo.nMax > 0) then
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.set_size(ScrollInfo.nMax, uHeight)
else
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.set_size(Round(ATarget) + GetSystemMetrics(SM_CYVSCROLL), uHeight);
PGtkLayout(TGtk3ScrollableWin(AControl).GetContainerWidget)^.queue_resize;
end;
end;
end;
end; end;
if (ScrollInfo.FMask and SIF_PAGE) <> 0 then if (ScrollInfo.FMask and SIF_PAGE) <> 0 then
@ -4139,9 +4144,12 @@ var
end; end;
Adjustment^.thaw_notify; Adjustment^.thaw_notify;
{$IFDEF GTK3DEBUGSCROLL} {$IFDEF GTK3DEBUGSCROLL}
DebugLn(Format('Updated Adjustment: lower=%.2f, upper=%.2f, page_size=%.2f, value=%.2f, page_increment=%.2f InUpdate %s', DebugLn(Format('Updated Adjustment: lower=%.2f, upper=%.2f, page_size=%.2f, value=%.2f, page_increment=%.2f InUpdate %s %s Logical %s',
[Adjustment^.lower, Adjustment^.upper, Adjustment^.page_size, Adjustment^.value, Adjustment^.page_increment, BoolToStr(AControl.InUpdate, True)])); [Adjustment^.lower, Adjustment^.upper, Adjustment^.page_size, Adjustment^.value, Adjustment^.page_increment, BoolToStr(AControl.InUpdate, True),
dbgHex(PtrUInt(Adjustment)), BoolToStr(HaveLogicalValues, True)]));
{$ENDIF} {$ENDIF}
if ((ScrollInfo.FMask and SIF_RANGE) <> 0) or ((ScrollInfo.FMask and SIF_PAGE) <> 0) then
UpdateContentSize;
AControl.EndUpdate; AControl.EndUpdate;
end; end;