From 8cc8a50d89c33ff539e54352e067079cebd32c51 Mon Sep 17 00:00:00 2001
From: Leo Leplat <60394504+Rylern@users.noreply.github.com>
Date: Fri, 21 Mar 2025 15:45:42 +0000
Subject: [PATCH 1/5] Update selected URI after search suggestion clicked

---
 .../gui/viewer/JavadocViewer.java             | 46 +++++++++++++++----
 .../gui/viewer/javadoc_viewer.fxml            |  2 +-
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java b/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java
index 6b63bdf..c9dc173 100644
--- a/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java
+++ b/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java
@@ -45,8 +45,6 @@ public class JavadocViewer extends BorderPane {
     @FXML
     private ComboBox<URI> uris;
     @FXML
-    private HBox searchContainer;
-    @FXML
     private AutoCompletionTextField<JavadocEntry> autoCompletionTextField;
 
     /**
@@ -95,7 +93,7 @@ protected void updateItem(URI item, boolean empty) {
                 super.updateItem(item, empty);
 
                 if (item == null || empty) {
-                    setGraphic(null);
+                    setText(null);
                 } else {
                     setText(getName(item));
                 }
@@ -107,7 +105,7 @@ protected void updateItem(URI item, boolean empty) {
                 super.updateItem(item, empty);
 
                 if (item == null || empty) {
-                    setGraphic(null);
+                    setText(null);
                 } else {
                     setText(getName(item));
                 }
@@ -141,7 +139,10 @@ protected void updateItem(URI item, boolean empty) {
                     .flatMap(List::stream)
                     .map(javadocElement -> new JavadocEntry(
                             javadocElement,
-                            () -> webView.getEngine().load(javadocElement.uri().toString())
+                            () -> {
+                                updateSelectedUri(javadocElement.uri());
+                                webView.getEngine().load(javadocElement.uri().toString());
+                            }
                     ))
                     .filter(javadocEntry -> !CATEGORIES_TO_SKIP.contains(javadocEntry.getCategory()))
                     .toList());
@@ -155,13 +156,10 @@ private void setUpListeners() {
         ));
 
         uris.getSelectionModel().selectedItemProperty().addListener((p, o, n) -> {
-            if (n != null) {
+            if (n != null && !webView.getEngine().getLocation().equals(n.toString())) {
                 webView.getEngine().load(n.toString());
             }
         });
-        if (uris.getSelectionModel().getSelectedItem() != null) {
-            webView.getEngine().load(uris.getSelectionModel().getSelectedItem().toString());
-        }
 
         // Sometimes, redirection is not automatically performed
         // (see https://github.com/qupath/qupath/pull/1513#issuecomment-2095553840)
@@ -204,6 +202,24 @@ private static String getName(URI uri) {
         return name;
     }
 
+    private void updateSelectedUri(URI uri) {
+        int maxIndex = Integer.MIN_VALUE;
+        URI closestUri = null;
+
+        for (URI sd: uris.getItems()) {
+            int index = getNumberOfCommonCharactersFromBeginning(uri.toString(), sd.toString());
+
+            if (index > maxIndex) {
+                maxIndex = index;
+                closestUri = sd;
+            }
+        }
+
+        if (closestUri != null) {
+            uris.getSelectionModel().select(closestUri);
+        }
+    }
+
     private static Optional<String> changeLocation(String currentLocation, String newLocation) {
         int index = currentLocation.lastIndexOf("/");
 
@@ -213,4 +229,16 @@ private static Optional<String> changeLocation(String currentLocation, String ne
             return Optional.of(currentLocation.substring(0, currentLocation.lastIndexOf("/")) + "/" + newLocation);
         }
     }
+
+    private static int getNumberOfCommonCharactersFromBeginning(String text1, String text2) {
+        int n = Math.min(text1.length(), text2.length());
+
+        for (int i=0; i<n; i++) {
+            if (text1.charAt(i) != text2.charAt(i)) {
+                return i;
+            }
+        }
+
+        return n;
+    }
 }
diff --git a/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml b/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
index c538933..c295f71 100644
--- a/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
+++ b/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
@@ -33,7 +33,7 @@
                     </tooltip>
                 </ComboBox>
             </HBox>
-            <HBox fx:id="searchContainer" alignment="CENTER_RIGHT" spacing="10.0">
+            <HBox alignment="CENTER_RIGHT" spacing="10.0">
                 <Label text="%JavadocViewer.search" />
                 <VBox.margin>
                     <Insets />

From 11ef6af3c252c0ad2a1866bff99b185f98418a83 Mon Sep 17 00:00:00 2001
From: Leo Leplat <60394504+Rylern@users.noreply.github.com>
Date: Fri, 21 Mar 2025 15:53:28 +0000
Subject: [PATCH 2/5] Top bar on one line

---
 .../gui/viewer/javadoc_viewer.fxml            | 71 ++++++++-----------
 1 file changed, 28 insertions(+), 43 deletions(-)

diff --git a/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml b/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
index c295f71..e1b0cb2 100644
--- a/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
+++ b/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
@@ -7,48 +7,33 @@
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-
+<?import javafx.scene.layout.Region?>
 <?import qupath.ui.javadocviewer.gui.components.AutoCompletionTextField?>
-<fx:root stylesheets="@styles.css" type="BorderPane" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
-    <top>
-        <VBox spacing="5.0" BorderPane.alignment="CENTER">
-            <HBox spacing="4.0">
-                <padding>
-                    <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
-                </padding>
-                <Button fx:id="back" mnemonicParsing="false" onAction="#onBackClicked" text="&lt;">
-                    <tooltip>
-                        <Tooltip text="%JavadocViewer.back" />
-                    </tooltip>
-                </Button>
-                <Button fx:id="forward" mnemonicParsing="false" onAction="#onForwardClicked" text="&gt;">
-                    <tooltip>
-                        <Tooltip text="%JavadocViewer.forward" />
-                    </tooltip>
-                </Button>
-                <ComboBox fx:id="uris" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
-                    <tooltip>
-                        <Tooltip text="%JavadocViewer.javadocSource" />
-                    </tooltip>
-                </ComboBox>
-            </HBox>
-            <HBox alignment="CENTER_RIGHT" spacing="10.0">
-                <Label text="%JavadocViewer.search" />
-                <VBox.margin>
-                    <Insets />
-                </VBox.margin>
-                <padding>
-                    <Insets left="10.0" right="10.0" />
-                </padding>
-                <AutoCompletionTextField fx:id="autoCompletionTextField" prefWidth="400"/>
-            </HBox>
-            <BorderPane.margin>
-                <Insets />
-            </BorderPane.margin>
-            <padding>
-                <Insets bottom="5.0" />
-            </padding>
-        </VBox>
-    </top>
+
+<fx:root stylesheets="@styles.css" type="BorderPane" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
+   <top>
+         <HBox alignment="CENTER_LEFT" spacing="4.0" BorderPane.alignment="CENTER">
+             <padding>
+                 <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
+             </padding>
+             <Button fx:id="back" mnemonicParsing="false" onAction="#onBackClicked" text="&lt;">
+                 <tooltip>
+                     <Tooltip text="%JavadocViewer.back" />
+                 </tooltip>
+             </Button>
+             <Button fx:id="forward" mnemonicParsing="false" onAction="#onForwardClicked" text="&gt;">
+                 <tooltip>
+                     <Tooltip text="%JavadocViewer.forward" />
+                 </tooltip>
+             </Button>
+             <ComboBox fx:id="uris" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
+                 <tooltip>
+                     <Tooltip text="%JavadocViewer.javadocSource" />
+                 </tooltip>
+             </ComboBox>
+            <Region prefWidth="10.0" />
+             <Label minWidth="-Infinity" text="%JavadocViewer.search" />
+             <AutoCompletionTextField fx:id="autoCompletionTextField" prefWidth="400"/>
+         </HBox>
+   </top>
 </fx:root>

From 9c30c04aa3b0589507da9dfe31aed0aa4e71d415 Mon Sep 17 00:00:00 2001
From: Leo Leplat <60394504+Rylern@users.noreply.github.com>
Date: Fri, 21 Mar 2025 15:53:49 +0000
Subject: [PATCH 3/5] Unused import

---
 .../java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java b/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java
index c9dc173..9ddf3bc 100644
--- a/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java
+++ b/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewer.java
@@ -10,7 +10,6 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ListCell;
 import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
 import javafx.scene.web.WebHistory;
 import javafx.scene.web.WebView;
 import qupath.ui.javadocviewer.gui.components.AutoCompletionTextField;

From 8421ce83aa4188042037e1155ccd68a84f06a805 Mon Sep 17 00:00:00 2001
From: lleplat <lleplat@ed.ac.uk>
Date: Mon, 24 Mar 2025 11:31:09 +0000
Subject: [PATCH 4/5] Toolbar instead of HBox

---
 .../ui/javadocviewer/gui/viewer/JavadocViewerCommand.java  | 3 ---
 .../qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewerCommand.java b/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewerCommand.java
index a73468a..ca1f8dc 100644
--- a/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewerCommand.java
+++ b/javadocviewer/src/main/java/qupath/ui/javadocviewer/gui/viewer/JavadocViewerCommand.java
@@ -68,9 +68,6 @@ public void run() {
             Scene scene = new Scene(javadocViewer);
             stage.setScene(scene);
             stage.show();
-
-            stage.setMinWidth(javadocViewer.getWidth());
-            stage.setMinHeight(javadocViewer.getHeight());
         }
 
         stage.show();
diff --git a/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml b/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
index e1b0cb2..27bc5d5 100644
--- a/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
+++ b/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
@@ -8,11 +8,12 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
+<?import javafx.scene.control.ToolBar?>
 <?import qupath.ui.javadocviewer.gui.components.AutoCompletionTextField?>
 
 <fx:root stylesheets="@styles.css" type="BorderPane" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
    <top>
-         <HBox alignment="CENTER_LEFT" spacing="4.0" BorderPane.alignment="CENTER">
+         <ToolBar  BorderPane.alignment="CENTER">
              <padding>
                  <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
              </padding>
@@ -31,9 +32,9 @@
                      <Tooltip text="%JavadocViewer.javadocSource" />
                  </tooltip>
              </ComboBox>
-            <Region prefWidth="10.0" />
+             <Region prefWidth="10.0" />
              <Label minWidth="-Infinity" text="%JavadocViewer.search" />
              <AutoCompletionTextField fx:id="autoCompletionTextField" prefWidth="400"/>
-         </HBox>
+         </ToolBar>
    </top>
 </fx:root>

From 10e9447cb273c604a3c13e120b1ff3f00b85d60b Mon Sep 17 00:00:00 2001
From: lleplat <lleplat@ed.ac.uk>
Date: Mon, 24 Mar 2025 16:25:58 +0000
Subject: [PATCH 5/5] Search in center

---
 .../ui/javadocviewer/gui/viewer/javadoc_viewer.fxml    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml b/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
index 27bc5d5..b168ae6 100644
--- a/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
+++ b/javadocviewer/src/main/resources/qupath/ui/javadocviewer/gui/viewer/javadoc_viewer.fxml
@@ -3,17 +3,15 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.control.ToolBar?>
 <?import qupath.ui.javadocviewer.gui.components.AutoCompletionTextField?>
 
 <fx:root stylesheets="@styles.css" type="BorderPane" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
    <top>
-         <ToolBar  BorderPane.alignment="CENTER">
+         <ToolBar BorderPane.alignment="CENTER">
              <padding>
                  <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
              </padding>
@@ -27,14 +25,12 @@
                      <Tooltip text="%JavadocViewer.forward" />
                  </tooltip>
              </Button>
-             <ComboBox fx:id="uris" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
+             <AutoCompletionTextField fx:id="autoCompletionTextField" promptText="%JavadocViewer.search" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS"/>
+             <ComboBox fx:id="uris" maxWidth="200">
                  <tooltip>
                      <Tooltip text="%JavadocViewer.javadocSource" />
                  </tooltip>
              </ComboBox>
-             <Region prefWidth="10.0" />
-             <Label minWidth="-Infinity" text="%JavadocViewer.search" />
-             <AutoCompletionTextField fx:id="autoCompletionTextField" prefWidth="400"/>
          </ToolBar>
    </top>
 </fx:root>