From d4da792e492ad7f21bbd3c854e8ec16e3d9cf62f Mon Sep 17 00:00:00 2001 From: crschnick Date: Tue, 23 Jul 2024 01:26:45 +0000 Subject: [PATCH] Style fixes --- .../java/io/xpipe/app/comp/store/DenseStoreEntryComp.java | 2 +- .../java/io/xpipe/app/comp/store/StandardStoreEntryComp.java | 5 +++-- .../main/java/io/xpipe/app/comp/store/StoreNotesComp.java | 5 +---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java index 0b0b5f75..45d43221 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/DenseStoreEntryComp.java @@ -92,7 +92,7 @@ public class DenseStoreEntryComp extends StoreEntryComp { nameCC.setHgrow(Priority.ALWAYS); grid.getColumnConstraints().addAll(nameCC); var nameBox = new HBox(name, notes); - nameBox.setSpacing(1); + nameBox.setSpacing(6); nameBox.setAlignment(Pos.CENTER_LEFT); grid.addRow(0, nameBox); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java index 39de6a9b..ad23e8d2 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StandardStoreEntryComp.java @@ -2,6 +2,7 @@ package io.xpipe.app.comp.store; import io.xpipe.app.core.AppFont; import io.xpipe.app.fxcomps.Comp; +import io.xpipe.core.process.OsType; import javafx.geometry.HPos; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -33,14 +34,14 @@ public class StandardStoreEntryComp extends StoreEntryComp { var grid = new GridPane(); grid.setHgap(6); - grid.setVgap(0); + grid.setVgap(OsType.getLocal() == OsType.MACOS ? 2 : 0); var storeIcon = createIcon(46, 40); grid.add(storeIcon, 0, 0, 1, 2); grid.getColumnConstraints().add(new ColumnConstraints(56)); var nameAndNotes = new HBox(name, notes); - nameAndNotes.setSpacing(1); + nameAndNotes.setSpacing(6); nameAndNotes.setAlignment(Pos.CENTER_LEFT); grid.add(nameAndNotes, 1, 0); GridPane.setVgrow(nameAndNotes, Priority.ALWAYS); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java index 7b132864..07e77dc6 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreNotesComp.java @@ -1,5 +1,6 @@ package io.xpipe.app.comp.store; +import atlantafx.base.controls.Popover; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.base.DialogComp; import io.xpipe.app.comp.base.MarkdownEditorComp; @@ -10,7 +11,6 @@ import io.xpipe.app.fxcomps.CompStructure; import io.xpipe.app.fxcomps.impl.IconButtonComp; import io.xpipe.app.fxcomps.util.BindingsHelper; import io.xpipe.app.storage.DataStorage; - import javafx.application.Platform; import javafx.beans.property.Property; import javafx.beans.property.SimpleStringProperty; @@ -18,8 +18,6 @@ import javafx.event.ActionEvent; import javafx.scene.control.Button; import javafx.scene.paint.Color; -import atlantafx.base.controls.Popover; - import java.util.List; import java.util.concurrent.atomic.AtomicReference; @@ -39,7 +37,6 @@ public class StoreNotesComp extends Comp { .focusTraversableForAccessibility() .tooltipKey("notes") .styleClass("notes-button") - .grow(false, true) .hide(BindingsHelper.map(n, s -> s.getCommited() == null && s.getCurrent() == null)) .createStructure() .get();