Skip to content

[Gtk4] Fix layout problems #3331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akurtakov wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −1
Open

[Gtk4] Fix layout problems #3331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,18 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
gtk_widget_show(topHandle);
gtk_widget_get_preferred_size (topHandle, requisition);
gtk_widget_size_allocate(topHandle, allocation, -1);
gtk_widget_hide(topHandle);
/*
* On Gtk 4 gtk_widget_hide() resets the widget's allocation to 0x0. If the SWT
* widget is no longer in the HIDDEN state but visibility hasn't propagated in
* GTK 4, leave it visible on the GTK side so its allocation (and the propagated
* allocations of its children) survive. Otherwise children of a Composite that
* was made visible right before this setBounds call would be left at size 0x0
* and miss Resize events. See
* https://github.com/eclipse-platform/eclipse.platform.swt/issues/3330
*/
if (!GTK.GTK4 || (state & HIDDEN) != 0) {
gtk_widget_hide(topHandle);
}
/* Bug 540002: Showing and hiding widget causes original focused control to loose focus,
* Reset focus to original focused control after dealing with allocation.
*/
Expand All @@ -1184,6 +1195,8 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
}
} else {
if (GTK.GTK4) {
// Prevent GTK+ allocation warnings, preferred size should be retrieved before setting allocation size.
GTK.gtk_widget_get_preferred_size(topHandle, null, null);
GTK4.gtk_widget_size_allocate (topHandle, allocation, -1);
} else {
// Prevent GTK+ allocation warnings, preferred size should be retrieved before setting allocation size.
Expand Down
Loading