From 4563b3770b6e6fda53154733e67caec37f87d7e7 Mon Sep 17 00:00:00 2001
From: Raphael Jolly <rjolly@users.sourceforge.net>
Date: Tue, 10 Dec 2019 14:00:53 +0100
Subject: [PATCH] empty

---
 wm/src/linoleum/wm/WindowManager.java | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/wm/src/linoleum/wm/WindowManager.java b/wm/src/linoleum/wm/WindowManager.java
index 27d0a1d3..7ccea3da 100644
--- a/wm/src/linoleum/wm/WindowManager.java
+++ b/wm/src/linoleum/wm/WindowManager.java
@@ -171,6 +171,8 @@ private void when(final Event event) {
 			when_unmap_notify((UnmapNotify) event);
 			break;
 		case ConfigureNotify.CODE:	// Event.SUBSTRUCTURE_NOTIFY
+			when_configure_notify((ConfigureNotify) event);
+			break;
 		case CreateNotify.CODE:		// Event.SUBSTRUCTURE_NOTIFY, ignored
 		case MappingNotify.CODE:	// un-avoidable, ignored TODO
 			break;
@@ -294,6 +296,22 @@ private void unmap() {
 		}
 	}
 
+	private void when_configure_notify(final ConfigureNotify event) {
+		final WindowManager frame = getFrame(event.window_id);
+		if (frame != null) {
+			frame.configure();
+		}
+	}
+
+	private void configure() {
+		if (client.early_unmapped || client.early_destroyed) {
+			return;
+		}
+		if (isSelected() && mapped) {
+			client.set_input_focus();
+		}
+	}
+
 	private Container getContent() {
 		return getDesktopPane().getRootPane().getContentPane();
 	}
@@ -424,7 +442,6 @@ private void formInternalFrameActivated(javax.swing.event.InternalFrameEvent evt
 				return;
 			}
 			client.raise();
-			client.set_input_focus();
 			getOwner().display.flush();
 		}
         }//GEN-LAST:event_formInternalFrameActivated