SimpleWindow for Kiss-flixel

projects/flixel-desktop-habit-puzzle-game/source/HabitState.hx

@@ -33,6 +33,7 @@ import flixel.ui.FlxButton;
 using kiss_flixel.CameraTools;
 using kiss_flixel.GroupTools;
 import kiss_flixel.KissExtendedSprite;
+import kiss_flixel.SimpleWindow;
 import haxe.ds.Option;
 import jigsawx.JigsawPiece;
 import jigsawx.Jigsawx;

projects/flixel-desktop-habit-puzzle-game/source/HabitState.kiss

@@ -6,6 +6,8 @@
 
 (load "PuzzlePacks.kiss")
 
+(defAlias &ident textSize SimpleWindow.textSize)
+
 (method &override :Void create [] 
     (#when debug
         (add cameraBounds))
@@ -47,7 +49,7 @@
     (pieceCamera.updateMouseBorderControl elapsed KEYBOARD_SCROLL_SPEED 0.002 uiCamera)
 
     // Hold left-click to hide the habit text and see the image clearly:
-    (when entryTexts (if FlxG.mouse.pressed (remove entryTexts) (add entryTexts)))
+    (when entryWindow (if FlxG.mouse.pressed (entryWindow.hide) (entryWindow.show)))
     
     (when FlxG.keys.justPressed.ESCAPE
         (Sys.exit 0))
@@ -92,20 +94,23 @@
         (when FlxG.keys.justPressed.RIGHT
             (unless (= rewardFileIndex maxRewardFile)
                 (+= rewardFileIndex 1)
-                (refreshModel))))
+                (refreshModel)))))
-    // Handle keyboard input:
-    (when (and shortcutHandler !entryNameText)
-        (shortcutHandler.update)))
 
 (prop &mut :FlxSave save null)
-(prop &mut :FlxTypedGroup<FlxText> entryTexts null)
+(prop &mut :SimpleWindow entryWindow null)
 (prop &mut :FlxTypedGroup<FlxText> logTexts (new FlxTypedGroup))
 (prop &mut :FlxKeyShortcutHandler<Entry> shortcutHandler null)
 
 (prop &mut :HabitModel model null)
 
-(prop EDGE_LEEWAY 25)
+
-(prop BUBBLE_SIZE 15)
+(method scaledToTheImageThatWorkedNice [v]
+    ~(* v (/ (smallerDimension) 367)))
+(method smallerDimension [] (min rewardSprite.pixels.width rewardSprite.pixels.height))
+// TODO these variables don't do exactly what I think they do when scaled, like at all:
+(defAlias &ident EDGE_LEEWAY 25)
+(defAlias &ident BUBBLE_SIZE 15)
+
 (var PUZZLE_WIDTH 6)
 (var PUZZLE_HEIGHT 5)
 (var TOTAL_PIECES (* PUZZLE_WIDTH PUZZLE_HEIGHT))
@@ -288,62 +293,33 @@
 
         (pieceCamera.calculateScrollBounds rewardSprites uiCamera SCROLL_BOUND_MARGIN)
 
-        (when entryTexts (remove entryTexts))
+        (when entryWindow (entryWindow.hide))
-        (set entryTexts (new FlxTypedGroup))
+        (set entryWindow (new SimpleWindow "" (FlxColor.fromRGBFloat 0 0 0 0.5) FlxColor.WHITE 0.9 0.9))
-        (set textY 0)
+        (set entryWindow.cameras [uiCamera])
-        (set _color FlxColor.LIME)
+        (set entryWindow.textColor FlxColor.LIME)
         (_makeText "Puzzle #$(+ 1 rewardFileIndex) / ${model.rewardFiles.length}" (- TOTAL_PIECES (- p currentRewardFile.startingPoints)))
-        (set _color FlxColor.ORANGE)
+        (set entryWindow.textColor FlxColor.ORANGE)
         (map (m.activeDailyEntries) makeText)
-        (set _color FlxColor.GREEN)
+        (set entryWindow.textColor FlxColor.GREEN)
         (map (m.activeMonthlyEntries) makeText)
