Improve multi-window support in DevTools

Author: pcastornii

shellfx-devtools/src/main/java/com/techsenger/shellfx/devtools/DevToolsTabDockFxView.java

@@ -43,9 +43,14 @@
 import com.techsenger.shellfx.material.icon.FontIconView;
 import com.techsenger.shellfx.material.style.Spacing;
 import com.techsenger.shellfx.material.style.StyleClasses;
+import javafx.geometry.Side;
 import javafx.scene.control.Button;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.Tooltip;
+import javafx.stage.Stage;
+import javafx.stage.Window;
 
 /**
  *
@@ -191,6 +196,23 @@ protected void addHandlers() {
         super.addHandlers();
         selectButton.setOnAction(e -> getPresenter().onSelect());
         selectionButton.setOnAction(e -> getPresenter().onSelection(selectionButton.isSelected()));
+        optionsButton.setOnAction(e -> {
+            var menu = createOptionsMenu();
+            menu.show(optionsButton, Side.BOTTOM, 0, 0);
+        });
+    }
+
+    protected ContextMenu createOptionsMenu() {
+        var menu = new ContextMenu();
+        for (var window : Window.getWindows()) {
+            if (window instanceof Stage stage) {
+                var uid = stage.hashCode();
+                var item = new MenuItem(stage.getTitle() + " (uid: " + uid + ")");
+                item.setOnAction(e -> getPresenter().onWindowSelected(uid));
+                menu.getItems().add(item);
+            }
+        }
+        return menu;
     }
 
     @Override

shellfx-devtools/src/main/java/com/techsenger/shellfx/devtools/DevToolsTabDockPresenter.java

@@ -53,7 +53,7 @@ public DevToolsTabDockPresenter(V view, DevToolsTabDockParams params) {
         this.settings = params.getSettings();
         this.historyManager = params.getHistoryManager();
         themeSubscription = settings.getAppearance().onThemeChanged((oldV, newV) -> updateHighlight(newV));
-        this.selector = new Selector(view.getConnector());
+        this.selector = new Selector(view.getConnector(), getDescriptor().getLogPrefix());
     }
 
     public boolean isSelectionSelected() {
@@ -127,6 +127,10 @@ protected void onSelection(boolean selected) {
         this.selector.setSelectionVisible(selected);
     }
 
+    protected void onWindowSelected(int uid) {
+        this.selector.selectWindow(uid);
+    }
+
     @Override
     protected void postInitialize() {
         super.postInitialize();

shellfx-devtools/src/main/java/com/techsenger/shellfx/devtools/Selector.java

@@ -18,11 +18,14 @@
 
 import com.techsenger.connectorfx.Connector;
 import com.techsenger.connectorfx.HighlightOptions;
+import com.techsenger.connectorfx.LocalElement;
 import com.techsenger.connectorfx.event.NodeSelectedEvent;
 import com.techsenger.connectorfx.scenegraph.Element;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is the single point to control the selected node.
@@ -31,13 +34,17 @@
  */
 public class Selector {
 
+    private static final Logger logger = LoggerFactory.getLogger(Selector.class);
+
     @FunctionalInterface
     public interface SelectorListener {
         void onSelected(int oldWindowUid, int newWindowUid, Element oldElement, Element newElement);
     }
 
     private final Connector connector;
 
+    private final String logPrefix;
+
     private final List<SelectorListener> listeners = new ArrayList<>();
 
     private HighlightOptions highlightOptions = new HighlightOptions(false, false, false);
@@ -48,8 +55,9 @@ public interface SelectorListener {
 
     private Element selectedNode;
 
-    Selector(Connector connector) {
+    Selector(Connector connector, String logPrefix) {
         this.connector = connector;
+        this.logPrefix = logPrefix;
         // this event is fired only when a node is selected in inspector mode (using select button)
         connector.getEventBus().subscribe(NodeSelectedEvent.class, (e) -> {
             // When inspect mode is set to false the selection is removed because for selection
@@ -92,6 +100,7 @@ public Element getSelectedNode() {
 
     void setSelectedWindowUid(Integer selectedWindowUid) {
         this.selectedWindowUid = selectedWindowUid;
+        logger.debug("{} Selected window UID: {}", logPrefix, this.selectedWindowUid);
     }
 
     void setSelectionVisible(boolean selectionVisible) {
@@ -124,13 +133,25 @@ private void updateSelectedElements(Integer newWindowUid, Element newNode) {
         if (!Objects.equals(this.selectedWindowUid, newWindowUid) || !Objects.equals(this.selectedNode, newNode)) {
             var oldWindowUid = this.selectedWindowUid;
             var oldNode = this.selectedNode;
-            this.selectedWindowUid = newWindowUid;
-            this.selectedNode = newNode;
+            setSelectedWindowUid(newWindowUid);
+            setSelectedNode(newNode);
             notifyListeners(oldWindowUid, newWindowUid, oldNode, newNode);
         }
     }
 
     private void notifyListeners(int oldWindowUid, int newWindowUid, Element oldElement, Element newElement) {
         this.listeners.stream().forEach(l -> l.onSelected(oldWindowUid, newWindowUid, oldElement, newElement));
     }
+
+    public void setSelectedNode(Element selectedNode) {
+        this.selectedNode = selectedNode;
+        if (logger.isDebugEnabled()) {
+            if (this.selectedNode != null && this.selectedNode.isNodeElement()) {
+                logger.debug("{} Selected node: {} from window with UID: {}", logPrefix, this.selectedNode,
+                         ((LocalElement) this.selectedNode).unwrap().getScene().getWindow().hashCode());
+            } else {
+                logger.debug("{} Selected node: {}", logPrefix, this.selectedNode);
+            }
+        }
+    }
 }