From 581a923255616edb842b299c68376805d6e018bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hilmar=20G=C3=BAstafsson?= Date: Fri, 31 Jan 2020 18:49:30 +0100 Subject: [PATCH] Remove WindowsUIManager id --- src/ui/windows.rs | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/ui/windows.rs b/src/ui/windows.rs index 2c0b606..1d5ab7b 100644 --- a/src/ui/windows.rs +++ b/src/ui/windows.rs @@ -17,7 +17,7 @@ * along with espanso. If not, see . */ -use crate::bridge::windows::{cleanup_ui, close_notification, show_context_menu, WindowsMenuItem}; +use crate::bridge::windows::{cleanup_ui, show_context_menu, WindowsMenuItem}; use crate::ui::{MenuItem, MenuItemType}; use log::debug; use std::io; @@ -28,15 +28,12 @@ use std::{thread, time}; use widestring::U16CString; use winrt_notification::{Duration, IconCrop, Sound, Toast}; -pub struct WindowsUIManager { - id: Arc>, -} +pub struct WindowsUIManager; impl super::UIManager for WindowsUIManager { fn notify(&self, message: &str) { fn get_icon_path() -> io::Result> { - let path_buf = std::env::current_exe()?; - let path_buf = path_buf.parent().unwrap().to_path_buf(); + let path_buf = std::env::current_exe()?.parent().unwrap().to_path_buf(); let installed_ico = path_buf.join("icon.ico"); let dev_ico = path_buf .parent() @@ -109,11 +106,7 @@ impl super::UIManager for WindowsUIManager { } impl WindowsUIManager { - pub fn new() -> WindowsUIManager { - let id = Arc::new(Mutex::new(0)); - - let manager = WindowsUIManager { id }; - - manager + pub fn new() -> Self { + WindowsUIManager } }