void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify correct unicode characters counting.

Browse source
This commit is contained in:
John Preston 2024-06-14 18:04:12 +04:00
parent ec40292cbf
commit 9a25d2c413
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -7513,7 +7513,7 @@ void HistoryWidget::showPremiumToast(not_null<DocumentData*> document) {
} }
void HistoryWidget::checkCharsCount() { void HistoryWidget::checkCharsCount() {
_fieldCharsCountManager.setCount(Ui::FieldCharacterCount(_field)); _fieldCharsCountManager.setCount(Ui::ComputeFieldCharacterCount(_field));
checkCharsLimitation(); checkCharsLimitation();
} }

5
Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
View file

@ -3268,7 +3268,7 @@ not_null<Ui::RpWidget*> ComposeControls::likeAnimationTarget() const {
} }
int ComposeControls::fieldCharacterCount() const { int ComposeControls::fieldCharacterCount() const {
return Ui::FieldCharacterCount(_field); return Ui::ComputeFieldCharacterCount(_field);
} }
bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const { bool ComposeControls::preventsClose(Fn<void()> &&continueCallback) const {
@ -3451,7 +3451,8 @@ void ComposeControls::checkCharsLimitation() {
const auto maxCaptionSize = !hasMediaWithCaption const auto maxCaptionSize = !hasMediaWithCaption
? MaxMessageSize ? MaxMessageSize
: Data::PremiumLimits(&session()).captionLengthCurrent(); : Data::PremiumLimits(&session()).captionLengthCurrent();
const auto remove = Ui::FieldCharacterCount(_field) - maxCaptionSize; const auto remove = Ui::ComputeFieldCharacterCount(_field)
- maxCaptionSize;
if (remove > 0) { if (remove > 0) {
if (!_charsLimitation) { if (!_charsLimitation) {
using namespace Controls; using namespace Controls;

3
Telegram/SourceFiles/settings/settings_information.cpp
View file

@ -573,8 +573,7 @@ void SetupBio(
} }
changed->fire(*current != text); changed->fire(*current != text);
const auto limit = self->isPremium() ? premiumLimit : defaultLimit; const auto limit = self->isPremium() ? premiumLimit : defaultLimit;
const auto countLeft = limit const auto countLeft = limit - Ui::ComputeFieldCharacterCount(bio);
- bio->lastTextSizeWithoutSurrogatePairsCount();
countdown->setText(QString::number(countLeft)); countdown->setText(QString::number(countLeft));
countdown->setTextColorOverride( countdown->setTextColorOverride(
countLeft < 0 ? st::boxTextFgError->c : std::optional<QColor>()); countLeft < 0 ? st::boxTextFgError->c : std::optional<QColor>());

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 29bce3f8ff693e0386617dfd550a225d0ff11c5d Subproject commit 179a7ec1c1c4310e1c8c935e466d23cbfbe07221