beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small browser fixes

Browse source
This commit is contained in:
crschnick 2023-12-04 16:40:30 +00:00
parent dcb43a43ab
commit c2e5e0fa0d
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/xpipe/app/browser/BrowserFileListComp.java
View file

@ -190,6 +190,7 @@ final class BrowserFileListComp extends SimpleComp {
browserAction.execute(fileList.getFileSystemModel(), selected);
});
});
event.consume();
});
}

5
app/src/main/java/io/xpipe/app/browser/BrowserFileListCompEntry.java
View file

@ -10,6 +10,7 @@ import lombok.Getter;
import java.io.File;
import java.util.ArrayList;
import java.util.Objects;
import java.util.Timer;
import java.util.TimerTask;
@ -97,6 +98,10 @@ public class BrowserFileListCompEntry {
return false;
}
if (!Objects.equals(model.getFileSystemModel().getFileSystem(), cb.getEntries().get(0).getFileSystem())) {
return true;
}
// Prevent drag and drops of files into the current directory
if (cb.getBaseDirectory() != null && cb
.getBaseDirectory()

5
app/src/main/java/io/xpipe/app/browser/action/LeafAction.java
View file

@ -20,6 +20,11 @@ public interface LeafAction extends BrowserAction {
default Button toButton(OpenFileSystemModel model, List<BrowserEntry> selected) {
var b = new Button();
b.setOnAction(event -> {
// Only accept shortcut actions in the current tab
if (!model.equals(model.getBrowserModel().getSelected().getValue())) {
return;
}
ThreadHelper.runFailableAsync(() -> {
BooleanScope.execute(model.getBusy(), () -> {
execute(model, selected);

1
app/src/main/java/io/xpipe/app/fxcomps/util/Shortcuts.java
View file

@ -24,7 +24,6 @@ public class Shortcuts {
public static <T extends Region> void addShortcut(T region, KeyCombination comb, Consumer<T> exec) {
var filter = new EventHandler<KeyEvent>() {
public void handle(KeyEvent ke) {
var target = ke.getTarget();
if (!region.isVisible() || !region.isManaged() || region.isDisabled()) {
return;
}