From 9a25d2c4139e49312300f0de237725765fb338ca Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jun 2024 18:04:12 +0400
Subject: [PATCH] Simplify correct unicode characters counting.

---
 Telegram/SourceFiles/history/history_widget.cpp              | 2 +-
 .../history/view/controls/history_view_compose_controls.cpp  | 5 +++--
 Telegram/SourceFiles/settings/settings_information.cpp       | 3 +--
 Telegram/lib_ui                                              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index a805c5479..e81fc1bc2 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -7513,7 +7513,7 @@ void HistoryWidget::showPremiumToast(not_null<DocumentData*> document) {
 }
 
 void HistoryWidget::checkCharsCount() {
-	_fieldCharsCountManager.setCount(Ui::FieldCharacterCount(_field));
+	_fieldCharsCountManager.setCount(Ui::ComputeFieldCharacterCount(_field));
 	checkCharsLimitation();
 }
 
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 16a559689..779f0386b 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -3268,7 +3268,7 @@ not_null<Ui::RpWidget*> ComposeControls::likeAnimationTarget() const {
 }
 
 int ComposeControls::fieldCharacterCount() const {
-	return Ui::FieldCharacterCount(_field);
+	return Ui::ComputeFieldCharacterCount(_field);
 }
 
 bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
@@ -3451,7 +3451,8 @@ void ComposeControls::checkCharsLimitation() {
 	const auto maxCaptionSize = !hasMediaWithCaption
 		? MaxMessageSize
 		: Data::PremiumLimits(&session()).captionLengthCurrent();
-	const auto remove = Ui::FieldCharacterCount(_field) - maxCaptionSize;
+	const auto remove = Ui::ComputeFieldCharacterCount(_field)
+		- maxCaptionSize;
 	if (remove > 0) {
 		if (!_charsLimitation) {
 			using namespace Controls;
diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index 9db8d59a9..7be04db17 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -573,8 +573,7 @@ void SetupBio(
 		}
 		changed->fire(*current != text);
 		const auto limit = self->isPremium() ? premiumLimit : defaultLimit;
-		const auto countLeft = limit
-			- bio->lastTextSizeWithoutSurrogatePairsCount();
+		const auto countLeft = limit - Ui::ComputeFieldCharacterCount(bio);
 		countdown->setText(QString::number(countLeft));
 		countdown->setTextColorOverride(
 			countLeft < 0 ? st::boxTextFgError->c : std::optional<QColor>());
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 29bce3f8f..179a7ec1c 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 29bce3f8ff693e0386617dfd550a225d0ff11c5d
+Subproject commit 179a7ec1c1c4310e1c8c935e466d23cbfbe07221