From 6c7a9904a674201b8d1ecf79ca2a423bda49ee17 Mon Sep 17 00:00:00 2001
From: cage <cage@invalid>
Date: Thu, 1 Aug 2024 15:55:16 +0200
Subject: [PATCH] - [GUI] ensure the default text for the gemini text widget
 respects the directive 'text color' in the configuration file for simple text
 line type.

---
 src/gui/client/main-window.lisp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/gui/client/main-window.lisp b/src/gui/client/main-window.lisp
index 4332665..a1e7500 100644
--- a/src/gui/client/main-window.lisp
+++ b/src/gui/client/main-window.lisp
@@ -1714,18 +1714,22 @@ local file paths."
     (let* ((gemtext-font  (gui-conf:gemini-text-font-configuration))
            (padding       (client-configuration:config-gemtext-padding))
            (padding-pixel (* padding (gui:font-measure gemtext-font "0"))))
-      (multiple-value-bind (select-bg select-fg)
-          (gui-conf:main-window-select-colors)
-        (setf gemtext-widget (make-instance 'gui:scrolled-text
-                                            :background       (gui-conf:gemini-window-colors)
-                                            :selectbackground select-bg
-                                            :selectforeground select-fg
-                                            :insertwidth      0
-                                            :takefocus        (nodgui.utils:lisp-bool->tcl nil)
-                                            :padx             padding-pixel
-                                            :master           gemini-paned-frame
-                                            :read-only        t
-                                            :font             gemtext-font)))
+      (multiple-value-bind (bg fg)
+          (gui-conf:gemini-window-colors)
+        (multiple-value-bind (select-bg select-fg)
+            (gui-conf:main-window-select-colors)
+
+          (setf gemtext-widget (make-instance 'gui:scrolled-text
+                                              :background       bg
+                                              :foreground       fg
+                                              :selectbackground select-bg
+                                              :selectforeground select-fg
+                                              :insertwidth      0
+                                              :takefocus        (nodgui.utils:lisp-bool->tcl nil)
+                                              :padx             padding-pixel
+                                              :master           gemini-paned-frame
+                                              :read-only        t
+                                              :font             gemtext-font))))
       (gui:configure gemtext-widget :wrap :word))
     (setf info-frame (make-instance 'gui:frame :master object :relief :sunken :borderwidth 1))
     (setf info-text (make-instance 'gui:text :height 2 :wrap :none :master info-frame))