diff options
-rw-r--r-- | res/about/version.gmi | 3 | ||||
-rw-r--r-- | src/gmdocument.c | 4 | ||||
-rw-r--r-- | src/ui/documentwidget.c | 5 | ||||
-rw-r--r-- | src/ui/text.h | 4 |
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 @@ | |||
6 | ``` | 6 | ``` |
7 | # Release notes | 7 | # Release notes |
8 | 8 | ||
9 | # 1.9 | 9 | ## 1.9 |
10 | 10 | ||
11 | New features: | 11 | New features: |
12 | * Added a toolbar button for toggling the left sidebar. | 12 | * Added a toolbar button for toggling the left sidebar. |
@@ -17,6 +17,7 @@ New features: | |||
17 | * Windows: Automatic updates using the WinSparkle library. | 17 | * Windows: Automatic updates using the WinSparkle library. |
18 | 18 | ||
19 | Changes and enhancements: | 19 | Changes and enhancements: |
20 | * Adjusted font styles of heading levels 2 and 3. | ||
20 | * Sidebar context menus also appear when clicking over the sidebar background. In this case the menu contains general functions not related to any item. | 21 | * Sidebar context menus also appear when clicking over the sidebar background. In this case the menu contains general functions not related to any item. |
21 | * 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. | 22 | * 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. |
22 | * Feeds tab remembers the unread/all filter mode persistently. | 23 | * 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) { | |||
215 | theme->fonts[preformatted_GmLineType] = preformatted_FontId; | 215 | theme->fonts[preformatted_GmLineType] = preformatted_FontId; |
216 | theme->fonts[quote_GmLineType] = isMono ? monospaceParagraph_FontId : quote_FontId; | 216 | theme->fonts[quote_GmLineType] = isMono ? monospaceParagraph_FontId : quote_FontId; |
217 | theme->fonts[heading1_GmLineType] = FONT_ID(headingFont, bold_FontStyle, contentHuge_FontSize); | 217 | theme->fonts[heading1_GmLineType] = FONT_ID(headingFont, bold_FontStyle, contentHuge_FontSize); |
218 | theme->fonts[heading2_GmLineType] = FONT_ID(headingFont, bold_FontStyle, contentLarge_FontSize); | 218 | theme->fonts[heading2_GmLineType] = FONT_ID(headingFont, regular_FontStyle, contentLarge_FontSize); |
219 | theme->fonts[heading3_GmLineType] = FONT_ID(headingFont, regular_FontStyle, contentBig_FontSize); | 219 | theme->fonts[heading3_GmLineType] = FONT_ID(headingFont, bold_FontStyle, contentBig_FontSize); |
220 | theme->fonts[link_GmLineType] = FONT_ID( | 220 | theme->fonts[link_GmLineType] = FONT_ID( |
221 | bodyFont, | 221 | bodyFont, |
222 | ((isDarkBg && prefs->boldLinkDark) || (!isDarkBg && prefs->boldLinkLight)) ? semiBold_FontStyle | 222 | ((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) { | |||
4718 | iBool isHeadingVisible = isSideHeadingVisible_DocumentWidget_(d); | 4718 | iBool isHeadingVisible = isSideHeadingVisible_DocumentWidget_(d); |
4719 | /* Determine the required size. */ | 4719 | /* Determine the required size. */ |
4720 | iInt2 bufSize = init1_I2(minBannerSize); | 4720 | iInt2 bufSize = init1_I2(minBannerSize); |
4721 | const int sideHeadingFont = FONT_ID(documentHeading_FontId, regular_FontStyle, contentBig_FontSize); | ||
4721 | if (isHeadingVisible) { | 4722 | if (isHeadingVisible) { |
4722 | const iInt2 headingSize = measureWrapRange_Text(heading3_FontId, avail, | 4723 | const iInt2 headingSize = measureWrapRange_Text(sideHeadingFont, avail, |
4723 | currentHeading_DocumentWidget_(d)).bounds.size; | 4724 | currentHeading_DocumentWidget_(d)).bounds.size; |
4724 | if (headingSize.x > 0) { | 4725 | if (headingSize.x > 0) { |
4725 | bufSize.y += gap_Text + headingSize.y; | 4726 | bufSize.y += gap_Text + headingSize.y; |
@@ -4749,7 +4750,7 @@ static void updateSideIconBuf_DocumentWidget_(const iDocumentWidget *d) { | |||
4749 | if (isHeadingVisible) { | 4750 | if (isHeadingVisible) { |
4750 | iRangecc text = currentHeading_DocumentWidget_(d); | 4751 | iRangecc text = currentHeading_DocumentWidget_(d); |
4751 | iInt2 pos = addY_I2(bottomLeft_Rect(iconRect), gap_Text); | 4752 | iInt2 pos = addY_I2(bottomLeft_Rect(iconRect), gap_Text); |
4752 | const int font = heading3_FontId; | 4753 | const int font = sideHeadingFont; |
4753 | drawWrapRange_Text(font, pos, avail, tmBannerSideTitle_ColorId, text); | 4754 | drawWrapRange_Text(font, pos, avail, tmBannerSideTitle_ColorId, text); |
4754 | } | 4755 | } |
4755 | endTarget_Paint(&p); | 4756 | 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 { | |||
71 | preformattedSmall_FontId = FONT_ID(monospace_FontId, regular_FontStyle, contentTiny_FontSize), | 71 | preformattedSmall_FontId = FONT_ID(monospace_FontId, regular_FontStyle, contentTiny_FontSize), |
72 | quote_FontId = FONT_ID(documentBody_FontId, italic_FontStyle, contentRegular_FontSize), | 72 | quote_FontId = FONT_ID(documentBody_FontId, italic_FontStyle, contentRegular_FontSize), |
73 | heading1_FontId = FONT_ID(documentHeading_FontId, bold_FontStyle, contentHuge_FontSize), | 73 | heading1_FontId = FONT_ID(documentHeading_FontId, bold_FontStyle, contentHuge_FontSize), |
74 | heading2_FontId = FONT_ID(documentHeading_FontId, bold_FontStyle, contentLarge_FontSize), | 74 | heading2_FontId = FONT_ID(documentHeading_FontId, regular_FontStyle, contentLarge_FontSize), |
75 | heading3_FontId = FONT_ID(documentHeading_FontId, regular_FontStyle, contentBig_FontSize), | 75 | heading3_FontId = FONT_ID(documentHeading_FontId, bold_FontStyle, contentBig_FontSize), |
76 | banner_FontId = FONT_ID(documentHeading_FontId, light_FontStyle, contentLarge_FontSize), | 76 | banner_FontId = FONT_ID(documentHeading_FontId, light_FontStyle, contentLarge_FontSize), |
77 | monospaceParagraph_FontId = FONT_ID(documentMonospace_FontId, regular_FontStyle, contentRegular_FontSize), | 77 | monospaceParagraph_FontId = FONT_ID(documentMonospace_FontId, regular_FontStyle, contentRegular_FontSize), |
78 | monospaceBold_FontId = FONT_ID(documentMonospace_FontId, semiBold_FontStyle, contentRegular_FontSize), | 78 | monospaceBold_FontId = FONT_ID(documentMonospace_FontId, semiBold_FontStyle, contentRegular_FontSize), |