From 64a72c0704881ee33d424cea18bcb60b133b4fab Mon Sep 17 00:00:00 2001
From: Benoit Martins <benoit.martins@belledonne-communications.com>
Date: Mon, 21 Jul 2025 10:34:41 +0200
Subject: [PATCH] Fix time zone picker in the schedule meeting fragment

---
 .../Fragments/ScheduleMeetingFragment.swift   | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Linphone/UI/Main/Meetings/Fragments/ScheduleMeetingFragment.swift b/Linphone/UI/Main/Meetings/Fragments/ScheduleMeetingFragment.swift
index 0796de619..e50e7ed1c 100644
--- a/Linphone/UI/Main/Meetings/Fragments/ScheduleMeetingFragment.swift
+++ b/Linphone/UI/Main/Meetings/Fragments/ScheduleMeetingFragment.swift
@@ -171,6 +171,7 @@ struct ScheduleMeetingFragment: View {
 								.default_text_style_500(styleSize: 15)
 							Text(": \(meetingViewModel.selectedTimezone.formattedString())")
 								.fontWeight(.bold)
+								.lineLimit(1)
 								.default_text_style_500(styleSize: 15)
 								.onTapGesture {
 									showTimeZonePicker.toggle()
@@ -363,15 +364,21 @@ struct ScheduleMeetingFragment: View {
 					GeometryReader { geometry in
 						ScrollViewReader { proxyReader in
 							List(0..<meetingViewModel.knownTimezones.count, id: \.self) { idx in
-								Text(TimeZone.init(identifier: meetingViewModel.knownTimezones[idx])?.formattedString() ?? "Unknown timezone")
-									.fontWeight(meetingViewModel.selectedTimezoneIdx == idx ? Font.Weight.bold : Font.Weight.regular)
-									.onTapGesture {
-										if let timeZone = TimeZone.init(identifier: meetingViewModel.knownTimezones[idx]) {
-											meetingViewModel.selectedTimezoneIdx = idx
-											meetingViewModel.updateTimezone(timeZone: timeZone)
-										}
+								HStack {
+									Text(TimeZone.init(identifier: meetingViewModel.knownTimezones[idx])?.formattedString() ?? "Unknown timezone")
+										.fontWeight(meetingViewModel.selectedTimezoneIdx == idx ? Font.Weight.bold : Font.Weight.regular)
+										.frame(maxWidth: .infinity, alignment: .leading)
+								}
+								.contentShape(Rectangle())
+								.onTapGesture {
+									if let timeZone = TimeZone.init(identifier: meetingViewModel.knownTimezones[idx]) {
+										meetingViewModel.selectedTimezoneIdx = idx
+										meetingViewModel.updateTimezone(timeZone: timeZone)
+										showTimeZonePicker = false
 									}
-									.id(idx)
+								}
+								.id(idx)
+								.background(.white)
 							}
 							.frame(width: geometry.size.width - 30, height: 300)
 							.cornerRadius(20)