CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-07-02 21:11:03 +12:00
Code Issues Packages Projects Releases Wiki Activity

More file browser fixes

Browse source
This commit is contained in:
crschnick 2023-04-27 22:50:51 +00:00
parent 39828f4d15
commit 62a6438e97
4 changed files with 75 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/io/xpipe/app/browser/FileListCompEntry.java
View file

@ -3,10 +3,8 @@ package io.xpipe.app.browser;
import io.xpipe.core.store.FileSystem;
import javafx.geometry.Point2D;
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.SnapshotParameters;
import javafx.scene.control.TableView;
import javafx.scene.image.WritableImage;
import javafx.scene.image.Image;
import javafx.scene.input.*;
import lombok.Getter;
@ -156,9 +154,7 @@ public class FileListCompEntry {
Dragboard db = row.startDragAndDrop(TransferMode.COPY);
db.setContent(FileBrowserClipboard.startDrag(model.getFileSystemModel().getCurrentDirectory(), selected));
var r = new SelectedFileListComp(selected).createRegion();
new Scene(r);
WritableImage image = r.snapshot(new SnapshotParameters(), null);
Image image = SelectedFileListComp.snapshot(selected);
db.setDragView(image, -20, 15);
event.setDragDetect(true);

39
app/src/main/java/io/xpipe/app/browser/SelectedFileListComp.java
View file

@ -1,13 +1,22 @@
package io.xpipe.app.browser;
import io.xpipe.app.browser.icon.FileIcons;
import io.xpipe.app.browser.icon.FileIconManager;
import io.xpipe.app.comp.base.ListBoxViewComp;
import io.xpipe.app.core.AppStyle;
import io.xpipe.app.core.AppWindowHelper;
import io.xpipe.app.fxcomps.Comp;
import io.xpipe.app.fxcomps.SimpleComp;
import io.xpipe.app.fxcomps.impl.LabelComp;
import io.xpipe.core.impl.FileNames;
import io.xpipe.core.store.FileSystem;
import javafx.collections.ObservableList;
import javafx.scene.Scene;
import javafx.scene.SnapshotParameters;
import javafx.scene.control.Label;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.image.WritableImage;
import javafx.scene.layout.Region;
import javafx.scene.paint.Color;
import lombok.EqualsAndHashCode;
import lombok.Value;
@ -15,15 +24,33 @@ import lombok.Value;
@EqualsAndHashCode(callSuper = true)
public class SelectedFileListComp extends SimpleComp {
public static Image snapshot(ObservableList<FileSystem.FileEntry> list) {
var r = new SelectedFileListComp(list).styleClass("drag").createRegion();
var scene = new Scene(r);
AppWindowHelper.setupStylesheets(scene);
AppStyle.addStylesheets(scene);
SnapshotParameters parameters = new SnapshotParameters();
parameters.setFill(Color.TRANSPARENT);
WritableImage image = r.snapshot(parameters, null);
return image;
}
ObservableList<FileSystem.FileEntry> list;
@Override
protected Region createSimple() {
var c = new ListBoxViewComp<>(list, list, entry -> {
var l = new LabelComp(FileNames.getFileName(entry.getPath())).apply(struc -> struc.get()
.setGraphic(FileIcons.createIcon(entry).createRegion()));
return l;
}).styleClass("selected-file-list");
return Comp.of(() -> {
var icon = new ImageView(FileIconManager.getSvgCache()
.getCached(FileIconManager.getFileIcon(entry, false))
.orElse(null));
icon.setFitWidth(20);
icon.setFitHeight(20);
var l = new Label(FileNames.getFileName(entry.getPath()), icon);
return l;
});
})
.styleClass("selected-file-list");
return c.createRegion();
}
}

33
app/src/main/java/io/xpipe/app/fxcomps/impl/SvgCacheComp.java
View file

@ -7,13 +7,17 @@ import javafx.animation.PauseTransition;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.value.ObservableValue;
import javafx.scene.SnapshotParameters;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.image.WritableImage;
import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane;
import javafx.scene.paint.Color;
import javafx.util.Duration;
import java.util.concurrent.atomic.AtomicReference;
public class SvgCacheComp extends SimpleComp {
private final ObservableValue<Number> width;
@ -45,7 +49,21 @@ public class SvgCacheComp extends SimpleComp {
var webViewContent = new SimpleStringProperty();
var back = SvgView.create(webViewContent).createWebview();
back.prefWidthProperty().bind(width);
back.prefHeightProperty().bind(height);
var animation = new AtomicReference<PauseTransition>();
svgFile.addListener((observable, oldValue, newValue) -> {
var cached = cache.getCached(newValue);
webViewContent.setValue(newValue != null || cached.isEmpty() ? AppImages.svgImage(newValue) : null);
frontContent.setValue(cached.orElse(null));
back.setVisible(cached.isEmpty());
front.setVisible(cached.isPresent());
if (animation.get() != null) {
animation.get().stop();
animation.set(null);
}
var pt = new PauseTransition();
pt.setDuration(Duration.millis(1000));
pt.setOnFinished(actionEvent -> {
@ -57,7 +75,9 @@ public class SvgCacheComp extends SimpleComp {
return;
}
WritableImage image = back.snapshot(null, null);
SnapshotParameters parameters = new SnapshotParameters();
parameters.setFill(Color.TRANSPARENT);
WritableImage image = back.snapshot(parameters, null);
if (image.getWidth() < 10) {
return;
}
@ -65,16 +85,7 @@ public class SvgCacheComp extends SimpleComp {
cache.put(newValue, image);
});
pt.play();
});
back.prefWidthProperty().bind(width);
back.prefHeightProperty().bind(height);
svgFile.addListener((observable, oldValue, newValue) -> {
var cached = cache.getCached(newValue);
webViewContent.setValue(newValue != null || cached.isEmpty() ? AppImages.svgImage(newValue) : null);
frontContent.setValue(cached.orElse(null));
back.setVisible(cached.isEmpty());
front.setVisible(cached.isPresent());
animation.set(pt);
});
var stack = new StackPane(back, front);

19
app/src/main/resources/io/xpipe/app/resources/style/browser.css
View file

@ -5,13 +5,22 @@
}
.selected-file-list {
-fx-padding: 10px;
-fx-spacing: 5px;
-fx-padding: 8px;
}
.selected-file-list * {
-fx-spacing: 5px;
}
.selected-file-list.drag {
-fx-border-width: 1px;
-fx-border-color: -color-neutral-emphasis;
-fx-background-color: -color-neutral-muted;
-fx-background-radius: 1px;
-fx-border-radius: 1px;
}
.browser .bookmark-list {
-fx-border-width: 0 0 1 1;
}
@ -58,6 +67,14 @@
-fx-opacity: 0.8;
}
.browser .table-row-cell:hover {
-fx-background-color: -color-accent-subtle;
}
.browser .table-row-cell:selected {
-fx-background-color: -color-success-subtle;
}
.browser .table-row-cell:folder:drag-over {
-fx-background-color: -color-success-muted;
}