kamma/kf-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disk change opens oposite panel location

Browse Source
This commit is contained in:
Radek Davidek 2026-02-20 21:52:01 +01:00
parent 561beb1e3e
commit d7bcc04893
2 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/cz/kamma/kfmanager/ui/FilePanel.java
View File

@ -23,6 +23,7 @@ public class FilePanel extends JPanel {
private cz.kamma.kfmanager.config.AppConfig appConfig;
private Runnable onDirectoryChangedAll;
private java.util.function.Consumer<JTable> onTableCreated;
private java.util.function.Function<File, File> driveSelectionTargetResolver;
private boolean ignoreComboActions = false;
private boolean active = false;
@ -39,6 +40,10 @@ public class FilePanel extends JPanel {
this.onTableCreated = callback;
}
public void setDriveSelectionTargetResolver(java.util.function.Function<File, File> resolver) {
this.driveSelectionTargetResolver = resolver;
}
/** Start inline rename on the currently selected tab/table. */
public void startInlineRename() {
FilePanelTab tab = getCurrentTab();
@ -117,7 +122,19 @@ public class FilePanel extends JPanel {
if (selObj instanceof File sel) {
FilePanelTab currentTab = getCurrentTab();
if (currentTab != null) {
currentTab.loadDirectory(sel);
File targetDirectory = sel;
if (driveSelectionTargetResolver != null) {
try {
File resolved = driveSelectionTargetResolver.apply(sel);
if (resolved != null && resolved.exists() && resolved.isDirectory() && isWithinSelectedDrive(resolved, sel)) {
targetDirectory = resolved;
}
} catch (Exception ignore) {
// fall back to selected drive root
}
}
currentTab.loadDirectory(targetDirectory);
SwingUtilities.invokeLater(() -> {
try { currentTab.getFileTable().requestFocusInWindow(); } catch (Exception ignore) {}
});
@ -238,6 +255,25 @@ public class FilePanel extends JPanel {
}
}
private boolean isWithinSelectedDrive(File directory, File selectedDrive) {
try {
java.nio.file.Path dirPath = directory.toPath().toAbsolutePath().normalize();
java.nio.file.Path selectedPath = selectedDrive.toPath().toAbsolutePath().normalize();
if (dirPath.startsWith(selectedPath)) {
return true;
}
java.nio.file.Path dirRoot = dirPath.getRoot();
java.nio.file.Path selectedRoot = selectedPath.getRoot();
return dirRoot != null
&& selectedRoot != null
&& dirRoot.equals(selectedRoot)
&& selectedPath.equals(selectedRoot);
} catch (Exception ex) {
return false;
}
}
/**
* Show the drive dropdown popup and focus it.
*/

32
src/main/java/cz/kamma/kfmanager/ui/MainWindow.java
View File

@ -144,10 +144,13 @@ public class MainWindow extends JFrame {
// Provide a callback so tabs inside the panel can request switching panels with TAB
rightPanel.setSwitchPanelCallback(() -> switchPanelsFromChild());
rightPanel.setOnDirectoryChangedAll(() -> updateCommandLinePrompt());
rightPanel.setOnTableCreated(table -> {
rightPanel.setOnTableCreated(table -> {
setupFileTable(table, rightPanel);
});
setupFileTable(rightPanel.getFileTable(), rightPanel);
leftPanel.setDriveSelectionTargetResolver(selectedDrive -> getPreferredDirectoryFromOppositePanel(selectedDrive, rightPanel));
rightPanel.setDriveSelectionTargetResolver(selectedDrive -> getPreferredDirectoryFromOppositePanel(selectedDrive, leftPanel));
// Load and set ViewMode for right panel
try {
@ -2311,6 +2314,33 @@ public class MainWindow extends JFrame {
rightPanel.refresh(activePanel == rightPanel);
}
}
private File getPreferredDirectoryFromOppositePanel(File selectedDrive, FilePanel oppositePanel) {
if (selectedDrive == null || oppositePanel == null) return selectedDrive;
File oppositeDirectory = oppositePanel.getCurrentDirectory();
if (oppositeDirectory == null || !oppositeDirectory.exists() || !oppositeDirectory.isDirectory()) {
return selectedDrive;
}
return isWithinSelectedDrive(oppositeDirectory, selectedDrive) ? oppositeDirectory : selectedDrive;
}
private boolean isWithinSelectedDrive(File directory, File selectedDrive) {
try {
java.nio.file.Path dirPath = directory.toPath().toAbsolutePath().normalize();
java.nio.file.Path selectedPath = selectedDrive.toPath().toAbsolutePath().normalize();
if (dirPath.startsWith(selectedPath)) {
return true;
}
java.nio.file.Path dirRoot = dirPath.getRoot();
java.nio.file.Path selectedRoot = selectedPath.getRoot();
return dirRoot != null
&& selectedRoot != null
&& dirRoot.equals(selectedRoot)
&& selectedPath.equals(selectedRoot);
} catch (Exception ex) {
return false;
}
}
/**
* Set the view mode for the active panel