From b0a6a90bd159705beff3b7e4e58fb4155b7d24cc Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 2 Feb 2025 08:24:27 +0000 Subject: [PATCH] Style fixes --- .../io/xpipe/app/browser/BrowserFileChooserSessionComp.java | 1 - .../io/xpipe/app/browser/file/BrowserConnectionListComp.java | 1 - .../java/io/xpipe/app/browser/file/BrowserContextMenu.java | 2 -- .../java/io/xpipe/app/browser/file/BrowserFileListComp.java | 3 --- .../java/io/xpipe/app/browser/file/BrowserOverviewComp.java | 1 - .../java/io/xpipe/app/browser/file/BrowserTransferComp.java | 2 -- app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java | 1 - .../main/java/io/xpipe/app/comp/store/StoreCategoryComp.java | 4 ---- app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java | 1 - .../io/xpipe/app/comp/store/StoreEntryListOverviewComp.java | 4 ---- app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java | 1 - app/src/main/java/io/xpipe/app/core/window/AppDialog.java | 1 - .../main/java/io/xpipe/app/core/window/AppWindowHelper.java | 1 - app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java | 1 - app/src/main/java/io/xpipe/app/issue/UserReportComp.java | 2 -- app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java | 1 - app/src/main/java/io/xpipe/app/prefs/IconsCategory.java | 1 - .../xpipe/ext/base/browser/MultiExecuteSelectionAction.java | 1 - 18 files changed, 29 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java index 5ba94b561..48aab1c7a 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserFileChooserSessionComp.java @@ -63,7 +63,6 @@ public class BrowserFileChooserSessionComp extends DialogComp { }); var comp = new BrowserFileChooserSessionComp(stage, model); comp.apply(struc -> struc.get().setPrefSize(1200, 700)) - .apply(struc -> AppFontSizes.sm(struc.get())) .styleClass("browser") .styleClass("chooser"); return comp; diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java index 0a44f4de4..9f71d7eb3 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserConnectionListComp.java @@ -87,7 +87,6 @@ public final class BrowserConnectionListComp extends SimpleComp { var r = section.vgrow().createRegion(); r.getStyleClass().add("bookmark-list"); - AppFontSizes.sm(r); return r; } diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java index 90daa9bfb..c651b3565 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserContextMenu.java @@ -30,8 +30,6 @@ public final class BrowserContextMenu extends ContextMenu { e.consume(); }); - AppFontSizes.sm(this.getStyleableNode()); - var empty = source == null; var selected = new ArrayList<>( empty diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java index ef2e20e45..43f6b56c1 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java @@ -135,9 +135,6 @@ public final class BrowserFileListComp extends SimpleComp { prepareTableEntries(table); prepareTableChanges(table, filenameCol, mtimeCol, modeCol, ownerCol); prepareTypedSelectionModel(table); - - AppFontSizes.sm(table); - return table; } diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java index 370820d0f..75086999d 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserOverviewComp.java @@ -78,7 +78,6 @@ public class BrowserOverviewComp extends SimpleComp { var vbox = new VerticalComp(List.of(recentPane, commonPane, rootsPane)).styleClass("overview"); var r = vbox.createRegion(); - AppFontSizes.sm(r); return r; } } diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java index 9113003c3..ba5d2e055 100644 --- a/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java +++ b/app/src/main/java/io/xpipe/app/browser/file/BrowserTransferComp.java @@ -82,7 +82,6 @@ public class BrowserTransferComp extends SimpleComp { .grow(false, true); var dragNotice = new LabelComp(AppI18n.observable("dragLocalFiles")) .apply(struc -> struc.get().setGraphic(new FontIcon("mdi2h-hand-left"))) - .apply(struc -> AppFontSizes.sm(struc.get())) .apply(struc -> struc.get().setWrapText(true)) .hide(model.getEmpty()); @@ -195,7 +194,6 @@ public class BrowserTransferComp extends SimpleComp { }); var r = stack.styleClass("transfer").createRegion(); - AppFontSizes.sm(r); return r; } } diff --git a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java index 4c3005e8c..dc381d176 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/AppLayoutComp.java @@ -69,7 +69,6 @@ public class AppLayoutComp extends Comp { } }); }); - AppFontSizes.sm(pane); pane.getStyleClass().add("layout"); return new Structure(pane, multiR, sidebarR, new ArrayList<>(multiR.getChildren())); } diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryComp.java index 2aabac204..5aaa644cc 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreCategoryComp.java @@ -84,7 +84,6 @@ public class StoreCategoryComp extends SimpleComp { var expandButton = new IconButtonComp(expandIcon, () -> { category.toggleExpanded(); }) - .apply(struc -> AppFontSizes.sm(struc.get())) .apply(struc -> { struc.get().setAlignment(Pos.CENTER); struc.get().setFocusTraversable(false); @@ -188,8 +187,6 @@ public class StoreCategoryComp extends SimpleComp { category.getColor().subscribe((c) -> { DataColor.applyStyleClasses(c, struc.get()); }); - - AppFontSizes.sm(struc.get()); }); return v.createRegion(); @@ -197,7 +194,6 @@ public class StoreCategoryComp extends SimpleComp { private ContextMenu createContextMenu(Region text) { var contextMenu = ContextMenuHelper.create(); - AppFontSizes.sm(contextMenu.getStyleableNode()); if (AppPrefs.get().enableHttpApi().get()) { var copyId = new MenuItem(AppI18n.get("copyId"), new FontIcon("mdi2c-content-copy")); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java index 5110b9fa1..e874e5f59 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java @@ -269,7 +269,6 @@ public abstract class StoreEntryComp extends SimpleComp { protected ContextMenu createContextMenu() { var contextMenu = ContextMenuHelper.create(); - AppFontSizes.sm(contextMenu.getStyleableNode()); var hasSep = false; for (var p : getWrapper().getActionProviders()) { diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java index 0752478a2..7226361e8 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListOverviewComp.java @@ -116,7 +116,6 @@ public class StoreEntryListOverviewComp extends SimpleComp { HBox.setHgrow(f, Priority.ALWAYS); f.getStyleClass().add("filter-bar"); - AppFontSizes.sm(hbox); return hbox; } @@ -125,7 +124,6 @@ public class StoreEntryListOverviewComp extends SimpleComp { menu.textProperty().bind(AppI18n.observable("addConnections")); menu.setAlignment(Pos.CENTER); menu.setTextAlignment(TextAlignment.CENTER); - AppFontSizes.sm(menu); StoreCreationMenu.addButtons(menu); menu.setOpacity(0.85); menu.setMinWidth(Region.USE_PREF_SIZE); @@ -161,7 +159,6 @@ public class StoreEntryListOverviewComp extends SimpleComp { } }); alphabetical.apply(alphabeticalR -> { - AppFontSizes.sm(alphabeticalR.get()); alphabeticalR .get() .opacityProperty() @@ -202,7 +199,6 @@ public class StoreEntryListOverviewComp extends SimpleComp { } }); date.apply(dateR -> { - AppFontSizes.sm(dateR.get()); dateR.get() .opacityProperty() .bind(Bindings.createDoubleBinding( diff --git a/app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java b/app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java index 7e045cbbf..27191a179 100644 --- a/app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java +++ b/app/src/main/java/io/xpipe/app/core/AppGreetingsDialog.java @@ -82,7 +82,6 @@ public class AppGreetingsDialog { var label = new Label(AppI18n.get("legalAccept")); label.setGraphic(cb); - AppFontSizes.sm(label); label.setPadding(new Insets(20, 0, 10, 0)); label.setOnMouseClicked(event -> accepted.set(!accepted.get())); label.setGraphicTextGap(10); diff --git a/app/src/main/java/io/xpipe/app/core/window/AppDialog.java b/app/src/main/java/io/xpipe/app/core/window/AppDialog.java index 008a7857b..4b2a68670 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppDialog.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppDialog.java @@ -110,7 +110,6 @@ public class AppDialog { return Comp.of(() -> { var text = new Text(s); text.setWrappingWidth(450); - AppFontSizes.sm(text); var sp = new StackPane(text); return sp; }) diff --git a/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java b/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java index 5cf8b3c57..3bdbcb522 100644 --- a/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java +++ b/app/src/main/java/io/xpipe/app/core/window/AppWindowHelper.java @@ -49,7 +49,6 @@ public class AppWindowHelper { public static Region alertContentText(String s, int width) { var text = new Text(s); text.setWrappingWidth(width); - AppFontSizes.sm(text); var sp = new StackPane(text); sp.setPadding(new Insets(5)); return sp; diff --git a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java index 173be3793..d07395829 100644 --- a/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java +++ b/app/src/main/java/io/xpipe/app/issue/ErrorHandlerComp.java @@ -170,7 +170,6 @@ public class ErrorHandlerComp extends SimpleComp { if (event.getThrowable() != null) { content.getChildren().add(new Separator(Orientation.HORIZONTAL)); var details = createDetails(); - AppFontSizes.sm(details); layout.getChildren().add(details); layout.prefHeightProperty().bind(content.heightProperty().add(65).add(details.prefHeightProperty())); } diff --git a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java index 60291d9ad..fca3e6ef8 100644 --- a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java +++ b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java @@ -59,7 +59,6 @@ public class UserReportComp extends SimpleComp { protected Region createSimple() { var emailHeader = new Label(AppI18n.get("provideEmail")); emailHeader.setWrapText(true); - AppFontSizes.sm(emailHeader); var email = new TextField(); this.email.bind(email.textProperty()); VBox.setVgrow(email, Priority.ALWAYS); @@ -129,7 +128,6 @@ public class UserReportComp extends SimpleComp { buttons.setAlignment(Pos.CENTER); buttons.getStyleClass().add("buttons"); HBox.setHgrow(spacer, Priority.ALWAYS); - AppFontSizes.sm(dataPolicyButton); return buttons; } diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java index 380d08c67..67c9dd285 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java @@ -55,7 +55,6 @@ public class AppPrefsComp extends SimpleComp { split.getStyleClass().add("prefs"); var stack = new StackPane(split); stack.setPickOnBounds(false); - AppFontSizes.sm(stack); return stack; } } diff --git a/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java b/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java index d9a554562..794d57f79 100644 --- a/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/IconsCategory.java @@ -157,7 +157,6 @@ public class IconsCategory extends AppPrefsCategory { tile.setRight(buttons); tile.setIconSize(1.0); tile.grow(true, false); - tile.apply(struc -> AppFontSizes.sm(struc.get())); return tile; } } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java index 50f32babf..f2398b6b5 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/MultiExecuteSelectionAction.java @@ -120,7 +120,6 @@ public abstract class MultiExecuteSelectionAction implements BrowserBranchAction text.setWrapText(true); text.setEditable(false); text.setPrefRowCount(Math.max(8,( int) finalOut.lines().count())); - AppFontSizes.sm(text); var sp = new StackPane(text); return sp; })