Merge pull request #329 from chewing/push-wxopmrpmnxvw

feat: make notification configurable

Author: kanru

chewing_tip/src/ts/chewing.rs

@@ -608,7 +608,7 @@ impl ChewingTextService {
             unsafe {
                 chewing_free(ptr.cast());
             }
-            self.show_message(context, &text, Duration::from_secs(2))?;
+            self.show_message(context, &text, Duration::from_millis(500))?;
         }
 
         Ok(true)
@@ -648,7 +648,7 @@ impl ChewingTextService {
                     CHINESE_MODE => HSTRING::from("中文模式"),
                     _ => unreachable!(),
                 };
-                self.show_message(context, &msg, Duration::from_secs(2))?;
+                self.show_message(context, &msg, Duration::from_millis(500))?;
                 self.last_keydown_code = 0;
                 return Ok(true);
             } else {
@@ -661,7 +661,7 @@ impl ChewingTextService {
                     CHINESE_MODE => HSTRING::from("中文模式"),
                     _ => unreachable!(),
                 };
-                self.show_message(context, &msg, Duration::from_secs(2))?;
+                self.show_message(context, &msg, Duration::from_millis(500))?;
                 self.last_keydown_code = 0;
                 return Ok(true);
             }
@@ -677,7 +677,7 @@ impl ChewingTextService {
                 CHINESE_MODE => HSTRING::from("中文模式"),
                 _ => unreachable!(),
             };
-            self.show_message(context, &msg, Duration::from_secs(2))?;
+            self.show_message(context, &msg, Duration::from_millis(500))?;
             self.last_keydown_code = 0;
             return Ok(true);
         }
@@ -949,6 +949,9 @@ impl ChewingTextService {
     }
 
     fn show_message(&mut self, context: &ITfContext, text: &HSTRING, dur: Duration) -> Result<()> {
+        if !self.cfg.show_notification {
+            return Ok(());
+        }
         unsafe {
             let view = context.GetActiveView()?;
             let hwnd = view.GetWnd()?;
@@ -966,7 +969,10 @@ impl ChewingTextService {
             message_window.set_font_color(self.cfg.font_fg_color);
             message_window.set_text(text.clone())?;
 
-            let rect = self.get_selection_rect(context)?;
+            let mut rect = self.get_selection_rect(context)?;
+            // TODO: bound the position to the screen
+            rect.bottom += 50;
+            rect.left += 50;
             message_window.r#move(rect.left, rect.bottom);
             message_window.show();
 

chewing_tip/src/ts/config.rs

@@ -11,6 +11,7 @@ use windows_registry::{CURRENT_USER, Key};
 pub(super) struct Config {
     pub(super) switch_lang_with_shift: bool,
     pub(super) enable_caps_lock: bool,
+    pub(super) show_notification: bool,
     pub(super) enable_auto_learn: bool,
     pub(super) esc_clean_all_buf: bool,
     pub(super) full_shape_symbols: bool,
@@ -81,6 +82,7 @@ fn load_config() -> Result<Config> {
     let mut cfg = Config {
         cand_per_row: 3,
         switch_lang_with_shift: true,
+        show_notification: true,
         add_phrase_forward: true,
         advance_after_selection: true,
         font_size: 16,
@@ -127,6 +129,9 @@ fn load_config() -> Result<Config> {
     if let Ok(value) = reg_get_bool(&key, "SwitchLangWithShift") {
         cfg.switch_lang_with_shift = value;
     }
+    if let Ok(value) = reg_get_bool(&key, "ShowNotification") {
+        cfg.show_notification = value;
+    }
     if let Ok(value) = reg_get_bool(&key, "OutputSimpChinese") {
         cfg.output_simp_chinese = value;
     }

chewing_tip/src/ts/ui_elements/candidate_list.rs

@@ -266,8 +266,8 @@ impl View for RenderedView {
         let width = width as f32;
         let height = height as f32;
         // Convert to HW pixels
-        let hw_width = width * scale + 10.0;
-        let hw_height = height * scale + 10.0;
+        let hw_width = width * scale + 25.0;
+        let hw_height = height * scale + 25.0;
         Ok(RenderedMetrics {
             width,
             height,

preferences/src/config.rs

@@ -100,6 +100,7 @@ fn load_config(ui: &ConfigWindow) -> Result<()> {
     // Init settings to default value
     ui.set_cand_per_row(3);
     ui.set_switch_lang_with_shift(true);
+    ui.set_show_notification(true);
     ui.set_add_phrase_forward(true);
     ui.set_advance_after_selection(true);
     ui.set_conv_engine(1);
@@ -150,6 +151,9 @@ fn load_config(ui: &ConfigWindow) -> Result<()> {
     if let Ok(value) = reg_get_bool(&key, "SwitchLangWithShift") {
         ui.set_switch_lang_with_shift(value);
     }
+    if let Ok(value) = reg_get_bool(&key, "ShowNotification") {
+        ui.set_show_notification(value);
+    }
     if let Ok(value) = reg_get_bool(&key, "OutputSimpChinese") {
         ui.set_output_simp_chinese(value);
     }
@@ -244,6 +248,7 @@ fn save_config(ui: &ConfigWindow) -> Result<()> {
         ui.get_show_cand_with_space_key(),
     );
     let _ = reg_set_bool(&key, "SwitchLangWithShift", ui.get_switch_lang_with_shift());
+    let _ = reg_set_bool(&key, "ShowNotification", ui.get_show_notification());
     let _ = reg_set_bool(&key, "OutputSimpChinese", ui.get_output_simp_chinese());
     let _ = reg_set_bool(&key, "AddPhraseForward", ui.get_add_phrase_forward());
     let _ = reg_set_bool(

preferences/ui/config-window.slint

@@ -13,6 +13,7 @@ export component ConfigWindow inherits Window {
 
     in-out property <bool> switch-lang-with-shift;
     in-out property <bool> enable-caps-lock;
+    in-out property <bool> show-notification;
     in-out property <bool> esc-clean-all-buf;
     in-out property <bool> full-shape-symbols;
     in-out property <bool> upper-case-with-shift;
@@ -94,6 +95,11 @@ export component ConfigWindow inherits Window {
                             checked <=> enable-caps-lock;
                         }
 
+                        CheckBox {
+                            text: "顯示通知訊息";
+                            checked <=> show-notification;
+                        }
+
                         CheckBox {
                             text: "使用 Esc 清空編輯區字串";
                             checked <=> esc-clean-all-buf;