forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix #130 - mini-explorer, on startup selected folder becomes the root, instead of the previous root

This commit is contained in:
Basile Burg 2024-01-21 20:17:40 +01:00
parent bd3625a63f
commit 61c2d132df
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Bugs fixed ## Bugs fixed
- Mini-explorer, clearing the filter had for effect to scan the root folder instead of the selected one. (#129) - Mini-explorer, clearing the filter had for effect to scan the root folder instead of the selected one. (#129)
- Mini-explorer, on startup selected folder becomes the root, instead of the previous root. (#130)
# v3.9.26 # v3.9.26

11
src/u_miniexplorer.pas
View File

@ -44,6 +44,7 @@ type
fSplitter1Position: integer; fSplitter1Position: integer;
fSplitter2Position: integer; fSplitter2Position: integer;
fLastFolder: string; fLastFolder: string;
fRootFolder: string;
fDblClick: TExplorerDoubleClick; fDblClick: TExplorerDoubleClick;
fContextExpand: boolean; fContextExpand: boolean;
fShowHidden: boolean; fShowHidden: boolean;
@ -51,7 +52,8 @@ type
published published
property splitter1Position: integer read fSplitter1Position write fSplitter1Position; property splitter1Position: integer read fSplitter1Position write fSplitter1Position;
property splitter2Position: integer read fSplitter2Position write fSplitter2Position; property splitter2Position: integer read fSplitter2Position write fSplitter2Position;
property lastFolder: string read fLastFolder write fLastFolder; property lastFolder: string read fLastFolder;
property rootFolder: string read fRootFolder write fRootFolder;
property favoriteFolders: TStringList read fFavoriteFolders write setFavoriteFolders; property favoriteFolders: TStringList read fFavoriteFolders write setFavoriteFolders;
property doubleClick: TExplorerDoubleClick read fDblClick write fDblClick; property doubleClick: TExplorerDoubleClick read fDblClick write fDblClick;
property contextExpand: boolean read fContextExpand write fContextExpand; property contextExpand: boolean read fContextExpand write fContextExpand;
@ -109,6 +111,7 @@ type
fFreeProj: ICommonProject; fFreeProj: ICommonProject;
fFavorites: TStringList; fFavorites: TStringList;
fLastFold: string; fLastFold: string;
fRootFold: string;
fLastListOrTree: TControl; fLastListOrTree: TControl;
fDblClick: TExplorerDoubleClick; fDblClick: TExplorerDoubleClick;
fContextExpand: boolean; fContextExpand: boolean;
@ -237,6 +240,7 @@ begin
widg := TMiniExplorerWidget(source); widg := TMiniExplorerWidget(source);
fFavoriteFolders.Assign(widg.fFavorites); fFavoriteFolders.Assign(widg.fFavorites);
fLastFolder := widg.fLastFold; fLastFolder := widg.fLastFold;
fRootFolder := widg.fRootFold;
fSplitter1Position := widg.Splitter1.GetSplitterPosition; fSplitter1Position := widg.Splitter1.GetSplitterPosition;
fSplitter2Position := widg.Splitter2.GetSplitterPosition; fSplitter2Position := widg.Splitter2.GetSplitterPosition;
fDblClick:= widg.fDblClick; fDblClick:= widg.fDblClick;
@ -272,7 +276,9 @@ begin
widg.treeFolders.ObjectTypes := widg.treeFolders.ObjectTypes - [otHidden]; widg.treeFolders.ObjectTypes := widg.treeFolders.ObjectTypes - [otHidden];
widg.lstFiles.ObjectTypes := widg.lstFiles.ObjectTypes -[otHidden]; widg.lstFiles.ObjectTypes := widg.lstFiles.ObjectTypes -[otHidden];
end; end;
if widg.fLastFold.dirExists then if fRootFolder.isNotEmpty and fRootFolder.dirExists then
widg.browse(fRootFolder)
else if fLastFolder.isNotEmpty and fLastFolder.dirExists then
widg.browse(fLastFolder); widg.browse(fLastFolder);
end end
else inherited; else inherited;
@ -814,6 +820,7 @@ begin
if treeFolders.Selected.isNotAssigned then if treeFolders.Selected.isNotAssigned then
exit; exit;
fLastFold := treeFolders.Path.extractFileDir; // trailing path sep fLastFold := treeFolders.Path.extractFileDir; // trailing path sep
fRootFold := treeFolders.Root;
subjMnexDirectoryChanged(fMnxSubj, fLastFold); subjMnexDirectoryChanged(fMnxSubj, fLastFold);
lstFiles.Sort(); lstFiles.Sort();
end; end;