From 98598c9d5c29ec5d6b2b170ff97ef2df07967fbc Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Tue, 20 Jan 2026 21:29:44 +0100
Subject: [PATCH] Touch ui fixes

---
 base/sources/backends/data/ios.plist |  2 --
 paint/sources/camera.ts              |  2 +-
 paint/sources/tab_browser.ts         | 10 +++++++++-
 paint/sources/ui_menubar.ts          |  2 +-
 paint/sources/ui_sidebar.ts          |  4 ++--
 paint/sources/ui_toolbar.ts          |  8 ++++++++
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/base/sources/backends/data/ios.plist b/base/sources/backends/data/ios.plist
index 1609b20c..b4a49550 100644
--- a/base/sources/backends/data/ios.plist
+++ b/base/sources/backends/data/ios.plist
@@ -57,8 +57,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
diff --git a/paint/sources/camera.ts b/paint/sources/camera.ts
index 3c0cfd1e..7498c5cc 100644
--- a/paint/sources/camera.ts
+++ b/paint/sources/camera.ts
@@ -222,7 +222,7 @@ function camera_reset(view_index: i32 = -1) {
 
 	/// if arm_ios
 	if (config_is_iphone()) {
-		viewport_zoom(-2.4);
+		viewport_zoom(-2.8);
 		let right: vec4_t                = vec4_mult(transform_right(camera.base.transform), -0.135);
 		camera.base.transform.loc        = vec4_add(camera.base.transform.loc, right);
 		camera_origins[camera_index()].v = vec4_add(camera_origins[camera_index()].v, right);
diff --git a/paint/sources/tab_browser.ts b/paint/sources/tab_browser.ts
index 6593957a..44b8c104 100644
--- a/paint/sources/tab_browser.ts
+++ b/paint/sources/tab_browser.ts
@@ -15,7 +15,15 @@ function tab_browser_show_directory(directory: string) {
 }
 
 function tab_browser_draw(htab: ui_handle_t) {
-	if (ui_tab(htab, tr("Browser")) && ui._window_h > ui_statusbar_default_h * UI_SCALE()) {
+	let title: string = tr("Browser");
+
+	/// if arm_ios
+	if (config_is_iphone()) {
+		title = "  " + title;
+	}
+	/// end
+
+	if (ui_tab(htab, title) && ui._window_h > ui_statusbar_default_h * UI_SCALE()) {
 
 		if (config_raw.bookmarks == null) {
 			config_raw.bookmarks = [];
diff --git a/paint/sources/ui_menubar.ts b/paint/sources/ui_menubar.ts
index 406ecaf8..581f5856 100644
--- a/paint/sources/ui_menubar.ts
+++ b/paint/sources/ui_menubar.ts
@@ -37,7 +37,7 @@ function ui_menu_panel_x(): i32 {
 function ui_menu_top_y(): i32 {
 	/// if arm_ios
 	if (config_is_iphone()) {
-		return UI_ELEMENT_H();
+		return UI_ELEMENT_H() + UI_ELEMENT_OFFSET();
 	}
 	/// end
 
diff --git a/paint/sources/ui_sidebar.ts b/paint/sources/ui_sidebar.ts
index 9379cf18..6011b1ab 100644
--- a/paint/sources/ui_sidebar.ts
+++ b/paint/sources/ui_sidebar.ts
@@ -53,10 +53,10 @@ function ui_sidebar_render_ui() {
 
 	/// if arm_ios
 	if (config_is_iphone()) {
-		sidebar_y += UI_ELEMENT_H();
+		sidebar_y += UI_ELEMENT_H() + UI_ELEMENT_OFFSET();
 		ui_end();
 		draw_begin(null);
-		draw_set_color(ui.ops.theme.SEPARATOR_COL);
+		draw_set_color(ui.ops.theme.PRESSED_COL);
 		draw_filled_rect(ui_sidebar_tabx, 0, config_raw.layout[layout_size_t.SIDEBAR_W], sidebar_y);
 		draw_end();
 		ui_begin(ui);
diff --git a/paint/sources/ui_toolbar.ts b/paint/sources/ui_toolbar.ts
index 758cef71..1549402c 100644
--- a/paint/sources/ui_toolbar.ts
+++ b/paint/sources/ui_toolbar.ts
@@ -159,6 +159,14 @@ function ui_toolbar_render_ui() {
 		return;
 	}
 
+	if (!base_view3d_show && ui_view2d_show && ui_view2d_type != view_2d_type_t.LAYER) {
+		return;
+	}
+
+	if (!base_view3d_show && ui_nodes_show && !ui_view2d_show) {
+		return;
+	}
+
 	if (context_is_floating_toolbar()) {
 		x += ui_toolbar_x();
 		y += ui_toolbar_x() + 3 * UI_SCALE();