From 2abc40c1993d4c1bf353bca886b7ba1dc94e70cb Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Fri, 11 Feb 2022 17:15:47 -0800
Subject: font-view: Use AdwApplication

Also renames the CSS file so libadwaita can automatically
load it.
---
 src/application.css                 | 11 -----------
 src/font-view.c                     | 22 +++++++---------------
 src/gnome-font-viewer.gresource.xml |  2 +-
 src/style.css                       | 11 +++++++++++
 4 files changed, 19 insertions(+), 27 deletions(-)
 delete mode 100644 src/application.css
 create mode 100644 src/style.css

diff --git a/src/application.css b/src/application.css
deleted file mode 100644
index d08057d..0000000
--- a/src/application.css
+++ /dev/null
@@ -1,11 +0,0 @@
-gridview {
-  padding: 16px;
-}
-
-.font-item {
-  padding: 8px;
-}
-
-.font-preview {
-  font-size: 128px;
-}
diff --git a/src/font-view.c b/src/font-view.c
index 8337192..05b0235 100644
--- a/src/font-view.c
+++ b/src/font-view.c
@@ -52,11 +52,11 @@ G_DECLARE_FINAL_TYPE (FontViewApplication,
                       font_view_application,
                       FONT_VIEW,
                       APPLICATION,
-                      GtkApplication)
+                      AdwApplication)
 
 struct _FontViewApplication
 {
-    GtkApplication parent;
+    AdwApplication parent;
 
     GtkApplicationWindow *main_window;
     GtkWidget *main_grid;
@@ -89,7 +89,7 @@ struct _FontViewApplication
 
 G_DEFINE_TYPE (FontViewApplication,
                font_view_application,
-               GTK_TYPE_APPLICATION);
+               ADW_TYPE_APPLICATION);
 
 G_DECLARE_FINAL_TYPE (
     FontViewItem, font_view_item, FONT_VIEW, ITEM, GtkFlowBoxChild);
@@ -1293,8 +1293,6 @@ font_view_application_startup (GApplication *application)
     G_APPLICATION_CLASS (font_view_application_parent_class)
         ->startup (application);
 
-    adw_init ();
-
     if (!FcInit ())
         g_critical ("Can't initialize fontconfig library");
 
@@ -1304,14 +1302,6 @@ font_view_application_startup (GApplication *application)
     const gchar *back_accels[] = {"<Alt>Left", NULL};
     gtk_application_set_accels_for_action (GTK_APPLICATION (application),
                                            "app.back", back_accels);
-
-    GtkCssProvider *provider = gtk_css_provider_new ();
-    gtk_css_provider_load_from_resource (
-        GTK_CSS_PROVIDER (provider), "/org/gnome/font-viewer/application.css");
-
-    gtk_style_context_add_provider_for_display (
-        gdk_display_get_default (), GTK_STYLE_PROVIDER (provider),
-        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 }
 
 static void
@@ -1359,8 +1349,10 @@ font_view_application_class_init (FontViewApplicationClass *klass)
 static GApplication *
 font_view_application_new (void)
 {
-    return g_object_new (FONT_VIEW_TYPE_APPLICATION, "application-id",
-                         APPLICATION_ID, "flags", G_APPLICATION_HANDLES_OPEN,
+    return g_object_new (FONT_VIEW_TYPE_APPLICATION,
+                         "application-id", APPLICATION_ID,
+                         "flags", G_APPLICATION_HANDLES_OPEN,
+                         "resource-base-path", "/org/gnome/font-viewer/",
                          NULL);
 }
 
diff --git a/src/gnome-font-viewer.gresource.xml b/src/gnome-font-viewer.gresource.xml
index e4d5333..2a4ea62 100644
--- a/src/gnome-font-viewer.gresource.xml
+++ b/src/gnome-font-viewer.gresource.xml
@@ -2,6 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/font-viewer">
     <file preprocess="xml-stripblanks">font-view-app-menu.ui</file>
-    <file>application.css</file>
+    <file>style.css</file>
   </gresource>
 </gresources>
diff --git a/src/style.css b/src/style.css
new file mode 100644
index 0000000..d08057d
--- /dev/null
+++ b/src/style.css
@@ -0,0 +1,11 @@
+gridview {
+  padding: 16px;
+}
+
+.font-item {
+  padding: 8px;
+}
+
+.font-preview {
+  font-size: 128px;
+}
-- 
cgit v1.2.1