Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix: tray icon on mac

Ilian Sapundshiev46a0229cc7f1
diff --git a/app/components/SearchInline.tsx b/app/components/SearchInline.tsx
index a44a4c6e5..d7b410141 100644
--- a/app/components/SearchInline.tsx
+++ b/app/components/SearchInline.tsx
@@ -60,11 +60,11 @@ interface Props {
showUnixHiddenEntries: boolean;
}
-const MeainSearchField = withStyles((theme: Theme) =>
+const MainSearchField = withStyles((theme: Theme) =>
createStyles({
root: {
'& input': {
- padding: 7
+ padding: 6
},
'& .MuiInputBase-root': {
borderRadius: 7
@@ -341,7 +341,7 @@ const SearchInline = (props: Props) => {
whiteSpace: 'nowrap'
}}
>
- <MeainSearchField
+ <MainSearchField
fullWidth
id="textQuery"
name="textQuery"
@@ -354,7 +354,7 @@ const SearchInline = (props: Props) => {
}}
size="small"
style={{
- marginTop: 9,
+ marginTop: 10,
width: 'calc(100% - 80px)'
}}
inputRef={mainSearchField}
diff --git a/app/electron-tray-menu.ts b/app/electron-tray-menu.ts
index 56a5d3103..afffe4df8 100644
--- a/app/electron-tray-menu.ts
+++ b/app/electron-tray-menu.ts
@@ -23,10 +23,12 @@ import { app, Menu, nativeImage, Tray } from 'electron';
let tray = null;
+const icon1x =
+ 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAJcAAACXAETPAk3AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAiFJREFUOI3Nkl1I02EUxp/3/659tdEoJo1qbIYtM7JcgkVd1IVBNKguKruwzWaTBEMi3e52FSSCRZcDjUZXg6iQPkyTwC8atBUawloQkSAI/je3uf/n20Uoy6266KZz+Z7feTjPeR/gH4v8DfBdu9Wg0xqsoiAqpe8rfHo8Fospmj8O+4MXwdgjQRDoxp7VWmcGYrnfCnj9odMgatS02cjOnW0GRzgoiloYfvFmieez9jWOqzTcFggd4TgW0+m03M3uq5q9rt2QZAknTzQZXTVOeylbJtAW6K2Hqj7XaKi+u8tHM2YTErPzePpsFJIkQxBEvpT/xYLf31OrMDJGKdnS1XmF2By74BmfhtNkRP/tXnAcwef010UAljIBb0fQwVSMEWBrR/tlUrevBlBlDFTrcSOdRyCehDsxx+fyBRcIHldVobBuobUztI0o7LXKmO3ShTPE3bAfACDPDKB2pBUPdmRhmUki9SllAchwbtnQEg6HVQCgAPAhPlE85D5WDaBpYWFxubGx3mDQ65ARd0KbTeDJyDy+fVcB4JVJXzg/NNQnrm2+/r/J95MvD7qPF4vFoudd/KO0x+Gkb+/FMcpvR2JJBaV0SlqVPZHI3dXSu5Ul0dvec52A3DebTcRutWHuS4pQSqeEvNgcjfbnN/IVo+zzB1sIhyhjjIKxaaLi1OBg30oltiyiP+1MzB44fHSSMM4pbCKeh5E7mUrc/1E/ABKLycaigR8hAAAAAElFTkSuQmCC';
+const icon2x =
+ 'data:image/png;base64,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';
+
export default function buildTrayIconMenu(mainPageProps: any, i18n, isMacLike) {
- const icon = nativeImage.createFromDataURL(
- 'data:image/png;base64,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'
- );
const cKey = isMacLike ? ' - Cmd' : ' - Ctrl';
function openNextFile() {
@@ -107,7 +109,15 @@ export default function buildTrayIconMenu(mainPageProps: any, i18n, isMacLike) {
} */
// const tray = new Tray(nImage);
+ let icon = nativeImage.createFromDataURL(icon2x);
if (!tray) {
+ if (process.platform === 'darwin') {
+ icon = nativeImage.createFromDataURL(icon1x);
+ icon.addRepresentation({
+ scaleFactor: 2.0,
+ dataURL: icon2x
+ });
+ }
tray = new Tray(icon);
}
/* tray.on('click', () => {