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

LCL-GTK3: Redesign Hint window support. Issue #37351, patch from Anton Kavalenka.

Browse Source 
git-svn-id: trunk@64067 -
This commit is contained in:
juha 2020-10-24 12:29:35 +00:00
parent aa176da1c8
commit dc642ae69d
2 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7262,47 +7262,21 @@ begin
FHasPaint := True;
AForm := THintWindow(LCLObject);
FWidgetType := [wtWidget, wtContainer, wtScrollingWin, wtWindow, wtHintWindow];
FWidgetType := [wtWidget, wtContainer, wtWindow, wtHintWindow];
Result := TGtkWindow.new(GTK_WINDOW_POPUP);
FBox := TGtkVBox.new(GTK_ORIENTATION_VERTICAL, 0);
if (AForm.Menu <> nil) then
begin
FMenuBar := TGtkMenuBar.new; // our menubar (needed for main menu)
// MenuBar
// -> Menu Menu2
// Item 1 Item 3
// Item 2
g_object_set_data(Result,'lclmenubar',GPointer(1));
FBox^.pack_start(FMenuBar, False, False, 0);
end;
FScrollWin := PGtkScrolledWindow(TGtkScrolledWindow.new(nil, nil));
g_object_set_data(FScrollWin,'lclscrollingwindow',GPointer(1));
g_object_set_data(PGObject(FScrollWin), 'lclwidget', Self);
//FCentralWidget := TGtkLayout.new(nil, nil);
FCentralWidget := TGtkFixed.new;
FCentralWidget^.set_has_window(True);
FCentralWidget^.show;
FScrollWin^.add_with_viewport(FCentralWidget);
// FScrollWin^.add(FCentralWidget);
FScrollWin^.show;
FBox^.pack_end(FScrollWin, True, True, 0);
FBox^.show;
FScrollWin^.get_vscrollbar^.set_can_focus(False);
FScrollWin^.get_hscrollbar^.set_can_focus(False);
FScrollWin^.set_policy(GTK_POLICY_NEVER, GTK_POLICY_NEVER);
PGtkContainer(Result)^.add(FBox);
// FWidgetType := FWidgetType + [wtContainer, wtWindow];
// Result := TGtkWindow.new(GTK_WINDOW_POPUP);
// FCentralWidget := TGtkFixed.new;
// PGtkWindow(Result)^.add(FCentralWidget);
FCentralWidget := TGtkFixed.new;
FCentralWidget^.set_size_request(AForm.Width,AForm.Height+1);
fBox^.pack_start(fCentralWidget, true, true, 0);
PGtkWindow(Result)^.set_can_focus(false);
end;
{ TGtk3Dialog }

3
lcl/interfaces/gtk3/gtk3wsforms.pp
View File

@ -219,7 +219,7 @@ begin
PGtkWindow(AWidget)^.get_preferred_height(@AMinSize, @ANaturalSize);
AWidget^.size_allocate(@ARect);
if not (csDesigning in AForm.ComponentState) and (AForm.Parent = nil) and (AForm.ParentWindow = 0) then
if not (csDesigning in AForm.ComponentState) {and (AForm.Parent = nil) and (AForm.ParentWindow = 0)} then
begin
AFixedWidthHeight := AForm.BorderStyle in [bsDialog, bsSingle, bsToolWindow];
with Geometry do
@ -269,6 +269,7 @@ begin
end;
PGtkWindow(AWidget)^.resize(AWidth, AHeight);
PGtkWindow(AWidget)^.move(ALeft, ATop);
PGtkWindow(AWidget)^.set_size_request(AWidth,AHeight);
finally
TGtk3Widget(AWinControl.Handle).EndUpdate;
end;