From 100820b439c0f8e1820103d68de146cb1c955999 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sat, 11 May 2024 17:43:07 +0000 Subject: [PATCH] Small fixes --- .../io/xpipe/app/browser/BrowserNavBar.java | 5 +- .../xpipe/app/comp/base/ModalOverlayComp.java | 11 ++-- .../app/resources/img/home_icon-24-dark.png | Bin 565 -> 0 bytes .../xpipe/app/resources/img/home_icon-24.png | Bin 673 -> 0 bytes .../app/resources/img/home_icon-dark.svg | 56 ------------------ .../io/xpipe/app/resources/img/home_icon.svg | 56 ------------------ .../io/xpipe/app/resources/style/browser.css | 2 +- dist/changelogs/9.2_incremental.md | 1 + 8 files changed, 10 insertions(+), 121 deletions(-) delete mode 100644 app/src/main/resources/io/xpipe/app/resources/img/home_icon-24-dark.png delete mode 100644 app/src/main/resources/io/xpipe/app/resources/img/home_icon-24.png delete mode 100644 app/src/main/resources/io/xpipe/app/resources/img/home_icon-dark.svg delete mode 100644 app/src/main/resources/io/xpipe/app/resources/img/home_icon.svg diff --git a/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java b/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java index b269e678..d2c7198d 100644 --- a/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java +++ b/app/src/main/java/io/xpipe/app/browser/BrowserNavBar.java @@ -82,7 +82,7 @@ public class BrowserNavBar extends Comp { () -> { return model.getCurrentDirectory() != null ? FileIconManager.getFileIcon(model.getCurrentDirectory(), false) - : "home_icon.svg"; + : null; }, model.getCurrentPath()); var breadcrumbsGraphic = PrettyImageHelper.ofFixedSize(graphic, 24, 24) @@ -108,7 +108,6 @@ public class BrowserNavBar extends Comp { var breadcrumbs = new BrowserBreadcrumbBar(model).grow(false, true); var pathRegion = pathBar.createStructure().get(); - homeButton.maxWidthProperty().bind(pathRegion.heightProperty()); var breadcrumbsRegion = breadcrumbs.createRegion(); breadcrumbsRegion.setOnMouseClicked(event -> { pathRegion.requestFocus(); @@ -129,6 +128,8 @@ public class BrowserNavBar extends Comp { var topBox = new HBox(homeButton, stack, historyButton); topBox.setAlignment(Pos.CENTER); + homeButton.minWidthProperty().bind(pathRegion.heightProperty()); + homeButton.maxWidthProperty().bind(pathRegion.heightProperty()); homeButton.minHeightProperty().bind(pathRegion.heightProperty()); homeButton.maxHeightProperty().bind(pathRegion.heightProperty()); historyButton.minHeightProperty().bind(pathRegion.heightProperty()); diff --git a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java index 2d6fc0b9..a86dadbd 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/ModalOverlayComp.java @@ -1,12 +1,13 @@ package io.xpipe.app.comp.base; +import atlantafx.base.controls.ModalPane; +import atlantafx.base.layout.ModalBox; import atlantafx.base.theme.Styles; import io.xpipe.app.core.AppFont; import io.xpipe.app.core.AppI18n; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; import io.xpipe.app.fxcomps.util.PlatformThread; - import javafx.application.Platform; import javafx.beans.property.Property; import javafx.geometry.Insets; @@ -16,9 +17,6 @@ import javafx.scene.control.Label; import javafx.scene.layout.Region; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; - -import atlantafx.base.controls.ModalPane; -import atlantafx.base.layout.ModalBox; import lombok.Value; public class ModalOverlayComp extends SimpleComp { @@ -37,8 +35,9 @@ public class ModalOverlayComp extends SimpleComp { var modal = new ModalPane(); AppFont.small(modal); modal.focusedProperty().addListener((observable, oldValue, newValue) -> { - if (newValue) { - modal.getContent().requestFocus(); + var c = modal.getContent(); + if (newValue && c != null) { + c.requestFocus(); } }); modal.getStyleClass().add("modal-overlay-comp"); diff --git a/app/src/main/resources/io/xpipe/app/resources/img/home_icon-24-dark.png b/app/src/main/resources/io/xpipe/app/resources/img/home_icon-24-dark.png deleted file mode 100644 index 3cf9e11396d0ca57834ce5fdd083a0b1a1c11bc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 565 zcmV-50?Pe~P)UfTP~z^l%HU}o_#w%Ya^SvzA@H&Z_#w$F;B!k- zNXmeVDW$c#@RZUTa7of>Ng;Q?2~2a^?pdwiK>b6Jii?g56tXYM0}DYGdmv< z5A!_#Ch7U2{z^eaT#@v?)9L*6{{t5y;%b$kRV6U9Gm^%0o_>~Z3#(F4xBj0XB3x2C zB2KOfi-=Q_+GfTy`?KVByS-Z!Md9u*QcCY;`qm|VJc7BNQrax<=I)mz{W7!Ne*{^U z?ExE-9+}zonW-e{?Hu@rh`45EJ2Tlp(ngkLgK6*^pj+Mwy#c0S00000NkvXXu0mjf DEeZMZ diff --git a/app/src/main/resources/io/xpipe/app/resources/img/home_icon-24.png b/app/src/main/resources/io/xpipe/app/resources/img/home_icon-24.png deleted file mode 100644 index e3ee0d574110fcc52b896d8d5b71a7ff8e3a96b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 673 zcmV;S0$%-zP)xA0DqcrW1XBy!GOk@Qs3;}F8F-NH9S z&bb*$HzZw__r4CiNz?S=9>6zBUP?Ms0!-3@;o;%aJv}`u)oOL68}i7=NWYmK&-45s zU?nrV4OF5i8f`QhtH7~t1dT=`1$u!$lE$N2tu`0O@d;oWIMNNgnZv-ene~SdUX=i< z)oMLSl4Y|kS0L~GT}k6+*4wPD0&{7aPO-(_BrT_D`W>LuX&mqURp5b{Ju$P-O~6Uu zp>ytQtyX*1uD_!II0w8<({!>$d`i-JpsgS(AUFj4Y%NOq(Y$M$B7&~+{{&|C8;FO7 zhW70iHaIxAABfHD*II3T$&wb#ERW;(g>&xphQ0yd(>BZj=iD`bD2kNl`B|V5MbW}0 zK?vc4b8bx1l%xwSp!rs^nSBICB~_YdBrO4Bi;Ig(Yw!L72LcYjXtfxv00000NkvXX Hu0mjfsG}|- diff --git a/app/src/main/resources/io/xpipe/app/resources/img/home_icon-dark.svg b/app/src/main/resources/io/xpipe/app/resources/img/home_icon-dark.svg deleted file mode 100644 index 5444866e..00000000 --- a/app/src/main/resources/io/xpipe/app/resources/img/home_icon-dark.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - home - - - - - home - - - - diff --git a/app/src/main/resources/io/xpipe/app/resources/img/home_icon.svg b/app/src/main/resources/io/xpipe/app/resources/img/home_icon.svg deleted file mode 100644 index 380a865f..00000000 --- a/app/src/main/resources/io/xpipe/app/resources/img/home_icon.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - home - - - - - home - - - - diff --git a/app/src/main/resources/io/xpipe/app/resources/style/browser.css b/app/src/main/resources/io/xpipe/app/resources/style/browser.css index b95c3590..747e8c38 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/browser.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/browser.css @@ -179,7 +179,7 @@ .table-view .column-header-background .label { -fx-font-size: 0.9em; - -fx-font-weight: SEMIBOLD; + -fx-font-weight: NORMAL; } .browser .table-row-cell:empty { diff --git a/dist/changelogs/9.2_incremental.md b/dist/changelogs/9.2_incremental.md index 5b3fd060..c855118e 100644 --- a/dist/changelogs/9.2_incremental.md +++ b/dist/changelogs/9.2_incremental.md @@ -23,6 +23,7 @@ The file browser has been reworked to support many new keyboard shortcuts and th - The file list can be navigated with the arrow keys. CTRL and SHIFT can be used to multiple select files - Any files you drag can now be explicitly moved by holding ALT - Renaming files will now preserve the selection +- *RIGHT* will open the quick access menu tree for directories - *CTRL+W* closes the current file browser tab - *CTRL+SHIFT+W* closes all file browser tabs - *CTRL+Q* closes the window