From 0d808e81296a1c688c5edf559d49ac0ed0db70f3 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= jaakko.keranen@iki.fi

Date: Fri, 18 Mar 2022 17:04:14 +0200

Subject: [PATCH 1/1] Cleanup: Branch differences

res/fi.skyjake.Lagrange.appdata.xml | 2 +-

src/gmdocument.c | 2 +-

src/ui/sidebarwidget.c | 2 +-

src/ui/text.c | 2 +-

src/ui/text.h | 2 +-

5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/fi.skyjake.Lagrange.appdata.xml b/res/fi.skyjake.Lagrange.appdata.xml

index a0b33acd..0894cfb3 100644

--- a/res/fi.skyjake.Lagrange.appdata.xml

+++ b/res/fi.skyjake.Lagrange.appdata.xml

@@ -1,5 +1,5 @@

-

+

 <id>fi.skyjake.Lagrange</id>

 <metadata_license>CC0-1.0</metadata_license>

diff --git a/src/gmdocument.c b/src/gmdocument.c

index f897e25f..5e18725e 100644

--- a/src/gmdocument.c

+++ b/src/gmdocument.c

@@ -218,7 +218,7 @@ static void initTheme_GmDocument_(iGmDocument *d) {

 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, regular_FontStyle, contentLarge_FontSize);

• theme->fonts[heading3_GmLineType] = FONT_ID(headingFont, semiBold_FontStyle, contentBig_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/sidebarwidget.c b/src/ui/sidebarwidget.c

index cbfa1eee..932c79ff 100644

--- a/src/ui/sidebarwidget.c

+++ b/src/ui/sidebarwidget.c

@@ -1823,7 +1823,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)

             updateMouseHover_ListWidget(d->list);

         }

         if (constHoverItem_ListWidget(d->list) || isVisible_Widget(d->menu)) {

•            d->contextItem  = hoverItem_ListWidget(d->list);
  

•            d->contextItem = hoverItem_ListWidget(d->list);
  

             /* Context is drawn in hover state. */

             if (d->contextIndex != iInvalidPos) {

                 invalidateItem_ListWidget(d->list, d->contextIndex);

diff --git a/src/ui/text.c b/src/ui/text.c

index 74d4d710..bdd5ae6a 100644

--- a/src/ui/text.c

+++ b/src/ui/text.c

@@ -1794,9 +1794,9 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {

                           wrapAttrib,

                           origin,

                           iRound(wrapAdvance))) {

•        numWrapLines++;
  

         willAbortDueToWrap = iTrue;

     }

•    numWrapLines++;
  

     if (wrap && wrap->maxLines && numWrapLines == wrap->maxLines) {

         willAbortDueToWrap = iTrue;

     }

diff --git a/src/ui/text.h b/src/ui/text.h

index d51b0dad..a5422273 100644

--- a/src/ui/text.h

+++ b/src/ui/text.h

@@ -74,7 +74,7 @@ enum iFontId {

 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,   regular_FontStyle,  contentLarge_FontSize),

• heading3_FontId = FONT_ID(documentHeading_FontId, semiBold_FontStyle, contentBig_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),

--

2.25.1