empty

rjolly · Dec 10, 2019 · 4563b37 · 4563b37
1 parent aca5c60
commit 4563b37
Showing 1 changed file with 18 additions and 1 deletion.
diff --git 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