Skip to content

feat: support win #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonreshetov merged 8 commits into from
Apr 10, 2022
Merged

feat: support win #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
578db5a
fix(build): run dev for windows
antonreshetov Apr 10, 2022
884ee8c
chore: keep empty types folder
antonreshetov Apr 10, 2022
0f42308
fix(main): create popup menu in win
antonreshetov Apr 10, 2022
990c7b3
fix(main): show app title bar for win
antonreshetov Apr 10, 2022
903e3c0
feat: expose `platform`
antonreshetov Apr 10, 2022
cb86de5
polish: add border for title bar for win
antonreshetov Apr 10, 2022
c3c241e
feat(main): add about menu
antonreshetov Apr 10, 2022
eb8da53
chore: clean
antonreshetov Apr 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(main): create popup menu in win
  • Loading branch information
@antonreshetov
antonreshetov committed Apr 10, 2022
commit 0f42308558b4617ff6119d76b97f0dfdebcd6180
7 changes: 0 additions & 7 deletions src/main/components/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,3 @@ export const createMenu = (template: MenuItemConstructorOptions[]) => {
const menu = Menu.buildFromTemplate(template)
return menu
}

export const createPopupMenu = (template: MenuItemConstructorOptions[]) => {
const menu = createMenu(template)
menu.popup({ window: BrowserWindow.getFocusedWindow()! })

return menu
}
16 changes: 12 additions & 4 deletions src/main/services/ipc/context-menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createPopupMenu } from '../../components/menu'
import { createMenu } from '../../components/menu'
import type { MenuItemConstructorOptions } from 'electron'
import { BrowserWindow, MenuItem, dialog, ipcMain } from 'electron'
import type {
Expand All @@ -14,7 +14,7 @@ export const subscribeToContextMenu = () => {
const { name, type } = payload

return new Promise(resolve => {
createPopupMenu([
const menu = createMenu([
{
label: `Rename "${name}"`,
click: () =>
Expand Down Expand Up @@ -45,6 +45,8 @@ export const subscribeToContextMenu = () => {
}
}
])

menu.popup({ window: BrowserWindow.getFocusedWindow()! })
})
}
)
Expand All @@ -55,7 +57,7 @@ export const subscribeToContextMenu = () => {
const { name, type, selectedCount } = payload

return new Promise(resolve => {
const menu = createPopupMenu([])
const menu = createMenu([])

const defaultMenu: MenuItemConstructorOptions[] = [
{
Expand Down Expand Up @@ -151,18 +153,21 @@ export const subscribeToContextMenu = () => {
if (type === 'folder' || type === 'all' || type === 'inbox') {
defaultMenu.forEach(i => {
menu.append(new MenuItem(i))
menu.popup({ window: BrowserWindow.getFocusedWindow()! })
})
}

if (type === 'favorites') {
favoritesMenu.forEach(i => {
menu.append(new MenuItem(i))
menu.popup({ window: BrowserWindow.getFocusedWindow()! })
})
}

if (type === 'trash') {
trashMenu.forEach(i => {
menu.append(new MenuItem(i))
menu.popup({ window: BrowserWindow.getFocusedWindow()! })
})
}

Expand All @@ -181,7 +186,7 @@ export const subscribeToContextMenu = () => {
const { name, type, data } = payload

return new Promise(resolve => {
const menu = createPopupMenu([])
const menu = createMenu([])

const createLanguageMenu = () => {
return languages.map(i => {
Expand Down Expand Up @@ -308,18 +313,21 @@ export const subscribeToContextMenu = () => {
if (type === 'folder') {
folderMenu.forEach(i => {
menu.append(new MenuItem(i))
menu.popup({ window: BrowserWindow.getFocusedWindow()! })
})
}

if (type === 'tag') {
tagMenu.forEach(i => {
menu.append(new MenuItem(i))
menu.popup({ window: BrowserWindow.getFocusedWindow()! })
})
}

if (type === 'trash') {
trashMenu.forEach(i => {
menu.append(new MenuItem(i))
menu.popup({ window: BrowserWindow.getFocusedWindow()! })
})
}

Expand Down