From 7c63ea9394e4222cd03dde1b3d30f8069e752689 Mon Sep 17 00:00:00 2001
From: Taxi Service <serviceoftaxi@gmail.com>
Date: Mon, 3 Apr 2023 20:13:57 +0200
Subject: [PATCH 1/4] added BOLD_FRAME and INTERIOR_MEDIUM_FRAME

---
 data/art/border-bold.png           | Bin 0 -> 836 bytes
 docs/dev/Lua API.rst               |  17 ++++++++++++++---
 library/LuaApi.cpp                 |   1 +
 library/include/modules/Textures.h |   1 +
 library/lua/gui.lua                |   3 +++
 library/modules/Textures.cpp       |   7 +++++++
 6 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 data/art/border-bold.png

diff --git a/data/art/border-bold.png b/data/art/border-bold.png
new file mode 100644
index 0000000000000000000000000000000000000000..16423a3a7477fd94d1e27a45f0f91b2f6f28af84
GIT binary patch
literal 836
zcmV-K1H1f*P)<h;3K|Lk000e1NJLTq001}u001Ni0ssI2Q}Ax70000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!=1D|BRCwCtSifr&K@^_I6vjeCA#ku;
zqzHCr6NErYJB1Y5*x1<E2nqTJ_y>3>q_IhpTDzpXQV0Ya?T#%Xxr4<(f~1J)^xK_v
z@@{6{+>ARL0>0vIZ+Q3ioA>jZnai?lapBheUis|74G}Nf!?XRecX0F*&y&gI>$|+a
zx`5|zpO5f)Z(|Jm#(FWj{^Ub}b*I7cWb9m*3gz3)r_I9gUN}m;wc6gW6r#Zj5dBrr
zg<NY;E^fx6geWHgD~w#M-dR!K0G$x1T*+@!l%KXvL;m*o`Av-#eua_2Zt?NO65T^F
zI>pNR&M&70<U<_L=KITXI7+3du_{3p3US_FKdkq>tTt0+>W<q&t?!Zz572{`6eTi!
zCQ!J_z}jD1Ya&xyyU2~f4^P@edX%K5ryi+5jRv|gQaiFEk@{)r?s=Q^hl623yXy6u
z@A#|=fY*0tKUekihk8?>*viH}Jt$jww56!b)+K_TRg8Rz#8txYu7Rov6doV85+(tm
zzsi!#qr0!>gvj-j*Uj?bz#Yu@kLFc(qpScAd6wI>0ok7nDBBmAJ~~qj+HfU8&$h+C
zv>|2aWBaJh3TPiNr%6Jf$}zOkDM~;6Q><Wm`cKh@%k86xBTplzQXHBVZRoI%YC7kn
ze?D6-+910w6psGs0&-?EP4`QxdeFZHr9uC^tibLAoqKd9{nOd(XV#qq4LLQaK-1}O
zr~Cgm>p8*Ujyu=WbD!Z(<9-18i9MR?h-};GAoOHFC$XbICkwsN*rO)9eZ;l(Wt-^G
z@ohKun8|L4V?fAO8Aisp^IRWIUYS7;eHj%L4-HFpu4nAX$e^$^%;2M((8*5q@!sv>
znTNv4z43|In!5A~ia3c55(Y-_0)vloqM_LO9-=L|ORvD_7&lfkqhU;Tst=T&tdsj?
zPlysq;a7Qvz@0FXW%E%ti5!3B&ik^yDXy^o!zE0WHbUsD@lNHB00RKGR=gVn;~Fyn
O0000<MNUMnLSTZiBcv|?

literal 0
HcmV?d00001

diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
index 2af9e39f1..e63bc8a61 100644
--- a/docs/dev/Lua API.rst	
+++ b/docs/dev/Lua API.rst	
@@ -4352,11 +4352,22 @@ There are the following predefined frame style tables:
 
   A frame suitable for overlay widget panels.
 
+* ``BOLD_FRAME``
+
+  A frame suitable for a non-draggable panel meant to capture the user's focus,
+  like an important notification, confirmation dialog or error message.
+
 * ``INTERIOR_FRAME``
 
-  A frame suitable for light interior accent elements. This frame does *not* have
-  a visible ``DFHack`` signature on it, so it must not be used as the most external
-  frame for a DFHack-owned UI.
+  A frame suitable for light interior accent elements. This frame does *not*
+  have a visible ``DFHack`` signature on it, so it must not be used as the most
+  external frame for a DFHack-owned UI.
+
+* ``INTERIOR_MEDIUM_FRAME``
+
+  A copy of ``MEDIUM_FRAME`` that lacks the ``DFHack`` signature. Suitable for
+  panels that are part of a larger widget cluster. Must *not* be used as the
+  most external frame for a DFHack-owned UI.
 
 gui.widgets
 ===========
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
index c9bdc3021..5573d3f20 100644
--- a/library/LuaApi.cpp
+++ b/library/LuaApi.cpp
@@ -1718,6 +1718,7 @@ static const LuaWrapper::FunctionReg dfhack_textures_module[] = {
     WRAPM(Textures, getControlPanelTexposStart),
     WRAPM(Textures, getThinBordersTexposStart),
     WRAPM(Textures, getMediumBordersTexposStart),
+    WRAPM(Textures, getBoldBordersTexposStart),
     WRAPM(Textures, getPanelBordersTexposStart),
     WRAPM(Textures, getWindowBordersTexposStart),
     { NULL, NULL }
diff --git a/library/include/modules/Textures.h b/library/include/modules/Textures.h
index a438f01f4..95e628d5a 100644
--- a/library/include/modules/Textures.h
+++ b/library/include/modules/Textures.h
@@ -56,6 +56,7 @@ DFHACK_EXPORT long getControlPanelTexposStart();
  */
 DFHACK_EXPORT long getThinBordersTexposStart();
 DFHACK_EXPORT long getMediumBordersTexposStart();
+DFHACK_EXPORT long getBoldBordersTexposStart();
 DFHACK_EXPORT long getPanelBordersTexposStart();
 DFHACK_EXPORT long getWindowBordersTexposStart();
 
diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index 7791f3685..64e203d3c 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -916,8 +916,11 @@ end
 WINDOW_FRAME = make_frame('Window', true)
 PANEL_FRAME = make_frame('Panel', false)
 MEDIUM_FRAME = make_frame('Medium', false)
+BOLD_FRAME = make_frame('Bold', true)
 INTERIOR_FRAME = make_frame('Thin', false)
 INTERIOR_FRAME.signature_pen = false
+INTERIOR_MEDIUM_FRAME = copyall(MEDIUM_FRAME)
+INTERIOR_MEDIUM_FRAME.signature_pen = false
 
 -- for compatibility with pre-steam code
 GREY_LINE_FRAME = WINDOW_FRAME
diff --git a/library/modules/Textures.cpp b/library/modules/Textures.cpp
index 25d44695a..a30f879a0 100644
--- a/library/modules/Textures.cpp
+++ b/library/modules/Textures.cpp
@@ -26,6 +26,7 @@ static long g_on_off_texpos_start = -1;
 static long g_control_panel_texpos_start = -1;
 static long g_thin_borders_texpos_start = -1;
 static long g_medium_borders_texpos_start = -1;
+static long g_bold_borders_texpos_start = -1;
 static long g_panel_borders_texpos_start = -1;
 static long g_window_borders_texpos_start = -1;
 
@@ -134,6 +135,8 @@ void Textures::init(color_ostream &out) {
                                           &g_thin_borders_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/border-medium.png",
                                           &g_medium_borders_texpos_start);
+    g_num_dfhack_textures += load_textures(out, "hack/data/art/border-bold.png",
+                                          &g_bold_borders_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/border-panel.png",
                                           &g_panel_borders_texpos_start);
     g_num_dfhack_textures += load_textures(out, "hack/data/art/border-window.png",
@@ -202,6 +205,10 @@ long Textures::getMediumBordersTexposStart() {
     return g_medium_borders_texpos_start;
 }
 
+long Textures::getBoldBordersTexposStart() {
+    return g_bold_borders_texpos_start;
+}
+
 long Textures::getPanelBordersTexposStart() {
     return g_panel_borders_texpos_start;
 }

From 57146c527a04be2cf8ceb2cbbbfb4f2539a9ac69 Mon Sep 17 00:00:00 2001
From: Taxi Service <serviceoftaxi@gmail.com>
Date: Mon, 3 Apr 2023 21:20:45 +0200
Subject: [PATCH 2/4] added changelog entry

---
 docs/changelog.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index b0b86c4cd..522ed00c0 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -48,6 +48,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## API
 
 ## Lua
+- `gui`: added two new window borders, "BOLD_FRAME" and "INTERIOR_MEDIUM_FRAME"
 
 ## Removed
 

From 4dc7b3cc43fc7b2bbf97781f2d6f081b7c3ab827 Mon Sep 17 00:00:00 2001
From: Taxi Service <serviceoftaxi@gmail.com>
Date: Mon, 3 Apr 2023 21:25:59 +0200
Subject: [PATCH 3/4] attempt to make changelog entry work

---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 522ed00c0..d85231266 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -48,7 +48,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## API
 
 ## Lua
-- `gui`: added two new window borders, "BOLD_FRAME" and "INTERIOR_MEDIUM_FRAME"
+- `widget`: added two new window borders, ``BOLD_FRAME`` and ``INTERIOR_MEDIUM_FRAME``
 
 ## Removed
 

From 3628f8c5545ad190620705311c33f84fa772c969 Mon Sep 17 00:00:00 2001
From: TaxiService <serviceoftaxi@gmail.com>
Date: Mon, 3 Apr 2023 21:29:24 +0200
Subject: [PATCH 4/4] Update docs/changelog.txt

YES PLS

Co-authored-by: Myk <myk.taylor@gmail.com>
---
 docs/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index d85231266..ff9d05b0f 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -48,7 +48,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## API
 
 ## Lua
-- `widget`: added two new window borders, ``BOLD_FRAME`` and ``INTERIOR_MEDIUM_FRAME``
+- added two new window borders: ``gui.BOLD_FRAME`` for accented elements and ``gui.INTERIOR_MEDIUM_FRAME`` for a signature-less frame that's thicker than the existing ``gui.INTERIOR_FRAME``
 
 ## Removed