Skip to content

fix(desktop): keep New and Open commands enabled without active windows #491

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

Open
teyepe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(desktop): keep New and Open commands enabled without active windows #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 21 additions & 19 deletions apps/desktop/src/main/app/App.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,14 +556,10 @@ export class App {
},
document: {
create: async () => {
if (!window) return;

await this.#createWorkspaceFromWindow(window);
await this.#createWorkspaceFromWindow(window ?? null);
},
open: async () => {
if (!window) return;

await this.#openWorkspaceFromWindow(window);
await this.#openWorkspaceFromWindow(window ?? null);
},
canSave: () =>
document !== null ||
Expand Down Expand Up @@ -712,7 +708,7 @@ export class App {
}
}

async #createWorkspaceFromWindow(opener: Window): Promise<void> {
async #createWorkspaceFromWindow(opener: Window | null): Promise<void> {
try {
const session = await this.#workspaces.createUntitled();
this.#openWorkspaceWindow(opener, session);
Expand All @@ -722,7 +718,7 @@ export class App {
}
}

async #openWorkspaceFromWindow(opener: Window): Promise<void> {
async #openWorkspaceFromWindow(opener: Window | null): Promise<void> {
let openPath: string | null;
try {
openPath = await this.#nativeDialogs.openFont(opener);
Expand All @@ -741,19 +737,21 @@ export class App {
*
* @returns whether a workspace window now shows the file.
*/
async #openPathFromWindow(opener: Window, sourcePath: string): Promise<boolean> {
const openerIsLauncher = this.#workspaces.getForBrowserWindow(opener.window) === null;
if (openerIsLauncher) this.#replacedLaunchers.add(opener);
async #openPathFromWindow(opener: Window | null, sourcePath: string): Promise<boolean> {
const openerIsLauncher = opener
? this.#workspaces.getForBrowserWindow(opener.window) === null
: false;
if (openerIsLauncher && opener) this.#replacedLaunchers.add(opener);

try {
const session = await this.#workspaces.openPath(sourcePath);
if (this.#focusExistingWorkspaceWindow(opener, session)) return true;
if (opener && this.#focusExistingWorkspaceWindow(opener, session)) return true;

this.#openWorkspaceWindow(opener, session);
return true;
} catch (error) {
this.#log.warn("open document failed", error);
if (openerIsLauncher) this.#restoreLauncherRecents(opener);
if (openerIsLauncher && opener) this.#restoreLauncherRecents(opener);
await this.#nativeDialogs.showOpenFailure(opener, this.applicationName);
return false;
}
Expand Down Expand Up @@ -803,27 +801,31 @@ export class App {
}
}

#focusExistingWorkspaceWindow(opener: Window, session: FontSessionHost): boolean {
#focusExistingWorkspaceWindow(opener: Window | null, session: FontSessionHost): boolean {
const existingWindow = session.activeWindow();
if (!existingWindow) return false;

existingWindow.focus();
if (this.#workspaces.getForBrowserWindow(opener.window) === null) {
if (opener && this.#workspaces.getForBrowserWindow(opener.window) === null) {
this.#closeReplacedLauncher(opener);
}
return true;
}

#openWorkspaceWindow(opener: Window, session: FontSessionHost): void {
const closeOpener = this.#workspaces.getForBrowserWindow(opener.window) === null;
#openWorkspaceWindow(opener: Window | null, session: FontSessionHost): void {
const closeOpener = opener
? this.#workspaces.getForBrowserWindow(opener.window) === null
: false;

const bounds = screen.getDisplayMatching(opener.window.getBounds()).workArea;
const bounds = opener
? screen.getDisplayMatching(opener.window.getBounds()).workArea
: screen.getPrimaryDisplay().workArea;
const workspaceWindow = this.#createWindow(false, bounds);

this.#workspaces.attachWindow(session.workspaceId, workspaceWindow);
this.#loadWorkspace(workspaceWindow);

if (closeOpener) this.#closeReplacedLauncher(opener);
if (closeOpener && opener) this.#closeReplacedLauncher(opener);
}

#closeReplacedLauncher(launcher: Window): void {
Expand Down
2 changes: 0 additions & 2 deletions apps/desktop/src/main/commands/Commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,11 @@ const fileCommands: Command[] = [
{
id: "file.new",
label: "New Font",
enabled: (ctx) => ctx.windows.active() !== null,
run: (ctx) => ctx.document.create(),
},
{
id: "file.open",
label: "Open…",
enabled: (ctx) => ctx.windows.active() !== null,
run: (ctx) => ctx.document.open(),
},
{
Expand Down