From 217388b13751d29be579c570d934172df1b4cb2a Mon Sep 17 00:00:00 2001 From: M33 <327-m33@git.qoto.org> Date: Wed, 17 Mar 2021 13:58:22 +0000 Subject: [PATCH] Update src/data.rs --- src/data.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/data.rs b/src/data.rs index ef69e156..52e331d4 100644 --- a/src/data.rs +++ b/src/data.rs @@ -239,15 +239,16 @@ fn load_layout_data_with_fallback( // Build the path to the right keyboard layout subdirectory //let mut variant_path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(); - //let mut variant_name=String::new(); + let mut directory: &str = ""; let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR") .map(PathBuf::from) .or_else(|| xdg::data_path("squeekboard/keyboards")); - //if variant == ::data::ContentPurpose::Terminal { - // variant_name.push_str("/terminal/"); - //} + if variant == ::data::ContentPurpose::Terminal { + directory = "/terminal/"; + } + let variant_name = format!("{}{}", directory, name); //variant_name.push_str(name); //match variant { @@ -270,8 +271,8 @@ fn load_layout_data_with_fallback( //let mut variant_path_buf = PathBuf::new(); //variant_path_buf.push(variant_path); - log_print!(logging::Level::Info, "fn load_layout_data_with_fallback(): list_layout_sources(name:{}, kind:{:?}, path:{:?})", name, kind, path); - for (kind, source) in list_layout_sources(name, kind, path) { + log_print!(logging::Level::Info, "fn load_layout_data_with_fallback(): list_layout_sources(name:{}, variant_name:{}, kind:{:?}, path:{:?})", name, variant_name, kind, path); + for (kind, source) in list_layout_sources(variant_name, kind, path) { let layout = load_layout_data(source.clone()); match layout { Err(e) => match (e, source) { -- GitLab