From: John Benediktsson <mrjbq7@gmail.com>
Date: Mon, 1 Aug 2022 04:36:06 +0000 (-0700)
Subject: ui.gadgets.panes: fuse labels together with the same style
X-Git-Tag: 0.99~1243
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=fc8a56f640ac075291aff1341a9041927d4cc707

ui.gadgets.panes: fuse labels together with the same style
---

diff --git a/basis/ui/gadgets/panes/panes.factor b/basis/ui/gadgets/panes/panes.factor
index b94a37438a..138e4e9670 100644
--- a/basis/ui/gadgets/panes/panes.factor
+++ b/basis/ui/gadgets/panes/panes.factor
@@ -357,8 +357,10 @@ M: pane-stream stream-write-table
 : pane-bl ( style gadget -- )
     swap " " <word-break-gadget> apply-character-style add-gadget drop ;
 
+TUPLE: styled-label < label style ;
+
 : <styled-label> ( style text -- gadget )
-    <label>
+    styled-label new-label over >>style
     apply-font-style
     apply-background-style
     apply-image-style
@@ -367,8 +369,17 @@ M: pane-stream stream-write-table
 
 M: styled-pane pane-label style>> "" <styled-label> ;
 
+: find-styled-label ( gadget -- styled-label/f )
+    dup styled-label? [
+        children>> ?last [ find-styled-label ] [ f ] if*
+    ] unless ;
+
 : pane-text ( string style gadget -- )
-    [ swap <styled-label> ] [ swap add-gadget drop ] bi* ;
+    dup find-styled-label [ pick over style>> = ] [ f f ] if* [
+        2nip [ prepend ] change-text drop
+    ] [
+        drop [ swap <styled-label> ] [ swap add-gadget drop ] bi*
+    ] if ;
 
 M: pack pane-line pane-text ;