Skip to content

Fix blank preview on no code demos #865

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
merged 1 commit into from
Jan 14, 2024
Merged

Fix blank preview on no code demos #865

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
2 changes: 1 addition & 1 deletion demos
Open in desktop
Submodule demos updated 11 files
+1 −1 Workbench
+104 −0 demos/Column View/main.py
+0 −1 demos/Dialogs/main.blp
+0 −1 demos/Drag and Drop/main.blp
+0 −1 demos/Drag and Drop/main.js
+124 −0 demos/Drop Zone/main.py
+0 −1 demos/HTTP Server/main.blp
+0 −1 demos/HTTP Server/main.js
+0 −1 demos/Preferences Window/main.blp
+0 −1 demos/Preferences Window/main.js
+13 −6 demos/View Switcher/main.blp
15 changes: 11 additions & 4 deletions src/Library/Library.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,23 @@ async function openDemo({ application, demo_name, language }) {
session.settings.set_boolean("show-code", true);
}

const { autorun, languages } = demo;

// Override the user preferred language if the demo doesn't support it
const lang = session.getCodeLanguage();
if (demo.languages.length > 0 && !demo.languages.includes(lang.id)) {
if (languages.length > 0 && !languages.includes(lang.id)) {
session.settings.set_int(
"code-language",
getLanguage(demo.languages[0]).index,
);
}

const run = demo.autorun && session.getCodeLanguage().id === "javascript";
const { load } = Window({ application, session });
await load({ run });
const { load, runCode } = Window({ application, session });
await load();

const code_language = session.getCodeLanguage();
const run = autorun && code_language.id === "javascript";
if (run) {
await runCode();
}
}
2 changes: 1 addition & 1 deletion src/about.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ${getBlueprintVersion()}
copyright: "© 2022 Sonny Piers",
license_type: Gtk.License.GPL_3_0_ONLY,
version: pkg.version,
website: "https://workbench.sonny.re",
website: "https://apps.gnome.org/Workbench",
application_icon: pkg.name,
issue_url: "https://github.com/workbenchdev/Workbench/issues",
debug_info,
Expand Down
10 changes: 6 additions & 4 deletions src/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ application.connect("open", (_self, files, hint) => {
application,
session,
});
load({ run: false }).catch(console.error);
load().catch(console.error);
});

application.connect("startup", () => {
Expand All @@ -59,7 +59,9 @@ application.connect("activate", () => {
}
});

application.set_option_context_description("<https://workbench.sonny.re>");
application.set_option_context_description(
"<https://apps.gnome.org/Workbench>",
);

Actions({ application });

Expand Down Expand Up @@ -87,7 +89,7 @@ function restoreSessions() {
application,
session,
});
load({ run: false }).catch(console.error);
load().catch(console.error);
});
}
}
Expand All @@ -106,7 +108,7 @@ function bootstrap() {
session,
});
window.maximize();
load({ run: false }).catch(console.error);
load().catch(console.error);
settings.set_boolean("first-run", false);
}

Expand Down
26 changes: 10 additions & 16 deletions src/window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export default function Window({ application, session }) {
let compiler_rust = null;
let builder_python = null;

async function runCode({ format }) {
async function runCode() {
button_run.set_sensitive(false);

term_console.clear();
Expand All @@ -240,9 +240,7 @@ export default function Window({ application, session }) {
try {
await panel_ui.update();

if (format) {
await formatCode();
}
await formatCode();

await compile();
} catch (err) {
Expand Down Expand Up @@ -346,7 +344,7 @@ export default function Window({ application, session }) {
name: "run",
});
action_run.connect("activate", () => {
runCode({ format: true }).catch(console.error);
runCode().catch(console.error);
});
window.add_action(action_run);
application.set_accels_for_action("win.run", ["<Control>Return"]);
Expand Down Expand Up @@ -380,7 +378,7 @@ export default function Window({ application, session }) {
window.present();

const documents = Object.values(langs).map((lang) => lang.document);
async function load({ run }) {
async function load() {
panel_ui.stop();
previewer.stop();
documents.forEach((document) => document.stop());
Expand All @@ -397,15 +395,11 @@ export default function Window({ application, session }) {

await previewer.useInternal();

if (run) {
await runCode({ format: false });
} else {
term_console.clear();
panel_ui.start();
await panel_ui.update();
previewer.start();
await previewer.update(true);
}
term_console.clear();
panel_ui.start();
await panel_ui.update();
previewer.start();
await previewer.update(true);

documents.forEach((document) => {
document.start();
Expand All @@ -414,7 +408,7 @@ export default function Window({ application, session }) {
term_console.scrollToEnd();
}

return { load, window };
return { load, window, runCode };
}

async function setGtk4PreferDark(dark) {
Expand Down