Clicking on previously selected article selects it again and displays…

… it in the article window.
unclebob · Jul 7, 2023 · f0454ce · f0454ce
1 parent e89b9dc
commit f0454ce
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/more_speech/ui/swing/tabs.clj b/src/more_speech/ui/swing/tabs.clj
@@ -57,7 +57,7 @@
         renderer (.getCellRenderer header-tree)
         _ (.setBackgroundSelectionColor renderer (color :azure))]
     (listen header-tree :selection (partial node-selected tab-index))
-    (listen header-tree :mouse-pressed article-click)
+    (listen header-tree :mouse-pressed (partial article-click tab-index))
     (set-mem [:tab-tree-map tab-name] header-tree)
     header-tree))
 
@@ -274,8 +274,9 @@
 
 ;------DECLARED
 
-(defn article-click [e]
-  (when (.isPopupTrigger e)
+(defn article-click [tab-index e]
+  (if-not (.isPopupTrigger e)
+    (node-selected tab-index e)
     (let [tree (.getComponent e)
           path (.getPathForLocation tree (.getX e) (.getY e))
           node (.getLastPathComponent path)

diff --git a/src/more_speech/ui/swing/users_window.clj b/src/more_speech/ui/swing/users_window.clj
@@ -132,25 +132,31 @@
             (.setSelectedValue trusted-listbox
                                new-trusted-item true)))))))
 
+(defn untrust-items [listbox-items]
+  (loop [items listbox-items]
+    (when-let [item (first items)]
+      (let [untrusted-user (second item)]
+        (trust-updater/untrust untrusted-user)
+        (recur (rest items))))))
+
+(defn add-items-to-recent-users [listbox-items]
+  (loop [items listbox-items]
+    (when-let [item (first items)]
+      (let [user-id (second item)]
+        (update-mem [:user-window :recent-users] conj user-id)
+        (recur (rest items))))))
+
 (defn untrust-selection [frame _e]
   (let [trusted-listbox (select frame [:#trusted-users-listbox])
         recent-button (select frame [:#recent-button])
         selected-listbox (select frame [:#selected-users])
         selected-items (selection trusted-listbox {:multi? true})]
-    (loop [selected-items selected-items]
-      (when-let [selected-item (first selected-items)]
-        (let [untrusted-user (second selected-item)]
-          (trust-updater/untrust untrusted-user)
-          (recur (rest selected-items)))))
+    (untrust-items selected-items)
     (load-trusted-users)
     (config! trusted-listbox :model (get-mem [:user-window :trusted-user-items]))
     (config! recent-button :selected? true)
     (load-recent-users)
-    (loop [selected-items selected-items]
-      (when-let [selected-item (first selected-items)]
-        (let [untrusted-user (second selected-item)]
-          (update-mem [:user-window :recent-users] conj untrusted-user)
-          (recur (rest selected-items)))))
+    (add-items-to-recent-users selected-items)
     (set-mem [:user-window :recent-user-items]
              (make-sorted-listbox-items
                (get-mem [:user-window :recent-users])))