From fb56e64537de5f93786ed121f703da2a4105badc Mon Sep 17 00:00:00 2001 From: Ogulcan Celik Date: Mon, 8 Jun 2026 01:36:51 +0300 Subject: fix: improve windows pane behavior --- src/config/io.rs | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'src/config') diff --git a/src/config/io.rs b/src/config/io.rs index 1bfabf96..984f25e0 100644 --- a/src/config/io.rs +++ b/src/config/io.rs @@ -14,30 +14,20 @@ pub fn app_dir_name() -> &'static str { pub fn config_dir() -> PathBuf { if let Ok(dir) = std::env::var("XDG_CONFIG_HOME") { - PathBuf::from(dir).join(app_dir_name()) - } else if cfg!(windows) { - windows_config_dir() - } else if let Ok(home) = std::env::var("HOME") { - PathBuf::from(home).join(format!(".config/{}", app_dir_name())) - } else { - std::env::temp_dir().join(app_dir_name()) + return PathBuf::from(dir).join(app_dir_name()); } + platform_config_dir() } pub fn state_dir() -> PathBuf { if let Ok(dir) = std::env::var("XDG_STATE_HOME") { - PathBuf::from(dir).join(app_dir_name()) - } else if cfg!(windows) { - windows_state_dir() - } else if let Ok(home) = std::env::var("HOME") { - PathBuf::from(home).join(format!(".local/state/{}", app_dir_name())) - } else { - std::env::temp_dir().join(format!("{}-state", app_dir_name())) + return PathBuf::from(dir).join(app_dir_name()); } + platform_state_dir() } #[cfg(windows)] -fn windows_config_dir() -> PathBuf { +fn platform_config_dir() -> PathBuf { if let Ok(dir) = std::env::var("APPDATA") { return PathBuf::from(dir).join(app_dir_name()); } @@ -54,12 +44,16 @@ fn windows_config_dir() -> PathBuf { } #[cfg(not(windows))] -fn windows_config_dir() -> PathBuf { - unreachable!("windows_config_dir is only called on Windows") +fn platform_config_dir() -> PathBuf { + if let Ok(home) = std::env::var("HOME") { + PathBuf::from(home).join(format!(".config/{}", app_dir_name())) + } else { + std::env::temp_dir().join(app_dir_name()) + } } #[cfg(windows)] -fn windows_state_dir() -> PathBuf { +fn platform_state_dir() -> PathBuf { if let Ok(dir) = std::env::var("LOCALAPPDATA") { return PathBuf::from(dir).join(app_dir_name()); } @@ -76,8 +70,12 @@ fn windows_state_dir() -> PathBuf { } #[cfg(not(windows))] -fn windows_state_dir() -> PathBuf { - unreachable!("windows_state_dir is only called on Windows") +fn platform_state_dir() -> PathBuf { + if let Ok(home) = std::env::var("HOME") { + PathBuf::from(home).join(format!(".local/state/{}", app_dir_name())) + } else { + std::env::temp_dir().join(format!("{}-state", app_dir_name())) + } } impl Config { -- cgit v1.2.3