diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-04 13:19:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 13:19:55 +0100 |
| commit | f83f1d7c9b299f21f818e0ea28c27345f65bde4b (patch) | |
| tree | 6142421a00cd01011e7bd433953f4800d381e3c6 /drivers/unix | |
| parent | 2856740e6b238576273a321a125e9d92b687fdb2 (diff) | |
| parent | aee586553a4be72b72b669fb489fae72337ab7ad (diff) | |
Merge pull request #36069 from RandomShaper/imvu/improve_drives_ux
Improve UX of drive letters
Diffstat (limited to 'drivers/unix')
| -rw-r--r-- | drivers/unix/dir_access_unix.cpp | 7 | ||||
| -rw-r--r-- | drivers/unix/dir_access_unix.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index 02cb4fa956..715bc56003 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -269,6 +269,11 @@ String DirAccessUnix::get_drive(int p_drive) { return list[p_drive]; } +bool DirAccessUnix::drives_are_shortcuts() { + + return true; +} + Error DirAccessUnix::make_dir(String p_dir) { GLOBAL_LOCK_FUNCTION @@ -337,7 +342,7 @@ Error DirAccessUnix::change_dir(String p_dir) { return OK; } -String DirAccessUnix::get_current_dir() { +String DirAccessUnix::get_current_dir(bool p_include_drive) { String base = _get_root_path(); if (base != "") { diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h index 32ddc76638..b403d8e356 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -63,9 +63,10 @@ public: virtual int get_drive_count(); virtual String get_drive(int p_drive); + virtual bool drives_are_shortcuts(); virtual Error change_dir(String p_dir); ///< can be relative or absolute, return false on success - virtual String get_current_dir(); ///< return current dir location + virtual String get_current_dir(bool p_include_drive = true); ///< return current dir location virtual Error make_dir(String p_dir); virtual bool file_exists(String p_file); |