Added menu item for stacking

Fix for stack not shown if icon was clicked
lanthale · Nov 18, 2023 · eedf320 · eedf320
1 parent 39a68a1
commit eedf320
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/PhotoSlide/src/main/java/org/photoslide/MainViewController.java b/PhotoSlide/src/main/java/org/photoslide/MainViewController.java
@@ -207,11 +207,13 @@ public class MainViewController implements Initializable {
     private EditorMediaViewController editorMediaViewPaneController;
     @FXML
     private EditorToolsController editorToolsPaneController;
+    @FXML
+    private BookmarkBoardController bookmarksController;
+    @FXML
     private SearchToolsController searchtools;
     private SearchToolsDialog searchDialog;
     private PrintDialog printDialog;
-    private Properties bookmarks;
-    private BookmarkBoardController bookmarksController;
+    private Properties bookmarks;    
     private BMBIcon bmbIcon;
     @FXML
     private Button showProcessButton;
@@ -1228,4 +1230,14 @@ private void showBackgroundProcessListMenu(ActionEvent event) {
                 .add(getClass().getResource("/org/photoslide/css/PopOver.css").toExternalForm());
     }
 
+    @FXML
+    private void showMediaStackAction(ActionEvent event) {
+        MediaFile item = lighttablePaneController.getFactory().getSelectedMediaItem();
+        if (item != null) {
+            if (item.isStacked()) {
+                lighttablePaneController.getFactory().handleStackButtonAction(item.getStackName(), lighttablePaneController.getFactory().getSelectedCell());
+            }
+        }
+    }
+
 }
diff --git a/PhotoSlide/src/main/java/org/photoslide/browserlighttable/MediaGridCellFactory.java b/PhotoSlide/src/main/java/org/photoslide/browserlighttable/MediaGridCellFactory.java
@@ -251,13 +251,19 @@ public void handleGridCellSelection(Event t) throws MalformedURLException {
                 lightController.getFilenameLabel().setText(name);
             });
             return;
-        }                
-        if (t.getTarget().getClass().equals(FontIcon.class)) {
-            String code = ((FontIcon) t.getTarget()).getIconLiteral();
-            if (code.equalsIgnoreCase("ti-view-grid")) {
+        }
+        if (t.getTarget().getClass().equals(StackPane.class)) {
+            Node target = Utility.pick((StackPane) t.getTarget(), ((MouseEvent) t).getSceneX(), ((MouseEvent) t).getSceneY());
+            if (target.getClass().equals(FontIcon.class)) {
                 handleStackButtonAction(((MediaGridCell) t.getSource()).getItem().getStackName(), (MediaGridCell) t.getSource());
+                if (lightController.getImageView().getImage() != null) {
+                    if (lightController.getImageView().getImage() != null) {
+                        if (lightController.getImageView().getImage().getUrl().equalsIgnoreCase(((MediaGridCell) t.getSource()).getItem().getImageUrl().toString())) {
+                            return;
+                        }
+                    }
+                }
             }
-            t.consume();
         }
         if (((MediaGridCell) t.getSource()).getItem().isStacked()) {
             lightController.getStackButton().setText("Unstack");

diff --git a/PhotoSlide/src/main/java/org/photoslide/datamodel/MediaGridCell.java b/PhotoSlide/src/main/java/org/photoslide/datamodel/MediaGridCell.java
@@ -231,7 +231,7 @@ public final void setMedia(MediaFile item) {
             }
             setRatingNode(item.getRatingProperty().get());
             setBookmarked(item.isBookmarked());
-            setStacked(item.isStacked(), item.getStackPos());
+            setStacked(item.isStacked(), item.getStackPos());            
             if (item.deletedProperty().getValue() == true) {
                 setDeletedNode();
             }

diff --git a/PhotoSlide/src/main/resources/org/photoslide/fxml/MainView.fxml b/PhotoSlide/src/main/resources/org/photoslide/fxml/MainView.fxml
@@ -21,7 +21,7 @@
 <?import javafx.scene.text.Font?>
 <?import org.kordamp.ikonli.javafx.FontIcon?>
 
-<VBox prefHeight="750.0" prefWidth="1280.0" stylesheets="@../css/MainView.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.photoslide.MainViewController">
+<VBox prefHeight="750.0" prefWidth="1280.0" stylesheets="@../css/MainView.css" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.photoslide.MainViewController">
     <children>
         <MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
             <menus>
@@ -174,6 +174,7 @@
                             </graphic>
                         </MenuItem>
                         <SeparatorMenuItem mnemonicParsing="false" />
+                  <MenuItem mnemonicParsing="false" onAction="#showMediaStackAction" text="Show media stack" />
                         <MenuItem fx:id="stackMenu" mnemonicParsing="false" onAction="#stackMenuAction" text="Stack media files">
                             <accelerator>
                                 <KeyCodeCombination alt="UP" code="S" control="UP" meta="UP" shift="UP" shortcut="DOWN" />