kifu/gtk/build.rs

@@ -1,7 +1,7 @@
 fn main() {
     glib_build_tools::compile_resources(
         &["resources"],
-        "resources/gresources.xml",
+        "resources/resources.gresources.xml",
         "com.luminescent-dreams.kifu-gtk.gresource",
     );
 }

kifu/gtk/resources/resources.gresources.xml

@@ -2,6 +2,5 @@
 <gresources>
     <gresource prefix="/com/luminescent-dreams/kifu-gtk/">
         <file>wood_texture.jpg</file>
-        <file>style.css</file>
     </gresource>
 </gresources>

kifu/gtk/resources/style.css

@@ -1,3 +0,0 @@
-.content {
-    padding: 8px;
-}

kifu/gtk/src/ui/home.rs

@@ -131,10 +131,7 @@ impl Home {
         players.append(&white_player);
         *s.imp().white_player.borrow_mut() = Some(white_player.clone());
 
-        let new_game_button = gtk::Button::builder()
+        let new_game_button = gtk::Button::builder().label(&view.start_game.label).build();
-            .css_classes(vec!["suggested-action"])
-            .label(&view.start_game.label)
-            .build();
         s.append(&new_game_button);
 
         let library = Library::new();

kifu/gtk/src/ui/mod.rs

@@ -1,7 +1,6 @@
 use adw::prelude::*;
-use gio::resources_lookup_data;
 use glib::IsA;
-use gtk::{prelude::*, STYLE_PROVIDER_PRIORITY_USER};
+use gtk::prelude::*;
 
 mod chat;
 pub use chat::Chat;
@@ -15,6 +14,9 @@ pub use game_preview::GamePreview;
 mod library;
 pub use library::Library;
 
+mod layout;
+pub use layout::Layout;
+
 mod player_card;
 pub use player_card::PlayerCard;
 
@@ -38,27 +40,6 @@ pub struct AppWindow {
 
 impl AppWindow {
     pub fn new(app: &adw::Application) -> Self {
-        let window = adw::ApplicationWindow::builder()
-            .application(app)
-            .width_request(800)
-            .height_request(500)
-            .build();
-
-        let stylesheet = String::from_utf8(
-            resources_lookup_data(
-                "/com/luminescent-dreams/kifu-gtk/style.css",
-                gio::ResourceLookupFlags::NONE,
-            )
-            .expect("stylesheet should just be available")
-            .to_vec(),
-        )
-        .expect("to parse stylesheet");
-
-        let provider = gtk::CssProvider::new();
-        provider.load_from_data(&stylesheet);
-        let context = window.style_context();
-        context.add_provider(&provider, STYLE_PROVIDER_PRIORITY_USER);
-
         let header = adw::HeaderBar::builder()
             .title_widget(&gtk::Label::new(Some("Kifu")))
             .build();
@@ -74,7 +55,7 @@ impl AppWindow {
 
         header.pack_end(&hamburger);
 
-        let content = adw::Bin::builder().css_classes(vec!["content"]).build();
+        let content = adw::Bin::new();
         content.set_child(Some(
             &adw::StatusPage::builder().title("Nothing here").build(),
         ));
@@ -85,6 +66,12 @@ impl AppWindow {
         layout.append(&header);
         layout.append(&content);
 
+        let window = adw::ApplicationWindow::builder()
+            .application(app)
+            .width_request(800)
+            .height_request(500)
+            .build();
+
         window.set_content(Some(&layout));
 
         Self {