Skip to content

Destroy toplevel objects #176

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 6 commits into from
Dec 18, 2022
Merged

Destroy toplevel objects #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4df25b7
Ensure toplevel objects are destroyed
sonnyp Nov 8, 2022
7a579d7
vala-previewer: Fix cast
lw64 Dec 18, 2022
8a8b96b
f
sonnyp Dec 18, 2022
6d9f87f
f
sonnyp Dec 18, 2022
01d7705
f
sonnyp Dec 18, 2022
5813904
Merge branch 'main' into destroy-toplevel-objects
sonnyp Dec 18, 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
7 changes: 7 additions & 0 deletions src/Previewer/Internal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@ export default function Internal({
object_root[prop_name] = new_value;
}
}

// Toplevel windows returned by these functions will stay around
// until the user explicitly destroys them with gtk_window_destroy().
// https://docs.gtk.org/gtk4/class.Builder.html
if (object_preview instanceof Gtk.Window) {
object_preview.destroy();
}
}

if (!object_root.name) {
Expand Down
9 changes: 8 additions & 1 deletion src/Previewer/previewer.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace Workbench {
var target = this.builder.get_object (target_id) as Gtk.Widget;
if (target == null) {
stderr.printf (@"Widget with target_id='$target_id' could not be found.\n");
return;
return;
}

if (original_id != "") {
Expand Down Expand Up @@ -75,6 +75,13 @@ namespace Workbench {
((Gtk.Window) target).child = null;
this.window.child = child;
}

// Toplevel windows returned by these functions will stay around
// until the user explicitly destroys them with gtk_window_destroy().
// https://docs.gtk.org/gtk4/class.Builder.html
if (target is Gtk.Window) {
((Gtk.Window) target).destroy();
}
}

public void update_css (string content) {
Expand Down