From 888a0f32ec06f426e7cb909b9a5b083597cdad91 Mon Sep 17 00:00:00 2001 From: Timo Runge Date: Thu, 24 Oct 2019 21:43:34 +0200 Subject: [PATCH] High res status icon for macOS. Fix #98. --- src/context/macos.rs | 6 +++--- src/res/mac/icon.png | Bin 239 -> 4207 bytes src/res/mac/icon@2x.png | Bin 1395 -> 0 bytes 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 src/res/mac/icon@2x.png diff --git a/src/context/macos.rs b/src/context/macos.rs index 3c8fafc..6c66ed3 100644 --- a/src/context/macos.rs +++ b/src/context/macos.rs @@ -27,7 +27,7 @@ use std::fs; use log::{info, error}; use std::process::exit; -const STATUS_ICON_BINARY : &[u8] = include_bytes!("../res/mac/icon@2x.png"); +const STATUS_ICON_BINARY : &[u8] = include_bytes!("../res/mac/icon.png"); pub struct MacContext { pub send_channel: Sender @@ -53,7 +53,7 @@ impl MacContext { // Initialize the status icon path let espanso_dir = super::get_data_dir(); - let status_icon_target = espanso_dir.join("icon@2x.png"); + let status_icon_target = espanso_dir.join("icon.png"); if status_icon_target.exists() { info!("Status icon already initialized, skipping."); @@ -142,4 +142,4 @@ extern fn context_menu_click_callback(_self: *mut c_void, id: i32) { let event = Event::Action(ActionType::from(id)); (*_self).send_channel.send(event).unwrap(); } -} \ No newline at end of file +} diff --git a/src/res/mac/icon.png b/src/res/mac/icon.png index 04d9593a33bad04d0cf2d2bdc3d95a47790a895b..cde3e917153f320d197f02c8ae513cc482e96ef9 100644 GIT binary patch literal 4207 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 Z>HRAYjI(FswRwNdRu*>V6?+IV{{jD#`Bwk{ literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWw1G6FprVLn>}1B}jZcz}R(?iOa!8zT^Mmhjl@`mHkHrB>WVv zE%@s(>zs3}Wbd2{?>=prUL%ZB^Td)v+&m$K8bV3K09bNI-n zV8?NUdqK^j163;GYmN)mxim9vIndVX&ZNo6%f!TT=|WvlOlrg74c~X{Iqq>FmCr*; k-huh=;R_ma3`{%>mBk*@9r}Ex0UgKS>FVdQ&MBb@01jDGDF6Tf diff --git a/src/res/mac/icon@2x.png b/src/res/mac/icon@2x.png deleted file mode 100644 index 899084d2dc166913d0c247f302690eeac5a3ea71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1395 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB7>k44ofy`glX(f`a29w(7Bet# z3xhBt!>lP? zWt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)QswftllyTAW;z zSx}OhpQivaH!&%{w8U0P31kr*K;4;J0JkWw80ssa|MV*o3-k^34D_*SD#=VkI1fb^ zNCu(}>???6Ho%~oq=sB5lWKw@CN86int66l`S@+}q^R?d5LL5~U*5$<^w#D4_d=$f8RfUP^*Kh27B= zN2~=qzrX&Uwtjx?xj7H#6uTE2YybRyD|_zV>rub&_s{f8*GXnelVmPV+adStJg>kj z^lgn{pnfPwKw54~-S;QHXPB5YBUzy`;YD!9ugX9@rraOax2=UD1p?1`OkT1| zV#Z6(dus9J$7Y+(Xi983x>d;k$(ufeztUPD=@>9g^yAqFE+kU$9{uOYJP~Bv{@_xwU=Q(!;-f@XM zj+mz$9p$$n1>5)BO*Ya*&F=xvQ-6-ipCSPZ4Xs`85*uASMIdDhnL@Sw3 za}QNF9*(&ewDVP`aLkntM$R`ZcNE^6b*Db`pD5F#ijz{8u1Rj$lceWa{3_D&!P=Lc z=B?U?Y8e&zUH=FF3ls1Z6ngq7DdEYU4?z#yOQL27&Epc=*5i~V`q=aEmhQc47)2gB zzy01mJM8GZ=T8fZ&5Hj!+z+pQ;QXvYrqA-DT7xjdNsk7Cwp* zSQVElo^W=j^{l67Z=SnzG;gh=Ve6tBd?{Nuc;C=lBf8_8!55(S^SJk1`?K=%d%4!W zm<41>euScXAGVf=&wngD*K