Use Gtk.Widget.get_root instead of keeping MainWindow instance (#167)

We don't want to use MainWindow instance inside views other than the aim of setting transient window
ryonakano · Mar 3, 2024 · 68f5a0f · 68f5a0f
1 parent 7c416d3
commit 68f5a0f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -36,8 +36,8 @@ public class MainWindow : Adw.ApplicationWindow {
 
         model.load.begin ();
 
-        files_view = new View.FilesView (this);
-        edit_view = new View.EditView (this);
+        files_view = new View.FilesView ();
+        edit_view = new View.EditView ();
 
         split_view = new Adw.NavigationSplitView () {
             sidebar = files_view,

diff --git a/src/View/EditView.vala b/src/View/EditView.vala
@@ -6,8 +6,6 @@
 public class View.EditView : Adw.NavigationPage {
     public signal void saved ();
 
-    public MainWindow window { private get; construct; }
-
     private bool is_loading = false;
     private unowned Model.DesktopFile desktop_file;
 
@@ -31,8 +29,7 @@ public class View.EditView : Adw.NavigationPage {
     private Adw.StatusPage blank_page;
     private Gtk.Stack stack;
 
-    public EditView (MainWindow window) {
-        Object (window: window);
+    public EditView () {
     }
 
     construct {
@@ -232,7 +229,7 @@ public class View.EditView : Adw.NavigationPage {
                 accept_label = _("_Select"),
                 modal = true
             };
-            filechooser.open.begin (window, null, (obj, res) => {
+            filechooser.open.begin ((Gtk.Window) get_root (), null, (obj, res) => {
                 try {
                     var file = filechooser.open.end (res);
                     if (file == null) {
@@ -290,7 +287,7 @@ public class View.EditView : Adw.NavigationPage {
                 modal = true,
                 default_filter = filefilter
             };
-            filechooser.open.begin (window, null, (obj, res) => {
+            filechooser.open.begin ((Gtk.Window) get_root (), null, (obj, res) => {
                 try {
                     var file = filechooser.open.end (res);
                     if (file == null) {
@@ -360,7 +357,7 @@ public class View.EditView : Adw.NavigationPage {
         });
 
         open_text_editor_button.clicked.connect (() => {
-            desktop_file.open_external.begin (window, (obj, res) => {
+            desktop_file.open_external.begin ((Gtk.Window) get_root (), (obj, res) => {
                 bool ret;
 
                 try {
@@ -376,7 +373,7 @@ public class View.EditView : Adw.NavigationPage {
 
                 if (!ret) {
                     var error_dialog = new Adw.MessageDialog (
-                        window,
+                        (Gtk.Window) get_root (),
                         _("Failed to Open with External App"),
                         _("There was an error while opening the file with an external app.")
                     );
@@ -463,7 +460,7 @@ public class View.EditView : Adw.NavigationPage {
             }
 
             var error_dialog = new Adw.MessageDialog (
-                window,
+                (Gtk.Window) get_root (),
                 dialog_title,
                 _("There was an error while saving the app entry.")
             );

diff --git a/src/View/FilesView.vala b/src/View/FilesView.vala
@@ -8,16 +8,11 @@ public class View.FilesView : Adw.NavigationPage {
     public signal void deleted (bool is_success);
     public signal void selected (Model.DesktopFile file);
 
-    public MainWindow window { private get; construct; }
-
     private ListStore list_store;
     private Adw.HeaderBar headerbar;
     private Gtk.ListBox files_list;
 
-    public FilesView (MainWindow window) {
-        Object (
-            window: window
-        );
+    public FilesView () {
     }
 
     construct {
@@ -132,7 +127,7 @@ public class View.FilesView : Adw.NavigationPage {
         delete_button.add_css_class ("flat");
         delete_button.clicked.connect (() => {
             var delete_dialog = new Adw.MessageDialog (
-                window,
+                (Gtk.Window) get_root (),
                 dialog_title,
                 _("This removes the app from the launcher.")
             );
@@ -146,7 +141,7 @@ public class View.FilesView : Adw.NavigationPage {
                     bool ret = file.delete_file ();
                     if (!ret) {
                         var error_dialog = new Adw.MessageDialog (
-                            window,
+                            (Gtk.Window) get_root (),
                             _("Failed to Delete Entry of “%s”").printf (app_name),
                             _("There was an error while removing the app entry.")
                         );