GmDocument: Heading font styles

Swapped bold styling of heading levels 2 and 3 for better visual distinction of the hierarchy.

4 files changed, 9 insertions, 7 deletions

diff --git a/res/about/version.gmi b/res/about/version.gmi
index d89700af..3b15f567 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,7 +6,7 @@
 ```
 # Release notes
 
-# 1.9
+## 1.9
 
 New features:
 * Added a toolbar button for toggling the left sidebar.
@@ -17,6 +17,7 @@ New features:
 * Windows: Automatic updates using the WinSparkle library.
 
 Changes and enhancements:
+* Adjusted font styles of heading levels 2 and 3.
 * Sidebar context menus also appear when clicking over the sidebar background. In this case the menu contains general functions not related to any item.
 * Feeds tab in the sidebar has a redesigned action toolbar with "Mark All as Read", and dropdown menu and keyboard shortcuts for changing the filter mode.
 * Feeds tab remembers the unread/all filter mode persistently.
diff --git a/src/gmdocument.c b/src/gmdocument.c
index dea7f345..de394888 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -215,8 +215,8 @@ static void initTheme_GmDocument_(iGmDocument *d) {
     theme->fonts[preformatted_GmLineType] = preformatted_FontId;
     theme->fonts[quote_GmLineType] = isMono ? monospaceParagraph_FontId : quote_FontId;
     theme->fonts[heading1_GmLineType] = FONT_ID(headingFont, bold_FontStyle, contentHuge_FontSize);
-    theme->fonts[heading2_GmLineType] = FONT_ID(headingFont, bold_FontStyle, contentLarge_FontSize);
-    theme->fonts[heading3_GmLineType] = FONT_ID(headingFont, regular_FontStyle, contentBig_FontSize);
+    theme->fonts[heading2_GmLineType] = FONT_ID(headingFont, regular_FontStyle, contentLarge_FontSize);
+    theme->fonts[heading3_GmLineType] = FONT_ID(headingFont, bold_FontStyle, contentBig_FontSize);
     theme->fonts[link_GmLineType] = FONT_ID(
         bodyFont,
         ((isDarkBg && prefs->boldLinkDark) || (!isDarkBg && prefs->boldLinkLight)) ? semiBold_FontStyle
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index b70f48e4..c41c77d6 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -4718,8 +4718,9 @@ static void updateSideIconBuf_DocumentWidget_(const iDocumentWidget *d) {
     iBool       isHeadingVisible = isSideHeadingVisible_DocumentWidget_(d);
     /* Determine the required size. */
     iInt2 bufSize = init1_I2(minBannerSize);
+    const int sideHeadingFont = FONT_ID(documentHeading_FontId, regular_FontStyle, contentBig_FontSize);
     if (isHeadingVisible) {
-        const iInt2 headingSize = measureWrapRange_Text(heading3_FontId, avail,
+        const iInt2 headingSize = measureWrapRange_Text(sideHeadingFont, avail,
                                                         currentHeading_DocumentWidget_(d)).bounds.size;
         if (headingSize.x > 0) {
             bufSize.y += gap_Text + headingSize.y;
@@ -4749,7 +4750,7 @@ static void updateSideIconBuf_DocumentWidget_(const iDocumentWidget *d) {
     if (isHeadingVisible) {
         iRangecc    text = currentHeading_DocumentWidget_(d);
         iInt2       pos  = addY_I2(bottomLeft_Rect(iconRect), gap_Text);
-        const int   font = heading3_FontId;
+        const int   font = sideHeadingFont;
         drawWrapRange_Text(font, pos, avail, tmBannerSideTitle_ColorId, text);
     }
     endTarget_Paint(&p);
diff --git a/src/ui/text.h b/src/ui/text.h
index de76ed09..63499484 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -71,8 +71,8 @@ enum iFontId {
     preformattedSmall_FontId  = FONT_ID(monospace_FontId,         regular_FontStyle,  contentTiny_FontSize),
     quote_FontId              = FONT_ID(documentBody_FontId,      italic_FontStyle,   contentRegular_FontSize),
     heading1_FontId           = FONT_ID(documentHeading_FontId,   bold_FontStyle,     contentHuge_FontSize),
-    heading2_FontId           = FONT_ID(documentHeading_FontId,   bold_FontStyle,     contentLarge_FontSize),
-    heading3_FontId           = FONT_ID(documentHeading_FontId,   regular_FontStyle,  contentBig_FontSize),
+    heading2_FontId           = FONT_ID(documentHeading_FontId,   regular_FontStyle,  contentLarge_FontSize),
+    heading3_FontId           = FONT_ID(documentHeading_FontId,   bold_FontStyle,     contentBig_FontSize),
     banner_FontId             = FONT_ID(documentHeading_FontId,   light_FontStyle,    contentLarge_FontSize),
     monospaceParagraph_FontId = FONT_ID(documentMonospace_FontId, regular_FontStyle,  contentRegular_FontSize),
     monospaceBold_FontId      = FONT_ID(documentMonospace_FontId, semiBold_FontStyle, contentRegular_FontSize),