AboutWindow -> AboutDialog

blissd · Apr 11, 2024 · ad5ef77 · ad5ef77
1 parent 017d6a0
commit ad5ef77
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -483,8 +483,7 @@ impl SimpleComponent for App {
         folder_album.emit(AlbumInput::Refresh); // initial photo
 
         let about_dialog = AboutDialog::builder()
-            .transient_for(&root)
-            .launch(())
+            .launch(root.clone())
             .detach();
 
        let preferences_dialog = PreferencesDialog::builder()

diff --git a/src/app/components/about.rs b/src/app/components/about.rs
@@ -2,22 +2,26 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use gtk::prelude::GtkWindowExt;
 use relm4::{adw, gtk, ComponentParts, ComponentSender, SimpleComponent};
+use relm4::adw::prelude::AdwDialogExt;
+
 
 use crate::config::{APP_ID, VERSION};
 
-pub struct AboutDialog {}
+pub struct AboutDialog {
+    parent: adw::ApplicationWindow,
+    dialog: adw::AboutDialog,
+}
 
 impl SimpleComponent for AboutDialog {
-    type Init = ();
-    type Widgets = adw::AboutWindow;
+    type Init = adw::ApplicationWindow;
+    type Widgets = adw::AboutDialog;
     type Input = ();
     type Output = ();
-    type Root = adw::AboutWindow;
+    type Root = adw::AboutDialog;
 
     fn init_root() -> Self::Root {
-        adw::AboutWindow::builder()
+        adw::AboutDialog::builder()
             .application_icon(APP_ID)
             .license_type(gtk::License::Gpl30)
             .website("https://github.com/blissd/fotema")
@@ -28,23 +32,26 @@ impl SimpleComponent for AboutDialog {
             .copyright("© 2024 David Bliss")
             .developers(vec!["David Bliss"])
             .designers(vec!["David Bliss"])
-            .hide_on_close(true)
+            .can_close(true)
             .build()
     }
 
     fn init(
-        _: Self::Init,
-        root: Self::Root,
+        parent: Self::Init,
+        dialog: Self::Root,
         _sender: ComponentSender<Self>,
     ) -> ComponentParts<Self> {
-        let model = Self {};
+        let model = Self {
+            parent,
+            dialog: dialog.clone(),
+        };
 
-        let widgets = root.clone();
+        let widgets = dialog;
 
         ComponentParts { model, widgets }
     }
 
-    fn update_view(&self, dialog: &mut Self::Widgets, _sender: ComponentSender<Self>) {
-        dialog.present();
+    fn update_view(&self, _: &mut Self::Widgets, _sender: ComponentSender<Self>) {
+        self.dialog.present(&self.parent);
     }
 }