open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove WindowsUIManager id

Browse Source
This commit is contained in:
Hilmar Gústafsson 2020-01-31 18:49:30 +01:00
parent 7373ea80d1
commit 581a923255
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ui/windows.rs
View File

@ -17,7 +17,7 @@
* along with espanso. If not, see <https://www.gnu.org/licenses/>. * along with espanso. If not, see <https://www.gnu.org/licenses/>.
*/ */
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 crate::ui::{MenuItem, MenuItemType};
use log::debug; use log::debug;
use std::io; use std::io;
@ -28,15 +28,12 @@ use std::{thread, time};
use widestring::U16CString; use widestring::U16CString;
use winrt_notification::{Duration, IconCrop, Sound, Toast}; use winrt_notification::{Duration, IconCrop, Sound, Toast};
pub struct WindowsUIManager { pub struct WindowsUIManager;
id: Arc<Mutex<i32>>,
}
impl super::UIManager for WindowsUIManager { impl super::UIManager for WindowsUIManager {
fn notify(&self, message: &str) { fn notify(&self, message: &str) {
fn get_icon_path() -> io::Result<Box<Path>> { fn get_icon_path() -> io::Result<Box<Path>> {
let path_buf = std::env::current_exe()?; let path_buf = std::env::current_exe()?.parent().unwrap().to_path_buf();
let path_buf = path_buf.parent().unwrap().to_path_buf();
let installed_ico = path_buf.join("icon.ico"); let installed_ico = path_buf.join("icon.ico");
let dev_ico = path_buf let dev_ico = path_buf
.parent() .parent()
@ -109,11 +106,7 @@ impl super::UIManager for WindowsUIManager {
} }
impl WindowsUIManager { impl WindowsUIManager {
pub fn new() -> WindowsUIManager { pub fn new() -> Self {
let id = Arc::new(Mutex::new(0)); WindowsUIManager
let manager = WindowsUIManager { id };
manager
} }
} }