From b78508c163115e80499cf754a275058fc05b2d59 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sun, 18 Sep 2022 19:10:50 +0000 Subject: [PATCH] Close #130 - allow toggle low-priority habits --- .../flixel-desktop-habit-puzzle-game/source/HabitModel.kiss | 4 +++- .../flixel-desktop-habit-puzzle-game/source/HabitState.kiss | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss b/projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss index 6b7d4cdb..c99ea264 100644 --- a/projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss +++ b/projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss @@ -223,8 +223,10 @@ (_activeBonusEntries) (_activeTodoEntries)))) +(prop &mut :Bool showLowerPriority false) + (method :Bool topPriorityIsActive [] - (apply or (for e (_allActiveEntries) e.topPriority))) + ?(unless showLowerPriority (apply or (for e (_allActiveEntries) e.topPriority)))) (defMacro topPriority [name] `(method :Array ,name [] diff --git a/projects/flixel-desktop-habit-puzzle-game/source/HabitState.kiss b/projects/flixel-desktop-habit-puzzle-game/source/HabitState.kiss index 57526129..e97e4170 100644 --- a/projects/flixel-desktop-habit-puzzle-game/source/HabitState.kiss +++ b/projects/flixel-desktop-habit-puzzle-game/source/HabitState.kiss @@ -342,6 +342,12 @@ } null null FlxColor.WHITE 0.9 0.9 true (defAndReturn prop xKey "escape") backToEntryWindow true)] (set priorityWindow pw)))) + (let [showOrHide (if model.showLowerPriority "Hide" "Show")] + (_makeText "$showOrHide lower-priority habits and tasks" 0 + ->_ + (defAndCall method toggleLowerPriority + (set model.showLowerPriority !model.showLowerPriority) + (refreshModel)))) (set entryWindow.textColor (FlxColor.RED.getDarkened)) (_makeText "Delete a habit or task" 0 ->_