From d02488e3c760381eb924d7a39ab0e455abf822b4 Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Tue, 29 Oct 2024 15:17:28 +0000
Subject: [PATCH] Simplify tooltip
Now we have sections, we already know the total number of tries
---
src/rugby-app-window.c | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/rugby-app-window.c b/src/rugby-app-window.c
index c78d12d..bc62063 100644
--- a/src/rugby-app-window.c
+++ b/src/rugby-app-window.c
@@ -55,36 +55,32 @@ item_tooltip_cb (GtkListItem *item)
"kicks", &kicks,
NULL);
- if (tries > 0 && utries == 0)
+ if (tries > 0)
{
g_string_printf (tooltip, ngettext ("%d converted try",
"%d converted tries",
tries),
tries);
}
- else if (utries > 0 && tries == 0)
+ if (utries > 0)
{
- g_string_printf (tooltip, ngettext ("%d unconverted try",
- "%d unconverted tries",
- utries),
- utries);
- }
- else if (tries + utries > 0)
- {
- g_string_printf (tooltip, ngettext ("%d try (%d converted)",
- "%d tries (%d converted)",
- tries + utries),
- tries + utries, tries);
- }
+ if (tooltip->len > 0)
+ g_string_append (tooltip, ", ");
+ g_string_append_printf (tooltip, ngettext ("%d unconverted try",
+ "%d unconverted tries",
+ utries),
+ utries);
+ }
if (kicks > 0)
{
- if (tries > 0 || utries > 0)
- g_string_append_printf (tooltip, " and ");
+ if (tooltip->len > 0)
+ g_string_append (tooltip, ", ");
- g_string_append_printf (tooltip,
- ngettext ("%d kick", "%d kicks", kicks),
- kicks);
+ g_string_append_printf (tooltip, ngettext ("%d kick",
+ "%d kicks",
+ kicks),
+ kicks);
}
return g_string_free (tooltip, FALSE);
--
GitLab