From 68bca1b9863188b660cfe03adb87969099cd0a30 Mon Sep 17 00:00:00 2001

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

Date: Mon, 6 Feb 2023 10:32:56 +0200

Subject: [PATCH 1/1] TUI: Fixed build

res/about/version.gmi | 1 +

src/app.c | 5 +++--

src/ui/text_terminal.c | 4 ++--

3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/res/about/version.gmi b/res/about/version.gmi

index 90ac14b4..e7c78e33 100644

--- a/res/about/version.gmi

+++ b/res/about/version.gmi

@@ -9,6 +9,7 @@

1.15.2

• Fixed moving input focus to the next window when closing a window.

• Centered footer info text for better balance.

+* Fixed TUI build.

1.15.1

• Fixed opening multiple Preferences windows at the same time.

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

index 5f5791bf..e5d4d036 100644

--- a/src/app.c

+++ b/src/app.c

@@ -730,7 +730,7 @@ static iBool loadState_App_(iApp *d) {

// printf("[State] '%.4s' split:%d state:%x\n", magic, splitMode, winState);

#if defined (iPlatformTerminal)

             /* Terminal only supports one window. */

•            win = d->window;
  

•            win = as_MainWindow(d->window);
  

#else

             if (numWins == 1) {

                 win = as_MainWindow(d->window);

@@ -4419,7 +4419,8 @@ iBool handleCommand_App(const char *cmd) {

         iWidget *button  = findUserData_Widget(findChild_Widget(dlg, "panel.top"), idPanel);

         postCommand_Widget(button, "panel.open");

     }

•    if (prefs_App()->detachedPrefs && deviceType_App() == desktop_AppDeviceType) {
  

•    if (prefs_App()->detachedPrefs && deviceType_App() == desktop_AppDeviceType &&
  

•        !isTerminal_Platform()) {
  

         /* Detach into a window if it doesn't fit otherwise. */

         promoteDialogToWindow_Widget(dlg);

     }

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

index 7106a0f6..9eff5d92 100644

--- a/src/ui/text_terminal.c

+++ b/src/ui/text_terminal.c

@@ -206,6 +206,6 @@ static float nextTabStop_Font_(const iFont *d, float x) {

#include "text_simple.c"

-iRect run_Font(iBaseFont *font, const iRunArgs *args) {

• return runSimple_Font_((iFont *) font, args);

+void run_Font(iBaseFont *font, const iRunArgs *args) {

• runSimple_Font_((iFont *) font, args);

}

--

2.25.1