diff options
-rw-r--r-- | res/about/version.gmi | 3 | ||||
-rw-r--r-- | src/gmdocument.c | 7 | ||||
-rw-r--r-- | src/ui/text.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/res/about/version.gmi b/res/about/version.gmi index f0439704..61ea4476 100644 --- a/res/about/version.gmi +++ b/res/about/version.gmi | |||
@@ -6,6 +6,9 @@ | |||
6 | ``` | 6 | ``` |
7 | # Release notes | 7 | # Release notes |
8 | 8 | ||
9 | ## 1.9.1 | ||
10 | * Heading level 3 is indented like regular text lines, making the difference to level 2 evident. | ||
11 | |||
9 | ## 1.9 | 12 | ## 1.9 |
10 | 13 | ||
11 | New features: | 14 | New features: |
diff --git a/src/gmdocument.c b/src/gmdocument.c index 0c18efc2..884f8c07 100644 --- a/src/gmdocument.c +++ b/src/gmdocument.c | |||
@@ -216,7 +216,7 @@ static void initTheme_GmDocument_(iGmDocument *d) { | |||
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, regular_FontStyle, contentLarge_FontSize); | 218 | theme->fonts[heading2_GmLineType] = FONT_ID(headingFont, regular_FontStyle, contentLarge_FontSize); |
219 | theme->fonts[heading3_GmLineType] = FONT_ID(headingFont, semiBold_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 |
@@ -610,10 +610,11 @@ static void doLayout_GmDocument_(iGmDocument *d) { | |||
610 | initTheme_GmDocument_(d); | 610 | initTheme_GmDocument_(d); |
611 | d->isLayoutInvalidated = iFalse; | 611 | d->isLayoutInvalidated = iFalse; |
612 | /* TODO: Collect these parameters into a GmTheme. */ | 612 | /* TODO: Collect these parameters into a GmTheme. */ |
613 | float indents[max_GmLineType] = { 5, 10, 5, isNarrow ? 5 : 10, 0, 0, 0, 5 }; | 613 | float indents[max_GmLineType] = { 5, 10, 5, isNarrow ? 5 : 10, 0, 0, 5, 5 }; |
614 | if (isExtremelyNarrow) { | 614 | if (isExtremelyNarrow) { |
615 | /* Further reduce the margins. */ | 615 | /* Further reduce the margins. */ |
616 | indents[text_GmLineType] -= 5; | 616 | indents[text_GmLineType] -= 5; |
617 | indents[heading3_GmLineType] -= 5; | ||
617 | indents[bullet_GmLineType] -= 5; | 618 | indents[bullet_GmLineType] -= 5; |
618 | indents[preformatted_GmLineType] -= 5; | 619 | indents[preformatted_GmLineType] -= 5; |
619 | } | 620 | } |
@@ -624,7 +625,7 @@ static void doLayout_GmDocument_(iGmDocument *d) { | |||
624 | 0.0f, 0.25f, 1.0f, 0.5f, 2.0f, 1.5f, 1.25f, 0.25f | 625 | 0.0f, 0.25f, 1.0f, 0.5f, 2.0f, 1.5f, 1.25f, 0.25f |
625 | }; | 626 | }; |
626 | static const float bottomMargin[max_GmLineType] = { | 627 | static const float bottomMargin[max_GmLineType] = { |
627 | 0.0f, 0.25f, 1.0f, 0.5f, 1.5f, 0.5f, 0.5f, 0.25f | 628 | 0.0f, 0.25f, 1.0f, 0.5f, 1.5f, 0.5f, 0.25f, 0.25f |
628 | }; | 629 | }; |
629 | static const char *arrow = rightArrowhead_Icon; | 630 | static const char *arrow = rightArrowhead_Icon; |
630 | static const char *envelope = envelope_Icon; | 631 | static const char *envelope = envelope_Icon; |
diff --git a/src/ui/text.h b/src/ui/text.h index c6568025..63499484 100644 --- a/src/ui/text.h +++ b/src/ui/text.h | |||
@@ -72,7 +72,7 @@ enum iFontId { | |||
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, regular_FontStyle, contentLarge_FontSize), | 74 | heading2_FontId = FONT_ID(documentHeading_FontId, regular_FontStyle, contentLarge_FontSize), |
75 | heading3_FontId = FONT_ID(documentHeading_FontId, semiBold_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), |