mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-11-21 23:20:23 +00:00
Compare commits
2 commits
2d38d62428
...
e63d044313
Author | SHA1 | Date | |
---|---|---|---|
|
e63d044313 | ||
|
100820b439 |
9 changed files with 11 additions and 121 deletions
|
@ -107,6 +107,7 @@ public class BrowserFilterComp extends Comp<BrowserFilterComp.Structure> {
|
|||
}
|
||||
});
|
||||
button.prefHeightProperty().bind(text.heightProperty());
|
||||
button.prefWidthProperty().bind(text.heightProperty());
|
||||
return new Structure(box, (TextField) text, button);
|
||||
}
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ public class BrowserNavBar extends Comp<BrowserNavBar.Structure> {
|
|||
() -> {
|
||||
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<BrowserNavBar.Structure> {
|
|||
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<BrowserNavBar.Structure> {
|
|||
|
||||
var topBox = new HBox(homeButton, stack, historyButton);
|
||||
topBox.setAlignment(Pos.CENTER);
|
||||
homeButton.minWidthProperty().bind(pathRegion.heightProperty());
|
||||
homeButton.maxWidthProperty().bind(pathRegion.heightProperty().multiply(1.3));
|
||||
homeButton.minHeightProperty().bind(pathRegion.heightProperty());
|
||||
homeButton.maxHeightProperty().bind(pathRegion.heightProperty());
|
||||
historyButton.minHeightProperty().bind(pathRegion.heightProperty());
|
||||
|
|
|
@ -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");
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 565 B |
Binary file not shown.
Before Width: | Height: | Size: 673 B |
|
@ -1,56 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
id="Layer_1"
|
||||
data-name="Layer 1"
|
||||
viewBox="0 0 178.23 178.25"
|
||||
version="1.1"
|
||||
sodipodi:docname="home_icon-dark.svg"
|
||||
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<sodipodi:namedview
|
||||
id="namedview11"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.4039271"
|
||||
inkscape:cx="21.423279"
|
||||
inkscape:cy="89.852975"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1017"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="Layer_1" />
|
||||
<defs
|
||||
id="defs4">
|
||||
<style
|
||||
id="style2">.cls-1{fill:#ac55ff;}</style>
|
||||
</defs>
|
||||
<title
|
||||
id="title6">home</title>
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M340.33,244.41v0L267.6,171.68a16.39,16.39,0,0,0-23.2,0l-72.68,72.67-.07.08a16.41,16.41,0,0,0,10.92,28l.51,0H186v53.51a19.23,19.23,0,0,0,19.21,19.21h28.45a5.23,5.23,0,0,0,5.22-5.23V298a8.77,8.77,0,0,1,8.76-8.76h16.78a8.77,8.77,0,0,1,8.76,8.76V339.9a5.23,5.23,0,0,0,5.22,5.23h28.45A19.23,19.23,0,0,0,326,325.92V272.41h2.69a16.26,16.26,0,0,0,11.6-4.81A16.43,16.43,0,0,0,340.33,244.41Zm-7.4,15.81a5.89,5.89,0,0,1-4.21,1.75h-7.91a5.23,5.23,0,0,0-5.23,5.22v58.73a8.77,8.77,0,0,1-8.76,8.76H283.6V298a19.23,19.23,0,0,0-19.21-19.2H247.61A19.23,19.23,0,0,0,228.4,298v36.73H205.18a8.77,8.77,0,0,1-8.76-8.76V267.19a5.23,5.23,0,0,0-5.23-5.22h-8a6,6,0,0,1-4.11-10.18h0l72.71-72.7a6,6,0,0,1,8.44,0l72.69,72.69,0,0A6,6,0,0,1,332.93,260.22Z"
|
||||
transform="translate(-166.88 -166.87)"
|
||||
id="path8"
|
||||
style="fill:#f6f6f6;fill-opacity:1" />
|
||||
<metadata
|
||||
id="metadata828">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:title>home</dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
</svg>
|
Before Width: | Height: | Size: 2.3 KiB |
|
@ -1,56 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
id="Layer_1"
|
||||
data-name="Layer 1"
|
||||
viewBox="0 0 178.23 178.25"
|
||||
version="1.1"
|
||||
sodipodi:docname="home_icon.svg"
|
||||
inkscape:version="1.1.2 (b8e25be833, 2022-02-05)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<sodipodi:namedview
|
||||
id="namedview11"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.4039271"
|
||||
inkscape:cx="21.423279"
|
||||
inkscape:cy="89.852975"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1017"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="Layer_1" />
|
||||
<defs
|
||||
id="defs4">
|
||||
<style
|
||||
id="style2">.cls-1{fill:#ac55ff;}</style>
|
||||
</defs>
|
||||
<title
|
||||
id="title6">home</title>
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M340.33,244.41v0L267.6,171.68a16.39,16.39,0,0,0-23.2,0l-72.68,72.67-.07.08a16.41,16.41,0,0,0,10.92,28l.51,0H186v53.51a19.23,19.23,0,0,0,19.21,19.21h28.45a5.23,5.23,0,0,0,5.22-5.23V298a8.77,8.77,0,0,1,8.76-8.76h16.78a8.77,8.77,0,0,1,8.76,8.76V339.9a5.23,5.23,0,0,0,5.22,5.23h28.45A19.23,19.23,0,0,0,326,325.92V272.41h2.69a16.26,16.26,0,0,0,11.6-4.81A16.43,16.43,0,0,0,340.33,244.41Zm-7.4,15.81a5.89,5.89,0,0,1-4.21,1.75h-7.91a5.23,5.23,0,0,0-5.23,5.22v58.73a8.77,8.77,0,0,1-8.76,8.76H283.6V298a19.23,19.23,0,0,0-19.21-19.2H247.61A19.23,19.23,0,0,0,228.4,298v36.73H205.18a8.77,8.77,0,0,1-8.76-8.76V267.19a5.23,5.23,0,0,0-5.23-5.22h-8a6,6,0,0,1-4.11-10.18h0l72.71-72.7a6,6,0,0,1,8.44,0l72.69,72.69,0,0A6,6,0,0,1,332.93,260.22Z"
|
||||
transform="translate(-166.88 -166.87)"
|
||||
id="path8"
|
||||
style="fill:#2e2e2e;fill-opacity:1" />
|
||||
<metadata
|
||||
id="metadata828">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:title>home</dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
</svg>
|
Before Width: | Height: | Size: 2.3 KiB |
|
@ -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 {
|
||||
|
|
1
dist/changelogs/9.2_incremental.md
vendored
1
dist/changelogs/9.2_incremental.md
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue