From 3d1ad4f8fa434ca03d66300fdb26f3c7828ef644 Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Wed, 13 Nov 2024 23:16:38 +0000
Subject: [PATCH] Some style improvements
---
data/gtk/window.blp | 2 +-
data/style.css | 2 +-
src/rugby-possibility-widget.c | 44 ++++++++++++++++++----------------
3 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/data/gtk/window.blp b/data/gtk/window.blp
index 01915c1..1115e10 100644
--- a/data/gtk/window.blp
+++ b/data/gtk/window.blp
@@ -78,7 +78,7 @@ template $RugbyAppWindow : Adw.ApplicationWindow {
};
};
- styles ["rich-list", "card"]
+ styles ["rich-list"]
}
}
};
diff --git a/data/style.css b/data/style.css
index d08c025..f4cd3a5 100644
--- a/data/style.css
+++ b/data/style.css
@@ -5,5 +5,5 @@
*/
listview {
- margin: 24px 12px;
+ background-color: var(--window-bg-color);
}
diff --git a/src/rugby-possibility-widget.c b/src/rugby-possibility-widget.c
index 8bb03b7..b9f5b78 100644
--- a/src/rugby-possibility-widget.c
+++ b/src/rugby-possibility-widget.c
@@ -77,11 +77,12 @@ rugby_possibility_widget_set_property (GObject *object,
}
static void
-render_bar (GtkSnapshot *snapshot,
- float x,
- float w,
- float h,
- const GdkRGBA rgba)
+render_bar (GtkSnapshot *snapshot,
+ float x,
+ float w,
+ float h,
+ const GdkRGBA fill,
+ const GdkRGBA border)
{
graphene_rect_t area = GRAPHENE_RECT_INIT (x, 0.0, w, h);
@@ -92,17 +93,10 @@ render_bar (GtkSnapshot *snapshot,
gtk_snapshot_push_rounded_clip (snapshot, &rounded);
gtk_snapshot_append_color (snapshot,
- &rgba,
+ &fill,
&area);
gtk_snapshot_pop (snapshot);
- GdkRGBA border;
- AdwStyleManager *manager = adw_style_manager_get_default ();
- if (adw_style_manager_get_dark (manager))
- gdk_rgba_parse (&border, "white");
- else
- gdk_rgba_parse (&border, "black");
-
gtk_snapshot_append_border (snapshot,
&rounded,
(float[]) { 2.0, 2.0, 2.0, 2.0 },
@@ -132,32 +126,40 @@ rugby_possibility_widget_snapshot (GtkWidget *widget,
int score = tries * try_points + utries * utry_points + kicks * kick_points;
- GdkRGBA rgba;
+
+ GdkRGBA fill;
+ GdkRGBA border;
+
+ AdwStyleManager *manager = adw_style_manager_get_default ();
+ if (adw_style_manager_get_dark (manager))
+ gdk_rgba_parse (&border, "white");
+ else
+ gdk_rgba_parse (&border, "black");
// Tries
float w = width / (score / (float) try_points);
+ gdk_rgba_parse (&fill, "#33d17a"); // Green 3
for (int i = 0; i < tries; i++)
{
- gdk_rgba_parse (&rgba, "#33d17a"); // Green 3
- render_bar (snapshot, x, w, height, rgba);
+ render_bar (snapshot, x, w, height, fill, border);
x += w;
}
// Unconverted tries
w = width / (score / (float) utry_points);
+ gdk_rgba_parse (&fill, "#f6d32d"); // Yellow 3
for (int i = 0; i < utries; i++)
{
- gdk_rgba_parse (&rgba, "#e01b24"); // Red 3
- render_bar (snapshot, x, w, height, rgba);
+ render_bar (snapshot, x, w, height, fill, border);
x += w;
}
- // Unconverted kicks
+ // Kicks
w = width / (score / (float) kick_points);
+ gdk_rgba_parse (&fill, "#e01b24"); // Red 3
for (int i = 0; i < kicks; i++)
{
- gdk_rgba_parse (&rgba, "#f6d32d"); // Yellow 3
- render_bar (snapshot, x, w, height, rgba);
+ render_bar (snapshot, x, w, height, fill, border);
x += w;
}
}
--
GitLab