From 7a4f4db86de9ed610b9968f905f860d3b6272e61 Mon Sep 17 00:00:00 2001

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

Date: Wed, 20 Oct 2021 16:32:28 +0300

Subject: [PATCH 1/1] iOS: Fixing the build

src/fontpack.h | 3 ++-

src/ui/sidebarwidget.c | 2 +-

src/ui/window.c | 5 +++++

3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/fontpack.h b/src/fontpack.h

index 5d592822..d86de945 100644

--- a/src/fontpack.h

+++ b/src/fontpack.h

@@ -131,7 +131,8 @@ struct Impl_FontSpec {

};

iLocalDef int scaleType_FontSpec(enum iFontSize sizeId) {

• return sizeId / contentRegular_FontSize;

• iAssert(sizeId >= 0 && sizeId < max_FontSize);

• return sizeId < contentRegular_FontSize ? 0 : 1;

}

/----------------------------------------------------------------------------------------------/

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

index 42661f6b..821f8118 100644

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

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

@@ -743,7 +743,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {

#if defined (iPlatformMobile)

 if (deviceType_App() == phone_AppDeviceType) {

     d->itemFonts[0] = uiLabelBig_FontId;

•    d->itemFonts[1] = defaultBigBold_FontId;
  

•    d->itemFonts[1] = uiLabelBigBold_FontId;
  

 }

 d->widthAsGaps = 73.0f;

#else

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

index 569ec919..83dae427 100644

--- a/src/ui/window.c

+++ b/src/ui/window.c

@@ -537,6 +537,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {

#elif defined (iPlatformAppleMobile)

 SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal");

 flags |= SDL_WINDOW_METAL;

• d->base.isExposed = iTrue;

#else

 if (!forceSoftwareRender_App()) {

     flags |= SDL_WINDOW_OPENGL;

@@ -615,7 +616,11 @@ void init_MainWindow(iMainWindow *d, iRect rect) {

     SDL_EventState(SDL_SYSWMEVENT, SDL_TRUE);

 }

#endif

+#if defined (iPlatformDesktop)

 SDL_HideWindow(d->base.win);

+#else

• SDL_ShowWindow(d->base.win);

+#endif

}

void deinit_MainWindow(iMainWindow *d) {

--

2.25.1