From a78bb73665b06891bfe64c88e3a8a5a7789f4f02 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Thu, 21 Aug 2025 17:11:07 +0200
Subject: [PATCH] Android fixes

---
 base/sources/ts/ui_menu.ts     | 2 ++
 paint/sources/ui_header_ext.ts | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/base/sources/ts/ui_menu.ts b/base/sources/ts/ui_menu.ts
index 43423028..b832c903 100644
--- a/base/sources/ts/ui_menu.ts
+++ b/base/sources/ts/ui_menu.ts
@@ -36,6 +36,7 @@ function ui_menu_render() {
 
 	draw_begin();
 	ui_begin_region(ui, ui_menu_x, ui_menu_y, menu_w);
+	ui.input_enabled = ui.combo_selected_handle == null;
 	ui_menu_start();
 
 	if (ui_menu_commands != null) {
@@ -50,6 +51,7 @@ function ui_menu_render() {
 	ui.ops.theme.ELEMENT_H = _ELEMENT_H;
 	ui_menu_end();
 	ui_end_region();
+	ui.input_enabled = true;
 	draw_end();
 
 	if (ui_menu_show_first) {
diff --git a/paint/sources/ui_header_ext.ts b/paint/sources/ui_header_ext.ts
index 623f9168..64f1073a 100644
--- a/paint/sources/ui_header_ext.ts
+++ b/paint/sources/ui_header_ext.ts
@@ -186,6 +186,10 @@ function ui_header_draw_tool_properties() {
 
 		context_raw.bake_type = ui_combo(bake_handle, bakes, tr("Bake"));
 
+		if (bake_handle.changed && ui_menu_show) {
+			ui_menu_nested = true; // Update menu height
+		}
+
 		if (rt_bake) {
 			let samples_handle: ui_handle_t = ui_handle(__ID__);
 			if (samples_handle.init) {