Prune unused code.

src/more_speech/ui/application.clj

@@ -20,9 +20,7 @@
             [more-speech.ui.text-window :refer [map->text-window]]
             [more-speech.ui.text-frame :refer [map->text-frame]]
             [more-speech.ui.header-frame-functions :refer [->header-controls]]
-            [more-speech.ui.author-window :refer [map->author-window
+            [more-speech.ui.author-window :refer [->author-window-controls]]
-                                                  draw-author-window
-                                                  ->author-window-controls]]
             [more-speech.ui.graphics :as g]
             [more-speech.nostr.events :as events]
             [more-speech.ui.config :as config]))

src/more_speech/ui/author_window.clj

@@ -9,7 +9,6 @@
 
 (declare get-author-height
          draw-authors
-         scroll-authors
          update-authors)
 
 (defrecord author-window-controls []
@@ -20,26 +19,13 @@
     (draw-authors state frame))
   (update-elements [_c state frame]
     (update-authors state frame))
-  (scroll-elements [_c state frame delta]
+  )
-    (scroll-authors state frame delta)))
 
 (defn get-author-height [state]
   (let [graphics (get-in state [:application :graphics])
         line-height (g/line-height graphics)]
     line-height))
 
-(declare draw-author-window)
-
-(defrecord author-window [x y w h fonts]
-  widget
-  (setup-widget [widget _state]
-    widget)
-  (update-widget [_widget state]
-    state)
-  (draw-widget [widget state]
-    (draw-author-window state widget))
-  )
-
 (defn draw-author [frame cursor author]
   (let [g (:graphics cursor)]
     (g/text-align g [:left])
@@ -62,30 +48,9 @@
       (if (empty? authors)
         cursor
         (recur (draw-author frame cursor (first authors))
-               (rest authors)))))
+               (rest authors))))))
-  )
 
 (defn update-authors [state frame]
   (let [frame-path (:path frame)
         authors (get-in state [:application :nicknames])]
-    (assoc-in state (concat frame-path [:total-elements]) (count authors))))
+    (assoc-in state (concat frame-path [:total-elements]) (count authors))))
-
-(defn scroll-authors [state frame delta]
-  (let [n-authors (count (get-in state [:application :nicknames]))
-        display-position (:display-position frame)
-        display-position (+ display-position delta)
-        display-position (min n-authors display-position)
-        display-position (max 0 display-position)
-        frame (assoc frame :display-position display-position)]
-    frame))
-
-(defn draw-author-window [state window]
-  (let [application (:application state)
-        g (:graphics application)]
-    (g/with-translation
-      g [(:x window) (:y window)]
-      (fn [g] (g/stroke g [0 0 0])
-        (g/stroke-weight g 2)
-        (g/fill g [255 255 255])
-        (g/rect g [0 0 (:w window) (:h window)])
-        (draw-authors state window)))))

src/more_speech/ui/header_frame_functions.clj

@@ -11,13 +11,11 @@
             [more-speech.ui.text-frame :refer [text-window-controls
                                                get-element-height
                                                draw-elements
-                                               update-elements
+                                               update-elements]]))
-                                               scroll-elements]]))
 
 (declare get-header-height
          draw-headers
-         update-headers
+         update-headers)
-         scroll-headers)
 
 (defrecord header-controls []
   text-window-controls
@@ -27,8 +25,6 @@
     (draw-headers state frame))
   (update-elements [_c state frame]
     (update-headers state frame))
-  (scroll-elements [_c state frame delta]
-    (scroll-headers state frame delta))
   )
 
 (defn get-header-height [state]
@@ -183,12 +179,4 @@
             (recur (draw-header frame cursor header index)
                    (rest headers) (inc index))))))))
 
-(defn scroll-headers [state frame delta]
-  (let [articles (get-in state [:application :chronological-text-events])
-        display-position (:display-position frame)
-        display-position (+ display-position delta)
-        display-position (min (count articles) display-position)
-        display-position (max 0 display-position)
-        frame (assoc frame :display-position display-position)]
-    frame))
 

src/more_speech/ui/text_frame.clj

@@ -13,8 +13,7 @@
   (update-elements [controls state frame]
     "Called only if the widget is in [:application :this-update]
     sets :total-elements.")
-  (scroll-elements [controls state frame delta]
+  )
-    "sets :display-position"))
 
 (declare setup-text-frame
          update-text-frame
@@ -62,11 +61,17 @@
 
 (defn scroll-frame [frame-path state delta]
   (let [frame (get-in state frame-path)
-        controls (:controls frame)
+        display-position (:display-position frame)
-        state (assoc-in state frame-path (scroll-elements controls state frame delta))
+        total-elements (get frame :total-elements 0)
-        state (app-util/update-widget state frame)]
+        display-position (+ display-position delta)
+        display-position (min total-elements display-position)
+        display-position (max 0 display-position)
+        frame (assoc frame :display-position display-position)
+        state (assoc-in state frame-path frame)
+        state (app-util/update-widget state frame)
+        ]
     state))
 
 (defn mouse-wheel [frame state clicks]
-  (scroll-frame  (:path frame) state clicks))
+  (scroll-frame (:path frame) state clicks))