Toggle library mods when clicking their cards

Author: Villagers654

launcher/src/main/java/net/modtale/launcher/ui/library/LibraryWorldRenderer.java

@@ -345,17 +345,16 @@ private Node projectRow(HytaleWorld world, LibraryWorldProjectModel model, List<
             shell.getChildren().add(contentsCard);
         }
         ProjectCardInteraction.addHoverAnimationWithIndependentContent(shell, icon);
-        ProjectSummary target = navigationTarget(model);
-        if (target != null) {
+        if (!toggle.isDisabled()) {
             shell.setCursor(Cursor.HAND);
-            shell.setOnMouseClicked(event -> {
-                if (event.getButton() == MouseButton.PRIMARY && event.isStillSincePress()
-                        && !isNestedControl(event.getTarget(), shell)) {
-                    openProject.accept(target);
-                    event.consume();
-                }
-            });
         }
+        shell.setOnMouseClicked(event -> {
+            if (event.getButton() == MouseButton.PRIMARY && event.isStillSincePress()
+                    && !isNestedControl(event.getTarget(), shell)) {
+                toggle.fire();
+                event.consume();
+            }
+        });
         return shell;
     }
 
@@ -364,8 +363,7 @@ static boolean isNestedControl(Object target, Node card) {
         while (node != null && node != card) {
             if (node instanceof ButtonBase || node instanceof ComboBoxBase<?> || node instanceof LibraryToggleBox
                     || node.getStyleClass().contains("author-link")
-                    || node.getStyleClass().contains("library-world-version-row")
-                    || node.getStyleClass().contains("library-world-content-card")) {
+                    || node.getStyleClass().contains("library-world-project-title")) {
                 return true;
             }
             node = node.getParent();
@@ -403,6 +401,16 @@ private VBox projectCopy(LibraryWorldProjectModel model) {
         copy.setAlignment(Pos.CENTER_LEFT);
         Label title = new Label(display.title());
         title.getStyleClass().add("library-world-project-title");
+        ProjectSummary target = navigationTarget(model);
+        if (target != null) {
+            title.setCursor(Cursor.HAND);
+            title.setOnMouseClicked(event -> {
+                if (event.getButton() == MouseButton.PRIMARY && event.isStillSincePress()) {
+                    openProject.accept(target);
+                    event.consume();
+                }
+            });
+        }
 
         String subtitleText = projectMetaLine(model);
         HBox subtitle = new HBox(4);
@@ -585,16 +593,6 @@ private Node contentsCard(LibraryWorldProjectModel model, List<ConfigFile> confi
         header.getStyleClass().add("library-world-content-header");
         header.setAlignment(Pos.CENTER_LEFT);
         header.setPickOnBounds(true);
-        header.setOnMouseClicked(event -> {
-            Node target = event.getTarget() instanceof Node node ? node : null;
-            while (target != null && target != header) {
-                if (target == toggle) {
-                    return;
-                }
-                target = target.getParent();
-            }
-            toggleModpackContents.accept(model.installed());
-        });
 
         VBox card = new VBox(8);
         card.getStyleClass().add("library-world-content-card");

launcher/src/test/java/net/modtale/launcher/ui/library/LibraryCardInteractionTest.java

@@ -46,7 +46,7 @@ void providerRoutesPreserveIdentityAndRejectLocalFiles() {
     }
 
     @Test
-    void cardAndAuthorRouteSeparatelyAndNestedActionsStayInLibrary() throws Exception {
+    void cardTogglesWhileTitleAuthorAndControlsKeepTheirActions() throws Exception {
         FutureTask<Void> task = new FutureTask<>(() -> {
             AtomicInteger pages = new AtomicInteger();
             AtomicInteger creators = new AtomicInteger();
@@ -96,21 +96,50 @@ void cardAndAuthorRouteSeparatelyAndNestedActionsStayInLibrary() throws Exceptio
             toggle.setOnAction(toggles::incrementAndGet);
             click(toggle, MouseButton.PRIMARY);
             assertEquals(1, toggles.get());
-            assertEquals(1, pages.get());
+            assertTrue(toggle.isSelected());
+            click(card, MouseButton.PRIMARY);
+            assertEquals(2, toggles.get());
+            assertFalse(toggle.isSelected());
+            click(card.lookup(".library-world-project-copy"), MouseButton.PRIMARY);
+            assertEquals(3, toggles.get());
+            assertTrue(toggle.isSelected());
+            click(card, MouseButton.SECONDARY);
+            assertEquals(3, toggles.get());
+            click(card.lookup(".library-world-project-title"), MouseButton.PRIMARY);
+            click(card.lookup(".author-link"), MouseButton.PRIMARY);
+            for (Node button : card.lookupAll(".library-icon-action")) {
+                click(button, MouseButton.PRIMARY);
+            }
+            assertEquals(3, toggles.get());
+            assertEquals(2, pages.get());
+            assertEquals(2, creators.get());
+            toggle.setDisable(true);
+            click(card, MouseButton.PRIMARY);
+            assertEquals(3, toggles.get());
+            toggle.setDisable(false);
             ComboBox<String> combo = new ComboBox<>();
             VBox controls = new VBox(combo);
             controls.getStyleClass().add("library-world-version-row");
             VBox contents = new VBox();
             contents.getStyleClass().add("library-world-content-card");
             card.getChildren().addAll(controls, contents);
-            for (Node nested : List.of(combo, controls, contents)) {
+            click(combo, MouseButton.PRIMARY);
+            assertEquals(3, toggles.get());
+            for (Node nested : List.of(controls, contents)) {
                 click(nested, MouseButton.PRIMARY);
-                assertEquals(1, pages.get());
+                assertEquals(2, pages.get());
             }
+            assertEquals(5, toggles.get());
             VBox local = (VBox) method.invoke(renderer, null, model("local:file", "LOCAL"), List.of());
             assertNull(local.lookup(".author-link"));
             click(local.lookup(".library-world-project-title"), MouseButton.PRIMARY);
-            assertEquals(1, pages.get());
+            assertEquals(2, pages.get());
+            var localToggle = (LibraryToggleBox) local.lookup(".library-toggle-box");
+            localToggle.setDisable(false);
+            localToggle.setOnAction(toggles::incrementAndGet);
+            click(local, MouseButton.PRIMARY);
+            assertTrue(localToggle.isSelected());
+            assertEquals(6, toggles.get());
             return null;
         });
         Platform.runLater(task);