From 7736ba8af1c073bc8447edfa3b134f84d2dd4c87 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 4 Aug 2023 16:11:58 +0200
Subject: [PATCH] Change console height

Change console height from default 318 pixels to viewport (#19241)
---
 CHANGELOG.md                                  |  1 +
 RELEASENOTES.md                               |  1 +
 .../xdrv_01_9_webserver.ino                   | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5032d1690..d403a8130 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 - ESP32 autodetect flashsize and adjust filesystem (#19215)
 - Reduced log level for TeleInfo (#19216)
 - Matter increased polling frequency for local switches/occupancy (#19242)
+- Change console height from default 318 pixels to viewport (#19241)
 
 ### Fixed
 - Initial battery level percentage (#19160)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 7013f02c7..2e9a45e3b 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -143,6 +143,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - Initial ``DisplayMode`` from 1 to 0 and ``DisplayDimmmer`` from 10% to 50% [#19138](https://github.com/arendst/Tasmota/issues/19138)
 - Configuration backup and restore now supports ``.xdrvsetXXX`` files too [#18295](https://github.com/arendst/Tasmota/issues/18295)
 - Reduced log level for TeleInfo [#19216](https://github.com/arendst/Tasmota/issues/19216)
+- Change console height from default 318 pixels to viewport [#19241](https://github.com/arendst/Tasmota/issues/19241)
 - ESP32 shutter driver support up to 16 shutters [#18295](https://github.com/arendst/Tasmota/issues/18295)
 - ESP32 autodetect flashsize and adjust filesystem [#19215](https://github.com/arendst/Tasmota/issues/19215)
 - Berry extend `range(lower, upper, incr)` to arbitrary increment [#19120](https://github.com/arendst/Tasmota/issues/19120)
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
index 0b6db6671..10b2ad5a5 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
@@ -30,6 +30,8 @@
 // Enable below demo feature only if defines USE_UNISHOX_COMPRESSION and USE_SCRIPT_WEB_DISPLAY are disabled
 //#define USE_WEB_SSE
 
+#define USE_CONSOLE_CSS_FLEX
+
 #ifndef WIFI_SOFT_AP_CHANNEL
 #define WIFI_SOFT_AP_CHANNEL                      1      // Soft Access Point Channel number between 1 and 11 as used by WifiManager web GUI
 #endif
@@ -371,12 +373,28 @@ const char HTTP_FORM_RST_UPG_FCT[] PROGMEM =
   "<div id='f3' style='display:none;text-align:center;'><b>" D_UPLOAD_FACTORY "...</b></div>"
   "<div id='f2' style='display:none;text-align:center;'><b>" D_UPLOAD_STARTED "...</b></div>";
 
+#ifdef USE_CONSOLE_CSS_FLEX
+const char HTTP_CMND_STYLE[] PROGMEM =  // Overrule CSS for flex console
+  "html,body{margin:5;height:99%%;}"
+  "body{display:flex;flex-direction:column;}"
+  "textarea{resize:none;flex:auto;}";
+
+const char HTTP_FORM_CMND[] PROGMEM =
+  "</div>"                     // Close HTTP_HEAD_STYLE3 <div>
+  "<textarea readonly id='t1' wrap='off'></textarea><br>"
+  "<form method='get' onsubmit='return l(1);'>"
+  "<input id='c1' placeholder='" D_ENTER_COMMAND "' autofocus><br>"
+  //  "<br><button type='submit'>Send command</button>"
+  "</form>"
+  "<div style='padding:0;'>";  // Add dummy <div> replacing HTTP_HEAD_STYLE3 closed <div>
+#else
 const char HTTP_FORM_CMND[] PROGMEM =
   "<br><textarea readonly id='t1' cols='340' wrap='off'></textarea><br><br>"
   "<form method='get' onsubmit='return l(1);'>"
   "<input id='c1' placeholder='" D_ENTER_COMMAND "' autofocus><br>"
   //  "<br><button type='submit'>Send command</button>"
   "</form>";
+#endif  // USE_CONSOLE_CSS_FLEX
 
 const char HTTP_TABLE100[] PROGMEM =
   "<table style='width:100%%'>";
@@ -3117,7 +3135,11 @@ void HandleConsole(void)
 
   WSContentStart_P(PSTR(D_CONSOLE));
   WSContentSend_P(HTTP_SCRIPT_CONSOL, Settings->web_refresh);
+#ifdef USE_CONSOLE_CSS_FLEX
+  WSContentSendStyle_P(HTTP_CMND_STYLE);
+#else
   WSContentSendStyle();
+#endif  // USE_CONSOLE_CSS_FLEX
   WSContentSend_P(HTTP_FORM_CMND);
   WSContentSpaceButton((WebUseManagementSubmenu()) ? BUTTON_MANAGEMENT : BUTTON_MAIN);
   WSContentStop();