-        (set _color FlxColor.BLUE)
+        (set entryWindow.textColor FlxColor.BLUE)
         (map (m.activeIntervalEntries) makeText)
-        (set _color FlxColor.WHITE)
+        (set entryWindow.textColor FlxColor.WHITE)
         (map (m.activeBonusEntries) makeText)
-        (set _color FlxColor.YELLOW)
+        (set entryWindow.textColor FlxColor.YELLOW)
         (map (m.activeTodoEntries) makeText)
-        (set _color FlxColor.GRAY)
+        (set entryWindow.textColor FlxColor.GRAY)
         (_makeText "[SPACE] Cycle background color" 0)
-        (add entryTexts)
+        (entryWindow.show)
         
         (when !(= puzzleUnlocked -1)
-            (startPuzzlePackChoice puzzleUnlocked)))
+            (startPuzzlePackChoice puzzleUnlocked))))
-
-    (doFor e (m.allEntries)
-        (when (HabitModel.isActive e)
-            (let [label (HabitModel.activeLabel e)]
-                (shortcutHandler.registerItem label.label e))))
-
-    (set shortcutHandler.onBadKey ->:Void [_ _] {})
-    (set shortcutHandler.onSelectItem ->:Void [:Entry e]
-        (let [label (HabitModel.activeLabel e)]
-            (+= label.points 1)
-            (whenLet [(Daily days lastDayDone) e.type]
-                (set e.type (Daily days (HabitModel.todayString))))
-            (whenLet [(Monthly days lastDayDone) e.type]
-                (set e.type (Monthly days (.toString (DateTime.now)))))
-            (whenLet [(Interval days lastDayDone) e.type]
-                (set e.type (Interval days (.toString (DateTime.now)))))
-            (m.save)
-            (setModel m)
-            (shortcutHandler.start)))
-    (shortcutHandler.start))
 
 (method refreshModel [&opt m]
     (let [m (or m model)]
         (setModel m (nth m.rewardFiles rewardFileIndex))))
 
 (prop &mut textY 0)
-// Color currently used for making text, may be inverted or lightened to contrast with background:
-(prop &mut :FlxColor _color FlxColor.BLACK)
-(method getColor []
-    (if (= _color pieceCamera.bgColor)
-            (if (= pieceCamera.bgColor FlxColor.GRAY)
-                    (_color.getLightened 0.3)    
-                (_color.getInverted))
-        _color))
-(defAlias &ident color (getColor))
 
 (prop :Array<FlxColor> backgroundOptions [
     FlxColor.BLACK
@@ -353,15 +329,24 @@
 
 (method makeText [:Entry e]
     (let [label (HabitModel.activeLabel e)]
-        (_makeText label.label label.points)))
+        (_makeText label.label label.points ->:Void text {
+            // TODO move all of this logic other than setModel into HabitModel logic
+            (let [label (HabitModel.activeLabel e)]
+                (+= label.points 1)
+                (whenLet [(Daily days lastDayDone) e.type]
+                    (set e.type (Daily days (HabitModel.todayString))))
+                (whenLet [(Monthly days lastDayDone) e.type]
+                    (set e.type (Monthly days (.toString (DateTime.now)))))
+                (whenLet [(Interval days lastDayDone) e.type]
+                    (set e.type (Interval days (.toString (DateTime.now)))))
+                (model.save)
+                (setModel model))
+        })))
+
 
 // TODO configurable text size
-(method _makeText [:String s :Int points]
+(method _makeText [:String s :Int points &opt :Action action]
-    (let [text (new FlxText 0 textY 0 (+ s (* points "+")) (defAndReturn var &mut textSize 16))]
+    (entryWindow.makeText (+ s (pointsStr points)) action))
-        (set text.color color)
-        (set text.cameras [uiCamera])
-        (+= textY text.height)
-        (entryTexts.add text)))
 
 (method log [message]
     (prop &mut logTextY 0)
@@ -370,7 +355,7 @@
             (logTexts.clear)
             (set logTextY 0))
         (let [text (new FlxText FlxG.width logTextY 0 message textSize)]
-            (set text.color color)
+            (set text.color entryWindow.textColor)
             (set text.cameras [uiCamera])
             (+= logTextY text.height)
             (-= text.x text.width)
@@ -403,7 +388,6 @@
 
 (prop &mut c 0)
 (method :Void connectPiece [id self toSprite selfMatchZone toSpriteMatchZone]
-    ~"connectPiece"
     (let [thisConnectedPieces (dictGet connectedPieces id)
             toConnectedPieces (dictGet connectedPieces (dictGet indexMap toSprite))]
         
@@ -488,3 +472,8 @@
                         }))))
                 (+= y textSize)))
         (add nextPuzzleChoiceGroup)))
