From 7b1c059827adcb180f1bd5e74dd690c033011499 Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.eu>
Date: Mon, 1 Jan 2018 13:06:36 +0000
Subject: [PATCH] Rearrange filter logic
Fixes #2
---
src/rugby-app-window.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/rugby-app-window.c b/src/rugby-app-window.c
index 457cc2c..261ccb6 100644
--- a/src/rugby-app-window.c
+++ b/src/rugby-app-window.c
@@ -78,18 +78,19 @@ filter_visible_func (GtkTreeModel *model,
RUGBY_SCORE_STORE_KICKS, &kicks,
-1);
- gboolean try = gtk_switch_get_active (GTK_SWITCH (self->tryfilter));
- gboolean kick = gtk_switch_get_active (GTK_SWITCH (self->kickfilter));
-
- if (try && kick)
- return ((tries + utries == ftries) && (kicks == fkicks)) ? TRUE : FALSE;
- else if (try)
- return (tries + utries) == ftries ? TRUE : FALSE;
- else if (kick)
- return (kicks == fkicks) ? TRUE : FALSE;
+ gboolean try_filter = gtk_switch_get_active (GTK_SWITCH (self->tryfilter));
+ gboolean kick_filter = gtk_switch_get_active (GTK_SWITCH (self->kickfilter));
+ gboolean try_equal = ((tries + utries) == ftries);
+ gboolean kick_equal = (kicks == fkicks);
+
+ if (try_filter && kick_filter)
+ return try_equal && kick_equal;
+ else if (try_filter)
+ return try_equal;
+ else if (kick_filter)
+ return kick_equal;
else
return TRUE;
-
}
static void
--
GitLab