dragonwocky/notion-enhancer
1
0
Fork 0
mirror of https://github.com/notion-enhancer/notion-enhancer.git synced 2025-04-05 13:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

de-async-ifying stuff = tray fixed!

Browse Source
This commit is contained in:
dragonwocky 2020-07-18 23:50:56 +10:00
parent 48fa62d75d
commit 0621a5710c
2 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repo/core/mod.js
View File

@ -23,7 +23,7 @@ module.exports = {
'https://camo.githubusercontent.com/5c5bca9e987d986b8cc7e51066f90c6f8a84af08/68747470733a2f2f63646e2e646973636f72646170702e636f6d2f6174746163686d656e74732f3733313634373938343332333931393933332f3733313732373235393239353032333132342f494d475f323137302e6a7067',
options: [],
hacks: {
// 'main/main.js': require('./tray.js')(defaults),
'main/main.js': require('./tray.js')(defaults),
'renderer/preload.js': function (store) {
const data = store({ name: 'dragonwocky' });
console.log(data.name);

144
repo/core/tray.js
View File

@ -6,76 +6,80 @@
*/
let tray;
const electron = require('electron'),
path = require('path'),
is_mac = process.platform === 'darwin',
is_win = process.platform === 'win32',
settings = {};
electron.app.on('ready', () => {
tray = new electron.Tray(
is_win
? path.resolve(__dirname, 'windows.ico')
: new electron.nativeImage.createFromPath(
path.resolve(__dirname, 'mac+linux.png')
).resize({
width: 16,
height: 16,
})
);
module.exports = (defaults) =>
function (store) {
const electron = require('electron'),
path = require('path'),
is_mac = process.platform === 'darwin',
is_win = process.platform === 'win32',
settings = store(defaults);
const contextMenu = electron.Menu.buildFromTemplate([
{
type: 'normal',
label: 'Bug Report',
},
{
type: 'normal',
label: 'Feature Request',
},
{
type: 'separator',
},
{
type: 'normal',
label: 'Docs',
},
{
type: 'normal',
label: 'Enhancements',
},
{
type: 'separator',
},
{
label: 'Quit',
role: 'quit',
},
]);
tray.setContextMenu(contextMenu);
tray.setToolTip('Notion');
electron.app.on('ready', () => {
tray = new electron.Tray(
is_win
? path.normalize(`${__dirname}/windows.ico`)
: new electron.nativeImage.createFromPath(
path.normalize(`${__dirname}/mac+linux.png`)
).resize({
width: 16,
height: 16,
})
);
function showWindows() {
const windows = electron.BrowserWindow.getAllWindows();
if (is_mac) electron.app.show();
if (settings.maximized) windows.forEach((win) => [win.maximize()]);
else windows.forEach((win) => win.show());
electron.app.focus({ steal: true });
}
function hideWindows() {
const windows = electron.BrowserWindow.getAllWindows();
windows.forEach((win) => [win.isFocused() && win.blur(), win.hide()]);
if (is_mac) electron.app.hide();
}
tray.on('click', () => {
const windows = electron.BrowserWindow.getAllWindows();
if (windows.some((win) => win.isVisible())) hideWindows();
else showWindows();
});
electron.globalShortcut.register(settings.hotkey, () => {
const windows = electron.BrowserWindow.getAllWindows();
if (windows.some((win) => win.isFocused() && win.isVisible()))
hideWindows();
else showWindows();
});
});
const contextMenu = electron.Menu.buildFromTemplate([
{
type: 'normal',
label: 'Bug Report',
},
{
type: 'normal',
label: 'Feature Request',
},
{
type: 'separator',
},
{
type: 'normal',
label: 'Docs',
},
{
type: 'normal',
label: 'Enhancements',
},
{
type: 'separator',
},
{
label: 'Quit',
role: 'quit',
},
]);
tray.setContextMenu(contextMenu);
tray.setToolTip('Notion');
function showWindows() {
const windows = electron.BrowserWindow.getAllWindows();
if (is_mac) electron.app.show();
if (settings.maximized) windows.forEach((win) => [win.maximize()]);
else windows.forEach((win) => win.show());
electron.app.focus({ steal: true });
}
function hideWindows() {
const windows = electron.BrowserWindow.getAllWindows();
windows.forEach((win) => [win.isFocused() && win.blur(), win.hide()]);
if (is_mac) electron.app.hide();
}
tray.on('click', () => {
const windows = electron.BrowserWindow.getAllWindows();
if (windows.some((win) => win.isVisible())) hideWindows();
else showWindows();
});
electron.globalShortcut.register(settings.hotkey, () => {
const windows = electron.BrowserWindow.getAllWindows();
if (windows.some((win) => win.isFocused() && win.isVisible()))
hideWindows();
else showWindows();
});
});
};