+
+(function pointsStr [points]
+    (let [tallyUnit 5]
+        (+ (* "*" (Math.floor (/ points tallyUnit)))
+            (* "+" (% points tallyUnit)))))

projects/kiss-flixel/src/kiss_flixel/SimpleWindow.hx

@@ -0,0 +1,17 @@
+package kiss_flixel;
+
+import kiss.Prelude;
+import kiss.List;
+import flixel.FlxG;
+import flixel.ui.FlxButton;
+import flixel.text.FlxText;
+import flixel.FlxSprite;
+import flixel.util.FlxColor;
+import flixel.group.FlxGroup;
+import kiss_tools.FlxKeyShortcutHandler;
+
+typedef ShortcutAction = Void->Void;
+typedef Action = FlxSprite->Void;
+
+@:build(kiss.Kiss.build())
+class SimpleWindow extends FlxSprite {}

projects/kiss-flixel/src/kiss_flixel/SimpleWindow.kiss

@@ -0,0 +1,71 @@
+// All windows share the same text size
+(var &mut textSize 16)
+(var :kiss.List<SimpleWindow> windowStack [])
+
+// TODO tooltip support with left-click and right-click action
+// icons and explanations
+
+(defNew [:String title 
+            &opt :FlxColor bgColor
+            :FlxColor _textColor
+            :Float percentWidth
+            :Float percentHeight]
+    
+    [&mut :Float nextControlY 0
+        &mut :FlxColor textColor (or _textColor FlxColor.WHITE)
+        :FlxTypedGroup<FlxSprite> controls (new FlxTypedGroup)
+        :FlxKeyShortcutHandler<ShortcutAction> keyHandler (new FlxKeyShortcutHandler)]
+    
+    (super 0 0)
+    (makeGraphic
+        (Std.int (* FlxG.width (or percentWidth 0.5)))
+        (Std.int (* FlxG.height (or percentHeight 0.5)))
+        (or bgColor FlxColor.BLACK))
+    (screenCenter)
+    (set nextControlY y)
+    
+    (when title
+        (makeText title null))
+    
+    (set keyHandler.onBadKey ->:Void [_ _] {}) // TODO do SOMETHING
+    (set keyHandler.onSelectItem
+        ->:Void [:ShortcutAction a] {
+            (a)
+            (keyHandler.start)
+        })
+        
+    // TODO show which shortcuts' prefixes are partially highlighted?
+    )
+
+(method makeText [:String text &opt :Action onClick]
+    (let [ftext (new FlxText x nextControlY 0 text textSize)]
+        (set ftext.color textColor)
+        (set ftext.cameras this.cameras)
+        (controls.add ftext)
+        (+= nextControlY ftext.height)
+        (when onClick
+            // TODO enable mouse click
+            // TODO make a highlight color
+            // TODO right click?
+            (keyHandler.registerItem text ->:Void (onClick ftext)))
+        ftext))
+
+// TODO makeButton
+// TODO make inputText
+
+(method show []
+    (FlxG.state.add this)
+    (FlxG.state.add controls)
+    (windowStack.push this)
+    (keyHandler.start))
+
+(method hide []
+    (FlxG.state.remove this)
+    (FlxG.state.remove controls)
+    (windowStack.remove this)
+    (keyHandler.cancel))
+
+(method &override update [:Float elapsed]
+    (super.update elapsed)
+    (when (= (last windowStack) this)
+        (keyHandler.update)))