Merge pull request #733 from NickvisionApps/rid-evil-error

GNOME - Don't use Adw.ButtonContent outside a Gtk.Button
NickvisionApps · Nov 15, 2023 · f45a305 · f45a305
2 parents 0ab1572 + 0a40b16
commit f45a305
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/NickvisionMoney.GNOME/Blueprints/window.blp b/NickvisionMoney.GNOME/Blueprints/window.blp
@@ -158,10 +158,19 @@ Adw.ApplicationWindow _root {
                 hexpand: true;
                 halign: fill;
 
-                Adw.ButtonContent _greeting {
+                Gtk.Box {
                   halign: center;
                   margin-top: 24;
                   margin-bottom: 14;
+
+                  Gtk.Image _greetingIcon {
+                    pixel-size: 48;
+                    margin-end: 12;
+                  }  
+
+                  Gtk.Label _greetingLabel {                  
+                    styles ["greeting-title"]
+                  }
                 }
 
                 Gtk.Label _dragLabel {

diff --git a/NickvisionMoney.GNOME/Views/MainWindow.cs b/NickvisionMoney.GNOME/Views/MainWindow.cs
@@ -35,7 +35,8 @@ public partial class MainWindow : Adw.ApplicationWindow
     [Gtk.Connect] private readonly Adw.Bin _dashboardBin;
     [Gtk.Connect] private readonly Adw.ToastOverlay _toastOverlay;
     [Gtk.Connect] private readonly Adw.ViewStack _viewStack;
-    [Gtk.Connect] private readonly Adw.ButtonContent _greeting;
+    [Gtk.Connect] private readonly Gtk.Image _greetingIcon;
+    [Gtk.Connect] private readonly Gtk.Label _greetingLabel;
     [Gtk.Connect] private readonly Adw.PreferencesGroup _startPageRecentAccountsGroup;
     [Gtk.Connect] private readonly Gtk.Button _newAccountButton;
     [Gtk.Connect] private readonly Gtk.Button _openAccountButton;
@@ -87,16 +88,8 @@ private MainWindow(Gtk.Builder builder, MainWindowController controller, Adw.App
         _windowTitle.SetTitle(_controller.AppInfo.ShortName);
         _graphToggleButton.SetActive(_controller.ShowGraphs);
         //Greeting
-        _greeting.SetIconName(_controller.ShowSun ? "sun-outline-symbolic" : "moon-outline-symbolic");
-        _greeting.SetLabel(_controller.Greeting);
-        var image = (Gtk.Image)_greeting.GetFirstChild();
-        image.SetPixelSize(48);
-        image.SetMarginEnd(6);
-        var label = (Gtk.Label)_greeting.GetLastChild();
-        label.AddCssClass("greeting-title");
-        _greeting.SetHalign(Gtk.Align.Center);
-        _greeting.SetMarginTop(24);
-        _greeting.SetMarginBottom(14);
+        _greetingIcon.SetFromIconName(_controller.ShowSun ? "sun-outline-symbolic" : "moon-outline-symbolic");
+        _greetingLabel.SetLabel(_controller.Greeting);
         //Page Tabs
         _tabView.OnClosePage += OnCloseAccountPage;
         //New Account Action