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

Gtk3: cleanup.

Browse Source
This commit is contained in:
zeljan1 2025-01-23 09:17:39 +01:00
parent fc08a7c13f
commit 0661301110
1 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8173,9 +8173,7 @@ procedure TGtk3CustomControl.InitializeWidget;
begin begin
inherited InitializeWidget; inherited InitializeWidget;
if not IsDesigning then if not IsDesigning then
begin
g_signal_connect_data(GetScrolledWindow,'scroll-event', TGCallback(@Gtk3ScrolledWindowScrollEvent), Self, nil, G_CONNECT_DEFAULT); g_signal_connect_data(GetScrolledWindow,'scroll-event', TGCallback(@Gtk3ScrolledWindowScrollEvent), Self, nil, G_CONNECT_DEFAULT);
end;
end; end;
function TGtk3CustomControl.getViewport:PGtkViewport; function TGtk3CustomControl.getViewport:PGtkViewport;
@ -8198,20 +8196,13 @@ function TGtk3CustomControl.getClientRect: TRect;
var var
Allocation: TGtkAllocation; Allocation: TGtkAllocation;
R: TRect; R: TRect;
w: gint; w, h, x, y, VOffset, HOffset: gint;
h: gint;
x: gint;
y: gint;
AViewPort: PGtkViewport; AViewPort: PGtkViewport;
VOffset, HOffset:gint;
Bar:PGtkScrollbar; Bar:PGtkScrollbar;
begin begin
// Result := inherited getClientRect;
AViewPort := getViewport; AViewPort := getViewport;
if Gtk3IsViewPort(AViewPort) and Gtk3IsGdkWindow(AViewPort^.get_view_window) then if Gtk3IsViewPort(AViewPort) and Gtk3IsGdkWindow(AViewPort^.get_view_window) then
begin begin
// Result := GetViewportClientAreaWithScrollbars(PGtkScrolledWindow(FWidget));
AViewPort^.get_view_window^.get_geometry(@x, @y, @w, @h); AViewPort^.get_view_window^.get_geometry(@x, @y, @w, @h);
Bar := getHorizontalScrollbar; Bar := getHorizontalScrollbar;
@ -8226,8 +8217,6 @@ begin
else else
VOffset := 0; VOffset := 0;
// AViewPort^.get_view_window^.get_frame_extents(@AFrameRect);
Result := Rect(0, 0, AViewPort^.get_view_window^.get_width - VOffset, AViewPort^.get_view_window^.get_height - HOffset); Result := Rect(0, 0, AViewPort^.get_view_window^.get_width - VOffset, AViewPort^.get_view_window^.get_height - HOffset);
{$IFDEF GTK3DEBUGSIZE} {$IFDEF GTK3DEBUGSIZE}
@ -8307,16 +8296,6 @@ begin
FHasPaint := True; FHasPaint := True;
FScrollX := 0; FScrollX := 0;
FScrollY := 0; FScrollY := 0;
// layout is crap under gtk3
(*
FWidgetType := [wtWidget, wtLayout, wtScrollingWin];
Result := PGtkScrolledWindow(TGtkScrolledWindow.new(nil, nil));
FCentralWidget := TGtkLayout.new(nil, nil);
FCentralWidget^.set_has_window(True);
FCentralWidget^.show;
PGtkScrolledWindow(Result)^.add(FCentralWidget);
*)
FWidgetType := [wtWidget, wtContainer, wtScrollingWin, wtScrollingWinControl]; FWidgetType := [wtWidget, wtContainer, wtScrollingWin, wtScrollingWinControl];
Result := PGtkScrolledWindow(TGtkScrolledWindow.new(nil, nil)); Result := PGtkScrolledWindow(TGtkScrolledWindow.new(nil, nil));
FCentralWidget := TGtkFixed.new; FCentralWidget := TGtkFixed.new;
@ -8343,9 +8322,6 @@ function TGtk3Window.GetTitle: String;
begin begin
if Gtk3IsGtkWindow(fWidget) then if Gtk3IsGtkWindow(fWidget) then
Result:=PGtkWindow(fWidget)^.get_title() Result:=PGtkWindow(fWidget)^.get_title()
{else
if Gtk3IsWIdget(fWidget) then
Result:='widget'}
else else
Result:='' Result:=''
end; end;
@ -8397,19 +8373,6 @@ begin
Result := False; Result := False;
FillChar(Msg{%H-}, SizeOf(Msg), #0); FillChar(Msg{%H-}, SizeOf(Msg), #0);
(*
AScreen := AWidget^.window^.get_screen;
ActiveWindow := AScreen^.get_active_window;
if ActiveWindow <> AWidget^.window then
TGtk3Window(AData).ActivateWindow(nil)
else
TGtk3Window(AData).ActivateWindow(AEvent);
*)
// window state isn't changed on activate/deactivate, so must provide another solution
// DebugLn('Gtk3WindowState ',dbgsName(TGtk3Widget(AData).LCLObject),' changedmask=',dbgs(AEvent^.window_state.changed_mask),
// ' newstate ',dbgs(AEvent^.window_state.new_window_state),' currentState ', dbgs(TGtk3Window(AData).GetWindowState),
// ' WITHDRAWN ? ',dbgs(TGtk3Window(AData).getWindowState and GDK_WINDOW_STATE_WITHDRAWN));
Msg.Msg := LM_SIZE; Msg.Msg := LM_SIZE;
Msg.SizeType := SIZE_RESTORED; Msg.SizeType := SIZE_RESTORED;
@ -8433,18 +8396,22 @@ begin
end else end else
if GDK_WINDOW_STATE_FOCUSED in msk then if GDK_WINDOW_STATE_FOCUSED in msk then
begin begin
{$IFDEF GTK3DEBUGWINDOWSTATE}
if GDK_WINDOW_STATE_FOCUSED in AState then if GDK_WINDOW_STATE_FOCUSED in AState then
DebugLn('Gtk3WindowState: Focused') DebugLn('Gtk3WindowState: Focused')
else else
DebugLn('Gtk3WindowState: Defocused'); DebugLn('Gtk3WindowState: Defocused');
{$ENDIF}
exit; exit;
end else end else
if GDK_WINDOW_STATE_WITHDRAWN in msk then if GDK_WINDOW_STATE_WITHDRAWN in msk then
begin begin
{$IFDEF GTK3DEBUGWINDOWSTATE}
if GDK_WINDOW_STATE_WITHDRAWN in AState then if GDK_WINDOW_STATE_WITHDRAWN in AState then
DebugLn('Gtk3WindowState: Shown') DebugLn('Gtk3WindowState: Shown')
else else
DebugLn('Gtk3WindowState: Hidden'); DebugLn('Gtk3WindowState: Hidden');
{$ENDIF}
exit; exit;
end else end else
begin begin
@ -8456,7 +8423,9 @@ begin
Msg.Width := Word(AWidget^.window^.get_width); Msg.Width := Word(AWidget^.window^.get_width);
Msg.Height := Word(AWidget^.window^.get_height); Msg.Height := Word(AWidget^.window^.get_height);
{$IFDEF GTK3DEBUGWINDOWSTATE}
DebugLn('GetWindowState SizeType=',dbgs(Msg.SizeType),' realized ',dbgs(AWidget^.get_realized)); DebugLn('GetWindowState SizeType=',dbgs(Msg.SizeType),' realized ',dbgs(AWidget^.get_realized));
{$ENDIF}
TGtk3Window(AData).DeliverMessage(Msg); TGtk3Window(AData).DeliverMessage(Msg);
// DeliverMessage(Msg); // DeliverMessage(Msg);
end; end;
@ -9136,6 +9105,7 @@ var
Action: TGtkFileChooserAction; Action: TGtkFileChooserAction;
Button1: String; Button1: String;
AFileDialog: PGtkFileChooserDialog; AFileDialog: PGtkFileChooserDialog;
AParams: TCreateParams;
begin begin
inherited Create; inherited Create;
FOwnWidget := True; FOwnWidget := True;