#57 Make actions and "time pane" use the same space

Author: Bytekeeper

src/main/java/org/stt/gui/jfx/TimeTrackingItemCellWithActions.java

@@ -7,15 +7,14 @@
 import com.sun.javafx.sg.prism.NGNode;
 import javafx.animation.FadeTransition;
 import javafx.beans.binding.Bindings;
+import javafx.beans.binding.DoubleBinding;
 import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.layout.Background;
-import javafx.scene.layout.BackgroundFill;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
+import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import org.stt.model.TimeTrackingItem;
@@ -24,7 +23,6 @@
 import java.time.format.FormatStyle;
 import java.util.ResourceBundle;
 import java.util.function.Predicate;
-import java.util.stream.Stream;
 
 import static java.util.Objects.requireNonNull;
 import static org.stt.gui.jfx.Glyph.GLYPH_SIZE_MEDIUM;
@@ -44,7 +42,7 @@ class TimeTrackingItemCellWithActions extends ListCell<TimeTrackingItem> {
 
     private final Node newDayNode;
     private final TimeTrackingItemNodes itemNodes;
-    private final int buttonIndex;
+    private final HBox actions;
 
     TimeTrackingItemCellWithActions(Font fontAwesome,
                                     ResourceBundle localization,
@@ -66,21 +64,18 @@ class TimeTrackingItemCellWithActions extends ListCell<TimeTrackingItem> {
         deleteButton.setOnAction(event -> actionsHandler.delete(getItem()));
         stopButton.setOnAction(event -> actionsHandler.stop(getItem()));
 
-        itemNodes.appendNodesTo(cellPane.getChildren());
+        actions = new HBox(continueButton, editButton, deleteButton);
+        StackPane.setAlignment(actions, Pos.CENTER);
+        StackPane timeOrActions = new StackPaneWithoutResize();
 
-        buttonIndex = cellPane.getChildren().size();
+        actions.opacityProperty().bind(fadeOnHoverProperty());
+        SimpleDoubleProperty one = new SimpleDoubleProperty(1);
+        DoubleBinding timePaneOpacity = one.subtract(Bindings.min(one, fadeOnHoverProperty().multiply(2)));
+        itemNodes.appendNodesTo(timeOrActions, timePaneOpacity, cellPane.getChildren());
+        timeOrActions.getChildren().add(actions);
 
-        cellPane.getChildren().addAll(
-                continueButton,
-                editButton,
-                deleteButton);
         cellPane.setAlignment(Pos.CENTER_LEFT);
 
-        DoubleProperty opacityProperty = fadeOnHoverProperty();
-
-        Stream.of(continueButton, editButton, deleteButton, stopButton)
-                .map(Node::opacityProperty)
-                .forEach(p -> p.bind(opacityProperty));
 
         lastItemOnDayPane = new BorderPane();
 
@@ -137,7 +132,7 @@ protected void updateItem(TimeTrackingItem item, boolean empty) {
         if (empty) {
             setGraphic(null);
         } else {
-            cellPane.getChildren().set(buttonIndex, item.getEnd().isPresent() ? continueButton : stopButton);
+            actions.getChildren().set(0, item.getEnd().isPresent() ? continueButton : stopButton);
             itemNodes.setItem(item);
             if (lastItemOfDay.test(item)) {
                 setupLastItemOfDayPane();

src/main/java/org/stt/gui/jfx/TimeTrackingItemNodes.java

@@ -1,5 +1,6 @@
 package org.stt.gui.jfx;
 
+import javafx.beans.binding.DoubleBinding;
 import javafx.collections.ObservableList;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -97,7 +98,12 @@ private void applyLabelForComment(String activity) {
 
     public void appendNodesTo(ObservableList<Node> parent) {
         parent.addAll(labelArea, space, timePane);
+    }
 
+    public void appendNodesTo(Pane timePaneContainer, DoubleBinding timePaneOpacity, ObservableList<Node> parent) {
+        timePane.opacityProperty().bind(timePaneOpacity);
+        timePaneContainer.getChildren().add(timePane);
+        parent.addAll(labelArea, space, timePaneContainer);
     }
 
     public void setItem(TimeTrackingItem item) {
@@ -116,10 +122,10 @@ private void setupTimePane(TimeTrackingItem item) {
 
             if (!DateTimes.isOnSameDay(item.getStart(), item.getEnd().orElseGet(LocalDateTime::now))) {
                 StackPane stackPane = new StackPane(ongoingActivityGraphics);
-                Node hallo = new ImageView(WARNING_IMAGE);
+                Node ongoingActivityWarning = new ImageView(WARNING_IMAGE);
                 Tooltips.install(stackPane, localization.getString("ongoingActivityDidntStartToday"));
-                stackPane.getChildren().add(hallo);
-                StackPane.setAlignment(hallo, Pos.TOP_RIGHT);
+                stackPane.getChildren().add(ongoingActivityWarning);
+                StackPane.setAlignment(ongoingActivityWarning, Pos.TOP_RIGHT);
                 timePane.getChildren().setAll(labelForStart, stackPane);
             } else {
                 timePane.getChildren().setAll(labelForStart, ongoingActivityGraphics);