Skip to content

Process events until parent shell is activated #2592

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

Merged
merged 1 commit into from
Oct 7, 2025
+44 −15
Merged

Process events until parent shell is activated #2592

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
59 changes: 44 additions & 15 deletions ...swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
Expand Down Expand Up @@ -653,21 +655,48 @@ public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
* events when opening context menu. Only applicable on GTK x11.
*/
@Test
public void test_activateEventSend() {
if (SwtTestUtil.isGTK && SwtTestUtil.isX11) {
Shell testShell = new Shell(shell, SWT.SHELL_TRIM);
testShell.addListener(SWT.Activate, e -> {
listenerCalled = true;
});
testShell.open();
int[] styles = {SWT.ON_TOP, SWT.APPLICATION_MODAL, SWT.PRIMARY_MODAL, SWT.SYSTEM_MODAL, SWT.NO_TRIM, SWT.BORDER, SWT.SHELL_TRIM};
for (int style : styles) {
Shell childShell = new Shell(testShell, style);
listenerCalled = false;
childShell.open();
childShell.dispose();
assertTrue(listenerCalled);
}
public void test_activateEventSend() throws InterruptedException {
assumeTrue((SwtTestUtil.isGTK && SwtTestUtil.isX11) || SwtTestUtil.isGTK4,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that because of #2591 this assumption fails, even on GTK3 + x11.

When I had done the 1000x repeated test I had included the fix in this PR as well to make sure it ran.

Once #2591 is done this test will actually run properly.

In hindsight, I think I made it too complicated by having this as two PRs. Two commits in the one PR would have been sufficient (and simpler for me)

"Feature only works on GTK3 in x11 or GTK4 - https://bugs.eclipse.org/436841");

AtomicBoolean activateCalled = new AtomicBoolean();
AtomicBoolean deactivateCalled = new AtomicBoolean();
AtomicBoolean focusInCalled = new AtomicBoolean();
AtomicBoolean focusOutCalled = new AtomicBoolean();
Shell testShell = new Shell(shell, SWT.SHELL_TRIM);
testShell.addListener(SWT.Activate, e -> {
activateCalled.set(true);
});
testShell.addListener(SWT.FocusIn, e -> {
focusInCalled.set(true);
});
testShell.addListener(SWT.Deactivate, e -> {
deactivateCalled.set(true);
});
testShell.addListener(SWT.FocusOut, e -> {
focusOutCalled.set(true);
});
activateCalled.set(false);
testShell.open();
SwtTestUtil.processEvents(10000, () -> activateCalled.get() && focusInCalled.get());
assertTrue(activateCalled.get());
assertTrue(focusInCalled.get());
int[] styles = { SWT.ON_TOP, SWT.APPLICATION_MODAL, SWT.PRIMARY_MODAL, SWT.SYSTEM_MODAL, SWT.NO_TRIM, SWT.BORDER,
SWT.SHELL_TRIM };
for (int style : styles) {
deactivateCalled.set(false);
focusOutCalled.set(false);
Shell childShell = new Shell(testShell, style);
childShell.open();
SwtTestUtil.processEvents(10000, () -> deactivateCalled.get() && focusOutCalled.get());
assertTrue(deactivateCalled.get());
assertTrue(focusOutCalled.get());
activateCalled.set(false);
focusInCalled.set(false);
childShell.dispose();
SwtTestUtil.processEvents(10000, () -> activateCalled.get() && focusInCalled.get());
assertTrue(activateCalled.get());
assertTrue(focusInCalled.get());
}
}

Expand Down
Loading