From f93c2bb5e5393c074b56c4f571d7d4800891b776 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Feb 2022 11:05:52 +0300
Subject: [PATCH 001/635] Always convert to ARGB before rounding.

---
 ui/image/image_prepare.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index da8bc33..83900f5 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1011,6 +1011,10 @@ QImage Round(
 		return std::move(image);
 	}
 
+	image = std::move(image).convertToFormat(
+		QImage::Format_ARGB32_Premultiplied);
+	Assert(!image.isNull());
+
 	// We need to detach image first (if it is shared), before we
 	// count some offsets using QImage::bytesPerLine etc, because
 	// bytesPerLine may change on detach, this leads to crashes:
@@ -1068,10 +1072,6 @@ QImage Round(
 	}
 	Assert(!image.isNull());
 
-	image = std::move(image).convertToFormat(
-		QImage::Format_ARGB32_Premultiplied);
-	Assert(!image.isNull());
-
 	const auto masks = CornersMask(radius);
 	return Round(std::move(image), masks, corners, target);
 }

From 681da392eb0523e87f9c1e9b3c732757e0c18850 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 7 Feb 2022 17:46:24 +0300
Subject: [PATCH 002/635] Improve box rounding and buttons.

---
 ui/layers/box_layer_widget.cpp | 13 ++++++++++---
 ui/layers/layer_widget.cpp     |  2 +-
 ui/layers/layers.style         | 28 ++++++++++++++--------------
 ui/widgets/widgets.style       |  4 ++--
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index cd2b494..96ba72b 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -42,7 +42,7 @@ BoxLayerWidget::BoxLayerWidget(
 : LayerWidget(layer)
 , _layer(layer)
 , _content(std::move(content))
-, _roundRect(ImageRoundRadius::Small, st().bg) {
+, _roundRect(st::boxRadius, st().bg) {
 	_content->setParent(this);
 	_content->setDelegate(this);
 
@@ -270,6 +270,7 @@ QPointer<RoundButton> BoxLayerWidget::addButton(
 		const style::RoundButton &st) {
 	_buttons.emplace_back(this, std::move(text), st);
 	auto result = QPointer<RoundButton>(_buttons.back());
+	result->setTextTransform(RoundButton::TextTransform::NoTransform);
 	result->setClickedCallback(std::move(clickCallback));
 	result->show();
 	result->widthValue(
@@ -285,6 +286,7 @@ QPointer<RoundButton> BoxLayerWidget::addLeftButton(
 		const style::RoundButton &st) {
 	_leftButton = object_ptr<RoundButton>(this, std::move(text), st);
 	auto result = QPointer<RoundButton>(_leftButton);
+	result->setTextTransform(RoundButton::TextTransform::NoTransform);
 	result->setClickedCallback(std::move(clickCallback));
 	result->show();
 	result->widthValue(
@@ -377,14 +379,19 @@ int BoxLayerWidget::countFullHeight() const {
 }
 
 int BoxLayerWidget::contentTop() const {
-	return hasTitle() ? titleHeight() : (_noContentMargin ? 0 : st::boxTopMargin);
+	return hasTitle()
+		? titleHeight()
+		: _noContentMargin
+		?
+		0
+		: st::boxTopMargin;
 }
 
 void BoxLayerWidget::resizeEvent(QResizeEvent *e) {
 	updateButtonsPositions();
 	updateTitlePosition();
 
-	auto top = contentTop();
+	const auto top = contentTop();
 	_content->resize(width(), height() - top - buttonsHeight());
 	_content->moveToLeft(0, top);
 
diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 7d8722c..2b5731d 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -86,7 +86,7 @@ private:
 
 LayerStackWidget::BackgroundWidget::BackgroundWidget(QWidget *parent)
 : TWidget(parent)
-, _roundRect(ImageRoundRadius::Small, st::boxBg) {
+, _roundRect(st::boxRadius, st::boxBg) {
 }
 
 void LayerStackWidget::BackgroundWidget::setCacheImages(
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index fcdb708..84317e6 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -32,13 +32,14 @@ Box {
 }
 
 boxDuration: 200;
-boxRadius: 3px;
+boxRadius: 8px;
 
 boxButtonFont: font(boxFontSize semibold);
 defaultBoxButton: RoundButton(defaultLightButton) {
-	width: -24px;
-	height: 36px;
-	font: boxButtonFont;
+	width: -30px;
+	height: 34px;
+	textTop: 7px;
+	font: font(14px semibold);
 }
 
 boxLabelStyle: TextStyle(boxTextStyle) {
@@ -74,25 +75,25 @@ boxRoundShadow: Shadow {
 	fallback: windowShadowFgFallback;
 }
 
-boxTitleFont: font(17px semibold);
+boxTitleFont: font(16px semibold);
 boxTitle: FlatLabel(defaultFlatLabel) {
 	textFg: boxTitleFg;
 	maxHeight: 24px;
 	style: TextStyle(defaultTextStyle) {
 		font: boxTitleFont;
 		linkFont: boxTitleFont;
-		linkFontOver: font(17px semibold underline);
+		linkFontOver: font(16px semibold underline);
 	}
 }
-boxTitlePosition: point(22px, 16px);
-boxTitleHeight: 56px;
+boxTitlePosition: point(24px, 18px);
+boxTitleHeight: 48px;
 boxTitleAdditionalSkip: 9px;
 boxTitleAdditionalFont: normalFont;
 boxScroll: defaultSolidScroll;
 
-boxRowPadding: margins(22px, 0px, 22px, 0px);
+boxRowPadding: margins(24px, 0px, 24px, 0px);
 
-boxTopMargin: 6px;
+boxTopMargin: 8px;
 
 boxTitleClose: IconButton(defaultIconButton) {
 	width: boxTitleHeight;
@@ -119,14 +120,14 @@ boxOptionInputSkip: 6px;
 
 boxWidth: 320px;
 boxWideWidth: 364px;
-boxPadding: margins(22px, 30px, 22px, 8px);
+boxPadding: margins(24px, 30px, 24px, 8px);
 boxMaxListHeight: 492px;
 boxLittleSkip: 10px;
 boxMediumSkip: 20px;
 
 defaultBox: Box {
-	buttonPadding: margins(8px, 12px, 13px, 12px);
-	buttonHeight: 36px;
+	buttonPadding: margins(6px, 10px, 10px, 10px);
+	buttonHeight: 34px;
 	button: defaultBoxButton;
 	margin: margins(0px, 10px, 0px, 10px);
 	bg: boxBg;
@@ -134,7 +135,6 @@ defaultBox: Box {
 	titleAdditionalFg: boxTitleAdditionalFg;
 }
 layerBox: Box(defaultBox) {
-	buttonPadding: margins(8px, 8px, 8px, 8px);
 }
 boxLabel: FlatLabel(defaultFlatLabel) {
 	minWidth: 274px;
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 3ec601c..f9fb12e 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -878,7 +878,7 @@ defaultPopupMenu: PopupMenu {
 defaultInputField: InputField {
 	textBg: windowBg;
 	textFg: windowFg;
-	textMargins: margins(0px, 26px, 0px, 4px);
+	textMargins: margins(0px, 28px, 0px, 4px);
 	textAlign: align(topleft);
 
 	placeholderFg: windowSubTextFg;
@@ -901,7 +901,7 @@ defaultInputField: InputField {
 	font: boxTextFont;
 	menu: defaultPopupMenu;
 
-	heightMin: 52px;
+	heightMin: 55px;
 	heightMax: 148px;
 }
 

From 6685a1565eb19f6c434d72f5bf1147c14e98ac2c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Feb 2022 20:17:56 +0300
Subject: [PATCH 003/635] Allow rounding radius in InfoTopBar style.

---
 ui/widgets/widgets.style | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index f9fb12e..130102e 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1319,6 +1319,7 @@ InfoTopBar {
 	searchRow: SearchFieldRow;
 	highlightBg: color;
 	highlightDuration: int;
+	radius: pixels;
 }
 
 LevelMeter {

From b011d9fcb2a683f73bfad07c23ec3c9f364434fa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Feb 2022 13:39:54 +0300
Subject: [PATCH 004/635] Add new palette colors for colored icons.

---
 ui/colors.palette | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ui/colors.palette b/ui/colors.palette
index d78cf94..3b534c1 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -309,6 +309,16 @@ historyPeerUserpicFg: windowFgActive; // default userpic initials
 historyPeerSavedMessagesBg: historyPeer4UserpicBg; // saved messages userpic background
 historyPeerArchiveUserpicBg: dialogsUnreadBgMuted; // archive folder userpic background
 
+settingsIconBg1: #f06964 | historyPeer1UserpicBg; // red settings icon background
+settingsIconBg2: #6dc534 | historyPeer2UserpicBg; // green settings icon background
+settingsIconBg3: #ed9f20 | historyPeer3UserpicBg; // light-orange settings icon background
+settingsIconBg4: #56b3f5 | historyPeer4UserpicBg; // light-blue settings icon background
+settingsIconBg5: #7595ff | historyPeer5UserpicBg; // dark-blue settings icon background
+settingsIconBg6: #b580e2 | historyPeer6UserpicBg; // purple settings icon background
+settingsIconBg8: #f2925b | historyPeer8UserpicBg; // dark-orange settings icon background
+settingsIconBgArchive: #9da2b0 | historyPeerArchiveUserpicBg; // archive main menu icon background
+settingsIconFg: #ffffff | historyPeerUserpicFg; // settings icon shape
+
 // Some values are marked as (adjusted), it means they're adjusted by
 // hue and saturation of the average background color if user chooses
 // some other (not bundled to this color theme) background. If the

From 93ba307071358d547ef0f53a7aafae119b083802 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Feb 2022 13:40:17 +0300
Subject: [PATCH 005/635] Track icon offset inside SettingsButton style.

---
 ui/widgets/widgets.style | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 130102e..2ae207b 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -525,6 +525,7 @@ SettingsButton {
 
 	height: pixels;
 	padding: margins;
+	iconLeft: pixels;
 
 	toggle: Toggle;
 	toggleOver: Toggle;

From c1f44ca8c739cd7183c1e85eb1b7a62f1ada12d6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Feb 2022 13:40:31 +0300
Subject: [PATCH 006/635] Round SettingsSlider by 1px.

---
 ui/widgets/widgets.style | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 2ae207b..8e236b8 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1005,6 +1005,7 @@ SettingsSlider {
 	barTop: pixels;
 	barSkip: pixels;
 	barStroke: pixels;
+	barRadius: pixels;
 	barFg: color;
 	barFgActive: color;
 	labelTop: pixels;
@@ -1023,6 +1024,7 @@ defaultSettingsSlider: SettingsSlider {
 	barTop: 5px;
 	barSkip: 3px;
 	barStroke: 3px;
+	barRadius: 1px;
 	barFg: sliderBgInactive;
 	barFgActive: sliderBgActive;
 	labelTop: 17px;

From 43c61172d8d2ef08c2c190d6b3425823727ea9c9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Feb 2022 12:22:35 +0300
Subject: [PATCH 007/635] Allow overriding Ui::SettingsButton padding.

---
 ui/widgets/buttons.cpp | 21 ++++++++++++++-------
 ui/widgets/buttons.h   |  5 ++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index 4519357..b624afc 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -690,7 +690,8 @@ SettingsButton::SettingsButton(
 	rpl::producer<QString> &&text,
 	const style::SettingsButton &st)
 : RippleButton(parent, st.ripple)
-, _st(st) {
+, _st(st)
+, _padding(_st.padding) {
 	std::move(
 		text
 	) | rpl::start_with_next([this](QString &&value) {
@@ -736,11 +737,17 @@ rpl::producer<bool> SettingsButton::toggledValue() const {
 	return nullptr;
 }
 
-void SettingsButton::setColorOverride(std::optional<QColor> textColorOverride) {
+void SettingsButton::setColorOverride(
+		std::optional<QColor> textColorOverride) {
 	_textColorOverride = textColorOverride;
 	update();
 }
 
+void SettingsButton::setPaddingOverride(style::margins padding) {
+	_padding = padding;
+	resizeToWidth(widthNoMargins());
+}
+
 const style::SettingsButton &SettingsButton::st() const {
 	return _st;
 }
@@ -773,8 +780,8 @@ void SettingsButton::paintText(Painter &p, bool over, int outerw) const {
 		? _st.textFgOver
 		: _st.textFg);
 	p.drawTextLeft(
-		_st.padding.left(),
-		_st.padding.top(),
+		_padding.left(),
+		_padding.top(),
 		outerw,
 		_text,
 		_textWidth);
@@ -798,7 +805,7 @@ QRect SettingsButton::toggleRect() const {
 
 int SettingsButton::resizeGetHeight(int newWidth) {
 	updateVisibleText(newWidth);
-	return _st.padding.top() + _st.height + _st.padding.bottom();
+	return _padding.top() + _st.height + _padding.bottom();
 }
 
 void SettingsButton::onStateChanged(
@@ -821,8 +828,8 @@ void SettingsButton::setText(QString &&text) {
 
 void SettingsButton::updateVisibleText(int newWidth) {
 	auto availableWidth = newWidth
-		- _st.padding.left()
-		- _st.padding.right();
+		- _padding.left()
+		- _padding.right();
 	if (_toggle) {
 		availableWidth -= (width() - toggleRect().x());
 	}
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index 0e0c835..8be2672 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -266,6 +266,9 @@ public:
 	rpl::producer<bool> toggledValue() const;
 
 	void setColorOverride(std::optional<QColor> textColorOverride);
+	void setPaddingOverride(style::margins padding);
+
+	[[nodiscard]] const style::SettingsButton &st() const;
 
 protected:
 	int resizeGetHeight(int newWidth) override;
@@ -275,7 +278,6 @@ protected:
 
 	void paintEvent(QPaintEvent *e) override;
 
-	const style::SettingsButton &st() const;
 	void paintBg(Painter &p, const QRect &rect, bool over) const;
 	void paintText(Painter &p, bool over, int outerw) const;
 	void paintToggle(Painter &p, int outerw) const;
@@ -286,6 +288,7 @@ private:
 	void updateVisibleText(int newWidth);
 
 	const style::SettingsButton &_st;
+	style::margins _padding;
 	QString _original;
 	QString _text;
 	int _originalWidth = 0;

From 6316443b27cffbf0205e07edc0616d370044893c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Feb 2022 15:48:51 +0300
Subject: [PATCH 008/635] Allow SlideWrap to slide up, not only down.

---
 ui/wrap/slide_wrap.cpp | 29 ++++++++++++++++++++---------
 ui/wrap/slide_wrap.h   |  7 ++++++-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/ui/wrap/slide_wrap.cpp b/ui/wrap/slide_wrap.cpp
index 8075c5b..1dcd246 100644
--- a/ui/wrap/slide_wrap.cpp
+++ b/ui/wrap/slide_wrap.cpp
@@ -46,6 +46,11 @@ SlideWrap<RpWidget> *SlideWrap<RpWidget>::setDuration(int duration) {
 	return this;
 }
 
+SlideWrap<RpWidget> *SlideWrap<RpWidget>::setDirectionUp(bool up) {
+	_up = up;
+	return this;
+}
+
 SlideWrap<RpWidget> *SlideWrap<RpWidget>::toggle(
 		bool shown,
 		anim::type animated) {
@@ -92,22 +97,28 @@ SlideWrap<RpWidget> *SlideWrap<RpWidget>::toggleOn(
 }
 
 void SlideWrap<RpWidget>::animationStep() {
-	auto newWidth = width();
-	if (auto weak = wrapped()) {
-		auto margins = getMargins();
+	const auto weak = wrapped();
+	if (weak && !_up) {
+		const auto margins = getMargins();
 		weak->moveToLeft(margins.left(), margins.top());
-		newWidth = weak->width();
 	}
-	auto current = _animation.value(_toggled ? 1. : 0.);
-	auto newHeight = wrapped()
+	const auto newWidth = weak ? weak->width() : width();
+	const auto current = _animation.value(_toggled ? 1. : 0.);
+	const auto newHeight = weak
 		? (_animation.animating()
-		? anim::interpolate(0, wrapped()->heightNoMargins(), current)
-		: (_toggled ? wrapped()->height() : 0))
+			? anim::interpolate(0, weak->heightNoMargins(), current)
+			: (_toggled ? weak->height() : 0))
 		: 0;
+	if (weak && _up) {
+		const auto margins = getMargins();
+		weak->moveToLeft(
+			margins.left(),
+			margins.top() - (weak->height() - newHeight));
+	}
 	if (newWidth != width() || newHeight != height()) {
 		resize(newWidth, newHeight);
 	}
-	auto shouldBeHidden = !_toggled && !_animation.animating();
+	const auto shouldBeHidden = !_toggled && !_animation.animating();
 	if (shouldBeHidden != isHidden()) {
 		const auto guard = MakeWeak(this);
 		setVisible(!shouldBeHidden);
diff --git a/ui/wrap/slide_wrap.h b/ui/wrap/slide_wrap.h
index d972d7f..fcee961 100644
--- a/ui/wrap/slide_wrap.h
+++ b/ui/wrap/slide_wrap.h
@@ -31,6 +31,7 @@ public:
 		const style::margins &padding);
 
 	SlideWrap *setDuration(int duration);
+	SlideWrap *setDirectionUp(bool up);
 	SlideWrap *toggle(bool shown, anim::type animated);
 	SlideWrap *show(anim::type animated) {
 		return toggle(true, animated);
@@ -62,10 +63,11 @@ protected:
 private:
 	void animationStep();
 
-	bool _toggled = true;
 	rpl::event_stream<bool> _toggledChanged;
 	Animations::Simple _animation;
 	int _duration = 0;
+	bool _toggled = true;
+	bool _up = false;
 
 };
 
@@ -94,6 +96,9 @@ public:
 	SlideWrap *setDuration(int duration) {
 		return chain(Parent::setDuration(duration));
 	}
+	SlideWrap *setDirectionUp(bool up) {
+		return chain(Parent::setDirectionUp(up));
+	}
 	SlideWrap *toggle(bool shown, anim::type animated) {
 		return chain(Parent::toggle(shown, animated));
 	}

From 34a42aa8c3ea8c00cba5ced73e3bb6a84938cd92 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Feb 2022 17:58:36 +0300
Subject: [PATCH 009/635] Don't set userpic-color fallbacks for icon colors.

---
 ui/colors.palette | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/colors.palette b/ui/colors.palette
index 3b534c1..965c21c 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -309,15 +309,15 @@ historyPeerUserpicFg: windowFgActive; // default userpic initials
 historyPeerSavedMessagesBg: historyPeer4UserpicBg; // saved messages userpic background
 historyPeerArchiveUserpicBg: dialogsUnreadBgMuted; // archive folder userpic background
 
-settingsIconBg1: #f06964 | historyPeer1UserpicBg; // red settings icon background
-settingsIconBg2: #6dc534 | historyPeer2UserpicBg; // green settings icon background
-settingsIconBg3: #ed9f20 | historyPeer3UserpicBg; // light-orange settings icon background
-settingsIconBg4: #56b3f5 | historyPeer4UserpicBg; // light-blue settings icon background
-settingsIconBg5: #7595ff | historyPeer5UserpicBg; // dark-blue settings icon background
-settingsIconBg6: #b580e2 | historyPeer6UserpicBg; // purple settings icon background
-settingsIconBg8: #f2925b | historyPeer8UserpicBg; // dark-orange settings icon background
-settingsIconBgArchive: #9da2b0 | historyPeerArchiveUserpicBg; // archive main menu icon background
-settingsIconFg: #ffffff | historyPeerUserpicFg; // settings icon shape
+settingsIconBg1: #f06964; // red settings icon background
+settingsIconBg2: #6dc534; // green settings icon background
+settingsIconBg3: #ed9f20; // light-orange settings icon background
+settingsIconBg4: #56b3f5; // light-blue settings icon background
+settingsIconBg5: #7595ff; // dark-blue settings icon background
+settingsIconBg6: #b580e2; // purple settings icon background
+settingsIconBg8: #f2925b; // dark-orange settings icon background
+settingsIconBgArchive: #9da2b0; // archive main menu icon background
+settingsIconFg: #ffffff; // settings icon shape
 
 // Some values are marked as (adjusted), it means they're adjusted by
 // hue and saturation of the average background color if user chooses

From d6cdc810c456d902b6f1398f96b197dfc8ffdf19 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 7 Feb 2022 21:36:51 +0300
Subject: [PATCH 010/635] Renamed anim::interpolateF to anim::interpolateToF.

---
 ui/effects/animation_value.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/effects/animation_value.h b/ui/effects/animation_value.h
index 1b9694b..8d1ebe8 100644
--- a/ui/effects/animation_value.h
+++ b/ui/effects/animation_value.h
@@ -94,12 +94,12 @@ private:
 
 };
 
-TG_FORCE_INLINE float64 interpolateF(int a, int b, float64 b_ratio) {
+TG_FORCE_INLINE float64 interpolateToF(int a, int b, float64 b_ratio) {
 	return a + float64(b - a) * b_ratio;
 }
 
 TG_FORCE_INLINE int interpolate(int a, int b, float64 b_ratio) {
-	return base::SafeRound(interpolateF(a, b, b_ratio));
+	return base::SafeRound(interpolateToF(a, b, b_ratio));
 }
 
 #ifdef ARCH_CPU_32_BITS

From 27d3b68ff450f49393e57dbb01064aa2733b9a50 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 7 Feb 2022 21:37:15 +0300
Subject: [PATCH 011/635] Moved InterpolatedRect util to separated file.

---
 CMakeLists.txt                 |  1 +
 ui/effects/animation_value_f.h | 26 ++++++++++++++++++++++++++
 ui/paint/arcs.cpp              | 18 ++----------------
 3 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 ui/effects/animation_value_f.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fac166..e76e73c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ PRIVATE
 
     ui/effects/animation_value.cpp
     ui/effects/animation_value.h
+    ui/effects/animation_value_f.h
     ui/effects/animations.cpp
     ui/effects/animations.h
     ui/effects/cross_animation.cpp
diff --git a/ui/effects/animation_value_f.h b/ui/effects/animation_value_f.h
new file mode 100644
index 0000000..bd8adb7
--- /dev/null
+++ b/ui/effects/animation_value_f.h
@@ -0,0 +1,26 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+namespace anim {
+
+TG_FORCE_INLINE float64 interpolateF(float a, float b, float64 b_ratio) {
+	return a + float64(b - a) * b_ratio;
+};
+
+TG_FORCE_INLINE QRectF interpolatedRectF(
+		const QRectF &r1,
+		const QRectF &r2,
+		float64 ratio) {
+	return QRectF(
+		interpolateF(r1.x(), r2.x(), ratio),
+		interpolateF(r1.y(), r2.y(), ratio),
+		interpolateF(r1.width(), r2.width(), ratio),
+		interpolateF(r1.height(), r2.height(), ratio));
+}
+
+} // namespace anim
diff --git a/ui/paint/arcs.cpp b/ui/paint/arcs.cpp
index d3121d6..0204e06 100644
--- a/ui/paint/arcs.cpp
+++ b/ui/paint/arcs.cpp
@@ -7,24 +7,10 @@
 #include "ui/paint/arcs.h"
 
 #include "ui/effects/animation_value.h"
+#include "ui/effects/animation_value_f.h"
 #include "ui/painter.h"
 
 namespace Ui::Paint {
-namespace {
-
-inline float64 InterpolateF(float a, float b, float64 b_ratio) {
-	return a + float64(b - a) * b_ratio;
-};
-
-QRectF InterpolatedRect(const QRectF &r1, const QRectF &r2, float64 ratio) {
-	return QRectF(
-		InterpolateF(r1.x(), r2.x(), ratio),
-		InterpolateF(r1.y(), r2.y(), ratio),
-		InterpolateF(r1.width(), r2.width(), ratio),
-		InterpolateF(r1.height(), r2.height(), ratio));
-}
-
-} // namespace
 
 ArcsAnimation::ArcsAnimation(
 	const style::ArcsAnimation &st,
@@ -221,7 +207,7 @@ void ArcsAnimation::paint(Painter &p, std::optional<QColor> colorOverride) {
 			? arc.rect
 			: (progress == 1.)
 			? previousRect
-			: InterpolatedRect(arc.rect, previousRect, progress);
+			: anim::interpolatedRectF(arc.rect, previousRect, progress);
 		p.drawArc(rect, _startAngle, _spanAngle);
 	}
 	p.setOpacity(1.);

From 88966598b8056024f625828a64aa5818ee36a437 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Feb 2022 07:37:07 +0300
Subject: [PATCH 012/635] Removed limitations on number of indexes.

---
 ui/text/text.cpp           | 4 ++--
 ui/text/text_utilities.cpp | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index fc4c0e5..60cc4ea 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -565,8 +565,8 @@ bool Parser::processCustomIndex(uint16 index) {
 	if (url.isEmpty()) {
 		return false;
 	}
-	if (url.startsWith("internal:index") && url.back().isDigit()) {
-		const auto customIndex = uint16(url.back().unicode() - '0');
+	if (url.startsWith("internal:index")) {
+		const auto customIndex = uint16(url.back().unicode());
 		// if (customIndex != index) {
 			url = QString();
 			_linksIndexes.push_back(customIndex);
diff --git a/ui/text/text_utilities.cpp b/ui/text/text_utilities.cpp
index c6b36a7..7e16fa1 100644
--- a/ui/text/text_utilities.cpp
+++ b/ui/text/text_utilities.cpp
@@ -43,8 +43,7 @@ TextWithEntities Link(const QString &text, const QString &url) {
 }
 
 TextWithEntities Link(const QString &text, int index) {
-	Expects(index > 0 && index < 10);
-	return Link(text, QString("internal:index") + QChar('0' + index));
+	return Link(text, QString("internal:index") + QChar(index));
 }
 
 TextWithEntities PlainLink(const QString &text) {

From b69fcf60484c06feca0483ef22559ad1ecef99c8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Feb 2022 07:59:09 +0300
Subject: [PATCH 013/635] Added ability to hide layer from delegate of
 BoxContent.

---
 ui/layers/box_content.h        | 1 +
 ui/layers/box_layer_widget.cpp | 4 ++++
 ui/layers/box_layer_widget.h   | 1 +
 3 files changed, 6 insertions(+)

diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index cd8a672..c76e34b 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -79,6 +79,7 @@ public:
 	virtual void setNoContentMargin(bool noContentMargin) = 0;
 	virtual bool isBoxShown() const = 0;
 	virtual void closeBox() = 0;
+	virtual void hideLayer() = 0;
 	virtual void triggerButton(int index) = 0;
 
 	template <typename BoxType>
diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index 96ba72b..e8bcf53 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -217,6 +217,10 @@ void BoxLayerWidget::showBox(
 	_layer->showBox(std::move(box), options, animated);
 }
 
+void BoxLayerWidget::hideLayer() {
+	_layer->hideLayers(anim::type::normal);
+}
+
 void BoxLayerWidget::updateSize() {
 	setDimensions(width(), _maxContentHeight);
 }
diff --git a/ui/layers/box_layer_widget.h b/ui/layers/box_layer_widget.h
index a26c5ad..893e220 100644
--- a/ui/layers/box_layer_widget.h
+++ b/ui/layers/box_layer_widget.h
@@ -91,6 +91,7 @@ public:
 	void closeBox() override {
 		closeLayer();
 	}
+	void hideLayer() override;
 	void triggerButton(int index) override;
 
 	void setCloseByOutsideClick(bool close) override;

From c369eb13bf0ad1c04434d5ea6b740068c6d67ef3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 23 Feb 2022 04:07:24 +0300
Subject: [PATCH 014/635] Removed Q_OBJECT from BoxContent.

---
 ui/layers/box_content.cpp | 81 +++++++++++++++++++++------------------
 ui/layers/box_content.h   | 16 ++++----
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index 8e45c8e..e25af58 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -18,8 +18,6 @@
 #include "styles/style_layers.h"
 #include "styles/palette.h"
 
-#include <QtCore/QTimer>
-
 namespace Ui {
 
 void BoxContent::setTitle(rpl::producer<QString> title) {
@@ -48,7 +46,9 @@ void BoxContent::setInner(object_ptr<TWidget> inner) {
 	setInner(std::move(inner), st::boxScroll);
 }
 
-void BoxContent::setInner(object_ptr<TWidget> inner, const style::ScrollArea &st) {
+void BoxContent::setInner(
+		object_ptr<TWidget> inner,
+		const style::ScrollArea &st) {
 	if (inner) {
 		getDelegate()->setLayerType(true);
 		_scroll.create(this, st);
@@ -90,11 +90,13 @@ void BoxContent::finishScrollCreate() {
 	updateScrollAreaGeometry();
 	_scroll->scrolls(
 	) | rpl::start_with_next([=] {
-		onScroll();
+		updateInnerVisibleTopBottom();
+		updateShadowsVisibility();
 	}, lifetime());
 	_scroll->innerResizes(
 	) | rpl::start_with_next([=] {
-		onInnerResize();
+		updateInnerVisibleTopBottom();
+		updateShadowsVisibility();
 	}, lifetime());
 }
 
@@ -118,32 +120,39 @@ void BoxContent::scrollByDraggingDelta(int delta) {
 	_draggingScrollDelta = _scroll ? delta : 0;
 	if (_draggingScrollDelta) {
 		if (!_draggingScrollTimer) {
-			_draggingScrollTimer.create(this);
-			_draggingScrollTimer->setSingleShot(false);
-			connect(_draggingScrollTimer, SIGNAL(timeout()), this, SLOT(onDraggingScrollTimer()));
+			_draggingScrollTimer = std::make_unique<base::Timer>([=] {
+				draggingScrollTimerCallback();
+			});
 		}
-		_draggingScrollTimer->start(15);
+		_draggingScrollTimer->callEach(15);
 	} else {
-		_draggingScrollTimer.destroy();
+		_draggingScrollTimer = nullptr;
 	}
 }
 
-void BoxContent::onDraggingScrollTimer() {
-	auto delta = (_draggingScrollDelta > 0) ? qMin(_draggingScrollDelta * 3 / 20 + 1, int32(kMaxScrollSpeed)) : qMax(_draggingScrollDelta * 3 / 20 - 1, -int32(kMaxScrollSpeed));
+void BoxContent::draggingScrollTimerCallback() {
+	const auto delta = (_draggingScrollDelta > 0)
+		? qMin(_draggingScrollDelta * 3 / 20 + 1, int32(kMaxScrollSpeed))
+		: qMax(_draggingScrollDelta * 3 / 20 - 1, -int32(kMaxScrollSpeed));
 	_scroll->scrollToY(_scroll->scrollTop() + delta);
 }
 
 void BoxContent::updateInnerVisibleTopBottom() {
-	if (auto widget = static_cast<TWidget*>(_scroll ? _scroll->widget() : nullptr)) {
-		auto top = _scroll->scrollTop();
+	const auto widget = static_cast<TWidget*>(_scroll
+		? _scroll->widget()
+		: nullptr);
+	if (widget) {
+		const auto top = _scroll->scrollTop();
 		widget->setVisibleTopBottom(top, top + _scroll->height());
 	}
 }
 
 void BoxContent::updateShadowsVisibility() {
-	if (!_scroll) return;
+	if (!_scroll) {
+		return;
+	}
 
-	auto top = _scroll->scrollTop();
+	const auto top = _scroll->scrollTop();
 	_topShadow->toggle(
 		(top > 0 || _innerTopSkip > 0),
 		anim::type::normal);
@@ -152,16 +161,6 @@ void BoxContent::updateShadowsVisibility() {
 		anim::type::normal);
 }
 
-void BoxContent::onScroll() {
-	updateInnerVisibleTopBottom();
-	updateShadowsVisibility();
-}
-
-void BoxContent::onInnerResize() {
-	updateInnerVisibleTopBottom();
-	updateShadowsVisibility();
-}
-
 void BoxContent::setDimensionsToContent(
 		int newWidth,
 		not_null<RpWidget*> content) {
@@ -174,7 +173,7 @@ void BoxContent::setDimensionsToContent(
 
 void BoxContent::setInnerTopSkip(int innerTopSkip, bool scrollBottomFixed) {
 	if (_innerTopSkip != innerTopSkip) {
-		auto delta = innerTopSkip - _innerTopSkip;
+		const auto delta = innerTopSkip - _innerTopSkip;
 		_innerTopSkip = innerTopSkip;
 		if (_scroll && width() > 0) {
 			auto scrollTopWas = _scroll->scrollTop();
@@ -202,13 +201,21 @@ void BoxContent::setInnerVisible(bool scrollAreaVisible) {
 }
 
 QPixmap BoxContent::grabInnerCache() {
-	auto isTopShadowVisible = !_topShadow->isHidden();
-	auto isBottomShadowVisible = !_bottomShadow->isHidden();
-	if (isTopShadowVisible) _topShadow->setVisible(false);
-	if (isBottomShadowVisible) _bottomShadow->setVisible(false);
-	auto result = GrabWidget(this, _scroll->geometry());
-	if (isTopShadowVisible) _topShadow->setVisible(true);
-	if (isBottomShadowVisible) _bottomShadow->setVisible(true);
+	const auto isTopShadowVisible = !_topShadow->isHidden();
+	const auto isBottomShadowVisible = !_bottomShadow->isHidden();
+	if (isTopShadowVisible) {
+		_topShadow->setVisible(false);
+	}
+	if (isBottomShadowVisible) {
+		_bottomShadow->setVisible(false);
+	}
+	const auto result = GrabWidget(this, _scroll->geometry());
+	if (isTopShadowVisible) {
+		_topShadow->setVisible(true);
+	}
+	if (isBottomShadowVisible) {
+		_bottomShadow->setVisible(true);
+	}
 	return result;
 }
 
@@ -227,8 +234,8 @@ void BoxContent::keyPressEvent(QKeyEvent *e) {
 }
 
 void BoxContent::updateScrollAreaGeometry() {
-	auto newScrollHeight = height() - _innerTopSkip - _innerBottomSkip;
-	auto changed = (_scroll->height() != newScrollHeight);
+	const auto newScrollHeight = height() - _innerTopSkip - _innerBottomSkip;
+	const auto changed = (_scroll->height() != newScrollHeight);
 	_scroll->setGeometryToLeft(0, _innerTopSkip, width(), newScrollHeight);
 	_topShadow->entity()->resize(width(), st::lineWidth);
 	_topShadow->moveToLeft(0, _innerTopSkip);
@@ -239,7 +246,7 @@ void BoxContent::updateScrollAreaGeometry() {
 	if (changed) {
 		updateInnerVisibleTopBottom();
 
-		auto top = _scroll->scrollTop();
+		const auto top = _scroll->scrollTop();
 		_topShadow->toggle(
 			(top > 0 || _innerTopSkip > 0),
 			anim::type::instant);
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index c76e34b..8b470d9 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -18,6 +18,10 @@
 enum class RectPart;
 using RectParts = base::flags<RectPart>;
 
+namespace base {
+class Timer;
+} // namespace base
+
 namespace style {
 struct RoundButton;
 struct IconButton;
@@ -97,7 +101,6 @@ public:
 };
 
 class BoxContent : public RpWidget {
-	Q_OBJECT
 
 public:
 	BoxContent() {
@@ -211,7 +214,6 @@ public:
 
 	void scrollByDraggingDelta(int delta);
 
-public Q_SLOTS:
 	void onScrollToY(int top, int bottom = -1);
 
 protected:
@@ -274,12 +276,6 @@ protected:
 	void paintEvent(QPaintEvent *e) override;
 	void keyPressEvent(QKeyEvent *e) override;
 
-private Q_SLOTS:
-	void onScroll();
-	void onInnerResize();
-
-	void onDraggingScrollTimer();
-
 private:
 	void finishPrepare();
 	void finishScrollCreate();
@@ -290,6 +286,8 @@ private:
 	void updateShadowsVisibility();
 	object_ptr<TWidget> doTakeInnerWidget();
 
+	void draggingScrollTimerCallback();
+
 	BoxContentDelegate *_delegate = nullptr;
 
 	bool _preparing = false;
@@ -301,7 +299,7 @@ private:
 	object_ptr<FadeShadow> _topShadow = { nullptr };
 	object_ptr<FadeShadow> _bottomShadow = { nullptr };
 
-	object_ptr<QTimer> _draggingScrollTimer = { nullptr };
+	std::unique_ptr<base::Timer> _draggingScrollTimer;
 	int _draggingScrollDelta = 0;
 
 	rpl::event_stream<> _boxClosingStream;

From 4ba28e2fec2ab86fb539a4cfe08b9bd1803f8fcf Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 23 Feb 2022 04:11:04 +0300
Subject: [PATCH 015/635] Renamed BoxContent::onScrollToY to
 BoxContent::scrollToY.

---
 ui/layers/box_content.cpp | 2 +-
 ui/layers/box_content.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index e25af58..e089902 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -110,7 +110,7 @@ RectParts BoxContent::customCornersFilling() {
 	return {};
 }
 
-void BoxContent::onScrollToY(int top, int bottom) {
+void BoxContent::scrollToY(int top, int bottom) {
 	if (_scroll) {
 		_scroll->scrollToY(top, bottom);
 	}
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index 8b470d9..86112dc 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -214,7 +214,7 @@ public:
 
 	void scrollByDraggingDelta(int delta);
 
-	void onScrollToY(int top, int bottom = -1);
+	void scrollToY(int top, int bottom = -1);
 
 protected:
 	virtual void prepare() = 0;

From ec7af743519d6d30cfa59bc6a61fe4d61b538954 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Feb 2022 16:08:47 +0300
Subject: [PATCH 016/635] Update some icons.

---
 icons/box_button_back.png           | Bin 218 -> 339 bytes
 icons/box_button_back@2x.png        | Bin 282 -> 504 bytes
 icons/box_button_back@3x.png        | Bin 251 -> 772 bytes
 icons/box_button_close.png          | Bin 148 -> 315 bytes
 icons/box_button_close@2x.png       | Bin 269 -> 432 bytes
 icons/box_button_close@3x.png       | Bin 590 -> 562 bytes
 icons/box_search.png                | Bin 350 -> 392 bytes
 icons/box_search@2x.png             | Bin 707 -> 660 bytes
 icons/box_search@3x.png             | Bin 825 -> 1027 bytes
 icons/default_checkbox_check.png    | Bin 136 -> 279 bytes
 icons/default_checkbox_check@2x.png | Bin 255 -> 385 bytes
 icons/default_checkbox_check@3x.png | Bin 296 -> 523 bytes
 icons/simple_close.png              | Bin 124 -> 282 bytes
 icons/simple_close@2x.png           | Bin 176 -> 399 bytes
 icons/simple_close@3x.png           | Bin 264 -> 492 bytes
 ui/effects/animation_value.cpp      |   2 +-
 ui/effects/animation_value.h        |   2 +-
 17 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/icons/box_button_back.png b/icons/box_button_back.png
index 9db1870f6b3b21d9a479cab250c00a689506c791..3fcc4ad2ed4879d0ba1e9890e675c230bdd04fde 100644
GIT binary patch
literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$e_IkQFhG>XR
zop_L|MM0pg_`X7wrv5ye@^7Y10*88h1XXr@i;At9P$u@>$l}Dh?LYVDmt0w<DVDtE
z{qJ?Jxtv%N<d1)};eS5okp*-0{qha%i3eI%9q`j^wCz(q+O2bpW81Y|3Lyec4AryL
zxWsO5%T16@=5k`0zjJEP_uBaDt_3o4pZ`3?c}HS#*4A~}JzI3VuO7N!$!>csN+x`D
z&DZ}`d%hQ(vpIituHhM5d%KU@P3sp4Fy)7?T{0#2_M}tNdq0HB?>x<V667IIS3j3^
HP6<r_<Cbx|

delta 201
zcmV;)05<>A0@?wP8Gi-<001BJ|6u?C0HH}lK~y-6t&+J7!!Qg*zk|SqjsZM`HHkEW
zAh+6rYq0cUUWF-wAOd3gh)sZ%_#PmB0)S}E%reijSZmc8Xb(grp9&$I6SQzCMY^s#
zE@<JL^A`9k_yhh5S~$jd6n+a@xYjBF#26#q``rdJ%awZIhC))m;GEm-)g`8s&Monl
z7%xb+PkEZAbEmu}8OKo-Jhf<u2*WU-?|UrEqDJ@vGq8T5FG6`k00000NkvXXu0mjf
DlVMid

diff --git a/icons/box_button_back@2x.png b/icons/box_button_back@2x.png
index b729fc2796d28438305fa67fc819a76710c814f9..12276d366497bbb57328c1a455828c4e78cc8df1 100644
GIT binary patch
delta 489
zcmbQm^n-bVWIYoD1H&JQw~K)kV{wqX6T`Z5GB1G~m(&Q)G+$o^Eg+kNfw4W4fd!-l
zh^2s-fq{7eBLg##W(0{XV1mmkEMP{kK?>KjC4B}eOY(Ga4DsN-I@PzUIf19m`qrzn
zyS^~7)`#zHWY_Rm%AwS>HB|hTyslDESN-m$Y(f1ChtIUk6k5`~NFZ@mD~H<o+4|4C
z)h5>`*_^lT`&?ne;<&({^F?Z8-TzyE>(s>_Sm>SqY;R>V{j};*h6|TXTz_S4U9{wU
z+UDDD+e#v*b-uj*TJ&YtqJT@wFK13t@wlI3cI1mi-^6wGtF%<-rry-(ny@ZY%J6T|
zPKDU(rCwHt4IBj&?i%nU{d!sAv@3JgkuQfIHk6#+#PKpdp<s4Fi>Yt02x}*UkK2#M
z!hs@&<)5Y>O*%M1<u}`>s72dyH|tajU-*A{vx@)&@2g6=YsX7tC%ol<^^{X;-}}XE
zI_vwdzKG+vz0KY7_{XG*BT;X^{|1WmExVg%e#-LPbK`4WWe&F1(pB46Z@imVz4ed6
z^69FEU2HlR4R|(&O;X|Y+Bm&9eDSJPafZ%w9g_FPT`#qrf4==#-|PR(mmHVhn!Qka
QCMe)NUHx3vIVCg!056Tnb^rhX

delta 266
zcmV+l0rmd)1DXPm8Gi-<0047(dh`GQ0O3hQK~z|U#n(*=gD?;U;McT=a+gyHu9A)?
z^GJg0FkMtBtucRPCIhoEle`ZMf;Rw+#v&pBfcL)j2w(?PHxcnsMAUS~-v5OkHBFNa
zAQrx^D-XjU4-g112MC3i0R+SI0O9a7Kq34ZpcEblD2AT_%75YCfDYjwK&S9GAQrAw
z=o!w;Y|y#x%d$L;F|gJ~2SNy7X0ZkmmvGxQolDpmk^c}0BhC+%5%C2@#Py;QB0Zph
z$PWo4$_51y<-<aVx(xz|`b{y!IF5RNUxah6`4v3SSjR7U2m$jvw;qERqLeTD<!J)T
Q00000NkvXXt^-0~f{*%Z*8l(j

diff --git a/icons/box_button_back@3x.png b/icons/box_button_back@3x.png
index 5e5cf8b4184ddd274c7b40ea672ecd4719c79955..d946415b53d666d561324efbe340bb3a8bbd35b0 100644
GIT binary patch
delta 748
zcmV<I0u%lF0fYvSB!2;OQb$4nuFf3k0000)WmrjOO-%qQ0000800D<-00aO400961
z02%-Q00003paB2_0000100961paK8{000010000mpaTE|000010000m00000+c#_s
z0007RNkl<ZSP9LTNv|nE6vwZ5p7yrH%0gmk<13K(D0UV?5Pyk?5D_sC8}l5*5FsLb
z0@l6-?yJ1Mx%!>Hi}$J?)xD6@E&qT2y3VPtI{op%vqMD4Bb7=$9*@;(J)h6_`<>8@
zRBkXBj>qHY?_;;yiA1E2M+BtT>rbZ>L&N;qY&IfC60uIF`yLyH=61UojYbkre63ci
zJsb|~u|cud>wm>}BvB%o{eBN<d_EtEC%#sr(V*f5G=9Gy-;qSAR;#z$EuaYm0wkXJ
zT9rz**=zt!C=|kXBvC4r%Jq5;Xd;mai6_1m(X3W0KogBd@f}H&3WZ{^SOA(>EJosq
zua(Q?^Z6Xm#N%;%M-nBXnNFvGCXq;xc;ahiGTCG@0e>{9R0`jbM2Tp|<1wH~r_%y~
zfW#J4i}p9e;SkVdG8sBF5{abW?*p1_HcO4B+wB6HTrNk4Ml2S$+igHoEEa`AA!hDz
zWnXpLY&Kmk7u#eun}x$+gvh@5y7+p%UM`m}e{QD0P`&4rd94UcCKGBHUiaw#<ZL#Z
z-(4bq#ec`IlrhMSM#JrPv+<Y9WiS|gJRa<euZ#aEYIGYk?GY0w-g>=Gv-d+xX!7%p
zsnu!$rdq8=d7QXR)oPU{6Ix=q%Lrn6|1$ENLx`!<>44l-Diz)_mCI$yOx$-SADK#}
z66JB~^?IP5sBD#<HI6pg+^sDinF@sh&D^1J8f6RyAb0tEo{vm)8Ud!Jer(*RH75)c
zYHdfO5y)LKnS9QI_eVc6SuB?KlRWRp{RCjQ+n;|^i4fEG+Je4M&@65C^E(_4r_)Ju
e^0R6Fd;ANt=<S@suq3Mh0000<MNUMnLSTYN^GQhn

delta 223
zcmV<503iQ_2Kxb!B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0001;
zNkl<Zc-rjPy$ygM7=&Tao(W(V2II%k*aMhF(Za$Qt1o&n_a?ODX-F<8CDC%EKpK?w
z2*Pw~AWRp{$EI7&sMczX0n%7&siB4%YN(-x8fyNdc|R=84p@THj3x!vTuRYed+$*|
z<Di)!pFK@~HMQ1gqDj)^oTG^*8B_0_CYmHoAAAcxm_i6ZJ2S=zw0%=bKzlsrEOON*
ZzyN3gV{p-as`LN=002ovPDHLkV1j`xUmE}b

diff --git a/icons/box_button_close.png b/icons/box_button_close.png
index 3b0402893ab0c64450b8d081ba33aa55f8cc5e01..aa732afc8717de74f498f39648a26c98ff8644fd 100644
GIT binary patch
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uuz(rC1}QWNE&K$emU_B4hG>ZH
zop74>u!4Y#ZxA1EAe)hpd*2j>xdCj8`1z(dxJ7c#JUT!4QS;lGwaw{!bL)3a35t5X
zx<8R6VV2eNs`vMPpZv=;LxORJn^T9x<5`MQ$_&8_NoVg|oMM+YFLRpX-pgwG*LY&G
zdwupe7&V-}_~eUx%%zBDJNTb_^lxsQR6O1A*n&Kc#0xr`-&<SeS9xf9YhJrmdU}eG
i-^#7e=5YS|_?LO>`kqr~ls%S$9Pa7r=d#Wzp$P!mXk+^T

literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a)4Xipc%5RHj*0}t{t7;-4Z9{xN3
z-9x1fY~Od>k2THo{UhNJkh08E>c9<^xii^3Z_9bgpUF39jCXR+YWbFR_}bpqbB_+W
w-i@^4sx7&8`S{vZO)4%f(nd-OoT07kiV-r$UTbaZ09wP~>FVdQ&MBb@0Ck@<cmMzZ

diff --git a/icons/box_button_close@2x.png b/icons/box_button_close@2x.png
index fea726bdbee71641f170e4b68cfa3ae5365fba56..976b284392f636b83d7df5300997eecac156f382 100644
GIT binary patch
literal 432
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={W7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSVF5FO4N|zKE$K5*nUtrCV~7Xu
z+bPz3%?1K4Kkv2)1v)W{a(LyjiYsn^B;|3kB~*ud&$%QWRaU(pZ>sJcxFNvu{l|8e
zOD1PGoq4-bq2<o9v!DO$>@AeZ{p@4w;lbUpa{tv^+m?D-%=<KBnJ4G$Wr@6tG-f@I
z^cAgoQF4MYk@tefq$g93_wnuQ^|RgC&K>*iq2Kh16}HW+&Px`h^xZ6s{JF6B{lm$5
zUjk;|u${R+a_*_SzXEI4Tq}*8_O$rB-D5G=y+tph&d0j8JW^dD^!m$jvl^huQK5P7
zSFu|a7A~25qo3XV`{Tsr@n0ugxNG~QM7)2K&Q-A~|2fOD<3w01rTa=_CpXTitLb00
ziYG&>HSxyxzXm*oGMgvQU{et&i#`73{ipXr6^u`K7}$UP{p|+|El*cJmvv4FO#p-f
BrR4ws

literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002gNkl<ZNQuSP
zK@Ni;5QX7Mw{tEs_kCf@wTQdd1!=1laRyCG;zrH?B?<u%5vnQy(99?zm#&l&0Z>)j
zJym5Xg(O*Py@aHcSZgIomQor5fa@`ftmCf%fMRC52T`OKUp0hRkdt@=W)VmH14I#L
zd<%GyKzt9JA;EYb7$Fmr;dqAhkYIcaj1ccMe#j5Te?Cz!zAVc<KlvzbW-}|^A0NHr
zT4<j51QL%2k-4}Vxe|9F-&<xhK0*L&H~rao4|#9;BJJ3cbH3%+VrI-azmF|X+QFY?
To+i&%00000NkvXXu0mjf-wkKK

diff --git a/icons/box_button_close@3x.png b/icons/box_button_close@3x.png
index e818a6a97a9199113db73c272ec460033ba5a499..92e6626f44ff4525d8b0166d62d7be9952f45a33 100644
GIT binary patch
literal 562
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H<Xr$#jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;Zuz(rC1}VI4p2GuFHpkP&F(iWX
z?bW^OTpT3W9-Qse2$5<%CaMuT(feWm*Slsn?dN7Y_$F$koS$v1c<qPe=k2^l*FBy6
zz53JIxwU)eJ)U{MxKZEtfC0~ClTZ_PokQ<c+Y@hm|7+0~C~`NtGPKv>h?0!%x~%8F
zx8)|Et+xAQGyi?ZK5<vW<@+u&_0ABoJs&-7qOj(&t!+mZ2?}$#hK8Ory*O)=PNeCI
z%{r?yXZ32H-Xtx!Iw-2SU`xbQgE{YJS?sg6lwuMyKY68N_LFQEpH(I`YFlURR+E(~
zn{3D1?YaHgoiDOyJ2N-0{ru*r%G~#*<>zC3c9}je7P|81gD=PGw!{~^`r__w)6Khh
zeQNx|`H!AzKmNfl_H<qbhxh8vYk&U9pKjSQD}%SPtGvGa)bo-hivA6Gmv_2t?{r;!
z{>ZwEiMv(@W<R>T!l*Oj$?PMhM!ueta<;`z{Qu$ZU(LQ`rG0g!GU>CHnR>Vso2YMb
zSe(tP6?1*+YD=SqAn#?)5(<vJE@AO{(`qXh#R)2lkB0tyUVHz0v%-%(YR`p}1ohNk
idseD_@Oki$<sU=(lr}BjNsm8+;>*+3&t;ucLK6Tj$mHYz

literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq001Na001Ni0ssI2ZekD50000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz@JU2LRCwCNm$#0>KoEwlBb~_MRiK0x
zYIsAC5J?CSLE<X1h|fYpLFN0v;sTmm7BIf4?43WzYkOwaFfNhL=ZnRn%jGg`3ZzP<
z60+BcTrPJ!9!=9Mm&>;JAyTPS5JWbc&3-2`natsEFfRe<Nk8b-YV}JH@pL+UN~BV$
z{eEx$j#{necDo;Qf(ZRe5Q}6oX$*%$Q;K@M?(ul;b%Fv>6vW6#Boe#bPE0o%4X@X$
z?*tf%D1`+^Cy>Ig*=%b10Rt?GY`5EZJpK*kh9wc&YPD|q0RSe_H=9i?7P}^}L_#FA
z+iis(sZOVJhm#f2Xmq_^i!|g!KNh>)u1G-&LDhytB9Y~CDUuPr^5eGG>xp1Qkh=Y<
z0WB5_QKH}P`+PnN#s#+`47!%nm)~qQ6NLtY!TUM55CIVHaIzvC4o|03QSRd$VhRex
zM+#3U6q-yXrgi{^@_0!N27{V@<M9~qv&{ktgw#%>(I^lI*wY3PQam3izu&K;^QHr`
zL={=Pn)~Uo*d-^nQRju(^MN?`={xsRJ6Eps3-Mom^Z8u2<m<PXrwTvm)oP{bbhCM?
zTG|6``sP?5H*3WJV)MYG7_Dp`<s2PS|N1>&GJZRDu)ye5N2Z^Ch-2{|he0a}g~F?k
cxt{_I0NxbTCUcV|{r~^~07*qoM6N<$g7G2-RsaA1

diff --git a/icons/box_search.png b/icons/box_search.png
index 04735260760a3bc5d9b99022d3d868882a5d59c7..fff003560b82e86cfb3b82cd482841e1a2354cb1 100644
GIT binary patch
delta 376
zcmcb|)WJMKvYv^7fnmbL3^O3bSRCZ;#IWw1%u680B{jk`&DWPf3&`eRU~JE1U;!xs
zVksbIU|?Rr$iNJw89`zTnBcMk3z!jXkV2Et!cRczlc$Sgh=%CWiH3YG4kB$gSD3~)
zG%lE4uc@l{kZ;|h0`aX!7)`uvojRIa_SRo}mg<w1YqomEpU;2a|NWe%aq9p4%vqK5
zu9xn8ZylB~p?_nbNblnc8TUYu$Z3hKY>d;tC~(GIHtBmjftQy_&ysz)a{qd}+YSdF
z2AzsdNIIi%>AIYZ-jn9-vDb5NPg7rV@L?CP%gVkMo7aWUtslrftBkvD%Hw=WEY4Gz
z`H%rmXlQBd`c<oRP8T1t=-Zy_Jt-wpY+r<9(EaZf`Nt&Eet%k?d)scc?fKnDJj|!1
zmd2X<PJaLU5|iMvOe-E|0hUFDo3C#<{Wf1~{=bV8HUBNyY77boPgg&ebxsLQ0Mi7E
AmjD0&

delta 334
zcmV-U0kQsw1Kt9V8Gi-<001BJ|6u?C0VPR9K~y-6t&>5D!cY)IpJQ@>Kp<O#?$mYM
zdH}&2cmvNMIf9ULMD!B6{;otwZ$IP!?rK)bL^B!0X{gPw?xLyc-vh)475qlTam;$X
zCd)Dgg8^p7>2zYd-BQ=}qp#Pt!E82Tx7z`5I2^cMuZ%_`7JrKc0L$f)<MH_D*H0u#
zBJaJ*vQ!jB4K9izm1QaKy^<ukzc&SnqL7&>3`0G0fWk18nW-p>b^$X}p69K@cjS34
zGZUb%HuI{g>N1|Hs)*wlfER(fu1V9hQy@*#MiT$)!MiEE+<|kB$z+1}9{BqX`oQLS
z_<TN-Wf?&bFh?Gbna}4)V!z+BTCKQTE)7ov$T=rTa?W)|*n*FS)dx1W+l}FH$aFgG
gjIXU)Khrz)4TY@wg>IlGNB{r;07*qoM6N<$f~^pr1^@s6

diff --git a/icons/box_search@2x.png b/icons/box_search@2x.png
index 4d2c66f86e536edb168c150881677aeb32b04d57..f633fd720506d98e419569d87e841d5bed894fc9 100644
GIT binary patch
delta 646
zcmX@iI)!zDWIYoD1H&JQw~K)kV{wqX6T`Z5GB1G~m(&Q)G+$o^Eg+kNfw4W4fd!-l
zh^2s-fq{7eBLg##W(0{XV1mmkEMP{kK?>KjC4B}e`{(K67~;Wub?V+Mra*z##Z3`Q
zE`%Lqum51Elk=JDo7uFi_skuOIJh3=FMnd06S_e>n$<Dj!jr?E$3nla+nvaKQn%#Y
z8O!u{bLY;jt^E03`@uh^jS+9&ZVFl%Vk6hSBW}HT_tD>}xn|PegT9~ePzllz+kX3P
zd!ir{!<%_8)8>1qEW5nY@#isKo(<Axwb>43Z4H`vGiTcQ`sbP#U#BK+IJ%PIfLu{Q
zs_pNG1t*>s9ZdKz>(A{&o*WHJ8Xs*7n-Xd<;quEb+ZX(`XE@7vQ7+}{CF5TqmJ3W%
zHZ`7XRB$psxbM%+oUjX1ZfrB^uSxi2vw-`+vSmUG9v{uv8uk2hWX|*WgogJo+)fqk
zoFaWe%k6?Q!-fqD>{;?<>v!MvTVV1e_edstM8pNwbe)Nld#2AYWGr?onRIeVwIi$c
z-5Cv<YP)9o9IItwJ^%c(y3YPvS7toB9&cjwdWD5tf2)(CK*6ty3OP}g4Sd$K*2k^C
zz3-B}e3{J7`|rKuPp_Z<Sn6xq=FHIgtm+>R7Tn7)3E6o2?KCe{*>$hN58qa=7cM=u
z_KDwe<)zElzqorc<<Oi&p$!H%9@W^*S$j8X_0^EMn{V4iXy2P1yEZIz@AcO|*Tk(1
z38^)ZXmL`^Uta7s{d8)mJYT!r>h{AA|JLbqx-Fh~{#DWDj}<jmb8o%<wtj_oUxvx6
dm}C1T{<2I{@|3X>+rk4%6`rnsF6*2UngB0~A&me4

delta 694
zcmV;n0!jUp1;Yi98Gi-<0047(dh`GQ0*XmQK~z|U#g@HmGC>f=$2SLpaG;GSUSnl-
z2V!BRm`<<~tWq4-R&u3<)wLFaHe#c#HVOC-T(DTg4}^e)Bt?jzpdy0ALMD})cN0Bt
zqv!(*bL`GMzx&v^wE+Oa4JBNnNFWdZhr<B?0E58*5c%#2d4Gr9ZpTa}gRNEz52@Gd
zVLqQnuh(m(9-sNc!vns*zaKRIsr7n|x~`)j2<HO`f`FAu<)G1UI7C7S5<+mh-Ts<y
zx7+A;yUzot*XvBt(P)IJR0{2O`>(aJSPTgv%=(v?7ZgSDZvfeBmMK;!6f8lf(`hE}
z>FJ3d!0YwmYJat&MRZ-~`eu^JBm<F1B=`VIr4mi<bUNHS1^`ggH0D)U1`q@R7mEc=
zjzl7V0&qASIGIdnop3lz=l+3-LZJ}2TrL0r==b~Z{QPXT{HQjY4b*BidVPO?Ph(R6
zS(a%`2>FxwUfpi@U|myy{oMlq%;)p70G7)ojh#-XHGhCh>hA82#=G6l8o<ZL2aSC`
z-&p`2kB7#y*~}WiU@)L@Boa9bAR3L*xYz43bEaEpJRX}h5lcgsWu_VV{eJ6>=>I12
z`ud8pEOP@GhGEu@PdAabw>MhAFbpp9TrNj*x7#f$ioyo~02q(Q@$>VO79xaTC=@cy
z5k(Qp<$p5s=#TtIP6Mc_$^h(DEEX{qi=iY*)HE0jqNZs$olcpxjYb1)HXA>Hs;bN(
z;}FOx6^q4V=H>uD%{!eAhQncee0;QIJRA-&9*>`T!q&~5PA8pL6b1A7JQ{{Ux9VcC
zKtc#st5u#Y%Wr<+aZ_^^;0EU30I5{!7Utgok}o9DkLil$>?@EY37gI4HO<ksr?{1_
cb|N~aFB{hM{h*%gZ2$lO07*qoM6N<$f}@y1hX4Qo

diff --git a/icons/box_search@3x.png b/icons/box_search@3x.png
index 3b681f682e3e977569984958ca6917c6910f6b16..5cd6c5996cc0b25887b3e797192cb291eba697a3 100644
GIT binary patch
delta 1005
zcmV<J0}}kX27?HYB!2;OQb$4nuFf3k0000)WmrjOO-%qQ0000800D<-00aO400961
z02%-Q00003paB2_0000100961paK8{000010000mpaTE|000010000m00000+c#_s
z000ARNkl<ZSPAV{Jx?k@6y;$8g~5i<AhDw(%7<tm3K1oM7Jr0}p1(l+5s>%`G*D7P
zp)t0Ef`pce#10ETz(fHJf%i_H$>cigvNOB;)R#y>?#!Hf=Iq_sd+%5*KfnJh0>4br
z>-BoG+3fD_?&|8Q+wFEboevKWH#ax^e!tmlHX4myuV>0e8YD|gONBzA+wK0=`T+wZ
z@EVLpmXD5(M1Q1Eslda_$fh6rTCLVnsYG{@vf&GckEtyd=`-YTIBK=p;o+f@@$T-f
z-EQOP-~izm;V^A)Z@XMBCGz6pBA?GcJv}Lx<Yw?>=jZ2KJZ7_5wOZZT*-<_>W-yOc
zU^p-EDDiS?fG(HI9B-@D^7(w4M8E*a`QqJaIxYg>Jb!YGXJ=<Nn{AN~SpyPyjzRw!
z#}~_eQ(!0CiJF`yaO%tj$RhON5P$L5P_gjh-W`}JK-8w;!3h;PH)_=IrDq(>YDm?2
zR0bNJN~NL-6<fe}M+w2t{8SSZL%=|tqC<VBhccX=p3))5PnSNnQ61R>-QM0B&mUj_
z590(s+kaRnLa5=)0l9cSpR=Jp0}S9{zLZ}`5Q+eEMrB~O5rgtjej!09Ol)t|DP|in
zC=cZq5~SvAL=Y80`Go|jh1ZB6`kE-ekRWuTY;SZFrhH}KVVsm-ND%sB=8XO(8jZ4{
zJ_8K2Pon%ngj}XZo)vOa2QA3d>Q3)hzE>@SwtsI|?Unsdy<T5lUVa}(?U8By5Vlfw
zjN|dx@Aqq~_=_;PV|?3HdHX?)6zPrrNly(;kw|1Zow6$ZW}w?bhh)~RL*ibBRCaZB
zwX(9J_KrUFUbeNh_4xS6#YW!{cPXQ}J{%5nYM!5;kB^UOauN{-y#9L+doP=to5SId
z?tce0u~-ZM<O1X;5m~?hsq@Ceq`(M;LY$h>XcUjfDF!xbOR-o)C)(+BP`Y1VU-1tc
zGnl76Jm)Ak3<iUP!GOjFYWDW_<XFr?2Lb`~O;ioiU?Pz)i(ifh`B$lCe}7+&#Vqv3
z#>V~qJ&ny|GC4RnFpFP~XMKHLsV13B%4V^cg<e}*L$>8&lS-w`;+N(*IXR(fUS3|(
z>9jP9F^6|OHPkRR<dR%2cX@fqX1>7ics$qF*N}x|n8{?mK!I{gyWNfqw4kIbU4CXh
bHv)eE`dpSRf0gSA00000NkvXXu0mjfFL=q|

delta 802
zcmV+-1Ks?C2)PE3B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0008p
zNkl<Zc-rh(J8NP=7>x_d+L%fdJB_3=rB*({2R?p4NUCV1jiPoU`d2KpvGWC%3Tm2^
zS|uSuQUtV78(m*}P?#OAyP7+95)AlN-@Sb2%!zkqzVqem?0*#BEM(FtR4SF<@3-6S
zS65eBt@ix<952V?alha1cDv1HvtF;izrTOQUt_geE0xN8K40&R#bSXn6n~<Wi;IhD
zwYnA=fB?u}&CSitXf#?g1%S7=w>;HkGMU|F?(gs8@wmxkQYw|dHh~0>u~@9r>Fm~n
zgpZn3DkY#U6n_fX(fd&-K$!rTPNzA1DFJCD68Shh91aWMAY@mg)9G-M3D?WZi_7H_
zO9IIA^D`j<A!r!|3C@()>t*Bdcszo0$HHQ<SeU=mZU9cRvD{DPa+%)6(hmo{$4jM>
z=*~dj#eqOTx*(i8LI`p!Ap(4NcSqkhyzVnl5n3!k-hcl%h(y;Ud9hgJC5WbSI2<Ab
zp@);a)oSq)L{k|I1`)`?U_gFbGz4CPKt*VW!=VV|bUGzSxm?am5c(aVoy}$<KABAR
z*Tez**&ge#pvh!Ha)m;{Yhjv-UgEGIv@N=$@e%~HOLCZ95rTTX9?8vSGcQ4CM<j>!
z79pt7Xn&CW`udueAest;fC!{ot)^SYK|99KI<SN|JZ1*I%{8CT6GD))j5{11vA{Yq
zjz<E6=61W;)W9^-JhfVleGsE9?9<Z|n}vORe55U`q%kd#NC;dyetan=U($efd3pKz
z`no$|VUPQKzWrDf(7Tw!M*N=|5|{=tC>o7M^ndW5n?QocXf)bxw>b}r|5USDt=L9s
zv@QN$>h0~#>2xyuvjJyHuh;WegZJA4o6Ux6ZLwJF*RfnKQHEkkm+3(@^jH!M26MUG
z!@~pY<?l@(!6ROVLLrStBlT+kxSFqslbY|M29ZoAk4Vinvf1nrsi8F;i<)i3VzDDq
ga~q1|jz0nn0Nm!fVEBZ3c>n+a07*qoM6N<$f|UY-YXATM

diff --git a/icons/default_checkbox_check.png b/icons/default_checkbox_check.png
index 574f57123bd038d32c8e3bf99a69d06c028444c0..cee8d4573facf6b851a4227348c9bea81efbed73 100644
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^d_c^_!2~3^cmJ3Gq!^2X+?^QKos)S9<hZ0pc&7RK
zGH3zW91M)@nG7r-B|t0%#0(6~3m6%gfixpXYylHomTv(woDH&#!J}Zl6_9H5ba4!k
zkZe7_lb1!2hczHQCiQ}%WbFm!5(cFQD|&uTQcWx0df38&$-Y*4QL<$6p6}OgEmmrh
zPF}NhPO<u~SWQ>2pB~#!TXHMri92-|YAyZo^5Vj|L5G~ShVeAbE`IcD_Hn}#*=rZ}
yZuRTidTrNtzTRK+kN5e@{e8FX->>)SLKj(IR0I^>F5hzp<S0*9KbLh*2~7asfL6!=

delta 118
zcmV-+0Ez#X0*C>S8E*yv004y9Z^r-t08dFoK~yM_mC(Trz%U2{K)Qx^^ZsMF4}_Y~
zD!52|!1sWN2ssTvl0>p*KB}@{M*wDcKnY2{76VGy0|rXig9dtT{K5ycKWD`Q(pCCz
Y-LaA7&AorNa{vGU07*qoM6N<$f|_nG@&Et;

diff --git a/icons/default_checkbox_check@2x.png b/icons/default_checkbox_check@2x.png
index 6d3859c84cb809ea2feda32901477b47b31768a9..9109508f09013ebe87d9ecb41fcef32a0717a9b4 100644
GIT binary patch
delta 369
zcmey**vLFVvYv^7fkDvb)H)!=SRCZ;#IWw1%u680B{jk`&DWPf3&`eRU~JE1U;!xs
zVksbIU|?Rr$iNJw89`zTnBcN93z*?-5s<==v-^{Q)N4-{#}Es_qgOn+S`By@0tz3q
z-mz}7sF%CF^l)N~^`nXosk$Gk8uAx8_OA}Ol|D;Av~{nEuQ5;aSpkKvMeAO-2xQKh
zl<UUvXxBQ0N0&<HHrB3_JF;q3NNDOp_KlfRmrWv*WR8EiS{hp{{WbsMrZtN+HtB56
z{T-gEa6I?+zO`c4*Xx}Y^5;MNVAs2wdv%#6KHurH@O}01tilz)U0QxG=y|LWD<Krw
z-mawfwDO*b@1@+^Vq9m1E`F`8pO^mX-fJFR$=+s#h-t37jCQ;;4Lw&V(N>ah;Az(n
uUaMR0J6<Gp-xIm$JE`UOatrbAAJ6fnySs!o$lXi@1%RikpUXO@geCxuaEuNB

delta 238
zcmV<K01^Lz1OEY#8Gi-<005p|UHJe20LDo~K~zYIz0)xY#2^p_Q1=FNf;1MM$0pd?
zctdYv?GY>j^0x>fF;SP`xC2wk{0Hg?Ap~Z$)*9Y>D5dUa{FpHYIcESsjPZ`n!;bRa
z&jD*#&KX*3ez1iZWBA|j1vU=8#7dBeAf=p%o#3)82q9qGHfOBsIt$xDB0>nE80?_~
z*bYi5s{u815Ie856?8=zu=3ONP$ulT7Oh|=><P9|Caezj&_S#Xwoq&B2-XL$Xi5pr
oxl!ylD8#;}M8tvNbEyBSFRLJgFK>CutN;K207*qoM6N<$f-YTX4gdfE

diff --git a/icons/default_checkbox_check@3x.png b/icons/default_checkbox_check@3x.png
index 46f67cbde14f5759ef7642d2948e2dd5085ff29a..ebe40ff1f0c460eaca3c7b1976a0b11427ce0356 100644
GIT binary patch
delta 497
zcmZ3%)Xg$MrJk`k$lZxy-8q?;3=9k|sS%!OzP=1vKsE;hV|yk83y{SK#8N=az`(qK
zk%1XVGlIkxFu`TD7BIuvav+5byLbBnm6dwBIEHxezMXcytJy%{*lRn#ekHDXdsc|L
zYT1eiy1E=qub*^{{f79L__yyaGzyq$?Ox+~dXr^~A@Aqk&!i{sy8ZWOqQtS^$qov;
zZrGfE|NZyzWS`4RUhlGCHIWvL(G!>Y?`EGP&AfYEw&$c5TMips=--pHEpNrX+}nTa
z&U1Ty5_5I@)jRL-ozlAx3lyp=SoM#yozK1fEL88Lb@X@p**`YR)vs7pwKwiz+Jw}~
zTJ^u#k<;E(|4Tk^>bv`HUWMO-B8$0xCdr!j+IVlyUZ$8X(o`tZtPrv2(XX@|5B6=B
zD>@D~KmNF5NrJbTfrx8kS0wAc_nWz<-I$iTarXY*MRxN&e|PrndvAMwad1JRvI5WH
zNY-_)AF=i2u($-W+-F@<#q%JG|8SwqyPOb#<A$plb{SOftG}B6WMlCpl{HQJ(+=D{
z)Y_YM$s{)L!1P|OO*+ZE?EEep0vUhbRO##GdLb@%V_D{-T|0KJ(t2^I_(p`PMupSe
dM>1mmzgSK&o_dv|b2tkW7oM(uF6*2UngFo>&rJXT

delta 269
zcmV+o0rLKf1gHX#B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0002W
zNkl<Zc-rjNu?>VE7=~d6AWEFT0nh{(lPT<6z=8p=WDp8g;QqwK!pk8h@N<P<NdnJX
zLI}#nanxEf#t8m6=id7mqjPQ;hBo#w)PjqB%ox+mhLd@oUw`|xi*A~xzq8>y_ld6S
z)^!y^G_d==-}fD^g%Ffds5Yh4T6<p3FDPKcmSwp-kyB8{hDj;GdsI-&J_b^LL1Ft*
zK@~f*prU<SP~A=!VAzQQBs-^|uAMHxuzwZc+1~}&_F1rP8~l+Q*zfA>BftRh!^^9C
TLZemy0000<MFvhpu0mjfcBy>z

diff --git a/icons/simple_close.png b/icons/simple_close.png
index 10f8b030e8cd105c9c3ac7af355ac80689fada49..808a461c3c57db3e9edb455b9af97715a28d7844 100644
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V6Od#Ih<F907>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TW!7YXLKY4N_=bvEwU{YVmY&43Usb
zE-5Q}_WXJL_B>f;tq)(n{{8%%-#IAg(*6DQlP6D}n7VlJ;>M!L$Vi2Qmo5dRhzjhy
zbt|fcZ3mZ5kwB<`s6+CEuZ9PGE55yvY~f8muvFqf+M(QoO6-D8fr0`84QcWLf-bHV
z6&9Q4&AT^I*?rgU-Ga*u4P>m#-aI`$-65A@qD0c>XNp3<LGJQ&^>bP0l+XkK+<jA4

delta 105
zcmV-v0G9un0(_7eV+H^K0F5%wy#N3JLrFwIR2Y?&kTD7XFbD%fe|*2qZ_=TgwO|Do
za}X2R4iHK00<j$dNz%eayAB<6z$!dkZmaH<rH`3gkHU=WnHIhQW&*WYme+HK00000
LNkvXXu0mjfgqkMy

diff --git a/icons/simple_close@2x.png b/icons/simple_close@2x.png
index a53c4af643b83d0688a5b956e33cb646ca8c1465..e8386ad4a759682cb006aa6f666fb8584028a4b5 100644
GIT binary patch
delta 383
zcmdnM*v~vcvYv^7fr06DR}_$9EDmyaVpw-h<|UBhk{aQe=IhI#1!QwDFt%qhuz-{R
zu@n$9FfcD*WMBr;j3BWEOmJC|1<VLGNa3ctAN~TVpPnv`Ar^vDFZ*(}DhMznRG#kO
zh+<={msRKxa}4->?vmiEu3Re*NBfWq=cOfA#NBvNthns+%EiYdl6S3>Ze!#<x+rs2
z<}8~Vo7Qa0{k`w}CLdOH&r2p}E&BQ%8(c5lo@?EgJTHAEyCn}Zi}T0Y`TEnITh?9v
zr+0eOo^6_6*9$#Y*yAD;=gIX~{?o(hsWX>xp8xc`#o%4VTD#B7pSr(zy{j#?FeCQ*
zs#PtCO@1eY<z&{aEc$<4q@1&I-tXo2`M>jb25VI=4EfYDrDA2x*ALO<vF`WPlUBU{
zd3)PgoAbB7%N7KRqzhcMs1;zb(dk-b(Z~5gg6pt>Z}5vhOgDtmnrFyGCV_&()78&q
Iol`;+04ykx_W%F@

delta 159
zcmV;Q0AT-*1F!**8Gi-<0051N9Sr~g0C!15K~y-6wUk>5z%U2|m)_XhdYkD-2$a&$
zHJCsks5{^zN)nQY2<E$bUs{ow09(+A03b7mZ5rmOKo{DjV+S^XRp?Kw9q7jR0y7IQ
zr9w%(Iu)AcchZ1y>A*Rka%)ps$EJ0#TfbiGayYWSS{LloQ5c1NX>Z{H>C584E7$-4
N002ovPDHLkV1mo}L#6-#

diff --git a/icons/simple_close@3x.png b/icons/simple_close@3x.png
index 5a5f817033b6165696a4693f51a60b7778cd58b0..e51bb68a35ff4ba13923f98017f4b86ed8a27c22 100644
GIT binary patch
delta 477
zcmeBRdc!<HvYv^7fniIK<yRoZSRCZ;#IWw1%u680B{jk`&DWPf3&`eRU~JE1U;!xs
zVksbIU|?Rr$iNJw89`zTnBcN<3z!jXkit`r=Bz+vVV*9IAs)P2uWelC;vm8hkae@e
zUtr<o`UlY=i#{-NS?ymkNh3t-zk=XRug$z0PkOmj<lmEa6v$q8S5rdh`8`Qv@vdK4
zlT|c1nhbbSBlih)Jg>a}eX&MRXlcnLm7hQJLqjuXv0Ziz)ahcf{{FkxWs}a~?H2@>
z>BqL%%=e$Q?0-q@_4Y)D*V^Ki+j7r4Z`a{omLGfmb6UOlcZOe@;tPa#xL9qh4r1Sx
z|JD0l<3Gmo@b#~MeXQ^~Enix8O|tIOnZm6~_Rrou>-*~c(=XZSbM&;QM)#Lx9th1z
zTKTs6uwg>zn-i^9XGR{`o4YTgE<9g!((iTM&T*Ic?|A=;7GE*Hq_b3Mx&!-;<t2^+
z%ih~0$md`0S)^fM5GH#3W05@btHWOYmrIs>wwa&NuzT*z>#t4!wM(>J+?IR2blvN|
ziw^3SO#+|3`hBl(j^vKJc{-=hUB4iA*g)p^!{zmi3fGOKnpS0g0R^_FtDnm{r-UW|
D=YPTd

delta 247
zcmV<T00{r=1Be2U8Gi-<0028MuA%?{0MAK8K~zYI&6iOM10f7VLvu*IU%*^an0^#n
z7q+_^rPBd_B>H5CF^Y&lM37Q~nL$<2=5`HLg_$Ae+|LVg&ZxBl07@xa;i`&K3IL$i
z`hoY*rd{wJ+VqB-8P2o{KZ7=z8RRM;3Lo5aIB+NQ1>Oap+;Ahja0Pk<N8!N(ubqCu
zrMPvAc@aw%cZa)2q1WI$_yY7EJOiJ+^W%l#o3+jQnL_grqW;rrN^()I6QzJqN+#uz
xpgfC|Mu5`#(3(A3drNERMMz(m7Vzs&+Y{+F2jaShELH#j002ovPDHLkV1hQ3Zv_AV

diff --git a/ui/effects/animation_value.cpp b/ui/effects/animation_value.cpp
index 3370a8f..6b6b299 100644
--- a/ui/effects/animation_value.cpp
+++ b/ui/effects/animation_value.cpp
@@ -90,7 +90,7 @@ void SetSlowMultiplier(int multiplier) {
 void DrawStaticLoading(
 		QPainter &p,
 		QRectF rect,
-		int stroke,
+		float64 stroke,
 		QPen pen,
 		QBrush brush) {
 	PainterHighQualityEnabler hq(p);
diff --git a/ui/effects/animation_value.h b/ui/effects/animation_value.h
index 8d1ebe8..3cc0ec2 100644
--- a/ui/effects/animation_value.h
+++ b/ui/effects/animation_value.h
@@ -357,7 +357,7 @@ void SetSlowMultiplier(int multiplier); // 1 - default, 10 - slow x10.
 void DrawStaticLoading(
 	QPainter &p,
 	QRectF rect,
-	int stroke,
+	float64 stroke,
 	QPen pen,
 	QBrush brush = Qt::NoBrush);
 

From bd7c4ee06d7292fddf5f4dbd2249efd4d7bc8e85 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Feb 2022 19:23:05 +0300
Subject: [PATCH 017/635] Allow fractional stroke values in CrossAnimation.

---
 ui/effects/cross_animation.cpp | 26 +++++++++++++++-----------
 ui/style/style_core_scale.h    | 12 ++++++++++++
 ui/widgets/widgets.style       |  6 +++---
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ui/effects/cross_animation.cpp b/ui/effects/cross_animation.cpp
index 61084d7..4b6f7f9 100644
--- a/ui/effects/cross_animation.cpp
+++ b/ui/effects/cross_animation.cpp
@@ -120,14 +120,18 @@ void CrossAnimation::paint(
 		float64 loading) {
 	PainterHighQualityEnabler hq(p);
 
-	auto sqrt2 = sqrt(2.);
-	auto deleteScale = shown + st.minScale * (1. - shown);
-	auto deleteSkip = (deleteScale * st.skip) + (1. - deleteScale) * (st.size / 2);
-	auto deleteLeft = style::rtlpoint(x + deleteSkip, 0, outerWidth).x() + 0.;
-	auto deleteTop = y + deleteSkip + 0.;
-	auto deleteWidth = st.size - 2 * deleteSkip;
-	auto deleteHeight = st.size - 2 * deleteSkip;
-	auto deleteStroke = st.stroke / sqrt2;
+	const auto stroke = style::ConvertScaleExact(st.stroke);
+
+	const auto sqrt2 = sqrt(2.);
+	const auto deleteScale = shown + st.minScale * (1. - shown);
+	const auto deleteSkip = (deleteScale * st.skip)
+		+ (1. - deleteScale) * (st.size / 2);
+	const auto deleteLeft = 0.
+		+ style::rtlpoint(x + deleteSkip, 0, outerWidth).x();
+	const auto deleteTop = y + deleteSkip + 0.;
+	const auto deleteWidth = st.size - 2 * deleteSkip;
+	const auto deleteHeight = st.size - 2 * deleteSkip;
+	const auto deleteStroke = stroke / sqrt2;
 	std::array<QPointF, kPointCount> pathDelete = { {
 		{ deleteLeft, deleteTop + deleteStroke },
 		{ deleteLeft + deleteStroke, deleteTop },
@@ -176,10 +180,10 @@ void CrossAnimation::paint(
 		p.fillPath(path, color);
 	}
 	if (loadingArcLength != 0) {
-		auto roundSkip = (st.size * (1 - sqrt2) + 2 * sqrt2 * deleteSkip + st.stroke) / 2;
+		auto roundSkip = (st.size * (1 - sqrt2) + 2 * sqrt2 * deleteSkip + stroke) / 2;
 		auto roundPart = QRectF(x + roundSkip, y + roundSkip, st.size - 2 * roundSkip, st.size - 2 * roundSkip);
 		if (staticLoading) {
-			anim::DrawStaticLoading(p, roundPart, st.stroke, color);
+			anim::DrawStaticLoading(p, roundPart, stroke, color);
 		} else {
 			auto loadingArcStart = kFullArcLength / 8;
 			if (shown < 1.) {
@@ -192,7 +196,7 @@ void CrossAnimation::paint(
 
 			p.setBrush(Qt::NoBrush);
 			auto pen = color->p;
-			pen.setWidthF(st.stroke);
+			pen.setWidthF(stroke);
 			pen.setCapStyle(Qt::RoundCap);
 			p.setPen(pen);
 			p.drawArc(roundPart, loadingArcStart, loadingArcLength);
diff --git a/ui/style/style_core_scale.h b/ui/style/style_core_scale.h
index a92c786..93ac4da 100644
--- a/ui/style/style_core_scale.h
+++ b/ui/style/style_core_scale.h
@@ -44,6 +44,18 @@ template <typename T>
 	return ConvertScale(value, Scale());
 }
 
+template <typename T>
+[[nodiscard]] inline T ConvertScaleExact(T value, int scale) {
+	return (value < 0.)
+		? (-ConvertScale(-value, scale))
+		: T(double(value) * scale / 100.);
+}
+
+template <typename T>
+[[nodiscard]] inline T ConvertScaleExact(T value) {
+	return ConvertScaleExact(value, Scale());
+}
+
 [[nodiscard]] inline QSize ConvertScale(QSize size) {
 	return QSize(ConvertScale(size.width()), ConvertScale(size.height()));
 }
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 8e236b8..173bc1b 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -386,7 +386,7 @@ CrossAnimation {
 	fg: color;
 	size: pixels;
 	skip: pixels;
-	stroke: pixels;
+	stroke: double;
 	minScale: double;
 }
 
@@ -923,7 +923,7 @@ defaultMultiSelectItem: MultiSelectItem {
 	deleteCross: CrossAnimation {
 		size: 32px;
 		skip: 10px;
-		stroke: 2px;
+		stroke: 1.5;
 		minScale: 0.3;
 	}
 	duration: 150;
@@ -959,7 +959,7 @@ defaultMultiSelectSearchCancel: CrossButton {
 	cross: CrossAnimation {
 		size: 36px;
 		skip: 12px;
-		stroke: 2px;
+		stroke: 1.5;
 		minScale: 0.3;
 	}
 	crossFg: boxTitleCloseFg;

From 5214f96bbafa1d879fca39c3374cb182687084c8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 27 Feb 2022 17:48:43 +0300
Subject: [PATCH 018/635] Parse markup in Ui::Text::String::setMarkedText by
 default.

---
 ui/text/text.cpp       | 11 +++++++++--
 ui/text/text.h         | 10 ++++++----
 ui/widgets/tooltip.cpp |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 60cc4ea..4773df7 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -147,14 +147,21 @@ bool IsBad(QChar ch) {
 } // namespace Text
 } // namespace Ui
 
-const TextParseOptions _defaultOptions = {
+const TextParseOptions kDefaultTextOptions = {
 	TextParseLinks | TextParseMultiline, // flags
 	0, // maxw
 	0, // maxh
 	Qt::LayoutDirectionAuto, // dir
 };
 
-const TextParseOptions _textPlainOptions = {
+const TextParseOptions kMarkupTextOptions = {
+	TextParseLinks | TextParseMultiline | TextParseMarkdown, // flags
+	0, // maxw
+	0, // maxh
+	Qt::LayoutDirectionAuto, // dir
+};
+
+const TextParseOptions kPlainTextOptions = {
 	TextParseMultiline, // flags
 	0, // maxw
 	0, // maxh
diff --git a/ui/text/text.h b/ui/text/text.h
index b27fd80..3927652 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -29,7 +29,9 @@ struct TextParseOptions {
 	int32 maxh;
 	Qt::LayoutDirection dir;
 };
-extern const TextParseOptions _defaultOptions, _textPlainOptions;
+extern const TextParseOptions kDefaultTextOptions;
+extern const TextParseOptions kMarkupTextOptions;
+extern const TextParseOptions kPlainTextOptions;
 
 enum class TextSelectType {
 	Letters    = 0x01,
@@ -102,7 +104,7 @@ public:
 	String(
 		const style::TextStyle &st,
 		const QString &text,
-		const TextParseOptions &options = _defaultOptions,
+		const TextParseOptions &options = kDefaultTextOptions,
 		int32 minResizeWidth = QFIXED_MAX);
 	String(const String &other) = default;
 	String(String &&other) = default;
@@ -113,8 +115,8 @@ public:
 	int countWidth(int width, bool breakEverywhere = false) const;
 	int countHeight(int width, bool breakEverywhere = false) const;
 	void countLineWidths(int width, QVector<int> *lineWidths, bool breakEverywhere = false) const;
-	void setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options = _defaultOptions);
-	void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options = _defaultOptions, const std::any &context = {});
+	void setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options = kDefaultTextOptions);
+	void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options = kMarkupTextOptions, const std::any &context = {});
 
 	void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk);
 	bool hasLinks() const;
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index acf7bf4..e875ec5 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -85,7 +85,7 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *
 
 	_point = m;
 	_st = st;
-	_text = Text::String(_st->textStyle, text, _textPlainOptions, _st->widthMax);
+	_text = Text::String(_st->textStyle, text, kPlainTextOptions, _st->widthMax);
 
 	_useTransparency = Platform::TranslucentWindowsSupported(_point);
 	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);

From 6392af756fe51c72b6ffd8be4f429f449e1e1d1e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Feb 2022 08:07:08 +0300
Subject: [PATCH 019/635] Added utils for variant text.

---
 CMakeLists.txt           |  2 ++
 ui/text/text_variant.cpp | 48 ++++++++++++++++++++++++++++++++++++++++
 ui/text/text_variant.h   | 28 +++++++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 ui/text/text_variant.cpp
 create mode 100644 ui/text/text_variant.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e76e73c..b09a999 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,8 @@ PRIVATE
     ui/text/text_isolated_emoji.h
     ui/text/text_utilities.cpp
     ui/text/text_utilities.h
+    ui/text/text_variant.cpp
+    ui/text/text_variant.h
     ui/toast/toast.cpp
     ui/toast/toast.h
     ui/toast/toast_manager.cpp
diff --git a/ui/text/text_variant.cpp b/ui/text/text_variant.cpp
new file mode 100644
index 0000000..b795d94
--- /dev/null
+++ b/ui/text/text_variant.cpp
@@ -0,0 +1,48 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/text/text_variant.h"
+
+namespace v::text {
+
+rpl::producer<QString> take_plain(
+		data &&d,
+		rpl::producer<QString> &&fallback) {
+	if (const auto empty = std::get_if<0>(&d)) {
+		return std::move(fallback);
+	} else if (const auto plainPtr = std::get_if<1>(&d)) {
+		return rpl::single(base::take(*plainPtr));
+	} else if (const auto rplPlainPtr = std::get_if<2>(&d)) {
+		return base::take(*rplPlainPtr);
+	} else if (const auto markedPtr = std::get_if<3>(&d)) {
+		return rpl::single(base::take(*markedPtr).text);
+	} else if (const auto rplMarkedPtr = std::get_if<4>(&d)) {
+		return base::take(*rplMarkedPtr) | rpl::map([](const auto &marked) {
+			return marked.text;
+		});
+	}
+	Unexpected("Bad variant in take_plain.");
+}
+
+rpl::producer<TextWithEntities> take_marked(
+		data &&d,
+		rpl::producer<TextWithEntities> &&fallback) {
+	if (const auto empty = std::get_if<0>(&d)) {
+		return std::move(fallback);
+	} else if (const auto plainPtr = std::get_if<1>(&d)) {
+		return rpl::single(TextWithEntities{ base::take(*plainPtr) });
+	} else if (const auto rplPlainPtr = std::get_if<2>(&d)) {
+		return base::take(*rplPlainPtr) | rpl::map(TextWithEntities::Simple);
+	} else if (const auto markedPtr = std::get_if<3>(&d)) {
+		return rpl::single(base::take(*markedPtr));
+	} else if (const auto rplMarkedPtr = std::get_if<4>(&d)) {
+		return base::take(*rplMarkedPtr);
+	}
+	Unexpected("Bad variant in take_marked.");
+}
+
+} // namespace v::text
+
diff --git a/ui/text/text_variant.h b/ui/text/text_variant.h
new file mode 100644
index 0000000..e0ed379
--- /dev/null
+++ b/ui/text/text_variant.h
@@ -0,0 +1,28 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/text/text_entity.h"
+
+namespace v::text {
+
+using data = std::variant<
+	v::null_t,
+	QString,
+	rpl::producer<QString>,
+	TextWithEntities,
+	rpl::producer<TextWithEntities>>;
+
+[[nodiscard]] rpl::producer<QString> take_plain(
+	data &&d,
+	rpl::producer<QString> &&fallback = rpl::never<QString>());
+[[nodiscard]] rpl::producer<TextWithEntities> take_marked(
+	data &&d,
+	rpl::producer<TextWithEntities> &&fallback
+		= rpl::never<TextWithEntities>());
+
+} // namespace v::text

From dea62df69b02c52fd0efe37b8b39a592220a7bf0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Feb 2022 11:39:28 +0300
Subject: [PATCH 020/635] Replaced index-based accessor with type-based one in
 variant text.

---
 ui/text/text_variant.cpp | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/ui/text/text_variant.cpp b/ui/text/text_variant.cpp
index b795d94..943867c 100644
--- a/ui/text/text_variant.cpp
+++ b/ui/text/text_variant.cpp
@@ -11,16 +11,17 @@ namespace v::text {
 rpl::producer<QString> take_plain(
 		data &&d,
 		rpl::producer<QString> &&fallback) {
-	if (const auto empty = std::get_if<0>(&d)) {
+	using RplMarked = rpl::producer<TextWithEntities>;
+	if (const auto empty = std::get_if<v::null_t>(&d)) {
 		return std::move(fallback);
-	} else if (const auto plainPtr = std::get_if<1>(&d)) {
-		return rpl::single(base::take(*plainPtr));
-	} else if (const auto rplPlainPtr = std::get_if<2>(&d)) {
-		return base::take(*rplPlainPtr);
-	} else if (const auto markedPtr = std::get_if<3>(&d)) {
-		return rpl::single(base::take(*markedPtr).text);
-	} else if (const auto rplMarkedPtr = std::get_if<4>(&d)) {
-		return base::take(*rplMarkedPtr) | rpl::map([](const auto &marked) {
+	} else if (const auto ptr = std::get_if<QString>(&d)) {
+		return rpl::single(base::take(*ptr));
+	} else if (const auto ptr = std::get_if<rpl::producer<QString>>(&d)) {
+		return base::take(*ptr);
+	} else if (const auto ptr = std::get_if<TextWithEntities>(&d)) {
+		return rpl::single(base::take(*ptr).text);
+	} else if (const auto ptr = std::get_if<RplMarked>(&d)) {
+		return base::take(*ptr) | rpl::map([](const auto &marked) {
 			return marked.text;
 		});
 	}
@@ -30,16 +31,17 @@ rpl::producer<QString> take_plain(
 rpl::producer<TextWithEntities> take_marked(
 		data &&d,
 		rpl::producer<TextWithEntities> &&fallback) {
-	if (const auto empty = std::get_if<0>(&d)) {
+	using RplMarked = rpl::producer<TextWithEntities>;
+	if (const auto empty = std::get_if<v::null_t>(&d)) {
 		return std::move(fallback);
-	} else if (const auto plainPtr = std::get_if<1>(&d)) {
-		return rpl::single(TextWithEntities{ base::take(*plainPtr) });
-	} else if (const auto rplPlainPtr = std::get_if<2>(&d)) {
-		return base::take(*rplPlainPtr) | rpl::map(TextWithEntities::Simple);
-	} else if (const auto markedPtr = std::get_if<3>(&d)) {
-		return rpl::single(base::take(*markedPtr));
-	} else if (const auto rplMarkedPtr = std::get_if<4>(&d)) {
-		return base::take(*rplMarkedPtr);
+	} else if (const auto ptr = std::get_if<QString>(&d)) {
+		return rpl::single(TextWithEntities{ base::take(*ptr) });
+	} else if (const auto ptr = std::get_if<rpl::producer<QString>>(&d)) {
+		return base::take(*ptr) | rpl::map(TextWithEntities::Simple);
+	} else if (const auto ptr = std::get_if<TextWithEntities>(&d)) {
+		return rpl::single(base::take(*ptr));
+	} else if (const auto ptr = std::get_if<RplMarked>(&d)) {
+		return base::take(*ptr);
 	}
 	Unexpected("Bad variant in take_marked.");
 }

From 73ec29fa06e3cd353294b2282a00b66528a65ff3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Feb 2022 12:33:31 +0300
Subject: [PATCH 021/635] Added clearing of selection on changing of FlatLabel
 selectability.

---
 ui/widgets/labels.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 2362a45..bb3ca84 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -263,8 +263,12 @@ void FlatLabel::setMarkedText(const TextWithEntities &textWithEntities) {
 }
 
 void FlatLabel::setSelectable(bool selectable) {
-	_selectable = selectable;
-	setMouseTracking(_selectable || _text.hasLinks());
+	if (_selectable != selectable) {
+		_selection = { 0, 0 };
+		_savedSelection = { 0, 0 };
+		_selectable = selectable;
+		setMouseTracking(_selectable || _text.hasLinks());
+	}
 }
 
 void FlatLabel::setDoubleClickSelectsParagraph(bool doubleClickSelectsParagraph) {

From 5d475f54f0c8aa19693d13ec9a4f418f63018052 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Feb 2022 19:12:26 +0300
Subject: [PATCH 022/635] Enlarge padded title controls hit area.

---
 ui/platform/ui_platform_window_title.cpp | 18 +++++++++++-------
 ui/platform/ui_platform_window_title.h   |  2 +-
 ui/platform/win/ui_window_title_win.cpp  |  5 ++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index 33a9bf3..5c22615 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -218,15 +218,18 @@ void TitleControls::raise() {
 	_close->raise();
 }
 
-HitTestResult TitleControls::hitTest(QPoint point) const {
-	const auto test = [&](const object_ptr<Button> &button) {
-		return button && button->geometry().contains(point);
+HitTestResult TitleControls::hitTest(QPoint point, int padding) const {
+	const auto parent = _close->parentWidget()->geometry();
+	const auto test = [&](const object_ptr<Button> &button, bool close) {
+		return button && button->geometry().marginsAdded(
+			{ close ? padding : 0, padding, close ? padding : 0, 0 }
+		).contains(point);
 	};
-	if (test(_minimize)) {
+	if (test(_minimize, false)) {
 		return HitTestResult::Minimize;
-	} else if (test(_maximizeRestore)) {
+	} else if (test(_maximizeRestore, false)) {
 		return HitTestResult::MaximizeRestore;
-	} else if (test(_close)) {
+	} else if (test(_close, true)) {
 		return HitTestResult::Close;
 	}
 	return HitTestResult::None;
@@ -502,7 +505,8 @@ std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 	) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
 		const auto origin = raw->wrap.pos();
 		const auto relative = request->point - origin;
-		const auto controlsResult = raw->controls.hitTest(relative);
+		const auto padding = window->additionalContentPadding();
+		const auto controlsResult = raw->controls.hitTest(relative, padding);
 		if (controlsResult != HitTestResult::None) {
 			request->result = controlsResult;
 		}
diff --git a/ui/platform/ui_platform_window_title.h b/ui/platform/ui_platform_window_title.h
index 2e493d9..e61b37d 100644
--- a/ui/platform/ui_platform_window_title.h
+++ b/ui/platform/ui_platform_window_title.h
@@ -68,7 +68,7 @@ public:
 	void setResizeEnabled(bool enabled);
 	void raise();
 
-	[[nodiscard]] HitTestResult hitTest(QPoint point) const;
+	[[nodiscard]] HitTestResult hitTest(QPoint point, int padding) const;
 
 	void buttonOver(HitTestResult testResult);
 	void buttonDown(HitTestResult testResult);
diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index 6522c6c..4defa64 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -130,7 +130,10 @@ HitTestResult TitleWidget::hitTest(QPoint point) const {
 	const auto origin = _paddingHelper
 		? _paddingHelper->controlsParent.pos()
 		: QPoint();
-	const auto controlsResult = _controls.hitTest(point - origin);
+	const auto padding = _paddingHelper
+		? _paddingHelper->padding.current()
+		: 0;
+	const auto controlsResult = _controls.hitTest(point - origin, padding);
 	return (controlsResult != HitTestResult::None)
 		? controlsResult
 		: HitTestResult::Caption;

From 2f425edd7580c335a0c0c8900ec0c1ac2534a120 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Feb 2022 22:36:31 +0300
Subject: [PATCH 023/635] Adjust default icon colors.

---
 ui/colors.palette | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/colors.palette b/ui/colors.palette
index 965c21c..9acd342 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -53,9 +53,9 @@ attentionButtonBgRipple: #f4c3c2; // default attention button ripple effect
 menuBg: windowBg; // default popup menu background
 menuBgOver: windowBgOver; // default popup menu item background with mouse over
 menuBgRipple: windowBgRipple; // default popup menu item ripple effect
-menuIconFg: #a8a8a8; // default popup menu item icon (like main menu)
-menuIconFgOver: #999999; // default popup menu item icon with mouse over
-menuSubmenuArrowFg: #666B72; // default popup menu submenu arrow icon (like in message field context menu in case of RTL system language)
+menuIconFg: #999999; // default popup menu item icon (like main menu)
+menuIconFgOver: #8a8a8a; // default popup menu item icon with mouse over
+menuSubmenuArrowFg: #373737; // default popup menu submenu arrow icon (like in message field context menu in case of RTL system language)
 menuFgDisabled: #cccccc; // default popup menu item disabled text (like unavailable items in message field context menu)
 menuSeparatorFg: #f1f1f1; // default popup menu separator (like in message field context menu)
 
@@ -243,7 +243,7 @@ emojiPanBg: windowBg; // emoji panel background
 emojiPanCategories: #f7f7f7 | windowBg; // emoji panel categories background
 emojiPanHeaderFg: windowSubTextFg; // emoji panel section header text
 emojiPanHeaderBg: #fffffff2 | emojiPanBg; // emoji panel section header background
-emojiIconFg: checkboxFg; // emoji category icon
+emojiIconFg: #999999; // emoji category icon
 emojiIconFgActive: windowBgActive; // active emoji category icon
 stickerPanDeleteBg: #000000ff; // delete X button background for custom sent stickers in stickers panel (legacy)
 stickerPanDeleteFg: windowFgActive; // delete X button icon for custom sent stickers in stickers panel (legacy)

From 5f3e04a3199c96385e80025cb8db6c5ee5260345 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Feb 2022 23:25:03 +0300
Subject: [PATCH 024/635] Fix build with GCC.

---
 ui/platform/ui_platform_window_title.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index 5c22615..015b5bc 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -219,7 +219,6 @@ void TitleControls::raise() {
 }
 
 HitTestResult TitleControls::hitTest(QPoint point, int padding) const {
-	const auto parent = _close->parentWidget()->geometry();
 	const auto test = [&](const object_ptr<Button> &button, bool close) {
 		return button && button->geometry().marginsAdded(
 			{ close ? padding : 0, padding, close ? padding : 0, 0 }

From 1ba9270234db8cbe8badbe6f6fbaea0a5869e28d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 1 Mar 2022 08:35:05 +0300
Subject: [PATCH 025/635] Added ability to provide custom style of context menu
 to flat labels.

---
 ui/widgets/labels.cpp | 26 ++++++++++++++++++--------
 ui/widgets/labels.h   | 15 +++++++++++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index bb3ca84..99f2ddf 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -191,20 +191,26 @@ void LabelSimple::paintEvent(QPaintEvent *e) {
 	p.drawTextLeft(0, 0, width(), _text, _textWidth);
 }
 
-FlatLabel::FlatLabel(QWidget *parent, const style::FlatLabel &st)
+FlatLabel::FlatLabel(
+	QWidget *parent,
+	const style::FlatLabel &st,
+	const style::PopupMenu &stMenu)
 : RpWidget(parent)
 , _text(st.minWidth ? st.minWidth : QFIXED_MAX)
-, _st(st) {
+, _st(st)
+, _stMenu(stMenu) {
 	init();
 }
 
 FlatLabel::FlatLabel(
 	QWidget *parent,
 	const QString &text,
-	const style::FlatLabel &st)
+	const style::FlatLabel &st,
+	const style::PopupMenu &stMenu)
 : RpWidget(parent)
 , _text(st.minWidth ? st.minWidth : QFIXED_MAX)
-, _st(st) {
+, _st(st)
+, _stMenu(stMenu) {
 	setText(text);
 	init();
 }
@@ -212,10 +218,12 @@ FlatLabel::FlatLabel(
 FlatLabel::FlatLabel(
 	QWidget *parent,
 	rpl::producer<QString> &&text,
-	const style::FlatLabel &st)
+	const style::FlatLabel &st,
+	const style::PopupMenu &stMenu)
 : RpWidget(parent)
 , _text(st.minWidth ? st.minWidth : QFIXED_MAX)
-, _st(st) {
+, _st(st)
+, _stMenu(stMenu) {
 	textUpdated();
 	std::move(
 		text
@@ -228,10 +236,12 @@ FlatLabel::FlatLabel(
 FlatLabel::FlatLabel(
 	QWidget *parent,
 	rpl::producer<TextWithEntities> &&text,
-	const style::FlatLabel &st)
+	const style::FlatLabel &st,
+	const style::PopupMenu &stMenu)
 : RpWidget(parent)
 , _text(st.minWidth ? st.minWidth : QFIXED_MAX)
 , _st(st)
+, _stMenu(stMenu)
 , _touchSelectTimer([=] { touchSelect(); }) {
 	textUpdated();
 	std::move(
@@ -629,7 +639,7 @@ void FlatLabel::showContextMenu(QContextMenuEvent *e, ContextMenuReason reason)
 	const auto fullSelection = _selectable
 		&& _text.isFullSelection(_selection);
 
-	_contextMenu = base::make_unique_q<PopupMenu>(this);
+	_contextMenu = base::make_unique_q<PopupMenu>(this, _stMenu);
 
 	if (fullSelection && !_contextCopyText.isEmpty()) {
 		_contextMenu->addAction(
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index 2821f66..a63db89 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -96,21 +96,27 @@ private:
 class FlatLabel : public RpWidget, public ClickHandlerHost {
 
 public:
-	FlatLabel(QWidget *parent, const style::FlatLabel &st = st::defaultFlatLabel);
+	FlatLabel(
+		QWidget *parent,
+		const style::FlatLabel &st = st::defaultFlatLabel,
+		const style::PopupMenu &stMenu = st::defaultPopupMenu);
 
 	FlatLabel(
 		QWidget *parent,
 		const QString &text,
-		const style::FlatLabel &st = st::defaultFlatLabel);
+		const style::FlatLabel &st = st::defaultFlatLabel,
+		const style::PopupMenu &stMenu = st::defaultPopupMenu);
 
 	FlatLabel(
 		QWidget *parent,
 		rpl::producer<QString> &&text,
-		const style::FlatLabel &st = st::defaultFlatLabel);
+		const style::FlatLabel &st = st::defaultFlatLabel,
+		const style::PopupMenu &stMenu = st::defaultPopupMenu);
 	FlatLabel(
 		QWidget *parent,
 		rpl::producer<TextWithEntities> &&text,
-		const style::FlatLabel &st = st::defaultFlatLabel);
+		const style::FlatLabel &st = st::defaultFlatLabel,
+		const style::PopupMenu &stMenu = st::defaultPopupMenu);
 
 	void setOpacity(float64 o);
 	void setTextColorOverride(std::optional<QColor> color);
@@ -194,6 +200,7 @@ private:
 
 	Text::String _text;
 	const style::FlatLabel &_st;
+	const style::PopupMenu &_stMenu;
 	std::optional<QColor> _textColorOverride;
 	float64 _opacity = 1.;
 

From 8415f7058c83178d19150a76a7a865a3d1da5916 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Mar 2022 12:43:50 +0300
Subject: [PATCH 026/635] Support emoji in Ui::SettingsButton.

---
 ui/widgets/buttons.cpp   | 39 +++++++++++++--------------------------
 ui/widgets/buttons.h     |  7 ++-----
 ui/widgets/widgets.style |  4 ++--
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index b624afc..6a98811 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -703,6 +703,7 @@ SettingsButton::~SettingsButton() = default;
 
 SettingsButton *SettingsButton::toggleOn(rpl::producer<bool> &&toggled) {
 	Expects(_toggle == nullptr);
+
 	_toggle = std::make_unique<Ui::ToggleView>(
 		isOver() ? _st.toggleOver : _st.toggle,
 		false,
@@ -773,18 +774,24 @@ void SettingsButton::paintBg(Painter &p, const QRect &rect, bool over) const {
 }
 
 void SettingsButton::paintText(Painter &p, bool over, int outerw) const {
-	p.setFont(_st.font);
+	auto available = outerw - _padding.left() - _padding.right();
+	if (_toggle) {
+		available -= (width() - toggleRect().x());
+	}
+	if (available <= 0) {
+		return;
+	}
 	p.setPen(_textColorOverride
 		? QPen(*_textColorOverride)
 		: over
 		? _st.textFgOver
 		: _st.textFg);
-	p.drawTextLeft(
+	_text.drawLeftElided(
+		p,
 		_padding.left(),
 		_padding.top(),
-		outerw,
-		_text,
-		_textWidth);
+		available,
+		outerw);
 }
 
 void SettingsButton::paintToggle(Painter &p, int outerw) const {
@@ -804,7 +811,6 @@ QRect SettingsButton::toggleRect() const {
 }
 
 int SettingsButton::resizeGetHeight(int newWidth) {
-	updateVisibleText(newWidth);
 	return _padding.top() + _st.height + _padding.bottom();
 }
 
@@ -821,26 +827,7 @@ void SettingsButton::onStateChanged(
 }
 
 void SettingsButton::setText(QString &&text) {
-	_original = std::move(text);
-	_originalWidth = _st.font->width(_original);
-	updateVisibleText(width());
-}
-
-void SettingsButton::updateVisibleText(int newWidth) {
-	auto availableWidth = newWidth
-		- _padding.left()
-		- _padding.right();
-	if (_toggle) {
-		availableWidth -= (width() - toggleRect().x());
-	}
-	accumulate_max(availableWidth, 0);
-	if (availableWidth < _originalWidth) {
-		_text = _st.font->elided(_original, availableWidth);
-		_textWidth = _st.font->width(_text);
-	} else {
-		_text = _original;
-		_textWidth = _originalWidth;
-	}
+	_text.setText(_st.style, text);
 	update();
 }
 
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index 8be2672..da408f6 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -9,6 +9,7 @@
 #include "ui/abstract_button.h"
 #include "ui/round_rect.h"
 #include "ui/effects/animations.h"
+#include "ui/text/text.h"
 #include "styles/style_widgets.h"
 
 #include <memory>
@@ -285,14 +286,10 @@ protected:
 private:
 	void setText(QString &&text);
 	QRect toggleRect() const;
-	void updateVisibleText(int newWidth);
 
 	const style::SettingsButton &_st;
 	style::margins _padding;
-	QString _original;
-	QString _text;
-	int _originalWidth = 0;
-	int _textWidth = 0;
+	Ui::Text::String _text;
 	std::unique_ptr<Ui::ToggleView> _toggle;
 	std::optional<QColor> _textColorOverride;
 
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 173bc1b..f17cf40 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -520,7 +520,7 @@ SettingsButton {
 	textBg: color;
 	textBgOver: color;
 
-	font: font;
+	style: TextStyle;
 	rightLabel: FlatLabel;
 
 	height: pixels;
@@ -1393,7 +1393,7 @@ defaultSettingsButton: SettingsButton {
 	textBg: windowBg;
 	textBgOver: windowBgOver;
 
-	font: boxTextFont;
+	style: boxTextStyle;
 	rightLabel: defaultSettingsRightLabel;
 
 	height: 20px;

From 214c5e8e226172e07f6e36984a65e0757a994a32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Mar 2022 14:21:35 +0300
Subject: [PATCH 027/635] Make PreventDelayedActivation more reliable.

---
 ui/delayed_activation.cpp | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/ui/delayed_activation.cpp b/ui/delayed_activation.cpp
index fb1250a..63e373f 100644
--- a/ui/delayed_activation.cpp
+++ b/ui/delayed_activation.cpp
@@ -7,19 +7,35 @@
 #include "ui/delayed_activation.h"
 
 #include "ui/ui_utility.h"
+#include "base/call_delayed.h"
+#include "base/invoke_queued.h"
 
 #include <QtCore/QPointer>
+#include <QtCore/QCoreApplication>
 
 namespace Ui {
 namespace {
 
-auto Paused = false;
+constexpr auto kPreventTimeout = crl::time(100);
+
+bool Paused/* = false*/;
+bool Attempted/* = false*/;
 auto Window = QPointer<QWidget>();
 
+bool Unpause(bool force = false) {
+	if (force || Attempted) {
+		Attempted = false;
+		Paused = false;
+		return true;
+	}
+	return false;
+}
+
 } // namespace
 
 void ActivateWindowDelayed(not_null<QWidget*> widget) {
 	if (Paused) {
+		Attempted = true;
 		return;
 	} else if (std::exchange(Window, widget.get())) {
 		return;
@@ -40,7 +56,22 @@ void PreventDelayedActivation() {
 	Window = nullptr;
 	Paused = true;
 	PostponeCall([] {
-		Paused = false;
+		if (Unpause()) {
+			return;
+		}
+		InvokeQueued(qApp, [] {
+			if (Unpause()) {
+				return;
+			}
+			crl::on_main([] {
+				if (Unpause()) {
+					return;
+				}
+				base::call_delayed(kPreventTimeout, [] {
+					Unpause(true);
+				});
+			});
+		});
 	});
 }
 

From f0b800cdfb624f3d9bcf01a1b6340077c9c5555e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 3 Mar 2022 16:45:18 +0300
Subject: [PATCH 028/635] Introduced Ui::Show interface.

---
 CMakeLists.txt   |  1 +
 ui/layers/show.h | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 ui/layers/show.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b09a999..99ec041 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,7 @@ PRIVATE
     ui/layers/layer_manager.h
     ui/layers/layer_widget.cpp
     ui/layers/layer_widget.h
+    ui/layers/show.h
     ui/paint/arcs.cpp
     ui/paint/arcs.h
     ui/paint/blob.cpp
diff --git a/ui/layers/show.h b/ui/layers/show.h
new file mode 100644
index 0000000..c4f7a49
--- /dev/null
+++ b/ui/layers/show.h
@@ -0,0 +1,32 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/layers/layer_widget.h"
+
+namespace Ui {
+
+class BoxContent;
+
+class Show {
+public:
+	virtual ~Show() = 0;
+	virtual void showBox(
+		object_ptr<BoxContent> content,
+		LayerOptions options = LayerOption::KeepOther) const = 0;
+	virtual void hideLayer() const = 0;
+	[[nodiscard]] virtual not_null<QWidget*> toastParent() const = 0;
+	[[nodiscard]] virtual bool valid() const = 0;
+	virtual operator bool() const = 0;
+};
+
+inline Show::~Show() = default;
+
+using ShowPtr = std::shared_ptr<Show>;
+
+
+} // namespace Ui

From d2e482dac3e5ddbc200228d14d04d7d624c98af7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 3 Mar 2022 16:45:48 +0300
Subject: [PATCH 029/635] Added Ui::Show implementation for Ui::BoxContent.

---
 ui/layers/box_content.cpp | 37 +++++++++++++++++++++++++++++++++++++
 ui/layers/box_content.h   | 17 +++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index e089902..f4aae48 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -271,4 +271,41 @@ void BoxContent::paintEvent(QPaintEvent *e) {
 	}
 }
 
+BoxShow::BoxShow(not_null<Ui::BoxContent*> box)
+: Show()
+, _weak(Ui::MakeWeak(box.get())) {
+}
+
+BoxShow::~BoxShow() = default;
+
+void BoxShow::showBox(
+		object_ptr<BoxContent> content,
+		LayerOptions options) const {
+	if (_weak && _weak->isBoxShown()) {
+		_weak->getDelegate()->show(std::move(content), options);
+	}
+}
+
+void BoxShow::hideLayer() const {
+	if (_weak && _weak->isBoxShown()) {
+		_weak->getDelegate()->hideLayer();
+	}
+}
+
+not_null<QWidget*> BoxShow::toastParent() const {
+	if (!_toastParent) {
+		Assert(_weak != nullptr);
+		_toastParent = Ui::MakeWeak(_weak->window()); // =(
+	}
+	return _toastParent.data();
+}
+
+bool BoxShow::valid() const {
+	return _weak;
+}
+
+BoxShow::operator bool() const {
+	return valid();
+}
+
 } // namespace Ui
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index 86112dc..9426d88 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -11,6 +11,7 @@
 #include "ui/wrap/padding_wrap.h"
 #include "ui/widgets/labels.h"
 #include "ui/layers/layer_widget.h"
+#include "ui/layers/show.h"
 #include "ui/effects/animation_value.h"
 #include "ui/text/text_entity.h"
 #include "ui/rp_widget.h"
@@ -363,4 +364,20 @@ private:
 
 };
 
+class BoxShow : public Show {
+public:
+	explicit BoxShow(not_null<Ui::BoxContent*> box);
+	~BoxShow();
+	void showBox(
+		object_ptr<BoxContent> content,
+		LayerOptions options = LayerOption::KeepOther) const override;
+	void hideLayer() const override;
+	[[nodiscard]] not_null<QWidget*> toastParent() const override;
+	[[nodiscard]] bool valid() const override;
+	operator bool() const override;
+private:
+	mutable QPointer<QWidget> _toastParent;
+	const QPointer<Ui::BoxContent> _weak;
+};
+
 } // namespace Ui

From 1f89e8bd53454c85772c4d8ed3b513a7e7a13e7d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 1 Mar 2022 21:35:44 +0400
Subject: [PATCH 030/635] Remove unneeded Q_OBJECT from DropdownMenu

---
 ui/widgets/dropdown_menu.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ui/widgets/dropdown_menu.h b/ui/widgets/dropdown_menu.h
index 214ecdd..bedc871 100644
--- a/ui/widgets/dropdown_menu.h
+++ b/ui/widgets/dropdown_menu.h
@@ -13,8 +13,6 @@
 namespace Ui {
 
 class DropdownMenu : public InnerDropdown {
-	Q_OBJECT
-
 public:
 	DropdownMenu(QWidget *parent, const style::DropdownMenu &st = st::defaultDropdownMenu);
 
@@ -43,11 +41,6 @@ protected:
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
 
-private Q_SLOTS:
-	void onHidden() {
-		hideFinish();
-	}
-
 private:
 	// Not ready with submenus yet.
 	DropdownMenu(QWidget *parent, QMenu *menu, const style::DropdownMenu &st = st::defaultDropdownMenu);

From f2c77daccc055da283d0b5985f9c0c774a28709b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 1 Mar 2022 21:36:23 +0400
Subject: [PATCH 031/635] Use setContentMargins in QLineEdit-based input fields

---
 ui/widgets/input_fields.cpp | 39 ++++++++++++-------------------------
 ui/widgets/input_fields.h   |  5 -----
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 6154ae0..75cfc30 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -617,7 +617,6 @@ private:
 
 };
 
-template <typename InputClass>
 class InputStyle : public QCommonStyle {
 public:
 	InputStyle() {
@@ -626,22 +625,13 @@ public:
 
 	void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const override {
 	}
-	QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = nullptr) const override {
-		switch (r) {
-			case SE_LineEditContents:
-				const auto w = widget ? qobject_cast<const InputClass*>(widget) : nullptr;
-				return w ? w->getTextRect() : QCommonStyle::subElementRect(r, opt, widget);
-			break;
-		}
-		return QCommonStyle::subElementRect(r, opt, widget);
-	}
 
-	static InputStyle<InputClass> *instance() {
+	static InputStyle *instance() {
 		if (!_instance) {
 			if (!QGuiApplication::instance()) {
 				return nullptr;
 			}
-			_instance = new InputStyle<InputClass>();
+			_instance = new InputStyle();
 		}
 		return _instance;
 	}
@@ -651,12 +641,11 @@ public:
 	}
 
 private:
-	static InputStyle<InputClass> *_instance;
+	static InputStyle *_instance;
 
 };
 
-template <typename InputClass>
-InputStyle<InputClass> *InputStyle<InputClass>::_instance = nullptr;
+InputStyle *InputStyle::_instance = nullptr;
 
 template <typename Iterator>
 QString AccumulateText(Iterator begin, Iterator end) {
@@ -1000,9 +989,10 @@ FlatInput::FlatInput(
 		Integration::Instance().textActionsUpdated();
 	});
 
-	setStyle(InputStyle<FlatInput>::instance());
+	setStyle(InputStyle::instance());
 	QLineEdit::setTextMargins(0, 0, 0, 0);
-	setContentsMargins(0, 0, 0, 0);
+	setContentsMargins(_textMrg + QMargins(-2, -1, -2, -1));
+	setFrame(false);
 
 	setAttribute(Qt::WA_AcceptTouchEvents);
 	_touchTimer.setSingleShot(true);
@@ -1083,14 +1073,11 @@ void FlatInput::touchEvent(QTouchEvent *e) {
 
 void FlatInput::setTextMrg(const QMargins &textMrg) {
 	_textMrg = textMrg;
+	setContentsMargins(_textMrg + QMargins(-2, -1, -2, -1));
 	refreshPlaceholder(_placeholderFull.current());
 	update();
 }
 
-QRect FlatInput::getTextRect() const {
-	return rect().marginsRemoved(_textMrg + QMargins(-2, -1, -2, -1));
-}
-
 void FlatInput::finishAnimations() {
 	_placeholderFocusedAnimation.stop();
 	_placeholderVisibleAnimation.stop();
@@ -3787,9 +3774,10 @@ MaskedInputField::MaskedInputField(
 		Integration::Instance().textActionsUpdated();
 	});
 
-	setStyle(InputStyle<MaskedInputField>::instance());
+	setStyle(InputStyle::instance());
 	QLineEdit::setTextMargins(0, 0, 0, 0);
-	setContentsMargins(0, 0, 0, 0);
+	setContentsMargins(_textMargins + QMargins(-2, -1, -2, -1));
+	setFrame(false);
 
 	setAttribute(Qt::WA_AcceptTouchEvents);
 	_touchTimer.setSingleShot(true);
@@ -3837,6 +3825,7 @@ int MaskedInputField::borderAnimationStart() const {
 
 void MaskedInputField::setTextMargins(const QMargins &mrg) {
 	_textMargins = mrg;
+	setContentsMargins(_textMargins + QMargins(-2, -1, -2, -1));
 	refreshPlaceholder(_placeholderFull.current());
 }
 
@@ -3901,10 +3890,6 @@ void MaskedInputField::touchEvent(QTouchEvent *e) {
 	}
 }
 
-QRect MaskedInputField::getTextRect() const {
-	return rect().marginsRemoved(_textMargins + QMargins(-2, -1, -2, -1));
-}
-
 void MaskedInputField::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 846f18b..b86bbac 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -56,7 +56,6 @@ enum class InputSubmitSettings {
 };
 
 class FlatInput : public RpWidgetBase<QLineEdit> {
-	// The Q_OBJECT meta info is used for qobject_cast!
 	Q_OBJECT
 
 	using Parent = RpWidgetBase<QLineEdit>;
@@ -74,7 +73,6 @@ public:
 	void finishAnimations();
 
 	void setTextMrg(const QMargins &textMrg);
-	QRect getTextRect() const;
 
 	QSize sizeHint() const override;
 	QSize minimumSizeHint() const override;
@@ -557,7 +555,6 @@ private:
 };
 
 class MaskedInputField : public RpWidgetBase<QLineEdit> {
-	// The Q_OBJECT meta info is used for qobject_cast!
 	Q_OBJECT
 
 	using Parent = RpWidgetBase<QLineEdit>;
@@ -572,8 +569,6 @@ public:
 	void showErrorNoFocus();
 	void hideError();
 
-	QRect getTextRect() const;
-
 	QSize sizeHint() const override;
 	QSize minimumSizeHint() const override;
 

From 6956514425e89111a2c8249886659a1de9714ad3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 5 Mar 2022 18:35:44 +0400
Subject: [PATCH 032/635] Add some !isnan Assert-s in the animations engine.

---
 ui/effects/animations.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/ui/effects/animations.h b/ui/effects/animations.h
index 57d52d3..e7fd974 100644
--- a/ui/effects/animations.h
+++ b/ui/effects/animations.h
@@ -337,14 +337,21 @@ inline void Simple::start(
 		that = _data.get(),
 		callback = Prepare(std::forward<Callback>(callback))
 	](crl::time now) {
+		Assert(!std::isnan(double(now - that->animation.started())));
 		const auto time = anim::Disabled()
 			? that->duration
 			: (now - that->animation.started());
+		Assert(!std::isnan(time));
+		Assert(!std::isnan(that->delta));
+		Assert(!std::isnan(that->duration));
 		const auto finished = (time >= that->duration);
 		const auto progress = finished
 			? that->delta
 			: that->transition(that->delta, time / that->duration);
+		Assert(!std::isnan(that->from));
+		Assert(!std::isnan(progress));
 		that->value = that->from + progress;
+		Assert(!std::isnan(that->value));
 
 		if (finished) {
 			that->animation.stop();
@@ -401,7 +408,12 @@ inline bool Simple::animating() const {
 }
 
 TG_FORCE_INLINE float64 Simple::value(float64 final) const {
-	return animating() ? _data->value : final;
+	if (animating()) {
+		Assert(!std::isnan(_data->value));
+		return _data->value;
+	}
+	Assert(!std::isnan(final));
+	return final;
 }
 
 inline void Simple::startPrepared(

From 6be424604fe8d68e672411fd10d58fa4bc343621 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 7 Mar 2022 09:43:46 +0400
Subject: [PATCH 033/635] Add some more !isnan assertions.

---
 ui/effects/animation_value.cpp | 7 ++++++-
 ui/effects/animations.h        | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/effects/animation_value.cpp b/ui/effects/animation_value.cpp
index 6b6b299..934d9c8 100644
--- a/ui/effects/animation_value.cpp
+++ b/ui/effects/animation_value.cpp
@@ -19,7 +19,12 @@ int SlowMultiplierMinusOne/* = 0*/;
 } // namespace
 
 transition linear = [](const float64 &delta, const float64 &dt) {
-	return delta * dt;
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
+	const auto result = delta * dt;
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition sineInOut = [](const float64 &delta, const float64 &dt) {
diff --git a/ui/effects/animations.h b/ui/effects/animations.h
index e7fd974..bdc3a45 100644
--- a/ui/effects/animations.h
+++ b/ui/effects/animations.h
@@ -345,9 +345,12 @@ inline void Simple::start(
 		Assert(!std::isnan(that->delta));
 		Assert(!std::isnan(that->duration));
 		const auto finished = (time >= that->duration);
+		Assert(finished || that->duration > 0);
+		const auto progressRatio = finished ? 1. : time / that->duration;
+		Assert(!std::isnan(progressRatio));
 		const auto progress = finished
 			? that->delta
-			: that->transition(that->delta, time / that->duration);
+			: that->transition(that->delta, progressRatio);
 		Assert(!std::isnan(that->from));
 		Assert(!std::isnan(progress));
 		that->value = that->from + progress;

From f17320171a580dc03f1d10eddea3841a71f644e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Mar 2022 18:17:39 +0400
Subject: [PATCH 034/635] Allow disabling system resize for a window on macOS.

---
 ui/platform/linux/ui_utility_linux.h | 3 +++
 ui/platform/mac/ui_utility_mac.mm    | 9 +++++++++
 ui/platform/ui_platform_utility.h    | 2 ++
 ui/platform/win/ui_utility_win.h     | 3 +++
 4 files changed, 17 insertions(+)

diff --git a/ui/platform/linux/ui_utility_linux.h b/ui/platform/linux/ui_utility_linux.h
index c6be70e..d03c657 100644
--- a/ui/platform/linux/ui_utility_linux.h
+++ b/ui/platform/linux/ui_utility_linux.h
@@ -32,6 +32,9 @@ inline void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 inline void BringToBack(not_null<QWidget*> widget) {
 }
 
+inline void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio) {
+}
+
 inline constexpr bool UseMainQueueGeneric() {
 	return true;
 }
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index b230169..1948349 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -91,6 +91,15 @@ void DrainMainQueue() {
 void IgnoreAllActivation(not_null<QWidget*> widget) {
 }
 
+void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio) {
+	const auto winId = widget->window()->winId();
+	if (const auto view = reinterpret_cast<NSView*>(winId)) {
+		if (const auto window = [view window]) {
+			window.styleMask &= ~NSWindowStyleMaskResizable;
+		}
+	}
+}
+
 std::optional<bool> IsOverlapped(
 		not_null<QWidget*> widget,
 		const QRect &rect) {
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index c0bb5ea..4452332 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -29,6 +29,8 @@ void BringToBack(not_null<QWidget*> widget);
 void IgnoreAllActivation(not_null<QWidget*> widget);
 void ClearTransientParent(not_null<QWidget*> widget);
 
+void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio);
+
 [[nodiscard]] std::optional<bool> IsOverlapped(
     not_null<QWidget*> widget,
     const QRect &rect);
diff --git a/ui/platform/win/ui_utility_win.h b/ui/platform/win/ui_utility_win.h
index 2870cd0..67d8d89 100644
--- a/ui/platform/win/ui_utility_win.h
+++ b/ui/platform/win/ui_utility_win.h
@@ -38,6 +38,9 @@ inline void BringToBack(not_null<QWidget*> widget) {
 inline void ClearTransientParent(not_null<QWidget*> widget) {
 }
 
+inline void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio) {
+}
+
 inline constexpr bool UseMainQueueGeneric() {
 	return true;
 }

From dd3cc5000e4f136ee198c5ace014640593e0aa2c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 8 Mar 2022 18:59:49 +0400
Subject: [PATCH 035/635] Fix shadow icons in scale > 2x.

---
 icons/calls/call_shadow_left.png        | Bin 100 -> 192 bytes
 icons/calls/call_shadow_left@2x.png     | Bin 125 -> 196 bytes
 icons/calls/call_shadow_left@3x.png     | Bin 139 -> 214 bytes
 icons/calls/call_shadow_top.png         | Bin 103 -> 200 bytes
 icons/calls/call_shadow_top@2x.png      | Bin 127 -> 207 bytes
 icons/calls/call_shadow_top@3x.png      | Bin 141 -> 227 bytes
 icons/calls/call_shadow_top_left.png    | Bin 295 -> 467 bytes
 icons/calls/call_shadow_top_left@2x.png | Bin 559 -> 1034 bytes
 icons/calls/call_shadow_top_left@3x.png | Bin 927 -> 1807 bytes
 9 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/calls/call_shadow_left.png b/icons/calls/call_shadow_left.png
index 74864ad4b58577ca3a3d1856559ea719998b84c5..01d48f579e85c42f3efd58433ad98bfe2b1e44d3 100644
GIT binary patch
literal 192
zcmeAS@N?(olHy`uVBq!ia0vp^5<twz!2~3|&;0xY;uHtDJ29*~C-V}>aY>EvO!M_+
z&;qhK7#Q0#8CXC{fLIEM85o!sFfuR$X-1IP0w%bu!~$kG8>E_{|7b%TkkayWaSY**
zO-@NlN=ivdNlQy(WHvK1D=RDGlVI4?s3f4dKx%=PLc#$y25o1Cml4&1$3eP1UHx3v
IIVCg!0M`#B0ssI2

delta 81
zcmX@Wm@+}qn~i~i;mEqY)j&$y)5S4_V`grbAs2&!z+ow`m;d9}T<%=Z=)-w{DdqPJ
k7tbr-3UB>oX8MxMJZTZ*3w`!jH=s5KPgg&ebxsLQ0FKZdh5!Hn

diff --git a/icons/calls/call_shadow_left@2x.png b/icons/calls/call_shadow_left@2x.png
index 6a0e6e4c537f3e8ab7f3005d58f347ea1afbd90f..40cb398056300649275730afd15233cd8bbad194 100644
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^20+Zj!2~2HUOG_*q!^2X+?^QKos)S9<hZ0pc&7RK
zGH3zW91M)@nG7r-B|t0%#0(6~3m6%gfixpXYylHo)?fiMoDDLYf#F*FD<G-o>Eak7
zA(@=w!s_GW<G`qJvWF!iBBH@Yp_4~J$z#=whgB1MQxpUZCa#$G>=fgjHip+1E#K`0
O8Q|&a=d#Wzp$Pz^gDJKE

delta 106
zcmV-w0G0p50ez4eWCj2L03NVkApigXL`g(JR2Y@bjXMs2KokOp&))yYZuhd<X(i2&
z5J12MAPGqT*hbPY3ATrANkS6Z(w4Q>_%l0uNp8Egd49i@Kec|O4Vtb2>bD&Ut^fc4
M07*qoM6N<$f=|>b@&Et;

diff --git a/icons/calls/call_shadow_left@3x.png b/icons/calls/call_shadow_left@3x.png
index 30257ebe7755d12085cb5c309c4fad0dd42aa4cc..9814ab4278f0a332c930d91307a53c37f5d5c6fd 100644
GIT binary patch
delta 186
zcmeBXyv8^|rJk`k$lZxy-8q?;3=9k|sS%!OzP=1vKsE;hV|yk83y{SK#8N=az`(qK
zk%1XVGlIkxFu`R#7BIuvAbE!ULi*c*l!K>>V~B?6-TsYS3=SMlm;e2r?=K)TOZt(_
z6G;_ThEP#)W1fjuT;xi(-&Ekwn3r)b%*$<ma-P7N4sBg_?|rpz7=^bpygd@Gd<A5v
Mr>mdKI;Vst0HD4tJ^%m!

delta 110
zcmcb{*v&XWC0(+_HKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|SGur;B4q
z#jT{2goFeaRv#aq6Fh1X4r!BFHb^yPir-P?xx(PXb6A8Yx}T9nf<Z`t;jL4;K`2lo
NgQu&X%Q~loCIIh!A~yg4

diff --git a/icons/calls/call_shadow_top.png b/icons/calls/call_shadow_top.png
index 653e0afa994e839c76ca58e1a20333f70799a448..8cfcb9cb3b717d1fc5a5ff136ab2a72607e8440f 100644
GIT binary patch
literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{G!2~3?tYhc}2^0spJ29*~C-V}>aY>EvO!M_+
z&;qhK7#Q0#8CXC{fLIEM85o!sFfuR$X-1IP0w%aD;{s+lTLPqT%B2imAZ6s~;uyjq
zTiWf&$DqJ-NFv(o-~XheF8PzbFlavTb1^WE3~hh+>`cI=!*_p|zWJTb@F&7Ch*9j7
RLChkMDW0x=F6*2UngB}REl&Ud

delta 84
zcmX@Xm_9+$kBxzW!TQYfTR=+B)5S4_V`lDYM=k~fjw1(pyMO!_zutWzXwMl<!2+g$
o8+9koEL>HV_i66|h0LXl2UatQ{@wag8mN=O)78&qol`;+08`5$<^TWy

diff --git a/icons/calls/call_shadow_top@2x.png b/icons/calls/call_shadow_top@2x.png
index 47c672ca3b028dbf40d89d5aa5825b95344fc3d6..709c6e4358adccffc59857fa8e8b3417c9201aa4 100644
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^Oh9bF0V21g*<1xujKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<kw164THUKF!`x)*7q%1vM977}|
zlT&~oAtB+QyP=_>qGsc#88c@(HbrQPiHWILYVgamnzDw<hb`W?i?#o;qaHicu0RF{
WN5<A3z5Y8O!#rL6T-G@yGywp<RVc;)

delta 108
zcmX@lSU*8Bjg5hU!J1`t6OeNAba4!kn7Vg@As>SR2eWtMfBQ)Bqa711PF}g=$idOT
z#&ASKc%rS2tI^jvE}@gHI%leiDu%F>?_Zg;=Z4&p9Z8d>Z~wz1Ymmv*lJ{pC3(!Oc
MPgg&ebxsLQ0DNI3ga7~l

diff --git a/icons/calls/call_shadow_top@3x.png b/icons/calls/call_shadow_top@3x.png
index 350db0481b414a97a62b64e5b4fce8198d667177..580760ec60d8f08ac4970fd7612a20d3da4c4fe7 100644
GIT binary patch
delta 199
zcmeBWe9SmOrJk`k$lZxy-8q?;3=9k|sS%!OzP=1vKsE;hV|yk83y{SK#8N=az`(qK
zk%1XVGlIkxFu`S+7cj%w9w3Dkf6YO<d_7$pLo`I6PITmB5a40i`t`rL@DU4>>IWwp
zPxdY2O-oC4(3$UkfAyIS;!pP7lG&OvODU-@VsrIO)#epfBhyNC#ct`(Jl9jJ@HhX4
a{R&2f#f)bglA6ANZ18mTb6Mw<&;$Tpb2zL3

delta 112
zcmaFN*vmLUB~!A*HKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|SG;r;B4q
z#jT{I21YSAH#eb3A0Ho;Q%XlRZ0ra%w}`y*QI+-KnHF<B!A*x}vI-<H=$vG{_9C>@
Q1*nz5)78&qol`;+0Li2$?EnA(

diff --git a/icons/calls/call_shadow_top_left.png b/icons/calls/call_shadow_top_left.png
index baba49364f09da2655e03782fd31be9da4594658..8ad29e9a9d3908738f0d5490484099dc8ad9aae0 100644
GIT binary patch
delta 452
zcmZ3^beVaAWIYoD14F*(s`WsMu{g-xiDBJ2nU_G0OKOB?ny)W|7Ld)sz}TM2zyeYN
z#8N=az`(qKk%1XVGlIkxFu`Rd7BC~&Acc=iOV<LG*?PJ-hFA#pPKYc!Y{0|(`s+V;
zy*Y($^(K$4uCmK(2r7GAK5u``#5aEVJhfT(!vbG^UtrbsZ%x3QHwyel%Pk*;&3<9C
zu6FP9RQc3-&oAz&*R_ra)8sn$A;B*-)woId__^Kre}nF|R7Q$z-BEGSbxx;N9M`ju
z@Q8~|t5(~u4f?SDwUlFOdxp=v_p_EUtLz9&D$Bjiwyv%IlJz{b8~q2w?7fq|`KoAe
z9+MYTpK4v`bo0Ay?w8A#ADQrpIH++gZBv@K{gLn6PN}8OoPO&G%}A~(TfuYENTefV
z-Z#nTYJqJB91rqvcx9bF^!nWLr4Qva4X<Rpx@~bh+kvBqFKMluYs$X0%u|j^F233$
z_VCH+5>53JoVJ1suh@#!7EVuVxN*iLz~%DM8&3<>FR#567PCF>_q>kFKU`y;|9`{w
dV)f_B2jZpG>~ZC0N%KKr>gnp|vd$@?2>^ZXvKs&Z

delta 279
zcmV+y0qFkI1E&Iz8Gi-<007{3J@^0s0PaadK~zYIrIg_ggfIw$H<<7L$mg#btOaqm
zWQpD_{b*s%F~)CftT|`v+}aW9ikE;W(s|Cn5`cp&hFzU`1t@`PXTlOtiJF;w&)hr!
znK*>p{d#9ubo0pp#LR5C`|Vk|Vx0@1n#sazt>NxB5W7*uE`Jv0cp#1qNCZ_e$tgnR
z?tTd$$MJx~xLN?^AVL7bZ-7*NNF$0pfM9eH0cvDhO^z`zh<lMvQ6|oy7*&i&0b~!<
zMdNXdRRh8iy*637Q5S7%ir7JQH)7>&2VX$lZ;`PeN5wEzNVTl|H*xl5m4Mx<+kk(B
dw*Wiq1i@<t=MZMwK|lZi002ovPDHLkV1i}eedGWD

diff --git a/icons/calls/call_shadow_top_left@2x.png b/icons/calls/call_shadow_top_left@2x.png
index 0d9672fb51b6dd970b3413917c45f15c5453534d..8a8cfd3936c81c2177ad022c6e403c0d1d3206f9 100644
GIT binary patch
delta 1023
zcmV<b0|5N51d0fd8Gix*007uvZqNV#00DDSM?wIu&K&6g002Z~SV?A0O#mtY000O8
z0f%V-1ONa40RR918UO$Q000A^0RRI4000310RRA?0ssU600031001zc0{{d700031
z001xm0002nH*5?500VSML_t(o3AL3$RwF?SLnpxf&pc{=_<ty_>V$+xEgV_4CDF5(
z%fG*Qm&@ff;TO+_*=zROt6v4$Dt6X~3t1jJuLK$ronSTCGMsF6o(r^<Sk=ecXxTpt
z`b40uZj;Yqll7nUqd@JXN|WLNM(b^Wqb3i2^lQ6bHUpOFc1xn~Xk)ih&8(L)fNq;P
z!x8rcquI9oz<*;^tu}*{SwSzT&>)z1z5QzEFJoC-Ei($XU2%_Cwl)a%UFGZrXsxXt
z86C&BZ%bxH9+28#;?L<#K|;zFckbH;KK1SGEz?vPfG25@1=vDTKe}15HvwS4wi-py
zYY|sL+yM6(h#O{BbUAL1V7&pO9m{DEu{H=kT7IY;$bWd>AUJOrn?^9!Xb->72hgb7
z`Gs7{VecVCZP#Gi#@U1ypoRi2!2=vSPzU-Ni(!zkY9EFKqc+b~7SN;}`nCair(cM1
zBmxjh?KJQ2?=S%)lWPFa0SH<f1aAW6te0$&!()UPt@(1YW>OsGwEeDuwlfl}RlfkE
ztRRP^F@IBxQ3IGGq<DTIW_<=u?Hsg(SgV_?sQ~CSVT=NpfqKmLki%?zkF-3a2slqm
z4mB~NZPQI4B)q4kMmGSnBoLTJk`eoyC<q`#MgZ#(NLC;j#)rC20pzg4^g^)bfL1ny
zAUpF5g<`BwT0FuGGg`k2z?L*r)FRdT<`85$1AlSDnKdBqP8vQ^7R==S=jpW=D7_&D
z_zpCdXs=4k58?V_kfxa&h3r$j!wk@wz5|8j7+?!Yf~RT@JCL#sg2($XuLBrzY%4a~
zaM_n%Z-<3#gPSkpAX?y6RKK%Wp0Ge0wbs;V1=m1sd)Y$ZR6R@snN~*ZRe-W2fLYUo
z*?)f_S6g&o6Uf8ZHh7pr$L~PiXC@9%3$j1JodiQc9gWYx@n6h%9s^n$oc$&{VlOBg
zQv48X0_i6}u|qV*qnXAJ6O4s@ps}RE@J{O}z^gOt!W}RJ4K4h<r`^`<jAgH$0yB`u
zQ5Oev2>IR-3tW2&>;nzawG9Ia0F#>v|9DgsmTv;-!K}?1Yr}poJCYpC!}cc7+4gEo
zzO((`@JFEbdqHc2`=#3T3k}gV<+?!hU)ryK|KoqM)lx>V>b}g(K=(Z|Wr6y#>z%_H
ts8|2awOt0j7bvSg&y>xdFOLx2{s-5~4n_)3qI3WN002ovPDHLkV1k5Lyg>i}

delta 545
zcmV++0^a?K2(JW?8Gi-<00374`G)`i0rp8mK~!jg?V90^gD?z(3+(-0`R*4|iQ?Ev
z1KgyuRKdDZ{54Gw+O{#q&-h~PZyQ+E=Z%|g+txPMZ2+q#)$7{;*bO^Zeby2{WUBgI
zc3cSnP3-mCK4nZsX@IOrbdKgyzMCZjWQ^ORdR~zPz*Y_!uYUkVeV!<QvOT<`(#Pg+
z0Z`0G=M0J&XFwqU3pp~3%&RaNL4e3SGCjr^`@Tys2t@HC0Vq(YMGz{$QWCR7RZP#H
z5s-z*7!LuEn0a<&(P#%?NoY-;ZT_r8qZL3&rpP=4u>jrzu>}nQ>|nNck@*Pfyv{T4
znT)_nIp8Ji+<%VaxSU5@N&$#qXbwax?`@;g{0xD%R!1IO09Y8K>f=R#K~y3T0(e5n
zX19+8IgX<h0QHASY#%TRh-cdNDdkjE`h6fuUK9y63h16G05p-e>L?0cn?YD5$|(IL
zMtzm%!FinLi+rR2qKl$LR$*)<WA~&0cAwjGWea(w6@Qi6$I2*!L*~6`cw<-0QvjCG
z7Q%yyOy5$45Ck*G%qtKTrQeC8F{~*I&<21ED~42~s4t_oUuamwqSaoBfDE9TLdmVn
zRnaZKkyXu9bODIUrd7tIQUt1UBk<%3t}3;K{vudw4luww7N7*68hIjOw>$@)RC^hH
j8szK$D;n_+@V0&d8W;<m#D9n!00000NkvXXu0mjfFY@sZ

diff --git a/icons/calls/call_shadow_top_left@3x.png b/icons/calls/call_shadow_top_left@3x.png
index 260bb2658094fd232fe80415fdbfa6e624f5214e..c372e2da0dca018e71937bf7e9b2c6a049b0cad8 100644
GIT binary patch
delta 1791
zcmV<b1_1e=2agVrB!2;OQb$4nuFf3k0000)WmrjOO-%qQ0000800D<-00aO400961
z02%-Q00003paB2_0000100961paK8{000010000;paTE|000010000;00000kTFK@
z000JgNkl<ZXa&ue*>++{5Cg|P{r}%Q!h%4k7B1J=$MukoRDbT^?w<Mh?@zvukB@Ke
z_1*f@<G;W9e)KOL_TDp&bo<%Ej%+Y~@aL+k&yO7T>SjmskL2WSZ$9k!_*LdgXX&R2
z&V1WpN9L_^rutOmybZYU4Tl}sV9Yt9TtE9`fAv?xZyi>>#!qofD5YF=IHE9UOumPp
zS7Fmst;T37$$yo+35^?8aweSo#&#Wt-yD(wZ-5Kbk)u0R+^y`(hvgF0Yn)0lkU5Az
zMmMa`^gZ;MW~{`ltegtr0?LOC<&FuAAk#{@q$RxYjcwXx2nICIj8d?VZjPZ(o^;J0
zrKz%O5r3#iE3kV))G}3->k&%PeCQin)u#?mp+vc<n1555-a|s3F%>W6nKb2P<%?gG
z`^W;9@q=p-I|YfU+b#RA{DZESb24n$SVDk0h;aey)BYve9qp5E%#*4t#au;c>B53!
zr=^lSZGtE$wqol(SI$6j<`GJfg|5B6emNzgClr^f4ymLICy4!Ab@T2&m%oau0!rC~
z0jY@n6o0+p!_U;GY*7|aeY)nAT^=?qsMhJ4WfSa96+#A$LouUx6E`7LqTRIfKVx)x
zNPYak$niqTG+2j^!`K1EAnWH5H}CRuRE~aQR2tGn5%_u1&HMQL{Dk*Vg>0-UG49A#
zu*#ntMwiT+_VShr8Pe4;(#MlVC2L`N8n6lC(SNllJ2{Nl3N&7!JR=txS1)Dn(wQk%
zunA(G^KtvI3M&s~oaCr<Ke@T|lv7kyxwlUD4^E1AHQ?rAPAJ=lRTy{LmobLia%3y$
zfNK4uXxz=a{KWMdRxDa6Mie|8MkN`e;$G4nDzMAahO|nMYo(IyVm*j)xB@?A-thht
z@qgj4d;E(?GGJ2|`?0Ixh*cp~w>JG#i%7yIeC>EKPQW$n4$IWBd#&IBxoF*1uFJ^>
zth*a*7n>lSzWZV7k{P&wqYN`(b2G7B?3Zx)*9@hYK7huV4OrGNV3iCD?uVsX?3%2E
z1@*kTL~ig^xEX@oL^&F5mW2&$<q)o+#D6D;RkqyC^Xf|QCBW!9gf(bCcMwSNGh-9P
z^;Cj#JuD@~(lyKax$@>+Kh!*lknb6<a&lUg*rnDx$jxQ!rs8F6iQ3(LW0guh^91Ab
zC0Hlm`T)BM;i|dW`Emue29yNx>P-%#k!rI0h80>p-%wV`oaDmsD(POp-~(1Xo_{wv
zY-~XpeFgPcG(kK*6<Tx$F`z-&)^6>i1oqj$@-S+ukq0Z98<=y&jB<t(MmLjTkHC5#
zMGaFoL%YN1!Z0i8PT8wtos(C=lv}Z@{Sw9-6wMo^d^s%h%&BCVbcYJ;+UANV5_yOM
ziFV7fm2|i^Nq6MkH|CBWX?A@owSQ2#K4v9y6`)Lp)<lnHfpn+5Jj^qw!A%g?W5qnl
zoQkS4vzlnA6l_AV+|^qiHWt+Q(H(cKV^mTKCD~1*<zf@2TaBWWhr`Bpo=0mEQa7Kl
z)2kT4Q1*5RcMlJTtx~h&$Wo?{z4?|>nU+}88Uil^Ox@MO(&vX&JLP$#b${59Q7LRs
zniH&#QPKeAyQIKwSyh!{cYau<X0gXRAy=8QL|u}{sF2JlID!6#shgpZ`!Efo3xiRp
zcStTdE=+ftlL=K$2kV|?(fpFV{Eyv{$JE?xC9ZNb$f1OsPD6`!GvPSj58HI9d32Ya
zA^1za{(TLr3a(6a=eWOfn1A&uT>guuYDR?wZ-BLq3rIHugc4{=9~7m*=ivU0t?E5v
zI>}qQFw?9PO;EBk4P=f@tem#H!&s=gdowI)C~Qec${4M-?{(*g<wDG}So_t+nd3qf
zgY(^l&NNBL=n0-5R*l9zoPcgfw-g#yj@(p8`#wAz#*FN1u|jgK*ncX&+^Iras!-kz
z4~ISNu7&)ZDHhlQDZ&Etbi^h!%|9Z(a9E8`7dE8LC02Uoyo>uVR`h^!$EhR$`@%}A
zhWltG@7+FZn!TD=y4@7TerhYI=7grvN`BS79yU(hG|Ghz?o|D&!)Dg$(DEBw&8`(a
z7}1b6HzO^@AL8X<2YBcG=B@`<a@x_ubin=wqQGj8rwOaVm-M5Dx#{oh^wI&V<oRJo
z4j>1}85U&?8TuWb9Cmt@(}h2A>g2E*^QYFW-8Sy?!#2fl3Gu-JZ)tn-u=g(UmP@M1
hnZvjWsHT6x{U52M6#)3J=ZydW002ovPDHLkV1h+wa_#^C

delta 905
zcmV;419tq64xa~*B!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0009)
zNkl<Zc-rh*+mfp=3@bGM|I1zGWKPEGi|pLnE_vusV8B9(VjCWhd)(tK#<4$wV@eEZ
zOX#oHYxW~Z-^9{fV3D9d1DG3SIYCuml~ChPB)y>m!D%aiHGkY*?pMzoBGfbxl@)i9
z7S&|lzJBG=oxnPu!trm^;+bgoRYZZH>0fYY1!KYKq2ejRqY4C9dpjw*o}nr*&LLhl
zT7U%~uo|>Aon-Vm+;Rw*N`%tXNsAS$i(KwJ&l3|>rPZ{?4B6C@!1A6l3HxVSYU2m%
zjmByTFY`m~1b=W|m81E<@Pwu_K?2JWOJEEDJ%<T0l0!1}j+COMHwvI^TyX%**fwjI
z>~`}g@maz<eh;?CvYbxOaDcfh31dbz20ZJsiqz>BxqH_f!@ODP6$5tI13!h%M5IxQ
zuJBw`;5tK+{Z!=*cuKI5t)d*tf7wOYIqQH`DU-2Of`4WkY^JRP7W7$bNM_uVEqm;7
z{Lli;;$w-AI~ZdWIrYXWU@qpCdJOm>ql+Pt8_fN&CZ_;%b(je$5lg7$DBw8`%*C0i
z%w5H%qRk8xFcx*&fCVc~IYSs8tVz}PJB=~9ML2C&xJD=K!E(#7jCHjJ)Y1coUbuQb
zpLF_Ne}D1Xux^3I)}*G0g*|EX5h+H1RhKPHcx(?#h*Z+f|D#Hi(}Bfn88yD5G!+$F
zpsf^SN<G%lfpfF_3#}?tSzMQN1l-YWEhbfgmL`wzz((&nWPi6f#ksQXjaO>CB&Y~+
zEjtES<V}~W$p}=Mf(>~Cm>TMTX_Cwdr9Dth%70}*O1-~lnrdI|1o??%x}b6!2@Eg;
z>g9M%ZQ-HZQm<Q=d05XCG(1#4l%<W;5t+!C)eHkP#-#|7&*{K$gEH8baI4k+cc{HD
z{wQ6bSgh)WxDCefjDfc#E^m?2%YEm>E?f0!S&ExsXZO3aW&N1?IfS|{V~X&h$Sd5P
zoqu4!81M$y411>8`S{XtHW;+Kf`PtBL*L;|8C&qp<sX)!r8M=Z{9d3(&-7kxpF)Qi
z>&cZq&pf^sSkc}_OW4d<M9H(&zCnsZykQnF+JOuPy4aA;89KaO@iT$#T?}u=ZeTaC
f8(7o$5nur3{fu}c&i`Wo0000<MNUMnLIPld9SXNM


From 81e216f1cede22d30573233c36039716cc438b33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Mar 2022 17:37:02 +0400
Subject: [PATCH 036/635] Allow checking if JPEG bytes are a progressive jpeg.

---
 CMakeLists.txt             |  1 +
 ui/image/image_prepare.cpp | 50 +++++++++++++++++++++++++++++++++-----
 ui/image/image_prepare.h   |  2 ++
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99ec041..4c6651f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -278,4 +278,5 @@ PUBLIC
     desktop-app::lib_base
 PRIVATE
     desktop-app::external_zlib
+    desktop-app::external_jpeg
 )
diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 83900f5..ef13147 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -22,6 +22,21 @@
 #include <QtGui/QImageReader>
 #include <QtSvg/QSvgRenderer>
 
+#include <jpeglib.h>
+
+struct my_error_mgr : public jpeg_error_mgr {
+	jmp_buf setjmp_buffer;
+};
+
+extern "C" {
+
+static void my_error_exit(j_common_ptr cinfo) {
+	my_error_mgr* myerr = (my_error_mgr*)cinfo->err;
+	longjmp(myerr->setjmp_buffer, 1);
+}
+
+} // extern "C"
+
 namespace Images {
 namespace {
 
@@ -420,12 +435,12 @@ std::array<QImage, 4> PrepareCorners(
 		return {};
 	}
 	auto result = ReadResult();
+	result.format = reader.format().toLower();
+	result.animated = reader.supportsAnimation()
+		&& (reader.imageCount() > 1);
 	if (!reader.read(&result.image) || result.image.isNull()) {
 		return {};
 	}
-	result.animated = reader.supportsAnimation()
-		&& (reader.imageCount() > 1);
-	result.format = reader.format().toLower();
 	return result;
 }
 
@@ -459,9 +474,7 @@ ReadResult Read(ReadArgs &&args) {
 			Qt::KeepAspectRatio,
 			Qt::SmoothTransformation);
 	}
-	if (args.forceOpaque
-		&& result.format != qstr("jpg")
-		&& result.format != qstr("jpeg")) {
+	if (args.forceOpaque && result.format != qstr("jpeg")) {
 		result.image = Opaque(std::move(result.image));
 	}
 	return result;
@@ -1221,4 +1234,29 @@ QImage Prepare(QImage image, int w, int h, const PrepareArgs &args) {
 	return image;
 }
 
+bool IsProgressiveJpeg(const QByteArray &bytes) {
+	struct jpeg_decompress_struct info;
+	struct my_error_mgr jerr;
+
+	info.err = jpeg_std_error(&jerr);
+	jerr.error_exit = my_error_exit;
+	if (setjmp(jerr.setjmp_buffer)) {
+		return false;
+	}
+
+	jpeg_create_decompress(&info);
+	jpeg_mem_src(
+		&info,
+		reinterpret_cast<const unsigned char*>(bytes.data()),
+		bytes.size());
+	if (jpeg_read_header(&info, TRUE) != 1) {
+		return false;
+	}
+
+	const auto result = (info.progressive_mode > 0);
+	jpeg_destroy_decompress(&info);
+
+	return result;
+}
+
 } // namespace Images
diff --git a/ui/image/image_prepare.h b/ui/image/image_prepare.h
index 3535c79..2efb6a7 100644
--- a/ui/image/image_prepare.h
+++ b/ui/image/image_prepare.h
@@ -153,4 +153,6 @@ struct PrepareArgs {
 	return Prepare(std::move(image), size.width(), size.height(), args);
 }
 
+[[nodiscard]] bool IsProgressiveJpeg(const QByteArray &bytes);
+
 } // namespace Images

From c7826b8dff84a54a5a3b5d550492810a5f09680e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Mar 2022 15:54:05 +0400
Subject: [PATCH 037/635] Attempt to fix building with GCC.

---
 ui/image/image_prepare.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index ef13147..d66b2a5 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -23,6 +23,7 @@
 #include <QtSvg/QSvgRenderer>
 
 #include <jpeglib.h>
+#include <setjmp.h>
 
 struct my_error_mgr : public jpeg_error_mgr {
 	jmp_buf setjmp_buffer;

From 6e6ba5a14947242ae0de3296fd650a3b3338728e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Mar 2022 17:19:59 +0300
Subject: [PATCH 038/635] Moved Ui::SelectScrollManager to lib_ui.

---
 CMakeLists.txt                 |  2 ++
 ui/dragging_scroll_manager.cpp | 50 ++++++++++++++++++++++++++++++++++
 ui/dragging_scroll_manager.h   | 34 +++++++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 ui/dragging_scroll_manager.cpp
 create mode 100644 ui/dragging_scroll_manager.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c6651f..cc6654b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,6 +219,8 @@ PRIVATE
     ui/click_handler.h
     ui/delayed_activation.cpp
     ui/delayed_activation.h
+    ui/dragging_scroll_manager.cpp
+    ui/dragging_scroll_manager.h
     ui/emoji_config.cpp
     ui/emoji_config.h
     ui/focus_persister.h
diff --git a/ui/dragging_scroll_manager.cpp b/ui/dragging_scroll_manager.cpp
new file mode 100644
index 0000000..e62d3a3
--- /dev/null
+++ b/ui/dragging_scroll_manager.cpp
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/dragging_scroll_manager.h"
+
+#include "ui/widgets/scroll_area.h"
+
+namespace Ui {
+
+DraggingScrollManager::DraggingScrollManager()
+: _timer([=] { scrollByTimer(); }) {
+}
+
+void DraggingScrollManager::scrollByTimer() {
+	const auto d = (_delta > 0)
+		? std::min(_delta * 3 / 20 + 1, kMaxScrollSpeed)
+		: std::max(_delta * 3 / 20 - 1, -kMaxScrollSpeed);
+	_scrolls.fire_copy(d);
+}
+
+void DraggingScrollManager::checkDeltaScroll(
+		const QPoint &point,
+		int top,
+		int bottom) {
+	const auto diff = point.y() - top;
+	_delta = (diff < 0)
+		? diff
+		: (point.y() >= bottom)
+		? (point.y() - bottom + 1)
+		: 0;
+	if (_delta) {
+		_timer.callEach(15);
+	} else {
+		_timer.cancel();
+	}
+}
+
+void DraggingScrollManager::cancel() {
+	_timer.cancel();
+}
+
+rpl::producer<int> DraggingScrollManager::scrolls() {
+	return _scrolls.events();
+}
+
+} // namespace Ui
diff --git a/ui/dragging_scroll_manager.h b/ui/dragging_scroll_manager.h
new file mode 100644
index 0000000..5102bff
--- /dev/null
+++ b/ui/dragging_scroll_manager.h
@@ -0,0 +1,34 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+
+namespace Ui {
+
+class ScrollArea;
+
+class DraggingScrollManager final {
+public:
+	DraggingScrollManager();
+
+	void checkDeltaScroll(const QPoint &point, int top, int bottom);
+	void cancel();
+
+	rpl::producer<int> scrolls();
+
+private:
+	void scrollByTimer();
+
+	base::Timer _timer;
+	int _delta = 0;
+	rpl::event_stream<int> _scrolls;
+
+};
+
+} // namespace Ui

From 443191045bd1fcbba6a2e5a5691d6178d970ec90 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Mar 2022 17:36:51 +0300
Subject: [PATCH 039/635] Added ability to provide delta to
 DraggingScrollManager.

---
 ui/dragging_scroll_manager.cpp | 24 ++++++++++++++----------
 ui/dragging_scroll_manager.h   |  1 +
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ui/dragging_scroll_manager.cpp b/ui/dragging_scroll_manager.cpp
index e62d3a3..5df4ee5 100644
--- a/ui/dragging_scroll_manager.cpp
+++ b/ui/dragging_scroll_manager.cpp
@@ -22,16 +22,8 @@ void DraggingScrollManager::scrollByTimer() {
 	_scrolls.fire_copy(d);
 }
 
-void DraggingScrollManager::checkDeltaScroll(
-		const QPoint &point,
-		int top,
-		int bottom) {
-	const auto diff = point.y() - top;
-	_delta = (diff < 0)
-		? diff
-		: (point.y() >= bottom)
-		? (point.y() - bottom + 1)
-		: 0;
+void DraggingScrollManager::checkDeltaScroll(int delta) {
+	_delta = delta;
 	if (_delta) {
 		_timer.callEach(15);
 	} else {
@@ -39,6 +31,18 @@ void DraggingScrollManager::checkDeltaScroll(
 	}
 }
 
+void DraggingScrollManager::checkDeltaScroll(
+		const QPoint &point,
+		int top,
+		int bottom) {
+	const auto diff = point.y() - top;
+	checkDeltaScroll((diff < 0)
+		? diff
+		: (point.y() >= bottom)
+		? (point.y() - bottom + 1)
+		: 0);
+}
+
 void DraggingScrollManager::cancel() {
 	_timer.cancel();
 }
diff --git a/ui/dragging_scroll_manager.h b/ui/dragging_scroll_manager.h
index 5102bff..0d73b95 100644
--- a/ui/dragging_scroll_manager.h
+++ b/ui/dragging_scroll_manager.h
@@ -17,6 +17,7 @@ class DraggingScrollManager final {
 public:
 	DraggingScrollManager();
 
+	void checkDeltaScroll(int delta);
 	void checkDeltaScroll(const QPoint &point, int top, int bottom);
 	void cancel();
 

From d27e4803a130a262b84a54c915fc83f8c9bbe2f4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Mar 2022 17:39:02 +0300
Subject: [PATCH 040/635] Moved base::Timer to std::unique_ptr in
 DraggingScrollManager.

---
 ui/dragging_scroll_manager.cpp | 21 +++++++++++++--------
 ui/dragging_scroll_manager.h   | 10 +++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ui/dragging_scroll_manager.cpp b/ui/dragging_scroll_manager.cpp
index 5df4ee5..29aecdf 100644
--- a/ui/dragging_scroll_manager.cpp
+++ b/ui/dragging_scroll_manager.cpp
@@ -7,13 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/dragging_scroll_manager.h"
 
-#include "ui/widgets/scroll_area.h"
+#include "base/timer.h"
+#include "ui/widgets/scroll_area.h" // kMaxScrollSpeed.
 
 namespace Ui {
 
-DraggingScrollManager::DraggingScrollManager()
-: _timer([=] { scrollByTimer(); }) {
-}
+DraggingScrollManager::DraggingScrollManager() = default;
 
 void DraggingScrollManager::scrollByTimer() {
 	const auto d = (_delta > 0)
@@ -25,9 +24,12 @@ void DraggingScrollManager::scrollByTimer() {
 void DraggingScrollManager::checkDeltaScroll(int delta) {
 	_delta = delta;
 	if (_delta) {
-		_timer.callEach(15);
+		if (!_timer) {
+			_timer = std::make_unique<base::Timer>([=] { scrollByTimer(); });
+		}
+		_timer->callEach(15);
 	} else {
-		_timer.cancel();
+		cancel();
 	}
 }
 
@@ -44,10 +46,13 @@ void DraggingScrollManager::checkDeltaScroll(
 }
 
 void DraggingScrollManager::cancel() {
-	_timer.cancel();
+	if (_timer) {
+		_timer->cancel();
+		_timer = nullptr;
+	}
 }
 
-rpl::producer<int> DraggingScrollManager::scrolls() {
+rpl::producer<int> DraggingScrollManager::scrolls() const {
 	return _scrolls.events();
 }
 
diff --git a/ui/dragging_scroll_manager.h b/ui/dragging_scroll_manager.h
index 0d73b95..5ae4f1b 100644
--- a/ui/dragging_scroll_manager.h
+++ b/ui/dragging_scroll_manager.h
@@ -7,12 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/timer.h"
+namespace base {
+class Timer;
+} // namespace base
 
 namespace Ui {
 
-class ScrollArea;
-
 class DraggingScrollManager final {
 public:
 	DraggingScrollManager();
@@ -21,12 +21,12 @@ public:
 	void checkDeltaScroll(const QPoint &point, int top, int bottom);
 	void cancel();
 
-	rpl::producer<int> scrolls();
+	[[nodiscard]] rpl::producer<int> scrolls() const;
 
 private:
 	void scrollByTimer();
 
-	base::Timer _timer;
+	std::unique_ptr<base::Timer> _timer;
 	int _delta = 0;
 	rpl::event_stream<int> _scrolls;
 

From 2779a7d036f76aa08944c98c5fea5379bbcf63a7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Mar 2022 18:23:08 +0300
Subject: [PATCH 041/635] Replaced timer for dragging scroll in Ui::BoxContent
 with manager.

---
 ui/layers/box_content.cpp | 25 +++++++------------------
 ui/layers/box_content.h   |  6 ++----
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index f4aae48..d669d80 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -98,6 +98,12 @@ void BoxContent::finishScrollCreate() {
 		updateInnerVisibleTopBottom();
 		updateShadowsVisibility();
 	}, lifetime());
+	_draggingScroll.scrolls(
+	) | rpl::start_with_next([=](int delta) {
+		if (_scroll) {
+			_scroll->scrollToY(_scroll->scrollTop() + delta);
+		}
+	}, lifetime());
 }
 
 void BoxContent::scrollToWidget(not_null<QWidget*> widget) {
@@ -117,24 +123,7 @@ void BoxContent::scrollToY(int top, int bottom) {
 }
 
 void BoxContent::scrollByDraggingDelta(int delta) {
-	_draggingScrollDelta = _scroll ? delta : 0;
-	if (_draggingScrollDelta) {
-		if (!_draggingScrollTimer) {
-			_draggingScrollTimer = std::make_unique<base::Timer>([=] {
-				draggingScrollTimerCallback();
-			});
-		}
-		_draggingScrollTimer->callEach(15);
-	} else {
-		_draggingScrollTimer = nullptr;
-	}
-}
-
-void BoxContent::draggingScrollTimerCallback() {
-	const auto delta = (_draggingScrollDelta > 0)
-		? qMin(_draggingScrollDelta * 3 / 20 + 1, int32(kMaxScrollSpeed))
-		: qMax(_draggingScrollDelta * 3 / 20 - 1, -int32(kMaxScrollSpeed));
-	_scroll->scrollToY(_scroll->scrollTop() + delta);
+	_draggingScroll.checkDeltaScroll(_scroll ? delta : 0);
 }
 
 void BoxContent::updateInnerVisibleTopBottom() {
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index 9426d88..e1a5bb4 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -8,6 +8,7 @@
 
 #include "base/unique_qptr.h"
 #include "base/flags.h"
+#include "ui/dragging_scroll_manager.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/widgets/labels.h"
 #include "ui/layers/layer_widget.h"
@@ -287,8 +288,6 @@ private:
 	void updateShadowsVisibility();
 	object_ptr<TWidget> doTakeInnerWidget();
 
-	void draggingScrollTimerCallback();
-
 	BoxContentDelegate *_delegate = nullptr;
 
 	bool _preparing = false;
@@ -300,8 +299,7 @@ private:
 	object_ptr<FadeShadow> _topShadow = { nullptr };
 	object_ptr<FadeShadow> _bottomShadow = { nullptr };
 
-	std::unique_ptr<base::Timer> _draggingScrollTimer;
-	int _draggingScrollDelta = 0;
+	Ui::DraggingScrollManager _draggingScroll;
 
 	rpl::event_stream<> _boxClosingStream;
 

From ba40979470132db759fe8b8e7ff8ca70845f92c1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Mar 2022 18:24:52 +0300
Subject: [PATCH 042/635] Moved out kMaxScrollSpeed from scroll area.

---
 ui/dragging_scroll_manager.cpp | 7 ++++++-
 ui/widgets/scroll_area.h       | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/dragging_scroll_manager.cpp b/ui/dragging_scroll_manager.cpp
index 29aecdf..e9f2f2d 100644
--- a/ui/dragging_scroll_manager.cpp
+++ b/ui/dragging_scroll_manager.cpp
@@ -8,9 +8,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/dragging_scroll_manager.h"
 
 #include "base/timer.h"
-#include "ui/widgets/scroll_area.h" // kMaxScrollSpeed.
 
 namespace Ui {
+namespace {
+
+// 37px per 15ms while select-by-drag.
+inline constexpr auto kMaxScrollSpeed = 37;
+
+} // namespace
 
 DraggingScrollManager::DraggingScrollManager() = default;
 
diff --git a/ui/widgets/scroll_area.h b/ui/widgets/scroll_area.h
index 3ab7db1..03692a6 100644
--- a/ui/widgets/scroll_area.h
+++ b/ui/widgets/scroll_area.h
@@ -17,9 +17,6 @@
 
 namespace Ui {
 
-// 37px per 15ms while select-by-drag.
-inline constexpr auto kMaxScrollSpeed = 37;
-
 // Touch flick ignore 3px.
 inline constexpr auto kFingerAccuracyThreshold = 3;
 

From d98c3d539b0eb7c00f664c445ab4194c28e8cef7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Mar 2022 19:40:38 +0400
Subject: [PATCH 043/635] Allow moving window controls vertically.

---
 ui/platform/ui_platform_window_title.cpp | 10 ++++++----
 ui/platform/ui_platform_window_title.h   |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index 015b5bc..420e198 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -481,7 +481,8 @@ SeparateTitleControls::SeparateTitleControls(
 std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 		not_null<RpWindow*> window,
 		const style::WindowTitle &st,
-		Fn<void(bool maximized)> maximize) {
+		Fn<void(bool maximized)> maximize,
+		rpl::producer<int> controlsTop) {
 	auto result = std::make_unique<SeparateTitleControls>(
 		window->body(),
 		st,
@@ -491,11 +492,12 @@ std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 	auto &lifetime = raw->wrap.lifetime();
 	rpl::combine(
 		window->body()->widthValue(),
-		window->additionalContentPaddingValue()
-	) | rpl::start_with_next([=](int width, int padding) {
+		window->additionalContentPaddingValue(),
+		controlsTop ? std::move(controlsTop) : rpl::single(0)
+	) | rpl::start_with_next([=](int width, int padding, int top) {
 		raw->wrap.setGeometry(
 			padding,
-			0,
+			top,
 			width - 2 * padding,
 			raw->controls.geometry().height());
 	}, lifetime);
diff --git a/ui/platform/ui_platform_window_title.h b/ui/platform/ui_platform_window_title.h
index e61b37d..863171e 100644
--- a/ui/platform/ui_platform_window_title.h
+++ b/ui/platform/ui_platform_window_title.h
@@ -150,7 +150,8 @@ struct SeparateTitleControls {
 [[nodiscard]] auto SetupSeparateTitleControls(
 	not_null<RpWindow*> window,
 	const style::WindowTitle &st,
-	Fn<void(bool maximized)> maximize = nullptr)
+	Fn<void(bool maximized)> maximize = nullptr,
+	rpl::producer<int> controlsTop = nullptr)
 -> std::unique_ptr<SeparateTitleControls>;
 
 } // namespace Platform

From bf65a06735d98d883d3b00ddfea3dafa0c5daebf Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 16 Mar 2022 09:25:20 +0300
Subject: [PATCH 044/635] Added ability to set vertical origin to
 Ui::PopupMenu.

---
 ui/widgets/popup_menu.cpp | 20 ++++++++++++++------
 ui/widgets/popup_menu.h   |  7 +++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 308fed7..039659c 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -601,6 +601,10 @@ void PopupMenu::setForcedOrigin(PanelAnimation::Origin origin) {
 	_forcedOrigin = origin;
 }
 
+void PopupMenu::setForcedVerticalOrigin(VerticalOrigin origin) {
+	_forcedVerticalOrigin = origin;
+}
+
 void PopupMenu::showAnimated(PanelAnimation::Origin origin) {
 	setOrigin(origin);
 	showStarted();
@@ -760,15 +764,19 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 	const auto forceLeft = _forcedOrigin
 		&& (*_forcedOrigin == Origin::TopLeft
 			|| *_forcedOrigin == Origin::BottomLeft);
-	const auto forceTop = _forcedOrigin
-		&& (*_forcedOrigin == Origin::TopLeft
-			|| *_forcedOrigin == Origin::TopRight);
+	const auto forceTop = (_forcedVerticalOrigin
+			&& (*_forcedVerticalOrigin == VerticalOrigin::Top))
+		|| (_forcedOrigin
+			&& (*_forcedOrigin == Origin::TopLeft
+				|| *_forcedOrigin == Origin::TopRight));
 	const auto forceRight = _forcedOrigin
 		&& (*_forcedOrigin == Origin::TopRight
 			|| *_forcedOrigin == Origin::BottomRight);
-	const auto forceBottom = _forcedOrigin
-		&& (*_forcedOrigin == Origin::BottomLeft
-			|| *_forcedOrigin == Origin::BottomRight);
+	const auto forceBottom = (_forcedVerticalOrigin
+			&& (*_forcedVerticalOrigin == VerticalOrigin::Bottom))
+		|| (_forcedOrigin
+			&& (*_forcedOrigin == Origin::BottomLeft
+				|| *_forcedOrigin == Origin::BottomRight));
 	auto w = p - QPoint(0, _padding.top());
 	auto r = screen->availableGeometry();
 	_useTransparency = Platform::TranslucentWindowsSupported(p);
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 26937dd..1cfe9e7 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -21,6 +21,11 @@ class ScrollArea;
 
 class PopupMenu : public RpWidget {
 public:
+	enum class VerticalOrigin {
+		Top,
+		Bottom,
+	};
+
 	PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu);
 	PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu);
 
@@ -53,6 +58,7 @@ public:
 	void popup(const QPoint &p);
 	void hideMenu(bool fast = false);
 	void setForcedOrigin(PanelAnimation::Origin origin);
+	void setForcedVerticalOrigin(VerticalOrigin origin);
 
 	void setDestroyedCallback(Fn<void()> callback) {
 		_destroyedCallback = std::move(callback);
@@ -143,6 +149,7 @@ private:
 
 	QPointer<PopupMenu> _activeSubmenu;
 
+	std::optional<VerticalOrigin> _forcedVerticalOrigin;
 	PanelAnimation::Origin _origin = PanelAnimation::Origin::TopLeft;
 	std::optional<PanelAnimation::Origin> _forcedOrigin;
 	std::unique_ptr<PanelAnimation> _showAnimation;

From 87c95b8fa77bc7d34018103ca54239414bc56945 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 16 Mar 2022 12:22:01 +0400
Subject: [PATCH 045/635] Don't involve screen geometry for popup menus on
 Wayland

---
 ui/widgets/popup_menu.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 039659c..bb329c8 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -744,8 +744,9 @@ void PopupMenu::popup(const QPoint &p) {
 }
 
 void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource source) {
-	const auto screen = QGuiApplication::screenAt(p);
-	if (!screen
+	const auto usingScreenGeometry = !::Platform::IsWayland();
+	const auto screen = usingScreenGeometry ? QGuiApplication::screenAt(p) : nullptr;
+	if ((usingScreenGeometry && !screen)
 		|| (!parent && ::Platform::IsMac() && !Platform::IsApplicationActive())) {
 		_hiding = false;
 		_a_opacity.stop();
@@ -778,14 +779,14 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 			&& (*_forcedOrigin == Origin::BottomLeft
 				|| *_forcedOrigin == Origin::BottomRight));
 	auto w = p - QPoint(0, _padding.top());
-	auto r = screen->availableGeometry();
+	auto r = screen ? screen->availableGeometry() : QRect();
 	_useTransparency = Platform::TranslucentWindowsSupported(p);
 	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
 	handleCompositingUpdate();
 	if (style::RightToLeft()) {
-		const auto badLeft = (w.x() - width() < r.x() - _padding.left());
+		const auto badLeft = !r.isNull() && w.x() - width() < r.x() - _padding.left();
 		if (forceRight || (badLeft && !forceLeft)) {
-			if (_parent && w.x() + _parent->width() - _padding.left() - _padding.right() + width() - _padding.right() <= r.x() + r.width()) {
+			if (_parent && (r.isNull() || w.x() + _parent->width() - _padding.left() - _padding.right() + width() - _padding.right() <= r.x() + r.width())) {
 				w.setX(w.x() + _parent->width() - _padding.left() - _padding.right());
 			} else {
 				w.setX(r.x() - _padding.left());
@@ -794,9 +795,9 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 			w.setX(w.x() - width());
 		}
 	} else {
-		const auto badLeft = (w.x() + width() - _padding.right() > r.x() + r.width());
+		const auto badLeft = !r.isNull() && w.x() + width() - _padding.right() > r.x() + r.width();
 		if (forceRight || (badLeft && !forceLeft)) {
-			if (_parent && w.x() - _parent->width() + _padding.left() + _padding.right() - width() + _padding.right() >= r.x() - _padding.left()) {
+			if (_parent && (r.isNull() || w.x() - _parent->width() + _padding.left() + _padding.right() - width() + _padding.right() >= r.x() - _padding.left())) {
 				w.setX(w.x() + _padding.left() + _padding.right() - _parent->width() - width() + _padding.left() + _padding.right());
 			} else {
 				w.setX(p.x() - width() + _padding.right());
@@ -804,7 +805,7 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 			origin = PanelAnimation::Origin::TopRight;
 		}
 	}
-	const auto badTop = (w.y() + height() - _padding.bottom() > r.y() + r.height());
+	const auto badTop = !r.isNull() && w.y() + height() - _padding.bottom() > r.y() + r.height();
 	if (forceBottom || (badTop && !forceTop)) {
 		if (_parent) {
 			w.setY(r.y() + r.height() - height() + _padding.bottom());
@@ -813,10 +814,10 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 			origin = (origin == PanelAnimation::Origin::TopRight) ? PanelAnimation::Origin::BottomRight : PanelAnimation::Origin::BottomLeft;
 		}
 	}
-	if (w.x() < r.x()) {
+	if (!r.isNull() && w.x() < r.x()) {
 		w.setX(r.x());
 	}
-	if (w.y() < r.y()) {
+	if (!r.isNull() && w.y() < r.y()) {
 		w.setY(r.y());
 	}
 	move(w);

From af680714fff003f0d5e8c48502e4b0192d481c20 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 16 Mar 2022 12:49:01 +0400
Subject: [PATCH 046/635] Don't involve screen geometry for tooltip on Wayland

---
 ui/widgets/tooltip.cpp | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index e875ec5..f5d431f 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -10,6 +10,7 @@
 #include "ui/platform/ui_platform_utility.h"
 #include "base/invoke_queued.h"
 #include "styles/style_widgets.h"
+#include "base/platform/base_platform_info.h"
 
 #include <QtGui/QScreen>
 #include <QtWidgets/QApplication>
@@ -72,8 +73,9 @@ Tooltip::~Tooltip() {
 }
 
 void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *st) {
-	const auto screen = QGuiApplication::screenAt(m);
-	if (!screen) {
+	const auto usingScreenGeometry = !::Platform::IsWayland();
+	const auto screen = usingScreenGeometry ? QGuiApplication::screenAt(m) : nullptr;
+	if (usingScreenGeometry && !screen) {
 		Hide();
 		return;
 	}
@@ -114,18 +116,20 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *
 	}
 
 	// adjust tooltip position
-	const auto r = screen->availableGeometry();
-	if (r.x() + r.width() - _st->skip < p.x() + s.width() && p.x() + s.width() > m.x()) {
-		p.setX(qMax(r.x() + r.width() - int32(_st->skip) - s.width(), m.x() - s.width()));
-	}
-	if (r.x() + _st->skip > p.x() && p.x() < m.x()) {
-		p.setX(qMin(m.x(), r.x() + int32(_st->skip)));
-	}
-	if (r.y() + r.height() - _st->skip < p.y() + s.height()) {
-		p.setY(m.y() - s.height() - _st->skip);
-	}
-	if (r.y() > p.x()) {
-		p.setY(qMin(m.y() + _st->shift.y(), r.y() + r.height() - s.height()));
+	if (screen) {
+		const auto r = screen->availableGeometry();
+		if (r.x() + r.width() - _st->skip < p.x() + s.width() && p.x() + s.width() > m.x()) {
+			p.setX(qMax(r.x() + r.width() - int32(_st->skip) - s.width(), m.x() - s.width()));
+		}
+		if (r.x() + _st->skip > p.x() && p.x() < m.x()) {
+			p.setX(qMin(m.x(), r.x() + int32(_st->skip)));
+		}
+		if (r.y() + r.height() - _st->skip < p.y() + s.height()) {
+			p.setY(m.y() - s.height() - _st->skip);
+		}
+		if (r.y() > p.x()) {
+			p.setY(qMin(m.y() + _st->shift.y(), r.y() + r.height() - s.height()));
+		}
 	}
 
 	setGeometry(QRect(p, s));

From 1027fb5dffd816a1818b568e4c5fc298c97e0bc5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Mar 2022 20:40:27 +0400
Subject: [PATCH 047/635] Fix colorizing sparse images.

---
 ui/image/image_prepare.cpp | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index d66b2a5..dea3801 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1127,20 +1127,25 @@ QImage Colored(QImage &&image, QColor add) {
 		const auto ca = int(add.alphaF() * 0xFF);
 		const auto cr = int(add.redF() * 0xFF);
 		const auto cg = int(add.greenF() * 0xFF);
-		const auto cb = int(add .blueF() * 0xFF);
+		const auto cb = int(add.blueF() * 0xFF);
 		const auto w = image.width();
 		const auto h = image.height();
 		const auto size = w * h * 4;
-		for (auto i = index_type(); i != size; i += 4) {
-			const auto b = pix[i];
-			const auto g = pix[i + 1];
-			const auto r = pix[i + 2];
-			const auto a = pix[i + 3];
-			const auto aca = a * ca;
-			pix[i + 0] = uchar(b + ((aca * (cb - b)) >> 16));
-			pix[i + 1] = uchar(g + ((aca * (cg - g)) >> 16));
-			pix[i + 2] = uchar(r + ((aca * (cr - r)) >> 16));
-			pix[i + 3] = uchar(a + ((aca * (0xFF - a)) >> 16));
+		const auto add = image.bytesPerLine() - (w * 4);
+		auto i = index_type();
+		for (auto y = 0; y != h; ++y) {
+			for (auto to = i + (w * 4); i != to; i += 4) {
+				const auto b = pix[i];
+				const auto g = pix[i + 1];
+				const auto r = pix[i + 2];
+				const auto a = pix[i + 3];
+				const auto aca = a * ca;
+				pix[i + 0] = uchar(b + ((aca * (cb - b)) >> 16));
+				pix[i + 1] = uchar(g + ((aca * (cg - g)) >> 16));
+				pix[i + 2] = uchar(r + ((aca * (cr - r)) >> 16));
+				pix[i + 3] = uchar(a + ((aca * (0xFF - a)) >> 16));
+			}
+			i += add;
 		}
 	}
 	return std::move(image);

From 39176f619e699103b9ca3941ca6a54aa9b77f829 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 20 Mar 2022 09:03:14 +0400
Subject: [PATCH 048/635] Set screen for popup menu

---
 ui/widgets/popup_menu.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index bb329c8..c7d5923 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -760,6 +760,12 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 	}
 	_parent = parent;
 
+	if (_parent) {
+		setScreen(_parent->screen());
+	} else if (screen) {
+		setScreen(screen);
+	}
+
 	using Origin = PanelAnimation::Origin;
 	auto origin = Origin::TopLeft;
 	const auto forceLeft = _forcedOrigin

From 89be8d23fcd032c3410b3e17f294b2c3701c8d00 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 20 Mar 2022 09:03:23 +0400
Subject: [PATCH 049/635] Set screen for tooltip

---
 ui/widgets/tooltip.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index f5d431f..e7621fa 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -117,6 +117,7 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *
 
 	// adjust tooltip position
 	if (screen) {
+		setScreen(screen);
 		const auto r = screen->availableGeometry();
 		if (r.x() + r.width() - _st->skip < p.x() + s.width() && p.x() + s.width() > m.x()) {
 			p.setX(qMax(r.x() + r.width() - int32(_st->skip) - s.width(), m.x() - s.width()));

From 5fa3d7a9daa62fb82713bc822a5138116a6015f2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 20 Mar 2022 09:03:36 +0400
Subject: [PATCH 050/635] Remove unused variable

---
 ui/image/image_prepare.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index dea3801..f86a16c 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1130,7 +1130,6 @@ QImage Colored(QImage &&image, QColor add) {
 		const auto cb = int(add.blueF() * 0xFF);
 		const auto w = image.width();
 		const auto h = image.height();
-		const auto size = w * h * 4;
 		const auto add = image.bytesPerLine() - (w * 4);
 		auto i = index_type();
 		for (auto y = 0; y != h; ++y) {

From 8700c2223ab60db994376b39e4e74a6309d5154a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Mar 2022 19:45:56 +0400
Subject: [PATCH 051/635] Add NV12 -> RGB shader.

---
 ui/gl/gl_shader.cpp | 31 ++++++++++++++++++++++++++-----
 ui/gl/gl_shader.h   |  1 +
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/ui/gl/gl_shader.cpp b/ui/gl/gl_shader.cpp
index 2f47edd..e28bfed 100644
--- a/ui/gl/gl_shader.cpp
+++ b/ui/gl/gl_shader.cpp
@@ -80,6 +80,16 @@ uniform sampler2D s_texture;
 	};
 }
 
+QString FragmentYUV2RGB() {
+	return R"(
+	result = vec4(
+		1.164 * y + 1.596 * v,
+		1.164 * y - 0.392 * u - 0.813 * v,
+		1.164 * y + 2.17 * u,
+		1.);
+)";
+}
+
 ShaderPart FragmentSampleYUV420Texture() {
 	return {
 		.header = R"(
@@ -92,12 +102,23 @@ uniform sampler2D v_texture;
 	float y = texture2D(y_texture, v_texcoord).a - 0.0625;
 	float u = texture2D(u_texture, v_texcoord).a - 0.5;
 	float v = texture2D(v_texture, v_texcoord).a - 0.5;
-	result = vec4(
-		1.164 * y + 1.596 * v,
-		1.164 * y - 0.392 * u - 0.813 * v,
-		1.164 * y + 2.17 * u,
-		1.);
+)" + FragmentYUV2RGB(),
+	};
+}
+
+ShaderPart FragmentSampleNV12Texture() {
+	return {
+		.header = R"(
+varying vec2 v_texcoord;
+uniform sampler2D y_texture;
+uniform sampler2D uv_texture;
 )",
+		.body = R"(
+	float y = texture2D(y_texture, v_texcoord).a - 0.0625;
+	vec2 uv = texture2D(uv_texture, v_texcoord).rg - vec2(0.5, 0.5);
+	float u = uv.x;
+	float v = uv.y;
+)" + FragmentYUV2RGB(),
 	};
 }
 
diff --git a/ui/gl/gl_shader.h b/ui/gl/gl_shader.h
index 5dce379..521b311 100644
--- a/ui/gl/gl_shader.h
+++ b/ui/gl/gl_shader.h
@@ -24,6 +24,7 @@ struct ShaderPart {
 [[nodiscard]] ShaderPart VertexPassTextureCoord(char prefix = 'v');
 [[nodiscard]] ShaderPart FragmentSampleARGB32Texture();
 [[nodiscard]] ShaderPart FragmentSampleYUV420Texture();
+[[nodiscard]] ShaderPart FragmentSampleNV12Texture();
 [[nodiscard]] ShaderPart FragmentGlobalOpacity();
 [[nodiscard]] ShaderPart VertexViewportTransform();
 [[nodiscard]] ShaderPart FragmentRoundCorners();

From a0b04da1d95a67d1ba431b7652026bd72d86962e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 21 Mar 2022 14:35:22 +0300
Subject: [PATCH 052/635] Added utils for fade animated showing/hiding of
 widgets.

---
 CMakeLists.txt                |   2 +
 ui/effects/show_animation.cpp | 110 ++++++++++++++++++++++++++++++++++
 ui/effects/show_animation.h   |  20 +++++++
 3 files changed, 132 insertions(+)
 create mode 100644 ui/effects/show_animation.cpp
 create mode 100644 ui/effects/show_animation.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc6654b..fb289c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,8 @@ PRIVATE
     ui/effects/radial_animation.h
     ui/effects/ripple_animation.cpp
     ui/effects/ripple_animation.h
+    ui/effects/show_animation.cpp
+    ui/effects/show_animation.h
     ui/effects/slide_animation.cpp
     ui/effects/slide_animation.h
     ui/gl/gl_detection.cpp
diff --git a/ui/effects/show_animation.cpp b/ui/effects/show_animation.cpp
new file mode 100644
index 0000000..2e7a362
--- /dev/null
+++ b/ui/effects/show_animation.cpp
@@ -0,0 +1,110 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/effects/show_animation.h"
+
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+#include "styles/style_widgets.h"
+
+namespace Ui::Animations {
+namespace {
+
+void AnimateWidgets(const Widgets &targets, bool show) {
+	enum class Finish {
+		Bad,
+		Good,
+	};
+	struct Object {
+		base::unique_qptr<Ui::RpWidget> container;
+		QPointer<Ui::RpWidget> weakTarget;
+	};
+	struct State {
+		rpl::event_stream<Finish> destroy;
+		Ui::Animations::Simple animation;
+		std::vector<Object> objects;
+	};
+	auto lifetime = std::make_shared<rpl::lifetime>();
+	const auto state = lifetime->make_state<State>();
+
+	const auto from = show ? 0. : 1.;
+	const auto to = show ? 1. : 0.;
+
+	for (const auto &target : targets) {
+		state->objects.push_back({
+			base::make_unique_q<Ui::RpWidget>(target->parentWidget()),
+			Ui::MakeWeak(target),
+		});
+
+		const auto pixmap = Ui::GrabWidget(target);
+		const auto raw = state->objects.back().container.get();
+
+		raw->paintRequest(
+		) | rpl::start_with_next([=] {
+			QPainter p(raw);
+
+			p.setOpacity(state->animation.value(to));
+			p.drawPixmap(QPoint(), pixmap);
+		}, raw->lifetime());
+
+		target->geometryValue(
+		) | rpl::start_with_next([=](const QRect &r) {
+			raw->setGeometry(r);
+		}, raw->lifetime());
+
+		raw->show();
+
+		if (!show) {
+			target->hide();
+		}
+	}
+
+	state->destroy.events(
+	) | rpl::take(
+		1
+	) | rpl::start_with_next([=](Finish type) mutable {
+		if (type == Finish::Good && show) {
+			for (const auto &object : state->objects) {
+				if (object.weakTarget) {
+					object.weakTarget->show();
+				}
+			}
+		}
+		if (lifetime) {
+			base::take(lifetime)->destroy();
+		}
+	}, *lifetime);
+
+	state->animation.start(
+		[=](auto value) {
+			for (const auto &object : state->objects) {
+				object.container->update();
+
+				if (!object.weakTarget && show) {
+					state->destroy.fire(Finish::Bad);
+					return;
+				}
+			}
+			if (value == to) {
+				state->destroy.fire(Finish::Good);
+			}
+		},
+		from,
+		to,
+		st::defaultToggle.duration);
+}
+
+} // namespace
+
+void ShowWidgets(const Widgets &targets) {
+	AnimateWidgets(targets, true);
+}
+
+void HideWidgets(const Widgets &targets) {
+	AnimateWidgets(targets, false);
+}
+
+} // namespace Ui::Animations
diff --git a/ui/effects/show_animation.h b/ui/effects/show_animation.h
new file mode 100644
index 0000000..d75735d
--- /dev/null
+++ b/ui/effects/show_animation.h
@@ -0,0 +1,20 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Ui::Animations {
+
+using Widgets = std::vector<not_null<Ui::RpWidget*>>;
+
+void ShowWidgets(const Widgets &targets);
+void HideWidgets(const Widgets &targets);
+
+} // namespace Ui::Animations

From bc85f7baf32384fba63782160469d4b0dd3bcb79 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Mar 2022 15:22:28 +0300
Subject: [PATCH 053/635] Decomposed painting of text in Ui::Menu::Action.

---
 ui/widgets/menu/menu_action.cpp | 11 ++++++++++-
 ui/widgets/menu/menu_action.h   |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index d448cbb..a37bfbe 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -83,6 +83,15 @@ bool Action::hasSubmenu() const {
 	return _action->menu() != nullptr;
 }
 
+void Action::paintText(Painter &p) {
+	_text.drawLeftElided(
+		p,
+		_st.itemPadding.left(),
+		_st.itemPadding.top(),
+		_textWidth,
+		width());
+}
+
 void Action::paint(Painter &p) {
 	const auto enabled = isEnabled();
 	const auto selected = isSelected();
@@ -97,7 +106,7 @@ void Action::paint(Painter &p) {
 		icon->paint(p, _st.itemIconPosition, width());
 	}
 	p.setPen(selected ? _st.itemFgOver : (enabled ? _st.itemFg : _st.itemFgDisabled));
-	_text.drawLeftElided(p, _st.itemPadding.left(), _st.itemPadding.top(), _textWidth, width());
+	paintText(p);
 	if (hasSubmenu()) {
 		const auto left = width() - _st.itemPadding.right() - _st.arrow.width();
 		const auto top = (_height - _st.arrow.height()) / 2;
diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h
index 3149434..f1b852a 100644
--- a/ui/widgets/menu/menu_action.h
+++ b/ui/widgets/menu/menu_action.h
@@ -38,6 +38,8 @@ protected:
 
 	int contentHeight() const override;
 
+	void paintText(Painter &p);
+
 private:
 	void processAction();
 	void paint(Painter &p);

From 62002f034bbfd3e5f78a71317f37c685a8846b1f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Mar 2022 16:25:30 +0300
Subject: [PATCH 054/635] Added ability to ignore clicks for toggle in
 Ui::SettingsButton.

---
 ui/widgets/buttons.cpp | 12 ++++++++----
 ui/widgets/buttons.h   |  4 +++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index 6a98811..f253d14 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -701,16 +701,20 @@ SettingsButton::SettingsButton(
 
 SettingsButton::~SettingsButton() = default;
 
-SettingsButton *SettingsButton::toggleOn(rpl::producer<bool> &&toggled) {
+SettingsButton *SettingsButton::toggleOn(
+		rpl::producer<bool> &&toggled,
+		bool ignoreClick) {
 	Expects(_toggle == nullptr);
 
 	_toggle = std::make_unique<Ui::ToggleView>(
 		isOver() ? _st.toggleOver : _st.toggle,
 		false,
 		[this] { rtlupdate(toggleRect()); });
-	addClickHandler([this] {
-		_toggle->setChecked(!_toggle->checked(), anim::type::normal);
-	});
+	if (!ignoreClick) {
+		addClickHandler([this] {
+			_toggle->setChecked(!_toggle->checked(), anim::type::normal);
+		});
+	}
 	std::move(
 		toggled
 	) | rpl::start_with_next([this](bool toggled) {
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index da408f6..58d4709 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -261,7 +261,9 @@ public:
 		const style::SettingsButton &st);
 	~SettingsButton();
 
-	SettingsButton *toggleOn(rpl::producer<bool> &&toggled);
+	SettingsButton *toggleOn(
+		rpl::producer<bool> &&toggled,
+		bool ignoreClick = false);
 	bool toggled() const;
 	rpl::producer<bool> toggledChanges() const;
 	rpl::producer<bool> toggledValue() const;

From c676256872bee37984ff7dfe219a1cf70517e904 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Mar 2022 12:15:42 +0300
Subject: [PATCH 055/635] Fixed text validation when char is put on next part
 of time input.

---
 ui/widgets/time_input.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/time_input.cpp b/ui/widgets/time_input.cpp
index a4ed518..e7c3178 100644
--- a/ui/widgets/time_input.cpp
+++ b/ui/widgets/time_input.cpp
@@ -284,6 +284,7 @@ void TimeInput::putNext(const object_ptr<TimePart> &field, QChar ch) {
 		field->setText(ch + field->getLastText());
 		field->setCursorPosition(1);
 	}
+	field->onTextEdited();
 	field->setFocus();
 }
 

From 2256b4b8eab5944a246ae4a36b9158461ce95676 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Mar 2022 12:24:36 +0300
Subject: [PATCH 056/635] Moved number parsing to Ui::TimePart class.

---
 ui/widgets/time_input.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ui/widgets/time_input.cpp b/ui/widgets/time_input.cpp
index e7c3178..2cf825e 100644
--- a/ui/widgets/time_input.cpp
+++ b/ui/widgets/time_input.cpp
@@ -55,8 +55,10 @@ public:
 	void setMaxValue(int value);
 	void setWheelStep(int value);
 
-	rpl::producer<> erasePrevious() const;
-	rpl::producer<QChar> putNext() const;
+	[[nodiscard]] rpl::producer<> erasePrevious() const;
+	[[nodiscard]] rpl::producer<QChar> putNext() const;
+
+	[[nodiscard]] std::optional<int> number();
 
 protected:
 	void keyPressEvent(QKeyEvent *e) override;
@@ -77,8 +79,8 @@ private:
 
 };
 
-std::optional<int> Number(not_null<TimePart*> field) {
-	const auto text = field->getLastText();
+std::optional<int> TimePart::number() {
+	const auto text = getLastText();
 	auto view = QStringView(text);
 	while (view.size() > 1 && view.at(0) == '0') {
 		view = base::StringViewMid(view, 1);
@@ -121,7 +123,7 @@ void TimePart::keyPressEvent(QKeyEvent *e) {
 
 void TimePart::wheelEvent(QWheelEvent *e) {
 	const auto direction = WheelDirection(e);
-	const auto now = Number(this);
+	const auto now = number();
 	if (!now.has_value()) {
 		return;
 	}
@@ -307,11 +309,11 @@ bool TimeInput::setFocusFast() {
 }
 
 std::optional<int> TimeInput::hour() const {
-	return Number(_hour);
+	return _hour->number();
 }
 
 std::optional<int> TimeInput::minute() const {
-	return Number(_minute);
+	return _minute->number();
 }
 
 QString TimeInput::valueCurrent() const {

From c026c1125e4c23b7335753e60d4bc0da42cd7774 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Mar 2022 12:26:41 +0300
Subject: [PATCH 057/635] Moved Ui::TimePart to separated file.

---
 CMakeLists.txt                        |   2 +
 ui/widgets/fields/time_part_input.cpp | 123 ++++++++++++++++++++++
 ui/widgets/fields/time_part_input.h   |  44 ++++++++
 ui/widgets/time_input.cpp             | 143 +-------------------------
 4 files changed, 170 insertions(+), 142 deletions(-)
 create mode 100644 ui/widgets/fields/time_part_input.cpp
 create mode 100644 ui/widgets/fields/time_part_input.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb289c2..717e7d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,6 +176,8 @@ PRIVATE
     ui/widgets/input_fields.h
     ui/widgets/labels.cpp
     ui/widgets/labels.h
+    ui/widgets/fields/time_part_input.cpp
+    ui/widgets/fields/time_part_input.h
     ui/widgets/menu/menu.cpp
     ui/widgets/menu/menu.h
     ui/widgets/menu/menu_action.cpp
diff --git a/ui/widgets/fields/time_part_input.cpp b/ui/widgets/fields/time_part_input.cpp
new file mode 100644
index 0000000..f61a0db
--- /dev/null
+++ b/ui/widgets/fields/time_part_input.cpp
@@ -0,0 +1,123 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/widgets/fields/time_part_input.h"
+
+#include "ui/ui_utility.h" // WheelDirection
+
+#include <QtCore/QRegularExpression>
+
+namespace Ui {
+
+std::optional<int> TimePart::number() {
+	const auto text = getLastText();
+	auto view = QStringView(text);
+	while (view.size() > 1 && view.at(0) == '0') {
+		view = base::StringViewMid(view, 1);
+	}
+	return QRegularExpression("^\\d+$").match(view).hasMatch()
+		? std::make_optional(view.toInt())
+		: std::nullopt;
+}
+
+void TimePart::setMaxValue(int value) {
+	_maxValue = value;
+	_maxDigits = 0;
+	while (value > 0) {
+		++_maxDigits;
+		value /= 10;
+	}
+}
+
+void TimePart::setWheelStep(int value) {
+	_wheelStep = value;
+}
+
+rpl::producer<> TimePart::erasePrevious() const {
+	return _erasePrevious.events();
+}
+
+rpl::producer<QChar> TimePart::putNext() const {
+	return _putNext.events();
+}
+
+void TimePart::keyPressEvent(QKeyEvent *e) {
+	const auto isBackspace = (e->key() == Qt::Key_Backspace);
+	const auto isBeginning = (cursorPosition() == 0);
+	if (isBackspace && isBeginning && !hasSelectedText()) {
+		_erasePrevious.fire({});
+	} else {
+		MaskedInputField::keyPressEvent(e);
+	}
+}
+
+void TimePart::wheelEvent(QWheelEvent *e) {
+	const auto direction = WheelDirection(e);
+	const auto now = number();
+	if (!now.has_value()) {
+		return;
+	}
+	auto time = *now + (direction * _wheelStep);
+	const auto max = _maxValue + 1;
+	if (time < 0) {
+		time += max;
+	} else if (time >= max) {
+		time -= max;
+	}
+	setText(QString::number(time));
+}
+
+void TimePart::correctValue(
+		const QString &was,
+		int wasCursor,
+		QString &now,
+		int &nowCursor) {
+	auto newText = QString();
+	auto newCursor = -1;
+	const auto oldCursor = nowCursor;
+	const auto oldLength = now.size();
+	auto accumulated = 0;
+	auto limit = 0;
+	for (; limit != oldLength; ++limit) {
+		if (now[limit].isDigit()) {
+			accumulated *= 10;
+			accumulated += (now[limit].unicode() - '0');
+			if (accumulated > _maxValue || limit == _maxDigits) {
+				break;
+			}
+		}
+	}
+	for (auto i = 0; i != limit;) {
+		if (now[i].isDigit()) {
+			newText += now[i];
+		}
+		if (++i == oldCursor) {
+			newCursor = newText.size();
+		}
+	}
+	if (newCursor < 0) {
+		newCursor = newText.size();
+	}
+	if (newText != now) {
+		now = newText;
+		setText(now);
+		startPlaceholderAnimation();
+	}
+	if (newCursor != nowCursor) {
+		nowCursor = newCursor;
+		setCursorPosition(nowCursor);
+	}
+	if (accumulated > _maxValue
+		|| (limit == _maxDigits && oldLength > _maxDigits)) {
+		if (oldCursor > limit) {
+			_putNext.fire('0' + (accumulated % 10));
+		} else {
+			_putNext.fire(0);
+		}
+	}
+}
+
+} // namespace Ui
diff --git a/ui/widgets/fields/time_part_input.h b/ui/widgets/fields/time_part_input.h
new file mode 100644
index 0000000..bdd7d1b
--- /dev/null
+++ b/ui/widgets/fields/time_part_input.h
@@ -0,0 +1,44 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/widgets/input_fields.h"
+
+namespace Ui {
+
+class TimePart : public MaskedInputField {
+public:
+	using MaskedInputField::MaskedInputField;
+
+	void setMaxValue(int value);
+	void setWheelStep(int value);
+
+	[[nodiscard]] rpl::producer<> erasePrevious() const;
+	[[nodiscard]] rpl::producer<QChar> putNext() const;
+
+	[[nodiscard]] std::optional<int> number();
+
+protected:
+	void keyPressEvent(QKeyEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
+
+	void correctValue(
+		const QString &was,
+		int wasCursor,
+		QString &now,
+		int &nowCursor) override;
+
+private:
+	int _maxValue = 0;
+	int _maxDigits = 0;
+	int _wheelStep = 0;
+	rpl::event_stream<> _erasePrevious;
+	rpl::event_stream<QChar> _putNext;
+
+};
+
+} // namespace Ui
diff --git a/ui/widgets/time_input.cpp b/ui/widgets/time_input.cpp
index 2cf825e..a848849 100644
--- a/ui/widgets/time_input.cpp
+++ b/ui/widgets/time_input.cpp
@@ -6,9 +6,7 @@
 //
 #include "ui/widgets/time_input.h"
 
-#include "ui/widgets/input_fields.h"
-#include "ui/ui_utility.h"
-#include "base/qt/qt_common_adapters.h"
+#include "ui/widgets/fields/time_part_input.h"
 
 #include <QtCore/QRegularExpression>
 #include <QTime>
@@ -48,145 +46,6 @@ QString GetMinute(const QString &value) {
 
 } // namespace
 
-class TimePart final : public MaskedInputField {
-public:
-	using MaskedInputField::MaskedInputField;
-
-	void setMaxValue(int value);
-	void setWheelStep(int value);
-
-	[[nodiscard]] rpl::producer<> erasePrevious() const;
-	[[nodiscard]] rpl::producer<QChar> putNext() const;
-
-	[[nodiscard]] std::optional<int> number();
-
-protected:
-	void keyPressEvent(QKeyEvent *e) override;
-	void wheelEvent(QWheelEvent *e) override;
-
-	void correctValue(
-		const QString &was,
-		int wasCursor,
-		QString &now,
-		int &nowCursor) override;
-
-private:
-	int _maxValue = 0;
-	int _maxDigits = 0;
-	int _wheelStep = 0;
-	rpl::event_stream<> _erasePrevious;
-	rpl::event_stream<QChar> _putNext;
-
-};
-
-std::optional<int> TimePart::number() {
-	const auto text = getLastText();
-	auto view = QStringView(text);
-	while (view.size() > 1 && view.at(0) == '0') {
-		view = base::StringViewMid(view, 1);
-	}
-	return QRegularExpression("^\\d+$").match(view).hasMatch()
-		? std::make_optional(view.toInt())
-		: std::nullopt;
-}
-
-void TimePart::setMaxValue(int value) {
-	_maxValue = value;
-	_maxDigits = 0;
-	while (value > 0) {
-		++_maxDigits;
-		value /= 10;
-	}
-}
-
-void TimePart::setWheelStep(int value) {
-	_wheelStep = value;
-}
-
-rpl::producer<> TimePart::erasePrevious() const {
-	return _erasePrevious.events();
-}
-
-rpl::producer<QChar> TimePart::putNext() const {
-	return _putNext.events();
-}
-
-void TimePart::keyPressEvent(QKeyEvent *e) {
-	const auto isBackspace = (e->key() == Qt::Key_Backspace);
-	const auto isBeginning = (cursorPosition() == 0);
-	if (isBackspace && isBeginning && !hasSelectedText()) {
-		_erasePrevious.fire({});
-	} else {
-		MaskedInputField::keyPressEvent(e);
-	}
-}
-
-void TimePart::wheelEvent(QWheelEvent *e) {
-	const auto direction = WheelDirection(e);
-	const auto now = number();
-	if (!now.has_value()) {
-		return;
-	}
-	auto time = *now + (direction * _wheelStep);
-	const auto max = _maxValue + 1;
-	if (time < 0) {
-		time += max;
-	} else if (time >= max) {
-		time -= max;
-	}
-	setText(QString::number(time));
-}
-
-void TimePart::correctValue(
-		const QString &was,
-		int wasCursor,
-		QString &now,
-		int &nowCursor) {
-	auto newText = QString();
-	auto newCursor = -1;
-	const auto oldCursor = nowCursor;
-	const auto oldLength = now.size();
-	auto accumulated = 0;
-	auto limit = 0;
-	for (; limit != oldLength; ++limit) {
-		if (now[limit].isDigit()) {
-			accumulated *= 10;
-			accumulated += (now[limit].unicode() - '0');
-			if (accumulated > _maxValue || limit == _maxDigits) {
-				break;
-			}
-		}
-	}
-	for (auto i = 0; i != limit;) {
-		if (now[i].isDigit()) {
-			newText += now[i];
-		}
-		if (++i == oldCursor) {
-			newCursor = newText.size();
-		}
-	}
-	if (newCursor < 0) {
-		newCursor = newText.size();
-	}
-	if (newText != now) {
-		now = newText;
-		setText(now);
-		startPlaceholderAnimation();
-	}
-	if (newCursor != nowCursor) {
-		nowCursor = newCursor;
-		setCursorPosition(nowCursor);
-	}
-	if (accumulated > _maxValue
-		|| (limit == _maxDigits && oldLength > _maxDigits)) {
-		if (oldCursor > limit) {
-			_putNext.fire('0' + (accumulated % 10));
-		} else {
-			_putNext.fire(0);
-		}
-	}
-}
-
 TimeInput::TimeInput(
 	QWidget *parent,
 	const QString &value,

From 9f28a0b106311566d2adab8a7b82973accfdd944 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 28 Mar 2022 13:30:42 +0300
Subject: [PATCH 058/635] Added MaskedInputField::changed signal on wheel event
 in Ui::TimePart.

---
 ui/widgets/fields/time_part_input.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/fields/time_part_input.cpp b/ui/widgets/fields/time_part_input.cpp
index f61a0db..8f6433a 100644
--- a/ui/widgets/fields/time_part_input.cpp
+++ b/ui/widgets/fields/time_part_input.cpp
@@ -68,6 +68,7 @@ void TimePart::wheelEvent(QWheelEvent *e) {
 		time -= max;
 	}
 	setText(QString::number(time));
+	Ui::MaskedInputField::changed();
 }
 
 void TimePart::correctValue(

From c035b78f87b76b0250814c54d56550ffe18609da Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Mar 2022 18:38:49 +0300
Subject: [PATCH 059/635] Added IconButtonWithText control.

---
 CMakeLists.txt                       |  2 ++
 ui/widgets/buttons.cpp               | 17 ++++++++----
 ui/widgets/buttons.h                 |  2 ++
 ui/widgets/icon_button_with_text.cpp | 41 ++++++++++++++++++++++++++++
 ui/widgets/icon_button_with_text.h   | 31 +++++++++++++++++++++
 ui/widgets/widgets.style             | 11 ++++++++
 6 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 ui/widgets/icon_button_with_text.cpp
 create mode 100644 ui/widgets/icon_button_with_text.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 717e7d2..a24ac2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,6 +170,8 @@ PRIVATE
     ui/widgets/checkbox.h
     ui/widgets/dropdown_menu.cpp
     ui/widgets/dropdown_menu.h
+    ui/widgets/icon_button_with_text.cpp
+    ui/widgets/icon_button_with_text.h
     ui/widgets/inner_dropdown.cpp
     ui/widgets/inner_dropdown.h
     ui/widgets/input_fields.cpp
diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index f253d14..97f1c78 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -476,14 +476,19 @@ void IconButton::setRippleColorOverride(const style::color *colorOverride) {
 	_rippleColorOverride = colorOverride;
 }
 
+float64 IconButton::iconOverOpacity() const {
+	return (isDown() || forceRippled())
+		? 1.
+		: _a_over.value(isOver() ? 1. : 0.);
+}
+
 void IconButton::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	paintRipple(p, _st.rippleAreaPosition, _rippleColorOverride ? &(*_rippleColorOverride)->c : nullptr);
 
-	auto down = isDown();
-	auto overIconOpacity = (down || forceRippled()) ? 1. : _a_over.value(isOver() ? 1. : 0.);
-	auto overIcon = [this] {
+	const auto overIconOpacity = iconOverOpacity();
+	const auto overIcon = [&] {
 		if (_iconOverrideOver) {
 			return _iconOverrideOver;
 		} else if (!_st.iconOver.empty()) {
@@ -493,13 +498,13 @@ void IconButton::paintEvent(QPaintEvent *e) {
 		}
 		return &_st.icon;
 	};
-	auto justIcon = [this] {
+	const auto justIcon = [&] {
 		if (_iconOverride) {
 			return _iconOverride;
 		}
 		return &_st.icon;
 	};
-	auto icon = (overIconOpacity == 1.) ? overIcon() : justIcon();
+	const auto icon = (overIconOpacity == 1.) ? overIcon() : justIcon();
 	auto position = _st.iconPosition;
 	if (position.x() < 0) {
 		position.setX((width() - icon->width()) / 2);
@@ -509,7 +514,7 @@ void IconButton::paintEvent(QPaintEvent *e) {
 	}
 	icon->paint(p, position, width());
 	if (overIconOpacity > 0. && overIconOpacity < 1.) {
-		auto iconOver = overIcon();
+		const auto iconOver = overIcon();
 		if (iconOver != icon) {
 			p.setOpacity(overIconOpacity);
 			iconOver->paint(p, position, width());
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index 58d4709..89c32cf 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -196,6 +196,8 @@ protected:
 	QImage prepareRippleMask() const override;
 	QPoint prepareRippleStartPosition() const override;
 
+	[[nodiscard]] float64 iconOverOpacity() const;
+
 private:
 	const style::IconButton &_st;
 	const style::icon *_iconOverride = nullptr;
diff --git a/ui/widgets/icon_button_with_text.cpp b/ui/widgets/icon_button_with_text.cpp
new file mode 100644
index 0000000..7e28158
--- /dev/null
+++ b/ui/widgets/icon_button_with_text.cpp
@@ -0,0 +1,41 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/icon_button_with_text.h"
+
+namespace Ui {
+
+IconButtonWithText::IconButtonWithText(
+	not_null<RpWidget*> parent,
+	const style::IconButtonWithText &st)
+: IconButton(parent, st.iconButton)
+, _st(st) {
+}
+
+void IconButtonWithText::paintEvent(QPaintEvent *e) {
+	IconButton::paintEvent(e);
+
+	const auto r = rect() - _st.textPadding;
+
+	Painter p(this);
+	p.setFont(_st.font);
+	p.setPen(_st.textFg);
+	p.drawText(r, _text, style::al_center);
+
+	const auto overIconOpacity = IconButton::iconOverOpacity();
+	if (overIconOpacity > 0. && overIconOpacity < 1.) {
+		p.setPen(_st.textFgOver);
+		p.setOpacity(overIconOpacity);
+		p.drawText(r, _text, style::al_center);
+	}
+}
+
+void IconButtonWithText::setText(const QString &text) {
+	_text = text;
+}
+
+} // namespace Ui
diff --git a/ui/widgets/icon_button_with_text.h b/ui/widgets/icon_button_with_text.h
new file mode 100644
index 0000000..d4a31f8
--- /dev/null
+++ b/ui/widgets/icon_button_with_text.h
@@ -0,0 +1,31 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+
+namespace Ui {
+
+class IconButtonWithText final : public Ui::IconButton {
+public:
+	IconButtonWithText(
+		not_null<RpWidget*> parent,
+		const style::IconButtonWithText &st);
+
+	void setText(const QString &text);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+private:
+	const style::IconButtonWithText &_st;
+	QString _text;
+
+};
+
+} // namespace Ui
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index f17cf40..d54e19f 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -338,6 +338,17 @@ IconButton {
 	ripple: RippleAnimation;
 }
 
+IconButtonWithText {
+	iconButton: IconButton;
+	height: pixels;
+
+	textFg: color;
+	textFgOver: color;
+	textPadding: margins;
+
+	font: font;
+}
+
 MediaSlider {
 	width: pixels;
 	activeFg: color;

From 8d181e53c573639d8a4a7e66e89bc01791b0572b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 30 Mar 2022 20:02:03 +0300
Subject: [PATCH 060/635] Added ability to set text color of action menu item
 via QAction.

---
 ui/widgets/menu/menu_action.cpp | 16 +++++++++++++++-
 ui/widgets/menu/menu_action.h   |  1 +
 ui/widgets/menu/menu_common.cpp |  5 ++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index a37bfbe..d20e734 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -105,7 +105,13 @@ void Action::paint(Painter &p) {
 	if (const auto icon = (selected ? _iconOver : _icon)) {
 		icon->paint(p, _st.itemIconPosition, width());
 	}
-	p.setPen(selected ? _st.itemFgOver : (enabled ? _st.itemFg : _st.itemFgDisabled));
+	p.setPen(_fgOverride
+		? QPen(*_fgOverride)
+		: selected
+		? _st.itemFgOver
+		: enabled
+		? _st.itemFg
+		: _st.itemFgDisabled);
 	paintText(p);
 	if (hasSubmenu()) {
 		const auto left = width() - _st.itemPadding.right() - _st.arrow.width();
@@ -168,6 +174,14 @@ void Action::processAction() {
 	_shortcut = actionShortcut;
 	setMinWidth(w);
 	update();
+
+	// TODO better way.
+	if (const auto variant = _action->data(); variant.isValid()) {
+		const auto overrideColor = variant.value<QColor>();
+		if (overrideColor.isValid()) {
+			_fgOverride = overrideColor;
+		}
+	}
 }
 
 bool Action::isEnabled() const {
diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h
index f1b852a..23d28d6 100644
--- a/ui/widgets/menu/menu_action.h
+++ b/ui/widgets/menu/menu_action.h
@@ -54,6 +54,7 @@ private:
 	const style::icon *_iconOver;
 //	std::unique_ptr<ToggleView> _toggle;
 	int _textWidth = 0;
+	std::optional<QColor> _fgOverride;
 	const int _height;
 
 };
diff --git a/ui/widgets/menu/menu_common.cpp b/ui/widgets/menu/menu_common.cpp
index badc14c..2aa6ffb 100644
--- a/ui/widgets/menu/menu_common.cpp
+++ b/ui/widgets/menu/menu_common.cpp
@@ -6,6 +6,8 @@
 //
 #include "ui/widgets/menu/menu_common.h"
 
+#include "ui/ui_utility.h"
+
 #include <QAction>
 
 namespace Ui::Menu {
@@ -14,7 +16,8 @@ not_null<QAction*> CreateAction(
 		QWidget *parent,
 		const QString &text,
 		Fn<void()> &&callback) {
-	const auto action = new QAction(text, parent);
+	const auto action = Ui::CreateChild<QAction>(parent);
+	action->setText(text);
 	parent->connect(
 		action,
 		&QAction::triggered,

From 1c14306abab06a8c66ce25ac1fbe783f745eff39 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 4 Apr 2022 17:15:36 +0300
Subject: [PATCH 061/635] Revert "Added ability to set text color of menu item
 via QAction."

This reverts commit 8d181e53c573639d8a4a7e66e89bc01791b0572b.
---
 ui/widgets/menu/menu_action.cpp | 16 +---------------
 ui/widgets/menu/menu_action.h   |  1 -
 ui/widgets/menu/menu_common.cpp |  5 +----
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index d20e734..a37bfbe 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -105,13 +105,7 @@ void Action::paint(Painter &p) {
 	if (const auto icon = (selected ? _iconOver : _icon)) {
 		icon->paint(p, _st.itemIconPosition, width());
 	}
-	p.setPen(_fgOverride
-		? QPen(*_fgOverride)
-		: selected
-		? _st.itemFgOver
-		: enabled
-		? _st.itemFg
-		: _st.itemFgDisabled);
+	p.setPen(selected ? _st.itemFgOver : (enabled ? _st.itemFg : _st.itemFgDisabled));
 	paintText(p);
 	if (hasSubmenu()) {
 		const auto left = width() - _st.itemPadding.right() - _st.arrow.width();
@@ -174,14 +168,6 @@ void Action::processAction() {
 	_shortcut = actionShortcut;
 	setMinWidth(w);
 	update();
-
-	// TODO better way.
-	if (const auto variant = _action->data(); variant.isValid()) {
-		const auto overrideColor = variant.value<QColor>();
-		if (overrideColor.isValid()) {
-			_fgOverride = overrideColor;
-		}
-	}
 }
 
 bool Action::isEnabled() const {
diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h
index 23d28d6..f1b852a 100644
--- a/ui/widgets/menu/menu_action.h
+++ b/ui/widgets/menu/menu_action.h
@@ -54,7 +54,6 @@ private:
 	const style::icon *_iconOver;
 //	std::unique_ptr<ToggleView> _toggle;
 	int _textWidth = 0;
-	std::optional<QColor> _fgOverride;
 	const int _height;
 
 };
diff --git a/ui/widgets/menu/menu_common.cpp b/ui/widgets/menu/menu_common.cpp
index 2aa6ffb..badc14c 100644
--- a/ui/widgets/menu/menu_common.cpp
+++ b/ui/widgets/menu/menu_common.cpp
@@ -6,8 +6,6 @@
 //
 #include "ui/widgets/menu/menu_common.h"
 
-#include "ui/ui_utility.h"
-
 #include <QAction>
 
 namespace Ui::Menu {
@@ -16,8 +14,7 @@ not_null<QAction*> CreateAction(
 		QWidget *parent,
 		const QString &text,
 		Fn<void()> &&callback) {
-	const auto action = Ui::CreateChild<QAction>(parent);
-	action->setText(text);
+	const auto action = new QAction(text, parent);
 	parent->connect(
 		action,
 		&QAction::triggered,

From 362fbb6331fa311c472b8dfefd4bf56156e0f221 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 11 Apr 2022 01:43:08 +0400
Subject: [PATCH 062/635] Fix build without Wayland integration

---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a24ac2e..6a3ad7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,7 @@ PRIVATE
     ui/paint/blobs_linear.cpp
     ui/paint/blobs_linear.h
     ui/platform/linux/ui_linux_wayland_integration.cpp
+    ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
     ui/platform/linux/ui_linux_wayland_integration.h
     ui/platform/linux/ui_window_linux.cpp
     ui/platform/linux/ui_window_linux.h
@@ -265,9 +266,10 @@ if (NOT DESKTOP_APP_USE_PACKAGED_FONTS)
 endif()
 
 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-    remove_target_sources(Telegram ${src_loc} ui/platform/linux/ui_linux_wayland_integration.cpp)
-    nice_target_sources(Telegram ${src_loc} PRIVATE ui/platform/linux/ui_linux_wayland_integration_dummy.cpp)
+    remove_target_sources(lib_ui ${src_loc} ui/platform/linux/ui_linux_wayland_integration.cpp)
 elseif(LINUX)
+    remove_target_sources(lib_ui ${src_loc} ui/platform/linux/ui_linux_wayland_integration_dummy.cpp)
+
     target_link_libraries(lib_ui
     PUBLIC
         desktop-app::lib_waylandshells

From d5a37c74b17b2c06b0d37f9a16129c70e0581c57 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 11 Apr 2022 01:44:05 +0400
Subject: [PATCH 063/635] Try to use as less private APIs as possible to show
 window menu on Wayland

---
 CMakeLists.txt                                | 17 ++++++-
 .../linux/ui_linux_wayland_integration.cpp    | 46 ++++++++++++++-----
 2 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a3ad7c..6689f2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ generate_emoji(lib_ui emoji.txt emoji_suggestions/emoji_autocomplete.json)
 set_target_properties(lib_ui PROPERTIES AUTOMOC ON)
 target_prepare_qrc(lib_ui)
 
-target_precompile_headers(lib_ui PRIVATE ${src_loc}/ui/ui_pch.h)
+target_precompile_headers(lib_ui PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${src_loc}/ui/ui_pch.h>)
 nice_target_sources(lib_ui ${src_loc}
 PRIVATE
     ${style_files}
@@ -270,11 +270,26 @@ if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
 elseif(LINUX)
     remove_target_sources(lib_ui ${src_loc} ui/platform/linux/ui_linux_wayland_integration_dummy.cpp)
 
+    if (DESKTOP_APP_QT6)
+        qt6_generate_wayland_protocol_client_sources(lib_ui
+        FILES
+            ${third_party_loc}/wayland-protocols/stable/xdg-shell/xdg-shell.xml
+        )
+    else()
+        message(FATAL_ERROR "This piece of cmake code is not ported to Qt 5")
+    endif()
+
     target_link_libraries(lib_ui
     PUBLIC
         desktop-app::lib_waylandshells
         desktop-app::external_kwayland
     )
+
+    if (DESKTOP_APP_USE_PACKAGED)
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
+        target_link_libraries(lib_ui PRIVATE PkgConfig::WAYLAND_CLIENT)
+    endif()
 endif()
 
 target_include_directories(lib_ui
diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 01f1e80..8f9fed2 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -9,20 +9,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/platform/base_platform_info.h"
 #include "waylandshells/xdg_shell.h"
+#include "qwayland-xdg-shell.h"
 
+#include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
+#include <qpa/qplatformnativeinterface.h>
+#include <private/qguiapplication_p.h>
+#include <private/qhighdpiscaling_p.h>
 
-// private headers are using keywords :(
+// private QtWaylandClient headers are using keywords :(
 #ifdef QT_NO_KEYWORDS
 #define signals Q_SIGNALS
 #define slots Q_SLOTS
 #endif // QT_NO_KEYWORDS
 
-#include <private/qguiapplication_p.h>
 #include <private/qwaylandintegration_p.h>
 #include <private/qwaylanddisplay_p.h>
 #include <private/qwaylandwindow_p.h>
-#include <private/qwaylandshellsurface_p.h>
+#include <private/qwaylandinputdevice_p.h>
 
 #include <connection_thread.h>
 #include <registry.h>
@@ -113,16 +117,36 @@ void WaylandIntegration::unsetWindowExtents(QWindow *window) {
 }
 
 bool WaylandIntegration::showWindowMenu(QWindow *window) {
-	if (const auto waylandWindow = static_cast<QWaylandWindow*>(
-		window->handle())) {
-		if (const auto seat = waylandWindow->display()->lastInputDevice()) {
-			if (const auto shellSurface = waylandWindow->shellSurface()) {
-				return shellSurface->showWindowMenu(seat);
-			}
-		}
+	const auto native = QGuiApplication::platformNativeInterface();
+	if (!native) {
+		return false;
 	}
 
-	return false;
+	const auto toplevel = reinterpret_cast<xdg_toplevel*>(
+		native->nativeResourceForWindow(QByteArray("xdg_toplevel"), window));
+
+	const auto seat = reinterpret_cast<wl_seat*>(
+		native->nativeResourceForIntegration(QByteArray("wl_seat")));
+	
+	const auto serial = [&]() -> std::optional<uint32_t> {
+		const auto waylandWindow = static_cast<QWaylandWindow*>(
+			window->handle());
+		if (!waylandWindow) {
+			return std::nullopt;
+		}
+		return waylandWindow->display()->defaultInputDevice()->serial();
+	}();
+
+	if (!toplevel || !seat || !serial) {
+		return false;
+	}
+
+	const auto pos = QHighDpi::toNativePixels(
+		window->mapFromGlobal(QCursor::pos()),
+		window);
+
+	xdg_toplevel_show_window_menu(toplevel, seat, *serial, pos.x(), pos.y());
+	return true;
 }
 
 } // namespace Platform

From e09d5714e47afee3a872cf63dd783a71d06f7dae Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 11 Apr 2022 13:15:29 +0400
Subject: [PATCH 064/635] Use QPA API to set Wayland margins property

---
 .../linux/ui_linux_wayland_integration.cpp       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 8f9fed2..8757b58 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -105,13 +105,25 @@ bool WaylandIntegration::windowExtentsSupported() {
 void WaylandIntegration::setWindowExtents(
 		QWindow *window,
 		const QMargins &extents) {
-	window->setProperty(
+	const auto native = QGuiApplication::platformNativeInterface();
+	if (!native) {
+		return;
+	}
+
+	native->setWindowProperty(
+		window->handle(),
 		"_desktopApp_waylandCustomMargins",
 		QVariant::fromValue<QMargins>(extents));
 }
 
 void WaylandIntegration::unsetWindowExtents(QWindow *window) {
-	window->setProperty(
+	const auto native = QGuiApplication::platformNativeInterface();
+	if (!native) {
+		return;
+	}
+
+	native->setWindowProperty(
+		window->handle(),
 		"_desktopApp_waylandCustomMargins",
 		QVariant());
 }

From d5d8244abb781bcc92a89b78ed5a7912562cfde6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 11 Apr 2022 13:15:52 +0400
Subject: [PATCH 065/635] Convert window extents to native pixels

---
 ui/platform/linux/ui_utility_linux.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index f55ed32..6e88a80 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -23,6 +23,7 @@
 #include <QtCore/QPoint>
 #include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
+#include <private/qhighdpiscaling_p.h>
 
 namespace Ui {
 namespace Platform {
@@ -504,11 +505,12 @@ bool WindowExtentsSupported() {
 }
 
 void SetWindowExtents(QWindow *window, const QMargins &extents) {
+	const auto nativeExtents = QHighDpi::toNativePixels(extents, window);
 	if (const auto integration = WaylandIntegration::Instance()) {
-		integration->setWindowExtents(window, extents);
+		integration->setWindowExtents(window, nativeExtents);
 	} else if (::Platform::IsX11()) {
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-		SetXCBFrameExtents(window, extents);
+		SetXCBFrameExtents(window, nativeExtents);
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 	}
 }

From 01f07480b01953ef6fa1d7418e26baf37f0cb364 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Apr 2022 17:18:15 +0300
Subject: [PATCH 066/635] Fixed build with Xcode.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6689f2c..571592b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ generate_emoji(lib_ui emoji.txt emoji_suggestions/emoji_autocomplete.json)
 set_target_properties(lib_ui PROPERTIES AUTOMOC ON)
 target_prepare_qrc(lib_ui)
 
-target_precompile_headers(lib_ui PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${src_loc}/ui/ui_pch.h>)
+target_precompile_headers(lib_ui PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJC,OBJCXX>:${src_loc}/ui/ui_pch.h>)
 nice_target_sources(lib_ui ${src_loc}
 PRIVATE
     ${style_files}

From d1bf0699165b390d814fa3b092fc2722345f061c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Apr 2022 00:47:50 +0400
Subject: [PATCH 067/635] Wait for interface announce before xdg-decoration
 check

---
 ui/platform/linux/ui_window_linux.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/platform/linux/ui_window_linux.cpp b/ui/platform/linux/ui_window_linux.cpp
index a353c32..4023cc4 100644
--- a/ui/platform/linux/ui_window_linux.cpp
+++ b/ui/platform/linux/ui_window_linux.cpp
@@ -18,8 +18,11 @@ std::unique_ptr<BasicWindowHelper> CreateSpecialWindowHelper(
 
 bool NativeWindowFrameSupported() {
 	const auto waylandIntegration = WaylandIntegration::Instance();
-	return !waylandIntegration
-			|| waylandIntegration->xdgDecorationSupported();
+	if (waylandIntegration) {
+		waylandIntegration->waitForInterfaceAnnounce();
+		return waylandIntegration->xdgDecorationSupported();
+	}
+	return true;
 }
 
 } // namespace Platform

From 183576ae657b864306249baed3b1e1ff39fe0a1f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Apr 2022 04:35:20 +0400
Subject: [PATCH 068/635] Make a comment about the Qt's Caps Lock bug

In order to remember remove it once the bug is fixed
---
 ui/widgets/input_fields.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 75cfc30..918d465 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -2763,6 +2763,7 @@ void InputField::keyPressEventInner(QKeyEvent *e) {
 			? (~Qt::ControlModifier)
 			: (enter && shift)
 			? (~Qt::ShiftModifier)
+			// Qt bug workaround https://bugreports.qt.io/browse/QTBUG-49771
 			: (backspace && Platform::IsLinux())
 			? (Qt::ControlModifier)
 			: oldModifiers;

From e5d8e5403517fc8a0e4282475eddf144e7db3a63 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Apr 2022 10:35:00 +0400
Subject: [PATCH 069/635] Don't build OBJC precompiled header.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 571592b..bb67d85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ generate_emoji(lib_ui emoji.txt emoji_suggestions/emoji_autocomplete.json)
 set_target_properties(lib_ui PROPERTIES AUTOMOC ON)
 target_prepare_qrc(lib_ui)
 
-target_precompile_headers(lib_ui PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJC,OBJCXX>:${src_loc}/ui/ui_pch.h>)
+target_precompile_headers(lib_ui PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/ui/ui_pch.h>)
 nice_target_sources(lib_ui ${src_loc}
 PRIVATE
     ${style_files}

From 258cacf7c5b23052f6bfde34ccaef2edb178b98f Mon Sep 17 00:00:00 2001
From: Nicholas Guriev <nicholas@guriev.su>
Date: Fri, 8 Apr 2022 18:35:32 +0300
Subject: [PATCH 070/635] Avoid conditional branching on uninitialized values

C++ initializes members in the order in which they are defined in class. So the
order is important if the members are accessed by other initializers or methods
called from them.

Class BoxLayerWidget:
  _roundRect is initialized based on _layerType through the st() method.

Class Checkbox:
  Arguments of _text constructor depend on _checkAlignment through the
  countTextMinWidth and the checkRect methods.
---
 ui/layers/box_layer_widget.h | 2 +-
 ui/widgets/checkbox.h        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/layers/box_layer_widget.h b/ui/layers/box_layer_widget.h
index 893e220..016ad44 100644
--- a/ui/layers/box_layer_widget.h
+++ b/ui/layers/box_layer_widget.h
@@ -128,6 +128,7 @@ private:
 
 	const style::Box *_st = nullptr;
 	not_null<LayerStackWidget*> _layer;
+	bool _layerType = false;
 	int _fullHeight = 0;
 
 	bool _noContentMargin = false;
@@ -140,7 +141,6 @@ private:
 	rpl::variable<QString> _additionalTitle;
 	int _titleLeft = 0;
 	int _titleTop = 0;
-	bool _layerType = false;
 	bool _closeByOutsideClick = true;
 
 	std::vector<object_ptr<RoundButton>> _buttons;
diff --git a/ui/widgets/checkbox.h b/ui/widgets/checkbox.h
index 03a2b2b..9ffe452 100644
--- a/ui/widgets/checkbox.h
+++ b/ui/widgets/checkbox.h
@@ -228,8 +228,8 @@ private:
 	rpl::event_stream<bool> _checkedChanges;
 	QPixmap _checkCache;
 
-	Text::String _text;
 	style::align _checkAlignment = style::al_left;
+	Text::String _text;
 	int _allowTextLines = 1;
 	bool _textBreakEverywhere = false;
 

From aa155db0bd11485643511da210fa7629b48347e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Apr 2022 16:52:11 +0400
Subject: [PATCH 071/635] Fix possible use-after-free in VerticalLayout.

If some row widgets of VerticalLayout are living
in its own lifetime() we have a use-after-free.

Because this lifetime() destroys this child row
already after ~VerticalLayout which can call back
into VerticalLayout::childHeightUpdated (the subscription
lives inside the same lifetime() as well) which
will access _rows member that was already destroyed.

Now all subscriptions die before _rows are destroyed.
---
 ui/wrap/vertical_layout.cpp | 2 +-
 ui/wrap/vertical_layout.h   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/wrap/vertical_layout.cpp b/ui/wrap/vertical_layout.cpp
index c43aa0a..37ec354 100644
--- a/ui/wrap/vertical_layout.cpp
+++ b/ui/wrap/vertical_layout.cpp
@@ -133,7 +133,7 @@ RpWidget *VerticalLayout::insertChild(
 			}
 		}, [=] {
 			removeChild(weak);
-		}, lifetime());
+		}, _rowsLifetime);
 		return weak;
 	}
 	return nullptr;
diff --git a/ui/wrap/vertical_layout.h b/ui/wrap/vertical_layout.h
index 37851b3..6df45c8 100644
--- a/ui/wrap/vertical_layout.h
+++ b/ui/wrap/vertical_layout.h
@@ -82,6 +82,8 @@ private:
 	std::vector<Row> _rows;
 	bool _inResize = false;
 
+	rpl::lifetime _rowsLifetime;
+
 };
 
 } // namespace Ui

From e94d77847c7bd3e26b33fa20d40f2c467d8cca46 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 17 Apr 2022 00:56:56 +0300
Subject: [PATCH 072/635] Added ability to override painting of action menu
 items.

---
 ui/widgets/menu/menu_action.cpp | 27 ++++++++++++++++-----------
 ui/widgets/menu/menu_action.h   |  2 ++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index a37bfbe..8d7d9dd 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -68,12 +68,6 @@ Action::Action(
 	initResizeHook(parent->sizeValue());
 	processAction();
 
-	paintRequest(
-	) | rpl::start_with_next([=] {
-		Painter p(this);
-		paint(p);
-	}, lifetime());
-
 	enableMouseSelecting();
 
 	connect(_action, &QAction::changed, [=] { processAction(); });
@@ -83,6 +77,20 @@ bool Action::hasSubmenu() const {
 	return _action->menu() != nullptr;
 }
 
+void Action::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	paint(p);
+}
+
+void Action::paintBackground(Painter &p, bool selected) {
+	if (selected && _st.itemBgOver->c.alpha() < 255) {
+		p.fillRect(0, 0, width(), _height, _st.itemBg);
+	}
+	p.fillRect(
+		QRect(0, 0, width(), _height),
+		selected ? _st.itemBgOver : _st.itemBg);
+}
+
 void Action::paintText(Painter &p) {
 	_text.drawLeftElided(
 		p,
@@ -95,12 +103,9 @@ void Action::paintText(Painter &p) {
 void Action::paint(Painter &p) {
 	const auto enabled = isEnabled();
 	const auto selected = isSelected();
-	if (selected && _st.itemBgOver->c.alpha() < 255) {
-		p.fillRect(0, 0, width(), _height, _st.itemBg);
-	}
-	p.fillRect(0, 0, width(), _height, selected ? _st.itemBgOver : _st.itemBg);
+	paintBackground(p, selected);
 	if (enabled) {
-		paintRipple(p, 0, 0);
+		RippleButton::paintRipple(p, 0, 0);
 	}
 	if (const auto icon = (selected ? _iconOver : _icon)) {
 		icon->paint(p, _st.itemIconPosition, width());
diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h
index f1b852a..482f289 100644
--- a/ui/widgets/menu/menu_action.h
+++ b/ui/widgets/menu/menu_action.h
@@ -33,11 +33,13 @@ public:
 		const style::icon *iconOver = nullptr);
 
 protected:
+	void paintEvent(QPaintEvent *e) override;
 	QPoint prepareRippleStartPosition() const override;
 	QImage prepareRippleMask() const override;
 
 	int contentHeight() const override;
 
+	void paintBackground(Painter &p, bool selected);
 	void paintText(Painter &p);
 
 private:

From 289bcf50e99397dfb283ae835f0992937bc8c824 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Apr 2022 17:02:55 +0300
Subject: [PATCH 073/635] Fixed IconButtonWithText update when text changes.

---
 ui/widgets/icon_button_with_text.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/icon_button_with_text.cpp b/ui/widgets/icon_button_with_text.cpp
index 7e28158..10dbde9 100644
--- a/ui/widgets/icon_button_with_text.cpp
+++ b/ui/widgets/icon_button_with_text.cpp
@@ -35,7 +35,10 @@ void IconButtonWithText::paintEvent(QPaintEvent *e) {
 }
 
 void IconButtonWithText::setText(const QString &text) {
-	_text = text;
+	if (_text != text) {
+		_text = text;
+		update();
+	}
 }
 
 } // namespace Ui

From 50ef072af7f7518032c018291776e1cd528afa95 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Apr 2022 17:12:15 +0300
Subject: [PATCH 074/635] Added ability to provide align of text to
 IconButtonWithText.

---
 ui/widgets/icon_button_with_text.cpp | 4 ++--
 ui/widgets/widgets.style             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/icon_button_with_text.cpp b/ui/widgets/icon_button_with_text.cpp
index 10dbde9..ec4b85a 100644
--- a/ui/widgets/icon_button_with_text.cpp
+++ b/ui/widgets/icon_button_with_text.cpp
@@ -24,13 +24,13 @@ void IconButtonWithText::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 	p.setFont(_st.font);
 	p.setPen(_st.textFg);
-	p.drawText(r, _text, style::al_center);
+	p.drawText(r, _text, _st.textAlign);
 
 	const auto overIconOpacity = IconButton::iconOverOpacity();
 	if (overIconOpacity > 0. && overIconOpacity < 1.) {
 		p.setPen(_st.textFgOver);
 		p.setOpacity(overIconOpacity);
-		p.drawText(r, _text, style::al_center);
+		p.drawText(r, _text, _st.textAlign);
 	}
 }
 
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index d54e19f..fd3bb69 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -345,6 +345,7 @@ IconButtonWithText {
 	textFg: color;
 	textFgOver: color;
 	textPadding: margins;
+	textAlign: align;
 
 	font: font;
 }

From 4093d6605a901a9ae8bdd8fe877dd9cdb05ac9c6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 20 Apr 2022 11:35:11 +0400
Subject: [PATCH 075/635] Don't attach menu callback to QAction lifetime.

---
 ui/widgets/menu/menu_common.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/widgets/menu/menu_common.cpp b/ui/widgets/menu/menu_common.cpp
index badc14c..89376a6 100644
--- a/ui/widgets/menu/menu_common.cpp
+++ b/ui/widgets/menu/menu_common.cpp
@@ -6,6 +6,9 @@
 //
 #include "ui/widgets/menu/menu_common.h"
 
+#include "ui/ui_utility.h"
+#include "base/invoke_queued.h"
+
 #include <QAction>
 
 namespace Ui::Menu {
@@ -15,12 +18,11 @@ not_null<QAction*> CreateAction(
 		const QString &text,
 		Fn<void()> &&callback) {
 	const auto action = new QAction(text, parent);
-	parent->connect(
-		action,
-		&QAction::triggered,
-		action,
-		std::move(callback),
-		Qt::QueuedConnection);
+	const auto guard = MakeWeak(parent);
+	auto triggered = [guard, callback = std::move(callback)]() mutable {
+		InvokeQueued(guard, std::move(callback));
+	};
+	parent->connect(action, &QAction::triggered, std::move(triggered));
 	return action;
 }
 

From 3a6708cdc50d18c9154888e3204b4bf57828c788 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Apr 2022 15:18:18 +0400
Subject: [PATCH 076/635] Fix repeated menu callback invocation.

---
 ui/widgets/menu/menu_common.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/menu/menu_common.cpp b/ui/widgets/menu/menu_common.cpp
index 89376a6..c9131a9 100644
--- a/ui/widgets/menu/menu_common.cpp
+++ b/ui/widgets/menu/menu_common.cpp
@@ -19,8 +19,8 @@ not_null<QAction*> CreateAction(
 		Fn<void()> &&callback) {
 	const auto action = new QAction(text, parent);
 	const auto guard = MakeWeak(parent);
-	auto triggered = [guard, callback = std::move(callback)]() mutable {
-		InvokeQueued(guard, std::move(callback));
+	auto triggered = [guard, callback = std::move(callback)] {
+		InvokeQueued(guard, callback);
 	};
 	parent->connect(action, &QAction::triggered, std::move(triggered));
 	return action;

From 16f4aec946c12650299b7cad47543f22957f0444 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 23 Apr 2022 14:23:20 +0300
Subject: [PATCH 077/635] Added horizontal padding to round buttons with full
 radius and width.

---
 ui/widgets/buttons.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index 97f1c78..d2f5b4d 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -332,11 +332,14 @@ void RoundButton::resizeToText(const QString &text) {
 
 	int innerWidth = contentWidth();
 	if (_fullWidthOverride > 0) {
+		const auto padding = _fullRadius
+			? (_st.padding.left() + _st.padding.right())
+			: 0;
 		if (_fullWidthOverride < innerWidth + (_st.height - _st.font->height)) {
-			_text = _st.font->elided(text, qMax(_fullWidthOverride - (_st.height - _st.font->height), 1));
+			_text = _st.font->elided(text, qMax(_fullWidthOverride - (_st.height - _st.font->height) - padding, 1));
 			_textWidth = _st.font->width(_text);
 		}
-		resize(_fullWidthOverride, _st.height + _st.padding.top() + _st.padding.bottom());
+		resize(_fullWidthOverride + padding, _st.height + _st.padding.top() + _st.padding.bottom());
 	} else if (_fullWidthOverride < 0) {
 		resize(innerWidth - _fullWidthOverride, _st.height + _st.padding.top() + _st.padding.bottom());
 	} else if (_st.width <= 0) {

From 6abcbf773f1da5e558d0c0eb69ec4466dfb01ba3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Apr 2022 15:39:50 +0400
Subject: [PATCH 078/635] Don't destroy PopupMenu non-queued if
 !_useTransparency.

---
 ui/widgets/popup_menu.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index c7d5923..b4510ca 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -15,6 +15,7 @@
 #include "ui/ui_utility.h"
 #include "ui/delayed_activation.h"
 #include "ui/painter.h"
+#include "base/invoke_queued.h"
 #include "base/platform/base_platform_info.h"
 
 #include <QtGui/QtEvents>
@@ -645,20 +646,29 @@ void PopupMenu::prepareCache() {
 }
 
 void PopupMenu::startOpacityAnimation(bool hiding) {
-	_hiding = false;
 	if (!_useTransparency) {
 		_a_opacity.stop();
-		if (hiding) {
-			hideFinished();
+		_hiding = hiding;
+		if (_hiding) {
+			InvokeQueued(this, [=] {
+				if (_hiding) {
+					hideFinished();
+				}
+			});
 		} else {
 			update();
 		}
 		return;
 	}
+	_hiding = false;
 	prepareCache();
 	_hiding = hiding;
 	hideChildren();
-	_a_opacity.start([this] { opacityAnimationCallback(); }, _hiding ? 1. : 0., _hiding ? 0. : 1., _st.duration);
+	_a_opacity.start(
+		[=] { opacityAnimationCallback(); },
+		_hiding ? 1. : 0.,
+		_hiding ? 0. : 1.,
+		_st.duration);
 }
 
 void PopupMenu::showStarted() {

From f128bd6d505a811b1a658e89858bfefd554f37c4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Apr 2022 15:46:42 +0400
Subject: [PATCH 079/635] Revert "Fix repeated menu callback invocation."

This reverts commit 3a6708cdc50d18c9154888e3204b4bf57828c788.
---
 ui/widgets/menu/menu_common.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/menu/menu_common.cpp b/ui/widgets/menu/menu_common.cpp
index c9131a9..89376a6 100644
--- a/ui/widgets/menu/menu_common.cpp
+++ b/ui/widgets/menu/menu_common.cpp
@@ -19,8 +19,8 @@ not_null<QAction*> CreateAction(
 		Fn<void()> &&callback) {
 	const auto action = new QAction(text, parent);
 	const auto guard = MakeWeak(parent);
-	auto triggered = [guard, callback = std::move(callback)] {
-		InvokeQueued(guard, callback);
+	auto triggered = [guard, callback = std::move(callback)]() mutable {
+		InvokeQueued(guard, std::move(callback));
 	};
 	parent->connect(action, &QAction::triggered, std::move(triggered));
 	return action;

From 2d7532bddd56acee4c572ef9198756a26ea052a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Apr 2022 15:46:52 +0400
Subject: [PATCH 080/635] Revert "Don't attach menu callback to QAction
 lifetime."

This reverts commit 4093d6605a901a9ae8bdd8fe877dd9cdb05ac9c6.
---
 ui/widgets/menu/menu_common.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/widgets/menu/menu_common.cpp b/ui/widgets/menu/menu_common.cpp
index 89376a6..badc14c 100644
--- a/ui/widgets/menu/menu_common.cpp
+++ b/ui/widgets/menu/menu_common.cpp
@@ -6,9 +6,6 @@
 //
 #include "ui/widgets/menu/menu_common.h"
 
-#include "ui/ui_utility.h"
-#include "base/invoke_queued.h"
-
 #include <QAction>
 
 namespace Ui::Menu {
@@ -18,11 +15,12 @@ not_null<QAction*> CreateAction(
 		const QString &text,
 		Fn<void()> &&callback) {
 	const auto action = new QAction(text, parent);
-	const auto guard = MakeWeak(parent);
-	auto triggered = [guard, callback = std::move(callback)]() mutable {
-		InvokeQueued(guard, std::move(callback));
-	};
-	parent->connect(action, &QAction::triggered, std::move(triggered));
+	parent->connect(
+		action,
+		&QAction::triggered,
+		action,
+		std::move(callback),
+		Qt::QueuedConnection);
 	return action;
 }
 

From 49b4b35efaf7a31f9bd90f6c24f9ea793a0986eb Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org.ru>
Date: Mon, 25 Apr 2022 21:43:09 -0400
Subject: [PATCH 081/635] Fix -Wunused-const-variable warnings by removing
 unused variables

---
 ui/text/text.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 4773df7..97c9a0a 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -28,7 +28,6 @@ namespace {
 
 constexpr auto kStringLinkIndexShift = uint16(0x8000);
 constexpr auto kMaxDiacAfterSymbol = 2;
-constexpr auto kSelectedSpoilerOpacity = 0.5;
 
 inline bool IsMono(int32 flags) {
 	return (flags & TextBlockFPre) || (flags & TextBlockFCode);

From b77fb4508353f2499e46d85325f57dd25ceafe7f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Apr 2022 20:19:33 +0400
Subject: [PATCH 082/635] Add SeparatePanel and ShowMultilineToast.

---
 CMakeLists.txt                |   4 +
 ui/integration.cpp            |   8 +
 ui/integration.h              |   4 +
 ui/layers/layers.style        |  40 +++
 ui/toasts/common_toasts.cpp   |  30 ++
 ui/toasts/common_toasts.h     |  27 ++
 ui/ui_utility.h               |   2 +
 ui/widgets/input_fields.h     |   2 +
 ui/widgets/separate_panel.cpp | 641 ++++++++++++++++++++++++++++++++++
 ui/widgets/separate_panel.h   | 113 ++++++
 ui/widgets/widgets.style      |   4 +
 11 files changed, 875 insertions(+)
 create mode 100644 ui/toasts/common_toasts.cpp
 create mode 100644 ui/toasts/common_toasts.h
 create mode 100644 ui/widgets/separate_panel.cpp
 create mode 100644 ui/widgets/separate_panel.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb67d85..4448b46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,6 +161,8 @@ PRIVATE
     ui/toast/toast_manager.h
     ui/toast/toast_widget.cpp
     ui/toast/toast_widget.h
+    ui/toasts/common_toasts.cpp
+    ui/toasts/common_toasts.h
     ui/widgets/box_content_divider.cpp
     ui/widgets/box_content_divider.h
     ui/widgets/buttons.cpp
@@ -197,6 +199,8 @@ PRIVATE
     ui/widgets/popup_menu.h
     ui/widgets/rp_window.cpp
     ui/widgets/rp_window.h
+    ui/widgets/separate_panel.cpp
+    ui/widgets/separate_panel.h
     ui/widgets/scroll_area.cpp
     ui/widgets/scroll_area.h
     ui/widgets/side_bar_button.cpp
diff --git a/ui/integration.cpp b/ui/integration.cpp
index 28ffb7c..e34243d 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -143,4 +143,12 @@ QString Integration::phraseFormattingSpoiler() {
 	return "Spoiler";
 }
 
+QString Integration::phraseButtonOk() {
+	return "OK";
+}
+
+QString Integration::phraseButtonCancel() {
+	return "Cancel";
+}
+
 } // namespace Ui
diff --git a/ui/integration.h b/ui/integration.h
index c981689..67a953e 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -8,6 +8,8 @@
 
 #include "base/basic_types.h"
 
+#include <rpl/producer.h>
+
 #include <any>
 
 // Methods that must be implemented outside lib_ui.
@@ -71,6 +73,8 @@ public:
 	[[nodiscard]] virtual QString phraseFormattingStrikeOut();
 	[[nodiscard]] virtual QString phraseFormattingMonospace();
 	[[nodiscard]] virtual QString phraseFormattingSpoiler();
+	[[nodiscard]] virtual QString phraseButtonOk();
+	[[nodiscard]] virtual QString phraseButtonCancel();
 
 };
 
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 84317e6..75675c1 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -157,3 +157,43 @@ boxLoadingSize: 20px;
 boxDividerTop: icon {{ "box_divider_top", boxDividerFg }};
 boxDividerBottom: icon {{ "box_divider_bottom", boxDividerFg }};
 boxDividerHeight: 10px;
+
+separatePanelBorderCacheSize: 60px;
+separatePanelTitleHeight: 62px;
+separatePanelClose: IconButton(boxTitleClose) {
+	width: 60px;
+	height: 60px;
+
+	rippleAreaPosition: point(8px, 8px);
+	rippleAreaSize: 44px;
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: windowBgOver;
+	}
+}
+separatePanelTitleFont: font(18px semibold);
+separatePanelTitle: FlatLabel(defaultFlatLabel) {
+	textFg: boxTitleFg;
+	maxHeight: 26px;
+	style: TextStyle(defaultTextStyle) {
+		font: separatePanelTitleFont;
+		linkFont: separatePanelTitleFont;
+		linkFontOver: font(18px semibold underline);
+	}
+}
+separatePanelTitleTop: 18px;
+separatePanelTitleLeft: 22px;
+separatePanelTitleSkip: 0px;
+separatePanelBack: IconButton(separatePanelClose) {
+	icon: icon {{ "box_button_back", boxTitleCloseFg }};
+	iconOver: icon {{ "box_button_back", boxTitleCloseFgOver }};
+}
+separatePanelDuration: 150;
+
+webviewDialogButton: defaultBoxButton;
+webviewDialogSubmit: RoundButton(defaultActiveButton) {
+	width: -48px;
+	height: 34px;
+	textTop: 7px;
+	font: font(14px semibold);
+}
+webviewDialogPadding: margins(8px, 12px, 15px, 12px);
diff --git a/ui/toasts/common_toasts.cpp b/ui/toasts/common_toasts.cpp
new file mode 100644
index 0000000..0f06547
--- /dev/null
+++ b/ui/toasts/common_toasts.cpp
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/toasts/common_toasts.h"
+
+#include "ui/toast/toast.h"
+#include "styles/style_widgets.h"
+
+namespace Ui {
+
+base::weak_ptr<Toast::Instance> ShowMultilineToast(
+		MultilineToastArgs &&args) {
+	auto config = Ui::Toast::Config{
+		.text = std::move(args.text),
+		.st = &st::defaultMultilineToast,
+		.durationMs = (args.duration
+			? args.duration
+			: Ui::Toast::kDefaultDuration),
+		.multiline = true,
+	};
+	return args.parentOverride
+		? Ui::Toast::Show(args.parentOverride, std::move(config))
+		: Ui::Toast::Show(std::move(config));
+}
+
+} // namespace Ui
diff --git a/ui/toasts/common_toasts.h b/ui/toasts/common_toasts.h
new file mode 100644
index 0000000..7384c0a
--- /dev/null
+++ b/ui/toasts/common_toasts.h
@@ -0,0 +1,27 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/text_entity.h"
+#include "base/weak_ptr.h"
+
+namespace Ui {
+namespace Toast {
+class Instance;
+} // namespace Toast
+
+struct MultilineToastArgs {
+	QWidget *parentOverride = nullptr;
+	TextWithEntities text;
+	crl::time duration = 0;
+};
+
+base::weak_ptr<Toast::Instance> ShowMultilineToast(
+	MultilineToastArgs &&args);
+
+} // namespace Ui
diff --git a/ui/ui_utility.h b/ui/ui_utility.h
index f7f6fb1..80764f9 100644
--- a/ui/ui_utility.h
+++ b/ui/ui_utility.h
@@ -10,7 +10,9 @@
 #include "ui/rect_part.h"
 #include "ui/integration.h"
 
+#include <crl/crl.h>
 #include <QtCore/QEvent>
+#include <QtWidgets/QWidget>
 
 class QPixmap;
 class QImage;
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index b86bbac..01fd43e 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -17,6 +17,8 @@
 #include <QtWidgets/QTextEdit>
 #include <QtCore/QTimer>
 
+#include <rpl/variable.h>
+
 class QTouchEvent;
 class Painter;
 
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
new file mode 100644
index 0000000..9cfcbb4
--- /dev/null
+++ b/ui/widgets/separate_panel.cpp
@@ -0,0 +1,641 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/separate_panel.h"
+
+#include "ui/widgets/shadow.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/toasts/common_toasts.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/platform/ui_platform_utility.h"
+#include "ui/layers/layer_widget.h"
+#include "styles/style_widgets.h"
+#include "styles/style_layers.h"
+#include "styles/palette.h"
+#include "base/debug_log.h"
+
+#include <QtGui/QWindow>
+#include <QtGui/QScreen>
+#include <QtWidgets/QApplication>
+
+namespace Ui {
+
+SeparatePanel::SeparatePanel()
+: _close(this, st::separatePanelClose)
+, _back(this, object_ptr<Ui::IconButton>(this, st::separatePanelBack))
+, _body(this) {
+	setMouseTracking(true);
+	setWindowIcon(QGuiApplication::windowIcon());
+	initControls();
+	initLayout();
+}
+
+void SeparatePanel::setTitle(rpl::producer<QString> title) {
+	_title.create(this, std::move(title), st::separatePanelTitle);
+	_title->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_title->show();
+	updateTitleGeometry(width());
+}
+
+void SeparatePanel::initControls() {
+	widthValue(
+	) | rpl::start_with_next([=](int width) {
+		_back->moveToLeft(_padding.left(), _padding.top());
+		_close->moveToRight(_padding.right(), _padding.top());
+		if (_title) {
+			updateTitleGeometry(width);
+		}
+	}, lifetime());
+
+	_back->toggledValue(
+	) | rpl::start_with_next([=](bool toggled) {
+		_titleLeft.start(
+			[=] { updateTitlePosition(); },
+			toggled ? 0. : 1.,
+			toggled ? 1. : 0.,
+			st::fadeWrapDuration);
+	}, _back->lifetime());
+	_back->hide(anim::type::instant);
+	_titleLeft.stop();
+}
+
+void SeparatePanel::updateTitleGeometry(int newWidth) {
+	_title->resizeToWidth(newWidth
+		- _padding.left() - _back->width()
+		- _padding.right() - _close->width());
+	updateTitlePosition();
+}
+
+void SeparatePanel::updateTitlePosition() {
+	if (!_title) {
+		return;
+	}
+	const auto progress = _titleLeft.value(_back->toggled() ? 1. : 0.);
+	const auto left = anim::interpolate(
+		st::separatePanelTitleLeft,
+		_back->width() + st::separatePanelTitleSkip,
+		progress);
+	_title->moveToLeft(
+		_padding.left() + left,
+		_padding.top() + st::separatePanelTitleTop);
+}
+
+rpl::producer<> SeparatePanel::backRequests() const {
+	return rpl::merge(
+		_back->entity()->clicks() | rpl::to_empty,
+		_synteticBackRequests.events());
+}
+
+rpl::producer<> SeparatePanel::closeRequests() const {
+	return rpl::merge(
+		_close->clicks() | rpl::to_empty,
+		_userCloseRequests.events());
+}
+
+rpl::producer<> SeparatePanel::closeEvents() const {
+	return _closeEvents.events();
+}
+
+void SeparatePanel::setBackAllowed(bool allowed) {
+	if (allowed != _back->toggled()) {
+		_back->toggle(allowed, anim::type::normal);
+	}
+}
+
+void SeparatePanel::setHideOnDeactivate(bool hideOnDeactivate) {
+	_hideOnDeactivate = hideOnDeactivate;
+	if (!_hideOnDeactivate) {
+		showAndActivate();
+	} else if (!isActiveWindow()) {
+		LOG(("Export Info: Panel Hide On Inactive Change."));
+		hideGetDuration();
+	}
+}
+
+void SeparatePanel::showAndActivate() {
+	if (isHidden()) {
+		while (const auto widget = QApplication::activePopupWidget()) {
+			if (!widget->close()) {
+				break;
+			}
+		}
+	}
+	toggleOpacityAnimation(true);
+	raise();
+	setWindowState(windowState() | Qt::WindowActive);
+	activateWindow();
+	setFocus();
+}
+
+void SeparatePanel::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Escape) {
+		crl::on_main(this, [=] {
+			if (_back->toggled()) {
+				_synteticBackRequests.fire({});
+			} else {
+				_userCloseRequests.fire({});
+			}
+		});
+	}
+	return RpWidget::keyPressEvent(e);
+}
+
+bool SeparatePanel::eventHook(QEvent *e) {
+	if (e->type() == QEvent::WindowDeactivate && _hideOnDeactivate) {
+		LOG(("Export Info: Panel Hide On Inactive Window."));
+		hideGetDuration();
+	}
+	return RpWidget::eventHook(e);
+}
+
+void SeparatePanel::initLayout() {
+	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint)
+		| Qt::WindowStaysOnTopHint
+		| Qt::NoDropShadowWindowHint
+		| Qt::Dialog);
+	setAttribute(Qt::WA_MacAlwaysShowToolWindow);
+	setAttribute(Qt::WA_NoSystemBackground, true);
+	setAttribute(Qt::WA_TranslucentBackground, true);
+
+	createBorderImage();
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		createBorderImage();
+		Ui::ForceFullRepaint(this);
+	}, lifetime());
+
+	Ui::Platform::InitOnTopPanel(this);
+}
+
+void SeparatePanel::createBorderImage() {
+	const auto shadowPadding = st::callShadow.extend;
+	const auto cacheSize = st::separatePanelBorderCacheSize;
+	auto cache = QImage(
+		cacheSize * style::DevicePixelRatio(),
+		cacheSize * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	cache.setDevicePixelRatio(style::DevicePixelRatio());
+	cache.fill(Qt::transparent);
+	{
+		Painter p(&cache);
+		auto inner = QRect(0, 0, cacheSize, cacheSize).marginsRemoved(
+			shadowPadding);
+		Ui::Shadow::paint(p, inner, cacheSize, st::callShadow);
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		p.setBrush(st::windowBg);
+		p.setPen(Qt::NoPen);
+		PainterHighQualityEnabler hq(p);
+		p.drawRoundedRect(
+			myrtlrect(inner),
+			st::callRadius,
+			st::callRadius);
+	}
+	_borderParts = Ui::PixmapFromImage(std::move(cache));
+}
+
+void SeparatePanel::toggleOpacityAnimation(bool visible) {
+	if (_visible == visible) {
+		return;
+	}
+
+	_visible = visible;
+	if (_useTransparency) {
+		if (_animationCache.isNull()) {
+			showControls();
+			_animationCache = Ui::GrabWidget(this);
+			hideChildren();
+		}
+		_opacityAnimation.start(
+			[this] { opacityCallback(); },
+			_visible ? 0. : 1.,
+			_visible ? 1. : 0.,
+			st::separatePanelDuration,
+			_visible ? anim::easeOutCirc : anim::easeInCirc);
+	}
+	if (isHidden() && _visible) {
+		show();
+	}
+}
+
+void SeparatePanel::opacityCallback() {
+	update();
+	if (!_visible && !_opacityAnimation.animating()) {
+		finishAnimating();
+	}
+}
+
+void SeparatePanel::finishAnimating() {
+	_animationCache = QPixmap();
+	if (_visible) {
+		showControls();
+		if (_inner) {
+			_inner->setFocus();
+		}
+	} else {
+		finishClose();
+	}
+}
+
+void SeparatePanel::showControls() {
+	showChildren();
+	if (!_back->toggled()) {
+		_back->setVisible(false);
+	}
+}
+
+void SeparatePanel::finishClose() {
+	hide();
+	crl::on_main(this, [=] {
+		if (isHidden() && !_visible && !_opacityAnimation.animating()) {
+			LOG(("Export Info: Panel Closed."));
+			_closeEvents.fire({});
+		}
+	});
+}
+
+int SeparatePanel::hideGetDuration() {
+	LOG(("Export Info: Panel Hide Requested."));
+	toggleOpacityAnimation(false);
+	if (_animationCache.isNull()) {
+		finishClose();
+		return 0;
+	}
+	return st::separatePanelDuration;
+}
+
+void SeparatePanel::showBox(
+		object_ptr<Ui::BoxContent> box,
+		Ui::LayerOptions options,
+		anim::type animated) {
+	ensureLayerCreated();
+	_layer->showBox(std::move(box), options, animated);
+}
+
+void SeparatePanel::showToast(const TextWithEntities &text) {
+	Ui::ShowMultilineToast({
+		.parentOverride = this,
+		.text = text,
+	});
+}
+
+void SeparatePanel::ensureLayerCreated() {
+	if (_layer) {
+		return;
+	}
+	_layer = base::make_unique_q<Ui::LayerStackWidget>(_body);
+	_layer->setHideByBackgroundClick(false);
+	_layer->move(0, 0);
+	_body->sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		_layer->resize(size);
+	}, _layer->lifetime());
+	_layer->hideFinishEvents(
+	) | rpl::filter([=] {
+		return _layer != nullptr; // Last hide finish is sent from destructor.
+	}) | rpl::start_with_next([=] {
+		destroyLayer();
+	}, _layer->lifetime());
+}
+
+void SeparatePanel::destroyLayer() {
+	if (!_layer) {
+		return;
+	}
+
+	auto layer = base::take(_layer);
+	const auto resetFocus = Ui::InFocusChain(layer);
+	if (resetFocus) {
+		setFocus();
+	}
+	layer = nullptr;
+}
+
+void SeparatePanel::showInner(base::unique_qptr<Ui::RpWidget> inner) {
+	Expects(!size().isEmpty());
+
+	_inner = std::move(inner);
+	_inner->setParent(_body);
+	_inner->move(0, 0);
+	_body->sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		_inner->resize(size);
+	}, _inner->lifetime());
+	_inner->show();
+
+	if (_layer) {
+		_layer->raise();
+	}
+
+	showAndActivate();
+}
+
+void SeparatePanel::focusInEvent(QFocusEvent *e) {
+	crl::on_main(this, [=] {
+		if (_layer) {
+			_layer->setInnerFocus();
+		} else if (_inner && !_inner->isHidden()) {
+			_inner->setFocus();
+		}
+	});
+}
+
+void SeparatePanel::setInnerSize(QSize size) {
+	Expects(!size.isEmpty());
+
+	if (rect().isEmpty()) {
+		initGeometry(size);
+	} else {
+		updateGeometry(size);
+	}
+}
+
+QRect SeparatePanel::innerGeometry() const {
+	return _body->geometry();
+}
+
+void SeparatePanel::initGeometry(QSize size) {
+	const auto active = QApplication::activeWindow();
+	const auto available = !active
+		? QGuiApplication::primaryScreen()->availableGeometry()
+		: active->screen()->availableGeometry();
+	const auto parentGeometry = (active
+		&& active->isVisible()
+		&& active->isActiveWindow())
+		? active->geometry()
+		: available;
+
+	auto center = parentGeometry.center();
+	if (size.height() > available.height()) {
+		size = QSize(size.width(), available.height());
+	}
+	if (center.x() + size.width() / 2
+		> available.x() + available.width()) {
+		center.setX(
+			available.x() + available.width() - size.width() / 2);
+	}
+	if (center.x() - size.width() / 2 < available.x()) {
+		center.setX(available.x() + size.width() / 2);
+	}
+	if (center.y() + size.height() / 2
+		> available.y() + available.height()) {
+		center.setY(
+			available.y() + available.height() - size.height() / 2);
+	}
+	if (center.y() - size.height() / 2 < available.y()) {
+		center.setY(available.y() + size.height() / 2);
+	}
+	_useTransparency = Ui::Platform::TranslucentWindowsSupported(center);
+	_padding = _useTransparency
+		? st::callShadow.extend
+		: style::margins(
+			st::lineWidth,
+			st::lineWidth,
+			st::lineWidth,
+			st::lineWidth);
+	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
+	const auto rect = [&] {
+		const QRect initRect(QPoint(), size);
+		return initRect.translated(center - initRect.center()).marginsAdded(_padding);
+	}();
+	setGeometry(rect);
+	setMinimumSize(rect.size());
+	setMaximumSize(rect.size());
+	updateControlsGeometry();
+}
+
+void SeparatePanel::updateGeometry(QSize size) {
+	const auto rect = QRect(
+		x(),
+		y(),
+		_padding.left() + size.width() + _padding.right(),
+		_padding.top() + size.height() + _padding.bottom());
+	setGeometry(rect);
+	setMinimumSize(rect.size());
+	setMaximumSize(rect.size());
+	updateControlsGeometry();
+	update();
+}
+
+void SeparatePanel::resizeEvent(QResizeEvent *e) {
+	updateControlsGeometry();
+}
+
+void SeparatePanel::updateControlsGeometry() {
+	const auto top = _padding.top() + st::separatePanelTitleHeight;
+	_body->setGeometry(
+		_padding.left(),
+		top,
+		width() - _padding.left() - _padding.right(),
+		height() - top - _padding.bottom());
+}
+
+void SeparatePanel::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	if (!_animationCache.isNull()) {
+		auto opacity = _opacityAnimation.value(_visible ? 1. : 0.);
+		if (!_opacityAnimation.animating()) {
+			finishAnimating();
+			if (isHidden()) return;
+		} else {
+			p.setOpacity(opacity);
+
+			PainterHighQualityEnabler hq(p);
+			auto marginRatio = (1. - opacity) / 5;
+			auto marginWidth = qRound(width() * marginRatio);
+			auto marginHeight = qRound(height() * marginRatio);
+			p.drawPixmap(
+				rect().marginsRemoved(
+					QMargins(
+						marginWidth,
+						marginHeight,
+						marginWidth,
+						marginHeight)),
+				_animationCache,
+				QRect(QPoint(0, 0), _animationCache.size()));
+			return;
+		}
+	}
+
+	if (_useTransparency) {
+		paintShadowBorder(p);
+	} else {
+		paintOpaqueBorder(p);
+	}
+}
+
+void SeparatePanel::paintShadowBorder(Painter &p) const {
+	const auto factor = style::DevicePixelRatio();
+	const auto size = st::separatePanelBorderCacheSize;
+	const auto part1 = size / 3;
+	const auto part2 = size - part1;
+	const auto corner = QSize(part1, part1) * factor;
+
+	const auto topleft = QRect(QPoint(0, 0), corner);
+	p.drawPixmap(QRect(0, 0, part1, part1), _borderParts, topleft);
+
+	const auto topright = QRect(QPoint(part2, 0) * factor, corner);
+	p.drawPixmap(
+		QRect(width() - part1, 0, part1, part1),
+		_borderParts,
+		topright);
+
+	const auto bottomleft = QRect(QPoint(0, part2) * factor, corner);
+	p.drawPixmap(
+		QRect(0, height() - part1, part1, part1),
+		_borderParts,
+		bottomleft);
+
+	const auto bottomright = QRect(QPoint(part2, part2) * factor, corner);
+	p.drawPixmap(
+		QRect(width() - part1, height() - part1, part1, part1),
+		_borderParts,
+		bottomright);
+
+	const auto left = QRect(
+		QPoint(0, part1) * factor,
+		QSize(_padding.left(), part2 - part1) * factor);
+	p.drawPixmap(
+		QRect(0, part1, _padding.left(), height() - 2 * part1),
+		_borderParts,
+		left);
+
+	const auto top = QRect(
+		QPoint(part1, 0) * factor,
+		QSize(part2 - part1, _padding.top() + st::callRadius) * factor);
+	p.drawPixmap(
+		QRect(
+			part1,
+			0,
+			width() - 2 * part1,
+			_padding.top() + st::callRadius),
+		_borderParts,
+		top);
+
+	const auto right = QRect(
+		QPoint(size - _padding.right(), part1) * factor,
+		QSize(_padding.right(), part2 - part1) * factor);
+	p.drawPixmap(
+		QRect(
+			width() - _padding.right(),
+			part1,
+			_padding.right(),
+			height() - 2 * part1),
+		_borderParts,
+		right);
+
+	const auto bottom = QRect(
+		QPoint(part1, size - _padding.bottom() - st::callRadius) * factor,
+		QSize(part2 - part1, _padding.bottom() + st::callRadius) * factor);
+	p.drawPixmap(
+		QRect(
+			part1,
+			height() - _padding.bottom() - st::callRadius,
+			width() - 2 * part1,
+			_padding.bottom() + st::callRadius),
+		_borderParts,
+		bottom);
+
+	p.fillRect(
+		_padding.left(),
+		_padding.top() + st::callRadius,
+		width() - _padding.left() - _padding.right(),
+		height() - _padding.top() - _padding.bottom() - 2 * st::callRadius,
+		st::windowBg);
+}
+
+void SeparatePanel::paintOpaqueBorder(Painter &p) const {
+	const auto border = st::windowShadowFgFallback;
+	p.fillRect(0, 0, width(), _padding.top(), border);
+	p.fillRect(
+		myrtlrect(
+			0,
+			_padding.top(),
+			_padding.left(),
+			height() - _padding.top()),
+		border);
+	p.fillRect(
+		myrtlrect(
+			width() - _padding.right(),
+			_padding.top(),
+			_padding.right(),
+			height() - _padding.top()),
+		border);
+	p.fillRect(
+		_padding.left(),
+		height() - _padding.bottom(),
+		width() - _padding.left() - _padding.right(),
+		_padding.bottom(),
+		border);
+
+	p.fillRect(
+		_padding.left(),
+		_padding.top(),
+		width() - _padding.left() - _padding.right(),
+		height() - _padding.top() - _padding.bottom(),
+		st::windowBg);
+}
+
+void SeparatePanel::closeEvent(QCloseEvent *e) {
+	e->ignore();
+	_userCloseRequests.fire({});
+}
+
+void SeparatePanel::mousePressEvent(QMouseEvent *e) {
+	auto dragArea = myrtlrect(
+		_padding.left(),
+		_padding.top(),
+		width() - _padding.left() - _padding.right(),
+		st::separatePanelTitleHeight);
+	if (e->button() == Qt::LeftButton) {
+		if (dragArea.contains(e->pos())) {
+			const auto dragViaSystem = [&] {
+				if (windowHandle()->startSystemMove()) {
+					return true;
+				}
+				return false;
+			}();
+			if (!dragViaSystem) {
+				_dragging = true;
+				_dragStartMousePosition = e->globalPos();
+				_dragStartMyPosition = QPoint(x(), y());
+			}
+		} else if (!rect().contains(e->pos()) && _hideOnDeactivate) {
+			LOG(("Export Info: Panel Hide On Click."));
+			hideGetDuration();
+		}
+	}
+}
+
+void SeparatePanel::mouseMoveEvent(QMouseEvent *e) {
+	if (_dragging) {
+		if (!(e->buttons() & Qt::LeftButton)) {
+			_dragging = false;
+		} else {
+			move(_dragStartMyPosition
+				+ (e->globalPos() - _dragStartMousePosition));
+		}
+	}
+}
+
+void SeparatePanel::mouseReleaseEvent(QMouseEvent *e) {
+	if (e->button() == Qt::LeftButton && _dragging) {
+		_dragging = false;
+	}
+}
+
+void SeparatePanel::leaveEventHook(QEvent *e) {
+	Ui::Tooltip::Hide();
+}
+
+void SeparatePanel::leaveToChildEvent(QEvent *e, QWidget *child) {
+	Ui::Tooltip::Hide();
+}
+
+} // namespace Ui
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
new file mode 100644
index 0000000..49a5ab8
--- /dev/null
+++ b/ui/widgets/separate_panel.h
@@ -0,0 +1,113 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+#include "ui/layers/layer_widget.h"
+#include "ui/text/text_entity.h"
+
+class Painter;
+
+namespace Ui {
+class BoxContent;
+class IconButton;
+class LayerStackWidget;
+class FlatLabel;
+template <typename Widget>
+class FadeWrapScaled;
+} // namespace Ui
+
+namespace Ui {
+
+class SeparatePanel final : public Ui::RpWidget {
+public:
+	SeparatePanel();
+
+	void setTitle(rpl::producer<QString> title);
+	void setInnerSize(QSize size);
+	[[nodiscard]] QRect innerGeometry() const;
+
+	void setHideOnDeactivate(bool hideOnDeactivate);
+	void showAndActivate();
+	int hideGetDuration();
+
+	void showInner(base::unique_qptr<Ui::RpWidget> inner);
+	void showBox(
+		object_ptr<Ui::BoxContent> box,
+		Ui::LayerOptions options,
+		anim::type animated);
+	void showToast(const TextWithEntities &text);
+	void destroyLayer();
+
+	[[nodiscard]] rpl::producer<> backRequests() const;
+	[[nodiscard]] rpl::producer<> closeRequests() const;
+	[[nodiscard]] rpl::producer<> closeEvents() const;
+	void setBackAllowed(bool allowed);
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+	void closeEvent(QCloseEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void focusInEvent(QFocusEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+	void leaveToChildEvent(QEvent *e, QWidget *child) override;
+	void keyPressEvent(QKeyEvent *e) override;
+	bool eventHook(QEvent *e) override;
+
+private:
+	void initControls();
+	void initLayout();
+	void initGeometry(QSize size);
+	void updateGeometry(QSize size);
+	void showControls();
+	void updateControlsGeometry();
+	void createBorderImage();
+	void opacityCallback();
+	void ensureLayerCreated();
+
+	void updateTitleGeometry(int newWidth);
+	void updateTitlePosition();
+	void paintShadowBorder(Painter &p) const;
+	void paintOpaqueBorder(Painter &p) const;
+
+	void toggleOpacityAnimation(bool visible);
+	void finishAnimating();
+	void finishClose();
+
+	object_ptr<Ui::IconButton> _close;
+	object_ptr<Ui::FlatLabel> _title = { nullptr };
+	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _back;
+	object_ptr<Ui::RpWidget> _body;
+	base::unique_qptr<Ui::RpWidget> _inner;
+	base::unique_qptr<Ui::LayerStackWidget> _layer = { nullptr };
+	rpl::event_stream<> _synteticBackRequests;
+	rpl::event_stream<> _userCloseRequests;
+	rpl::event_stream<> _closeEvents;
+
+	bool _hideOnDeactivate = false;
+	bool _useTransparency = true;
+	style::margins _padding;
+
+	bool _dragging = false;
+	QPoint _dragStartMousePosition;
+	QPoint _dragStartMyPosition;
+
+	Ui::Animations::Simple _titleLeft;
+	bool _visible = false;
+
+	Ui::Animations::Simple _opacityAnimation;
+	QPixmap _animationCache;
+	QPixmap _borderParts;
+
+};
+
+} // namespace Ui
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index fd3bb69..ce1032e 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1445,6 +1445,10 @@ defaultToast: Toast {
 	durationSlide: 160;
 }
 
+defaultMultilineToast: Toast(defaultToast) {
+	minWidth: msgMinWidth;
+}
+
 shakeShift: 4px;
 
 // Windows specific title

From 283cb25dfdea09cbd3cd49410adf473ca0481b52 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 May 2022 07:57:52 +0400
Subject: [PATCH 083/635] Allow creating SeparatePanel with a parent.

---
 ui/widgets/separate_panel.cpp |  5 +++--
 ui/widgets/separate_panel.h   | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 9cfcbb4..8f916ea 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -27,8 +27,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
-SeparatePanel::SeparatePanel()
-: _close(this, st::separatePanelClose)
+SeparatePanel::SeparatePanel(QWidget *parent)
+: RpWidget(parent)
+, _close(this, st::separatePanelClose)
 , _back(this, object_ptr<Ui::IconButton>(this, st::separatePanelBack))
 , _body(this) {
 	setMouseTracking(true);
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 49a5ab8..6758be3 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -25,9 +25,9 @@ class FadeWrapScaled;
 
 namespace Ui {
 
-class SeparatePanel final : public Ui::RpWidget {
+class SeparatePanel final : public RpWidget {
 public:
-	SeparatePanel();
+	explicit SeparatePanel(QWidget *parent = nullptr);
 
 	void setTitle(rpl::producer<QString> title);
 	void setInnerSize(QSize size);
@@ -37,10 +37,10 @@ public:
 	void showAndActivate();
 	int hideGetDuration();
 
-	void showInner(base::unique_qptr<Ui::RpWidget> inner);
+	void showInner(base::unique_qptr<RpWidget> inner);
 	void showBox(
-		object_ptr<Ui::BoxContent> box,
-		Ui::LayerOptions options,
+		object_ptr<BoxContent> box,
+		LayerOptions options,
 		anim::type animated);
 	void showToast(const TextWithEntities &text);
 	void destroyLayer();
@@ -83,12 +83,12 @@ private:
 	void finishAnimating();
 	void finishClose();
 
-	object_ptr<Ui::IconButton> _close;
-	object_ptr<Ui::FlatLabel> _title = { nullptr };
-	object_ptr<Ui::FadeWrapScaled<Ui::IconButton>> _back;
-	object_ptr<Ui::RpWidget> _body;
-	base::unique_qptr<Ui::RpWidget> _inner;
-	base::unique_qptr<Ui::LayerStackWidget> _layer = { nullptr };
+	object_ptr<IconButton> _close;
+	object_ptr<FlatLabel> _title = { nullptr };
+	object_ptr<FadeWrapScaled<IconButton>> _back;
+	object_ptr<RpWidget> _body;
+	base::unique_qptr<RpWidget> _inner;
+	base::unique_qptr<LayerStackWidget> _layer = { nullptr };
 	rpl::event_stream<> _synteticBackRequests;
 	rpl::event_stream<> _userCloseRequests;
 	rpl::event_stream<> _closeEvents;
@@ -101,10 +101,10 @@ private:
 	QPoint _dragStartMousePosition;
 	QPoint _dragStartMyPosition;
 
-	Ui::Animations::Simple _titleLeft;
+	Animations::Simple _titleLeft;
 	bool _visible = false;
 
-	Ui::Animations::Simple _opacityAnimation;
+	Animations::Simple _opacityAnimation;
 	QPixmap _animationCache;
 	QPixmap _borderParts;
 

From eb82d31c5549603f7d8f4ab79e516ecbc8e163d6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 30 Apr 2022 05:34:41 +0400
Subject: [PATCH 084/635] Set additional margin to the input field without
 style sheet

---
 ui/widgets/input_fields.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 918d465..f22584b 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1494,10 +1494,9 @@ void InputField::setTagMimeProcessor(
 }
 
 void InputField::setAdditionalMargin(int margin) {
-	_inner->setStyleSheet(
-		QString::fromLatin1("QTextEdit { margin: %1px; }").arg(margin));
 	_additionalMargin = margin;
-	checkContentHeight();
+	QResizeEvent e(size(), size());
+	QCoreApplication::sendEvent(this, &e);
 }
 
 void InputField::setMaxLength(int length) {
@@ -3673,7 +3672,7 @@ void InputField::insertFromMimeDataInner(const QMimeData *source) {
 
 void InputField::resizeEvent(QResizeEvent *e) {
 	refreshPlaceholder(_placeholderFull.current());
-	_inner->setGeometry(rect().marginsRemoved(_st.textMargins));
+	_inner->setGeometry(rect().marginsRemoved(_st.textMargins + _additionalMargin));
 	_borderAnimationStart = width() / 2;
 	RpWidget::resizeEvent(e);
 	checkContentHeight();

From 35c84d7d54230c136db2271b1ddcd016b7341938 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 1 May 2022 03:50:35 +0300
Subject: [PATCH 085/635] Removed unused includes from BoxLayerWidget.

---
 ui/layers/box_layer_widget.cpp |  5 -----
 ui/layers/box_layer_widget.h   | 12 +++++-------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index e8bcf53..1336a5c 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -8,12 +8,7 @@
 
 #include "ui/effects/radial_animation.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/scroll_area.h"
 #include "ui/widgets/labels.h"
-#include "ui/widgets/shadow.h"
-#include "ui/wrap/fade_wrap.h"
-#include "ui/text/text_utilities.h"
-#include "ui/image/image_prepare.h"
 #include "ui/painter.h"
 #include "base/timer.h"
 #include "styles/style_layers.h"
diff --git a/ui/layers/box_layer_widget.h b/ui/layers/box_layer_widget.h
index 016ad44..05cfd13 100644
--- a/ui/layers/box_layer_widget.h
+++ b/ui/layers/box_layer_widget.h
@@ -10,19 +10,19 @@
 #include "base/flags.h"
 #include "ui/layers/layer_widget.h"
 #include "ui/layers/box_content.h"
-#include "ui/wrap/padding_wrap.h"
-#include "ui/widgets/labels.h"
-#include "ui/effects/animation_value.h"
-#include "ui/text/text_entity.h"
 #include "ui/round_rect.h"
 #include "ui/rp_widget.h"
 
 class Painter;
+struct TextWithEntities;
+
+namespace anim {
+enum class type;
+} // namespace anim
 
 namespace style {
 struct RoundButton;
 struct IconButton;
-struct ScrollArea;
 struct Box;
 } // namespace style
 
@@ -30,9 +30,7 @@ namespace Ui {
 
 class RoundButton;
 class IconButton;
-class ScrollArea;
 class FlatLabel;
-class FadeShadow;
 
 class BoxLayerWidget : public LayerWidget, public BoxContentDelegate {
 public:

From 9d07d6a476f057c55af9392804c3e8b6246c637c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 1 May 2022 02:35:42 +0300
Subject: [PATCH 086/635] Added ability to append pinned to top content to
 generic box.

---
 ui/layers/generic_box.cpp | 25 +++++++++++++++++++++++--
 ui/layers/generic_box.h   | 10 +++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index 447bf8c..fe90bce 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -16,15 +16,36 @@ namespace Ui {
 void GenericBox::prepare() {
 	_init(this);
 
+	const auto currentWidth = width();
+	if (_pinnedToTopContent) {
+		_pinnedToTopContent->resizeToWidth(currentWidth);
+	}
+
 	auto wrap = object_ptr<Ui::OverrideMargins>(this, std::move(_owned));
-	setDimensionsToContent(_width ? _width : st::boxWidth, wrap.data());
-	setInnerWidget(std::move(wrap));
+	setDimensionsToContent(currentWidth, wrap.data());
+	setInnerWidget(
+		std::move(wrap),
+		_pinnedToTopContent ? _pinnedToTopContent->height() : 0);
 }
 
 void GenericBox::addSkip(int height) {
 	addRow(object_ptr<Ui::FixedHeightWidget>(this, height));
 }
 
+not_null<Ui::VerticalLayout*> GenericBox::setPinnedToTopContent(
+		object_ptr<Ui::VerticalLayout> layout) {
+	_pinnedToTopContent = std::move(layout);
+	return _pinnedToTopContent.data();
+}
+
+int GenericBox::rowsCount() const {
+	return _content->count();
+}
+
+int GenericBox::width() const {
+	return _width ? _width : st::boxWidth;
+}
+
 not_null<Ui::VerticalLayout*> GenericBox::verticalLayout() {
 	return _content;
 }
diff --git a/ui/layers/generic_box.h b/ui/layers/generic_box.h
index b6832f8..4214375 100644
--- a/ui/layers/generic_box.h
+++ b/ui/layers/generic_box.h
@@ -42,9 +42,8 @@ public:
 		_showFinished = callback;
 	}
 
-	int rowsCount() const {
-		return _content->count();
-	}
+	[[nodiscard]] int rowsCount() const;
+	[[nodiscard]] int width() const;
 
 	template <
 		typename Widget,
@@ -85,6 +84,9 @@ public:
 		}
 	}
 
+	not_null<Ui::VerticalLayout*> setPinnedToTopContent(
+		object_ptr<Ui::VerticalLayout> layout);
+
 	[[nodiscard]] not_null<Ui::VerticalLayout*> verticalLayout();
 
 	using BoxContent::setNoContentMargin;
@@ -124,6 +126,8 @@ private:
 	not_null<Ui::VerticalLayout*> _content;
 	int _width = 0;
 
+	object_ptr<Ui::VerticalLayout> _pinnedToTopContent = { nullptr };
+
 };
 
 template <typename InitMethod, typename ...InitArgs>

From 9b6e11db62810626a56431cdc8eeb771817f6560 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 4 May 2022 11:22:46 +0400
Subject: [PATCH 087/635] Add anim::repeat enumeration (loop / once).

---
 ui/effects/animation_value.h | 9 +++++++--
 ui/layers/box_layer_widget.h | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/effects/animation_value.h b/ui/effects/animation_value.h
index 3cc0ec2..dee83eb 100644
--- a/ui/effects/animation_value.h
+++ b/ui/effects/animation_value.h
@@ -14,16 +14,21 @@
 
 namespace anim {
 
-enum class type {
+enum class type : uchar {
 	normal,
 	instant,
 };
 
-enum class activation {
+enum class activation : uchar {
 	normal,
 	background,
 };
 
+enum class repeat : uchar {
+	loop,
+	once,
+};
+
 using transition = Fn<float64(float64 delta, float64 dt)>;
 
 extern transition linear;
diff --git a/ui/layers/box_layer_widget.h b/ui/layers/box_layer_widget.h
index 05cfd13..b1f1fce 100644
--- a/ui/layers/box_layer_widget.h
+++ b/ui/layers/box_layer_widget.h
@@ -17,7 +17,7 @@ class Painter;
 struct TextWithEntities;
 
 namespace anim {
-enum class type;
+enum class type : uchar;
 } // namespace anim
 
 namespace style {

From 83553d08264effc9909e6674fa19c9d8d74a71de Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 5 May 2022 12:55:14 +0300
Subject: [PATCH 088/635] Decomposed painting of box content divider.

---
 ui/widgets/box_content_divider.cpp | 12 ++++++++++++
 ui/widgets/box_content_divider.h   |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/ui/widgets/box_content_divider.cpp b/ui/widgets/box_content_divider.cpp
index 60e03dc..abb4acf 100644
--- a/ui/widgets/box_content_divider.cpp
+++ b/ui/widgets/box_content_divider.cpp
@@ -34,12 +34,20 @@ BoxContentDivider::BoxContentDivider(
 void BoxContentDivider::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
 	p.fillRect(e->rect(), _bg);
+	paintTop(p);
+	paintBottom(p);
+}
+
+void BoxContentDivider::paintTop(QPainter &p) {
 	const auto dividerFillTop = QRect(
 		0,
 		0,
 		width(),
 		st::boxDividerTop.height());
 	st::boxDividerTop.fill(p, dividerFillTop);
+}
+
+void BoxContentDivider::paintBottom(QPainter &p) {
 	const auto dividerFillBottom = myrtlrect(
 		0,
 		height() - st::boxDividerBottom.height(),
@@ -48,4 +56,8 @@ void BoxContentDivider::paintEvent(QPaintEvent *e) {
 	st::boxDividerBottom.fill(p, dividerFillBottom);
 }
 
+const style::color &BoxContentDivider::color() const {
+	return _bg;
+}
+
 } // namespace Ui
diff --git a/ui/widgets/box_content_divider.h b/ui/widgets/box_content_divider.h
index 106af56..d46d09c 100644
--- a/ui/widgets/box_content_divider.h
+++ b/ui/widgets/box_content_divider.h
@@ -21,9 +21,14 @@ public:
 		int height,
 		const style::color &bg);
 
+	[[nodiscard]] const style::color &color() const;
+
 protected:
 	void paintEvent(QPaintEvent *e) override;
 
+	void paintTop(QPainter &p);
+	void paintBottom(QPainter &p);
+
 private:
 	const style::color &_bg;
 

From b97c0cadcb2ab3dff75d26b482a4a4e750a1c0e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 May 2022 17:40:33 +0400
Subject: [PATCH 089/635] Allow any RpWidget as a GenericBox::pinnedTopContent.

---
 ui/layers/generic_box.cpp |  6 +++---
 ui/layers/generic_box.h   | 16 ++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index fe90bce..beb32e5 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -32,9 +32,9 @@ void GenericBox::addSkip(int height) {
 	addRow(object_ptr<Ui::FixedHeightWidget>(this, height));
 }
 
-not_null<Ui::VerticalLayout*> GenericBox::setPinnedToTopContent(
-		object_ptr<Ui::VerticalLayout> layout) {
-	_pinnedToTopContent = std::move(layout);
+not_null<Ui::RpWidget*> GenericBox::doSetPinnedToTopContent(
+		object_ptr<Ui::RpWidget> content) {
+	_pinnedToTopContent = std::move(content);
 	return _pinnedToTopContent.data();
 }
 
diff --git a/ui/layers/generic_box.h b/ui/layers/generic_box.h
index 4214375..60bf1ef 100644
--- a/ui/layers/generic_box.h
+++ b/ui/layers/generic_box.h
@@ -84,16 +84,16 @@ public:
 		}
 	}
 
-	not_null<Ui::VerticalLayout*> setPinnedToTopContent(
-		object_ptr<Ui::VerticalLayout> layout);
+	template <typename Widget>
+	not_null<Widget*> setPinnedToTopContent(object_ptr<Widget> content) {
+		return static_cast<Widget*>(
+			doSetPinnedToTopContent(std::move(content)).get());
+	}
 
 	[[nodiscard]] not_null<Ui::VerticalLayout*> verticalLayout();
 
 	using BoxContent::setNoContentMargin;
 
-protected:
-	void prepare() override;
-
 private:
 	template <typename InitMethod, typename ...InitArgs>
 	struct Initer {
@@ -119,6 +119,10 @@ private:
 	auto MakeIniter(InitMethod &&method, InitArgs &&...args)
 		-> Initer<std::decay_t<InitMethod>, std::decay_t<InitArgs>...>;
 
+	void prepare() override;
+	not_null<Ui::RpWidget*> doSetPinnedToTopContent(
+		object_ptr<Ui::RpWidget> content);
+
 	FnMut<void(not_null<GenericBox*>)> _init;
 	Fn<void()> _focus;
 	Fn<void()> _showFinished;
@@ -126,7 +130,7 @@ private:
 	not_null<Ui::VerticalLayout*> _content;
 	int _width = 0;
 
-	object_ptr<Ui::VerticalLayout> _pinnedToTopContent = { nullptr };
+	object_ptr<Ui::RpWidget> _pinnedToTopContent = { nullptr };
 
 };
 

From 3cce0655d1c109a42764051a9f2ca4b01f343daa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 9 May 2022 17:09:05 +0400
Subject: [PATCH 090/635] Allow links in default multiline toasts.

---
 ui/toasts/common_toasts.cpp | 1 +
 ui/toasts/common_toasts.h   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/ui/toasts/common_toasts.cpp b/ui/toasts/common_toasts.cpp
index 0f06547..cc25a2f 100644
--- a/ui/toasts/common_toasts.cpp
+++ b/ui/toasts/common_toasts.cpp
@@ -21,6 +21,7 @@ base::weak_ptr<Toast::Instance> ShowMultilineToast(
 			? args.duration
 			: Ui::Toast::kDefaultDuration),
 		.multiline = true,
+		.filter = std::move(args.filter),
 	};
 	return args.parentOverride
 		? Ui::Toast::Show(args.parentOverride, std::move(config))
diff --git a/ui/toasts/common_toasts.h b/ui/toasts/common_toasts.h
index 7384c0a..1fe074d 100644
--- a/ui/toasts/common_toasts.h
+++ b/ui/toasts/common_toasts.h
@@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_entity.h"
 #include "base/weak_ptr.h"
 
+class ClickHandler;
+using ClickHandlerPtr = std::shared_ptr<ClickHandler>;
+using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
+
 namespace Ui {
 namespace Toast {
 class Instance;
@@ -19,6 +23,7 @@ struct MultilineToastArgs {
 	QWidget *parentOverride = nullptr;
 	TextWithEntities text;
 	crl::time duration = 0;
+	ClickHandlerFilter filter;
 };
 
 base::weak_ptr<Toast::Instance> ShowMultilineToast(

From 96279cc04d47bcef41f6eb907df47b741ee7c920 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 11 May 2022 12:41:08 +0400
Subject: [PATCH 091/635] Fix generic box size with pinned top content.

---
 ui/layers/generic_box.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index beb32e5..9e85910 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -17,15 +17,22 @@ void GenericBox::prepare() {
 	_init(this);
 
 	const auto currentWidth = width();
-	if (_pinnedToTopContent) {
-		_pinnedToTopContent->resizeToWidth(currentWidth);
+	const auto pinned = _pinnedToTopContent.data();
+	if (pinned) {
+		pinned->resizeToWidth(currentWidth);
 	}
 
 	auto wrap = object_ptr<Ui::OverrideMargins>(this, std::move(_owned));
-	setDimensionsToContent(currentWidth, wrap.data());
-	setInnerWidget(
-		std::move(wrap),
-		_pinnedToTopContent ? _pinnedToTopContent->height() : 0);
+	wrap->resizeToWidth(currentWidth);
+	rpl::combine(
+		pinned ? pinned->heightValue() : rpl::single(0),
+		wrap->heightValue()
+	) | rpl::start_with_next([=](int top, int height) {
+		setInnerTopSkip(top);
+		setDimensions(currentWidth, top + height);
+	}, wrap->lifetime());
+
+	setInnerWidget(std::move(wrap), pinned ? pinned->height() : 0);
 }
 
 void GenericBox::addSkip(int height) {

From c468f8b3c67312bddfc29983d4306ba766e2a765 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 May 2022 14:17:10 +0400
Subject: [PATCH 092/635] Allow adding any buttons to BoxContent.

---
 ui/layers/box_content.cpp      | 63 +++++++++++++++++++++++++++++++++-
 ui/layers/box_content.h        | 62 +++++++++++++--------------------
 ui/layers/box_layer_widget.cpp | 49 ++++++++++----------------
 ui/layers/box_layer_widget.h   | 25 ++++----------
 4 files changed, 111 insertions(+), 88 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index d669d80..e1a0423 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -24,6 +24,13 @@ void BoxContent::setTitle(rpl::producer<QString> title) {
 	getDelegate()->setTitle(std::move(title) | Text::ToWithEntities());
 }
 
+QPointer<AbstractButton> BoxContent::addButton(
+		object_ptr<AbstractButton> button) {
+	auto result = QPointer<AbstractButton>(button.data());
+	getDelegate()->addButton(std::move(button));
+	return result;
+}
+
 QPointer<RoundButton> BoxContent::addButton(
 		rpl::producer<QString> text,
 		Fn<void()> clickCallback) {
@@ -33,15 +40,69 @@ QPointer<RoundButton> BoxContent::addButton(
 		getDelegate()->style().button);
 }
 
+QPointer<RoundButton> BoxContent::addButton(
+		rpl::producer<QString> text,
+		const style::RoundButton &st) {
+	return addButton(std::move(text), nullptr, st);
+}
+
+QPointer<RoundButton> BoxContent::addButton(
+		rpl::producer<QString> text,
+		Fn<void()> clickCallback,
+		const style::RoundButton &st) {
+	auto button = object_ptr<RoundButton>(this, std::move(text), st);
+	auto result = QPointer<RoundButton>(button.data());
+	result->setTextTransform(RoundButton::TextTransform::NoTransform);
+	result->setClickedCallback(std::move(clickCallback));
+	getDelegate()->addButton(std::move(button));
+	return result;
+}
+
+QPointer<AbstractButton> BoxContent::addLeftButton(
+		object_ptr<AbstractButton> button) {
+	auto result = QPointer<AbstractButton>(button.data());
+	getDelegate()->addLeftButton(std::move(button));
+	return result;
+}
+
 QPointer<RoundButton> BoxContent::addLeftButton(
 		rpl::producer<QString> text,
 		Fn<void()> clickCallback) {
-	return getDelegate()->addLeftButton(
+	return addLeftButton(
 		std::move(text),
 		std::move(clickCallback),
 		getDelegate()->style().button);
 }
 
+QPointer<RoundButton> BoxContent::addLeftButton(
+		rpl::producer<QString> text,
+		Fn<void()> clickCallback,
+		const style::RoundButton &st) {
+	auto button = object_ptr<RoundButton>(this, std::move(text), st);
+	const auto result = QPointer<RoundButton>(button.data());
+	result->setTextTransform(RoundButton::TextTransform::NoTransform);
+	result->setClickedCallback(std::move(clickCallback));
+	getDelegate()->addLeftButton(std::move(button));
+	return result;
+}
+
+QPointer<AbstractButton> BoxContent::addTopButton(
+		object_ptr<AbstractButton> button) {
+	auto result = QPointer<AbstractButton>(button.data());
+	getDelegate()->addTopButton(std::move(button));
+	return result;
+}
+
+QPointer<IconButton> BoxContent::addTopButton(
+		const style::IconButton &st,
+		Fn<void()> clickCallback) {
+	auto button = object_ptr<IconButton>(this, st);
+	const auto result = QPointer<IconButton>(button.data());
+	result->setClickedCallback(std::move(clickCallback));
+	getDelegate()->addTopButton(std::move(button));
+	return result;
+}
+
 void BoxContent::setInner(object_ptr<TWidget> inner) {
 	setInner(std::move(inner), st::boxScroll);
 }
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index e1a5bb4..fa275f5 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -43,6 +43,7 @@ inline object_ptr<BoxType> Box(Args &&...args) {
 
 namespace Ui {
 
+class AbstractButton;
 class RoundButton;
 class IconButton;
 class ScrollArea;
@@ -60,17 +61,9 @@ public:
 	virtual void setCloseByOutsideClick(bool close) = 0;
 
 	virtual void clearButtons() = 0;
-	virtual QPointer<RoundButton> addButton(
-		rpl::producer<QString> text,
-		Fn<void()> clickCallback,
-		const style::RoundButton &st) = 0;
-	virtual QPointer<RoundButton> addLeftButton(
-		rpl::producer<QString> text,
-		Fn<void()> clickCallback,
-		const style::RoundButton &st) = 0;
-	virtual QPointer<IconButton> addTopButton(
-		const style::IconButton &st,
-		Fn<void()> clickCallback) = 0;
+	virtual void addButton(object_ptr<AbstractButton> button) = 0;
+	virtual void addLeftButton(object_ptr<AbstractButton> button) = 0;
+	virtual void addTopButton(object_ptr<AbstractButton> button) = 0;
 	virtual void showLoading(bool show) = 0;
 	virtual void updateButtonsPositions() = 0;
 
@@ -141,40 +134,31 @@ public:
 	void clearButtons() {
 		getDelegate()->clearButtons();
 	}
+	QPointer<AbstractButton> addButton(object_ptr<AbstractButton> button);
 	QPointer<RoundButton> addButton(
 		rpl::producer<QString> text,
 		Fn<void()> clickCallback = nullptr);
+	QPointer<RoundButton> addButton(
+		rpl::producer<QString> text,
+		const style::RoundButton &st);
+	QPointer<RoundButton> addButton(
+		rpl::producer<QString> text,
+		Fn<void()> clickCallback,
+		const style::RoundButton &st);
+	QPointer<AbstractButton> addLeftButton(
+		object_ptr<AbstractButton> button);
+	QPointer<RoundButton> addLeftButton(
+		rpl::producer<QString> text,
+		Fn<void()> clickCallback = nullptr);
 	QPointer<RoundButton> addLeftButton(
 		rpl::producer<QString> text,
-		Fn<void()> clickCallback = nullptr);
+		Fn<void()> clickCallback,
+		const style::RoundButton& st);
+	QPointer<AbstractButton> addTopButton(
+		object_ptr<AbstractButton> button);
 	QPointer<IconButton> addTopButton(
-			const style::IconButton &st,
-			Fn<void()> clickCallback = nullptr) {
-		return getDelegate()->addTopButton(st, std::move(clickCallback));
-	}
-	QPointer<RoundButton> addButton(
-			rpl::producer<QString> text,
-			const style::RoundButton &st) {
-		return getDelegate()->addButton(std::move(text), nullptr, st);
-	}
-	QPointer<RoundButton> addButton(
-			rpl::producer<QString> text,
-			Fn<void()> clickCallback,
-			const style::RoundButton &st) {
-		return getDelegate()->addButton(
-			std::move(text),
-			std::move(clickCallback),
-			st);
-	}
-	QPointer<RoundButton> addLeftButton(
-			rpl::producer<QString> text,
-			Fn<void()> clickCallback,
-			const style::RoundButton& st) {
-		return getDelegate()->addLeftButton(
-			std::move(text),
-			std::move(clickCallback),
-			st);
-	}
+		const style::IconButton &st,
+		Fn<void()> clickCallback = nullptr);
 	void showLoading(bool show) {
 		getDelegate()->showLoading(show);
 	}
diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index 1336a5c..860fead 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -263,46 +263,35 @@ void BoxLayerWidget::clearButtons() {
 	_topButton = nullptr;
 }
 
-QPointer<RoundButton> BoxLayerWidget::addButton(
-		rpl::producer<QString> text,
-		Fn<void()> clickCallback,
-		const style::RoundButton &st) {
-	_buttons.emplace_back(this, std::move(text), st);
-	auto result = QPointer<RoundButton>(_buttons.back());
-	result->setTextTransform(RoundButton::TextTransform::NoTransform);
-	result->setClickedCallback(std::move(clickCallback));
-	result->show();
-	result->widthValue(
+void BoxLayerWidget::addButton(object_ptr<AbstractButton> button) {
+	_buttons.push_back(std::move(button));
+	const auto raw = _buttons.back().data();
+	raw->setParent(this);
+	raw->show();
+	raw->widthValue(
 	) | rpl::start_with_next([=] {
 		updateButtonsPositions();
-	}, result->lifetime());
-	return result;
+	}, raw->lifetime());
 }
 
-QPointer<RoundButton> BoxLayerWidget::addLeftButton(
-		rpl::producer<QString> text,
-		Fn<void()> clickCallback,
-		const style::RoundButton &st) {
-	_leftButton = object_ptr<RoundButton>(this, std::move(text), st);
-	auto result = QPointer<RoundButton>(_leftButton);
-	result->setTextTransform(RoundButton::TextTransform::NoTransform);
-	result->setClickedCallback(std::move(clickCallback));
-	result->show();
-	result->widthValue(
+void BoxLayerWidget::addLeftButton(object_ptr<AbstractButton> button) {
+	_leftButton = std::move(button);
+	const auto raw = _leftButton.data();
+	raw->setParent(this);
+	raw->show();
+	raw->widthValue(
 	) | rpl::start_with_next([=] {
 		updateButtonsPositions();
-	}, result->lifetime());
-	return result;
+	}, raw->lifetime());
 }
 
-QPointer<IconButton> BoxLayerWidget::addTopButton(const style::IconButton &st, Fn<void()> clickCallback) {
-	_topButton = base::make_unique_q<IconButton>(this, st);
-	auto result = QPointer<IconButton>(_topButton.get());
-	result->setClickedCallback(std::move(clickCallback));
-	result->show();
+void BoxLayerWidget::addTopButton(object_ptr<AbstractButton> button) {
+	_topButton = base::make_unique_q<AbstractButton>(button.release());
+	const auto raw = _topButton.get();
+	raw->setParent(this);
+	raw->show();
 	updateButtonsPositions();
 	updateTitlePosition();
-	return result;
 }
 
 void BoxLayerWidget::showLoading(bool show) {
diff --git a/ui/layers/box_layer_widget.h b/ui/layers/box_layer_widget.h
index b1f1fce..8d6e182 100644
--- a/ui/layers/box_layer_widget.h
+++ b/ui/layers/box_layer_widget.h
@@ -21,15 +21,12 @@ enum class type : uchar;
 } // namespace anim
 
 namespace style {
-struct RoundButton;
-struct IconButton;
 struct Box;
 } // namespace style
 
 namespace Ui {
 
-class RoundButton;
-class IconButton;
+class AbstractButton;
 class FlatLabel;
 
 class BoxLayerWidget : public LayerWidget, public BoxContentDelegate {
@@ -56,17 +53,9 @@ public:
 	}
 
 	void clearButtons() override;
-	QPointer<RoundButton> addButton(
-		rpl::producer<QString> text,
-		Fn<void()> clickCallback,
-		const style::RoundButton &st) override;
-	QPointer<RoundButton> addLeftButton(
-		rpl::producer<QString> text,
-		Fn<void()> clickCallback,
-		const style::RoundButton &st) override;
-	QPointer<IconButton> addTopButton(
-		const style::IconButton &st,
-		Fn<void()> clickCallback) override;
+	void addButton(object_ptr<AbstractButton> button) override;
+	void addLeftButton(object_ptr<AbstractButton> button) override;
+	void addTopButton(object_ptr<AbstractButton> button) override;
 	void showLoading(bool show) override;
 	void updateButtonsPositions() override;
 	QPointer<QWidget> outerContainer() override;
@@ -141,9 +130,9 @@ private:
 	int _titleTop = 0;
 	bool _closeByOutsideClick = true;
 
-	std::vector<object_ptr<RoundButton>> _buttons;
-	object_ptr<RoundButton> _leftButton = { nullptr };
-	base::unique_qptr<IconButton> _topButton = { nullptr };
+	std::vector<object_ptr<AbstractButton>> _buttons;
+	object_ptr<AbstractButton> _leftButton = { nullptr };
+	base::unique_qptr<AbstractButton> _topButton = { nullptr };
 	std::unique_ptr<LoadingProgress> _loadingProgress;
 
 };

From 92df40196305de5b59f611020021b3ece9d96fde Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 18 May 2022 14:17:30 +0400
Subject: [PATCH 093/635] Add premium button colors.

---
 ui/colors.palette | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/colors.palette b/ui/colors.palette
index 9acd342..f200c50 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -653,3 +653,8 @@ songCoverOverlayFg: #00000066; // song cover overlay
 
 photoEditorBg: boxTitleAdditionalFg; // photo editor background
 photoEditorItemBaseHandleFg: #3ccaef; // photo editor handle circle
+
+premiumButtonBg1: #55a5ff; // upgrade to premium button gradient 1
+premiumButtonBg2: #a767ff; // upgrade to premium button gradient 2
+premiumButtonBg3: #db5c9d; // upgrade to premium button gradient 3
+premiumButtonFg: #ffffff; // upgrade to premium button text

From 6b469e469fac43f8b46687697314f40c7c18560e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 19 May 2022 09:03:13 +0400
Subject: [PATCH 094/635] Get rid of DisableCustomScaling hack

This shouldn't be needed since Qt is built without High-DPI scaling support in official binaries and QT_SCALE_FACTOR is a debug environment variable, so any use of it is a user's environment misconfiguration.

https://doc.qt.io/qt-6/highdpi.html#environment-variable-reference
---
 ui/ui_utility.cpp | 6 ------
 ui/ui_utility.h   | 2 --
 2 files changed, 8 deletions(-)

diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp
index e66055d..1086704 100644
--- a/ui/ui_utility.cpp
+++ b/ui/ui_utility.cpp
@@ -14,7 +14,6 @@
 #include <QtGui/QtEvents>
 #include <QWheelEvent>
 
-#include <private/qguiapplication_p.h>
 #include <private/qhighdpiscaling_p.h>
 
 #include <array>
@@ -214,11 +213,6 @@ bool IsContentVisible(
 		&& !widget->window()->isMinimized();
 }
 
-void DisableCustomScaling() {
-	QHighDpiScaling::setGlobalFactor(1);
-	QGuiApplicationPrivate::resetCachedDevicePixelRatio();
-}
-
 int WheelDirection(not_null<QWheelEvent*> e) {
 	// Only a mouse wheel is accepted.
 	constexpr auto step = static_cast<int>(QWheelEvent::DefaultDeltasPerStep);
diff --git a/ui/ui_utility.h b/ui/ui_utility.h
index 80764f9..420f0ff 100644
--- a/ui/ui_utility.h
+++ b/ui/ui_utility.h
@@ -194,8 +194,6 @@ QPointer<const Widget> MakeWeak(not_null<const Widget*> object) {
     not_null<QWidget*> widget,
     const QRect &rect = QRect());
 
-void DisableCustomScaling();
-
 int WheelDirection(not_null<QWheelEvent*> e);
 
 } // namespace Ui

From bbad41e04693954705f02583a21c6bf1b7e0bae8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 19 May 2022 09:05:26 +0400
Subject: [PATCH 095/635] Get rid of __HAIKU__ checks

This is a leftover of something that wasn't finiched and looks like won't be finished. It also feels that's not a good idea to mix Linux and Haiku in the same file though...
---
 ui/platform/linux/ui_utility_linux.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 6e88a80..6bfa4fa 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -620,17 +620,6 @@ TitleControls::Layout TitleControlsLayout() {
 	}
 #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
-#ifdef __HAIKU__
-	return TitleControls::Layout{
-		.left = {
-			TitleControls::Control::Close,
-		},
-		.right = {
-			TitleControls::Control::Minimize,
-			TitleControls::Control::Maximize,
-		}
-	};
-#else // __HAIKU__
 	return TitleControls::Layout{
 		.right = {
 			TitleControls::Control::Minimize,
@@ -638,7 +627,6 @@ TitleControls::Layout TitleControlsLayout() {
 			TitleControls::Control::Close,
 		}
 	};
-#endif // !__HAIKU__
 }
 
 } // namespace Platform

From a32f3a94b94a6158db3aca2673af97a8eceb0948 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 19 May 2022 09:08:14 +0400
Subject: [PATCH 096/635] Use modifier workaround only on X11

It's a bug in Qt's xcb backend after all
---
 ui/widgets/input_fields.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index f22584b..0b0c1aa 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -2763,7 +2763,7 @@ void InputField::keyPressEventInner(QKeyEvent *e) {
 			: (enter && shift)
 			? (~Qt::ShiftModifier)
 			// Qt bug workaround https://bugreports.qt.io/browse/QTBUG-49771
-			: (backspace && Platform::IsLinux())
+			: (backspace && Platform::IsX11())
 			? (Qt::ControlModifier)
 			: oldModifiers;
 		const auto changeModifiers = (oldModifiers & ~allowedModifiers) != 0;

From 941a10c8b0089e0e8a5494b896aad17d90b115c1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 19 May 2022 11:49:33 +0400
Subject: [PATCH 097/635] Avoid QHighDpi::toNativePixels where possible

---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 6 ++----
 ui/platform/linux/ui_utility_linux.cpp             | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 8757b58..5482837 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -15,7 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QWindow>
 #include <qpa/qplatformnativeinterface.h>
 #include <private/qguiapplication_p.h>
-#include <private/qhighdpiscaling_p.h>
 
 // private QtWaylandClient headers are using keywords :(
 #ifdef QT_NO_KEYWORDS
@@ -153,9 +152,8 @@ bool WaylandIntegration::showWindowMenu(QWindow *window) {
 		return false;
 	}
 
-	const auto pos = QHighDpi::toNativePixels(
-		window->mapFromGlobal(QCursor::pos()),
-		window);
+	const auto pos = window->mapFromGlobal(QCursor::pos())
+		* window->devicePixelRatio();
 
 	xdg_toplevel_show_window_menu(toplevel, seat, *serial, pos.x(), pos.y());
 	return true;
diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 6bfa4fa..51ed21e 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -23,7 +23,6 @@
 #include <QtCore/QPoint>
 #include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
-#include <private/qhighdpiscaling_p.h>
 
 namespace Ui {
 namespace Platform {
@@ -505,7 +504,7 @@ bool WindowExtentsSupported() {
 }
 
 void SetWindowExtents(QWindow *window, const QMargins &extents) {
-	const auto nativeExtents = QHighDpi::toNativePixels(extents, window);
+	const auto nativeExtents = extents * window->devicePixelRatio();
 	if (const auto integration = WaylandIntegration::Instance()) {
 		integration->setWindowExtents(window, nativeExtents);
 	} else if (::Platform::IsX11()) {

From 21a7adc03c0bb256b1dac8281fe1ca76c4296aa7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 19 May 2022 15:39:14 +0400
Subject: [PATCH 098/635] Move shell integration initialization to
 lib_waylandshells

---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 5482837..fa21c7b 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <qpa/qplatformnativeinterface.h>
-#include <private/qguiapplication_p.h>
 
 // private QtWaylandClient headers are using keywords :(
 #ifdef QT_NO_KEYWORDS
@@ -22,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #define slots Q_SLOTS
 #endif // QT_NO_KEYWORDS
 
-#include <private/qwaylandintegration_p.h>
 #include <private/qwaylanddisplay_p.h>
 #include <private/qwaylandwindow_p.h>
 #include <private/qwaylandinputdevice_p.h>
@@ -32,7 +30,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 Q_DECLARE_METATYPE(QMargins);
 
-using QtWaylandClient::QWaylandIntegration;
 using QtWaylandClient::QWaylandWindow;
 using namespace KWayland::Client;
 
@@ -93,11 +90,6 @@ bool WaylandIntegration::xdgDecorationSupported() {
 }
 
 bool WaylandIntegration::windowExtentsSupported() {
-	// initialize shell integration before querying
-	if (const auto integration = static_cast<QWaylandIntegration*>(
-		QGuiApplicationPrivate::platformIntegration())) {
-		integration->shellIntegration();
-	}
 	return WaylandShells::XdgShell();
 }
 

From 9c09b1fad07d5048b55a1dfcb27c7d1a585bba55 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 May 2022 17:29:34 +0400
Subject: [PATCH 099/635] Add premium sticker pack icon colors.

---
 ui/colors.palette | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/colors.palette b/ui/colors.palette
index f200c50..8f11b42 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -248,6 +248,8 @@ emojiIconFgActive: windowBgActive; // active emoji category icon
 stickerPanDeleteBg: #000000ff; // delete X button background for custom sent stickers in stickers panel (legacy)
 stickerPanDeleteFg: windowFgActive; // delete X button icon for custom sent stickers in stickers panel (legacy)
 stickerPreviewBg: #ffffffb0; // sticker and GIF preview background (when you press and hold on a sticker)
+stickerPanPremium1: #5a99ff; // premium sticker pack icon gradient 1
+stickerPanPremium2: #45b9f3; // premium sticker pack icon gradient 2
 
 historyTextInFg: windowFg; // inbox message text
 historyTextInFgSelected: historyTextInFg; // inbox message selected text or text in a selected message

From cea7f128a55a3f93df956ad21eb51634f851cc70 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 May 2022 02:01:34 +0300
Subject: [PATCH 100/635] Added util for calculating of intermediate gradient
 value.

---
 CMakeLists.txt          |  1 +
 ui/effects/gradient.cpp | 28 ++++++++++++++++++++++++++++
 ui/effects/gradient.h   |  4 ++++
 3 files changed, 33 insertions(+)
 create mode 100644 ui/effects/gradient.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4448b46..9df509c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ PRIVATE
     ui/effects/cross_line.h
     ui/effects/fade_animation.cpp
     ui/effects/fade_animation.h
+    ui/effects/gradient.cpp
     ui/effects/gradient.h
     ui/effects/numbers_animation.cpp
     ui/effects/numbers_animation.h
diff --git a/ui/effects/gradient.cpp b/ui/effects/gradient.cpp
new file mode 100644
index 0000000..55b5dda
--- /dev/null
+++ b/ui/effects/gradient.cpp
@@ -0,0 +1,28 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/effects/gradient.h"
+
+namespace anim {
+
+QColor gradient_color_at(const QGradient &gradient, float64 ratio) {
+	const auto &stops = gradient.stops();
+
+	for (auto i = 1; i < stops.size(); i++) {
+		const auto currentPoint = stops[i].first;
+		const auto previousPoint = stops[i - 1].first;
+
+		if ((ratio <= currentPoint) && (ratio >= previousPoint)) {
+			return anim::color(
+				stops[i - 1].second,
+				stops[i].second,
+				(ratio - previousPoint) / (currentPoint - previousPoint));
+		}
+	}
+	return QColor();
+}
+
+} // namespace anim
diff --git a/ui/effects/gradient.h b/ui/effects/gradient.h
index 1c882f0..ddf6949 100644
--- a/ui/effects/gradient.h
+++ b/ui/effects/gradient.h
@@ -14,6 +14,10 @@
 
 namespace anim {
 
+[[nodiscard]] QColor gradient_color_at(
+	const QGradient &gradient,
+	float64 ratio);
+
 struct gradient_colors {
 	explicit gradient_colors(QColor color) {
 		stops.push_back({ 0., color });

From c25c3e043c2ea4ec5d565d2be3828f4c5d45684b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 20 May 2022 17:10:33 +0400
Subject: [PATCH 101/635] Adapt for XCB::IsSupportedByWM changes

---
 ui/platform/linux/ui_utility_linux.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 51ed21e..1a50f60 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -495,7 +495,9 @@ bool WindowExtentsSupported() {
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 	namespace XCB = base::Platform::XCB;
 	if (::Platform::IsX11()
-		&& XCB::IsSupportedByWM(kXCBFrameExtentsAtomName.utf16())) {
+		&& XCB::IsSupportedByWM(
+			XCB::GetConnectionFromQt(),
+			kXCBFrameExtentsAtomName.utf16())) {
 		return true;
 	}
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION

From 3668ee10854005ccff1289851120ae14052eeedd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 23 May 2022 12:38:42 +0400
Subject: [PATCH 102/635] Remove Pre tag when removing Code tag.

---
 ui/widgets/input_fields.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 0b0c1aa..43a09b4 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -3312,8 +3312,16 @@ void InputField::removeMarkdownTag(
 	auto tags = TagList();
 	for (const auto &existing : current.tags) {
 		const auto id = TextUtilities::TagWithRemoved(existing.id, tag);
-		if (!id.isEmpty()) {
-			tags.push_back({ existing.offset, existing.length, id });
+		const auto additional = (tag == kTagPre)
+			? kTagCode
+			: (tag == kTagCode)
+			? kTagPre
+			: QString();
+		const auto use = additional.isEmpty()
+			? id
+			: TextUtilities::TagWithRemoved(id, additional);
+		if (!use.isEmpty()) {
+			tags.push_back({ existing.offset, existing.length, use });
 		}
 	}
 

From f62e5ce5f622b7e9c39fca458eae23eb952b9e60 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 20 May 2022 22:13:18 +0300
Subject: [PATCH 103/635] Added premium settings icon colors.

---
 ui/colors.palette | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/colors.palette b/ui/colors.palette
index 8f11b42..e5ad475 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -660,3 +660,6 @@ premiumButtonBg1: #55a5ff; // upgrade to premium button gradient 1
 premiumButtonBg2: #a767ff; // upgrade to premium button gradient 2
 premiumButtonBg3: #db5c9d; // upgrade to premium button gradient 3
 premiumButtonFg: #ffffff; // upgrade to premium button text
+
+premiumIconBg1: #f38926; // icon in premium settings gradient 1
+premiumIconBg2: #e44456; // icon in premium settings gradient 2

From 7133ccd2f9e5176334e597cd7727d69faf944868 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 20 May 2022 23:52:20 +0300
Subject: [PATCH 104/635] Added ability to set custom duration of numbers
 animation.

---
 ui/effects/numbers_animation.cpp | 7 ++++++-
 ui/effects/numbers_animation.h   | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/effects/numbers_animation.cpp b/ui/effects/numbers_animation.cpp
index 6f81a75..2a44ac3 100644
--- a/ui/effects/numbers_animation.cpp
+++ b/ui/effects/numbers_animation.cpp
@@ -17,12 +17,17 @@ NumbersAnimation::NumbersAnimation(
 	const style::font &font,
 	Fn<void()> animationCallback)
 : _font(font)
+, _duration(st::slideWrapDuration)
 , _animationCallback(std::move(animationCallback)) {
 	for (auto ch = '0'; ch != '9'; ++ch) {
 		accumulate_max(_digitWidth, _font->m.horizontalAdvance(ch));
 	}
 }
 
+void NumbersAnimation::setDuration(int duration) {
+	_duration = duration;
+}
+
 void NumbersAnimation::setText(const QString &text, int value) {
 	if (_a_ready.animating()) {
 		_delayedText = text;
@@ -82,7 +87,7 @@ void NumbersAnimation::realSetText(QString text, int value) {
 			[this] { animationCallback(); },
 			0.,
 			1.,
-			st::slideWrapDuration);
+			_duration);
 	}
 }
 
diff --git a/ui/effects/numbers_animation.h b/ui/effects/numbers_animation.h
index 49aac7e..c2f3fd3 100644
--- a/ui/effects/numbers_animation.h
+++ b/ui/effects/numbers_animation.h
@@ -25,6 +25,7 @@ public:
 		_widthChangedCallback = std::move(callback);
 	}
 	void setText(const QString &text, int value);
+	void setDuration(int duration);
 	void finishAnimating();
 
 	void paint(QPainter &p, int x, int y, int outerWidth);
@@ -44,6 +45,8 @@ private:
 
 	const style::font &_font;
 
+	int _duration;
+
 	QList<Digit> _digits;
 	int _digitWidth = 0;
 

From 79af7c5523ae59d4dd13cc2bde86bb8611bde11c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 24 May 2022 08:50:24 +0300
Subject: [PATCH 105/635] Added ability to set disable monospace in numbers
 animation.

---
 ui/effects/numbers_animation.cpp | 30 +++++++++++++++++++++++-------
 ui/effects/numbers_animation.h   |  3 +++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/ui/effects/numbers_animation.cpp b/ui/effects/numbers_animation.cpp
index 2a44ac3..cbe0230 100644
--- a/ui/effects/numbers_animation.cpp
+++ b/ui/effects/numbers_animation.cpp
@@ -28,6 +28,10 @@ void NumbersAnimation::setDuration(int duration) {
 	_duration = duration;
 }
 
+void NumbersAnimation::setDisabledMonospace(bool value) {
+	_disabledMonospace = value;
+}
+
 void NumbersAnimation::setText(const QString &text, int value) {
 	if (_a_ready.animating()) {
 		_delayedText = text;
@@ -80,8 +84,13 @@ void NumbersAnimation::realSetText(QString text, int value) {
 			--oldSize;
 		}
 	}
-	_fromWidth = oldSize * _digitWidth;
-	_toWidth = newSize * _digitWidth;
+	if (_disabledMonospace) {
+		_fromWidth = _toWidth;
+		_toWidth = _font->m.horizontalAdvance(text);
+	} else {
+		_fromWidth = oldSize * _digitWidth;
+		_toWidth = newSize * _digitWidth;
+	}
 	if (animating) {
 		_a_ready.start(
 			[this] { animationCallback(); },
@@ -122,30 +131,37 @@ void NumbersAnimation::paint(QPainter &p, int x, int y, int outerWidth) {
 
 	QString singleChar('0');
 	if (style::RightToLeft()) x = outerWidth - x - width;
-	x += width - _digits.size() * _digitWidth;
+	x += width
+		- (_disabledMonospace ? _toWidth : _digits.size() * _digitWidth);
 	auto fromTop = anim::interpolate(0, _font->height, progress) * (_growing ? 1 : -1);
 	auto toTop = anim::interpolate(_font->height, 0, progress) * (_growing ? -1 : 1);
 	for (auto i = 0; i != digitsCount; ++i) {
 		auto &digit = _digits[i];
 		auto from = digit.from;
 		auto to = digit.to;
+		const auto toCharWidth = (!_disabledMonospace || to.isDigit())
+			? _digitWidth
+			: _font->m.horizontalAdvance(to);
+		const auto fromCharWidth = (!_disabledMonospace || from.isDigit())
+			? _digitWidth
+			: _font->m.horizontalAdvance(from);
 		if (from == to) {
 			p.setOpacity(1.);
 			singleChar[0] = from;
-			p.drawText(x + (_digitWidth - digit.fromWidth) / 2, y + _font->ascent, singleChar);
+			p.drawText(x + (toCharWidth - digit.fromWidth) / 2, y + _font->ascent, singleChar);
 		} else {
 			if (from.unicode()) {
 				p.setOpacity(1. - progress);
 				singleChar[0] = from;
-				p.drawText(x + (_digitWidth - digit.fromWidth) / 2, y + fromTop + _font->ascent, singleChar);
+				p.drawText(x + (fromCharWidth - digit.fromWidth) / 2, y + fromTop + _font->ascent, singleChar);
 			}
 			if (to.unicode()) {
 				p.setOpacity(progress);
 				singleChar[0] = to;
-				p.drawText(x + (_digitWidth - digit.toWidth) / 2, y + toTop + _font->ascent, singleChar);
+				p.drawText(x + (toCharWidth - digit.toWidth) / 2, y + toTop + _font->ascent, singleChar);
 			}
 		}
-		x += _digitWidth;
+		x += std::max(toCharWidth, fromCharWidth);
 	}
 	p.setOpacity(1.);
 }
diff --git a/ui/effects/numbers_animation.h b/ui/effects/numbers_animation.h
index c2f3fd3..b18d217 100644
--- a/ui/effects/numbers_animation.h
+++ b/ui/effects/numbers_animation.h
@@ -26,6 +26,7 @@ public:
 	}
 	void setText(const QString &text, int value);
 	void setDuration(int duration);
+	void setDisabledMonospace(bool value);
 	void finishAnimating();
 
 	void paint(QPainter &p, int x, int y, int outerWidth);
@@ -60,6 +61,8 @@ private:
 	int _value = 0;
 	bool _growing = false;
 
+	bool _disabledMonospace = false;
+
 	Fn<void()> _animationCallback;
 	Fn<void()> _widthChangedCallback;
 

From a78089716bf153b4283ec79757268d1047913f12 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 26 May 2022 12:30:14 +0400
Subject: [PATCH 106/635] Allow non-transparent-for-mouse-events toasts.

---
 ui/toast/toast.cpp        | 4 ++++
 ui/toast/toast.h          | 1 +
 ui/toast/toast_widget.cpp | 6 ++++++
 ui/toast/toast_widget.h   | 1 +
 4 files changed, 12 insertions(+)

diff --git a/ui/toast/toast.cpp b/ui/toast/toast.cpp
index b2016ba..5933d0a 100644
--- a/ui/toast/toast.cpp
+++ b/ui/toast/toast.cpp
@@ -87,6 +87,10 @@ void Instance::hide() {
 	_widget->deleteLater();
 }
 
+void Instance::setInputUsed(bool used) {
+	_widget->setInputUsed(used);
+}
+
 not_null<RpWidget*> Instance::widget() const {
 	return _widget.get();
 }
diff --git a/ui/toast/toast.h b/ui/toast/toast.h
index 6c2a67c..2c0a2d5 100644
--- a/ui/toast/toast.h
+++ b/ui/toast/toast.h
@@ -56,6 +56,7 @@ public:
 	void hideAnimated();
 	void hide();
 
+	void setInputUsed(bool used);
 	[[nodiscard]] not_null<RpWidget*> widget() const;
 
 private:
diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index 0081af7..8978989 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -49,6 +49,12 @@ Widget::Widget(QWidget *parent, const Config &config)
 	show();
 }
 
+void Widget::setInputUsed(bool used) {
+	setAttribute(
+		Qt::WA_TransparentForMouseEvents,
+		!used && !_text.hasLinks());
+}
+
 void Widget::onParentResized() {
 	updateGeometry();
 }
diff --git a/ui/toast/toast_widget.h b/ui/toast/toast_widget.h
index 1ec5e97..493e5c5 100644
--- a/ui/toast/toast_widget.h
+++ b/ui/toast/toast_widget.h
@@ -21,6 +21,7 @@ public:
 
 	// shownLevel=1 completely visible, shownLevel=0 completely invisible
 	void setShownLevel(float64 shownLevel);
+	void setInputUsed(bool used);
 
 	void onParentResized();
 

From 060eb63ce86c9df8f6c13a40344fab84cd9a1a38 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 29 May 2022 02:04:38 +0400
Subject: [PATCH 107/635] Get rid of qtextitemint.cpp

All the variables are public, so there's no need to use non-exported constructor
---
 CMakeLists.txt           |  4 ----
 ui/text/qtextitemint.cpp | 48 ----------------------------------------
 ui/text/text.cpp         | 38 ++++++++++++++++++++++++++-----
 3 files changed, 33 insertions(+), 57 deletions(-)
 delete mode 100644 ui/text/qtextitemint.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9df509c..00ef694 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -262,10 +262,6 @@ PRIVATE
     emoji_suggestions/emoji_suggestions_helper.h
 )
 
-if (DESKTOP_APP_USE_PACKAGED)
-    nice_target_sources(lib_ui ${src_loc} PRIVATE ui/text/qtextitemint.cpp)
-endif()
-
 if (NOT DESKTOP_APP_USE_PACKAGED_FONTS)
     nice_target_sources(lib_ui ${src_loc} PRIVATE fonts/fonts.qrc)
 endif()
diff --git a/ui/text/qtextitemint.cpp b/ui/text/qtextitemint.cpp
deleted file mode 100644
index 20e9473..0000000
--- a/ui/text/qtextitemint.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// This file is part of Desktop App Toolkit,
-// a set of libraries for developing nice desktop applications.
-//
-// For license and copyright information please follow this link:
-// https://github.com/desktop-app/legal/blob/master/LEGAL
-//
-#include <private/qtextengine_p.h>
-
-QTextItemInt::QTextItemInt(
-	const QGlyphLayout &g,
-	QFont *font,
-	const QChar *chars_,
-	int numChars,
-	QFontEngine *fe,
-	const QTextCharFormat &format)
-: charFormat(format)
-, num_chars(numChars)
-, chars(chars_)
-, f(font)
-, glyphs(g)
-, fontEngine(fe) {
-}
-
-void QTextItemInt::initWithScriptItem(const QScriptItem &si) {
-	// explicitly initialize flags so that initFontAttributes can be called
-	// multiple times on the same TextItem
-	flags = { };
-	if (si.analysis.bidiLevel %2)
-		flags |= QTextItem::RightToLeft;
-	ascent = si.ascent;
-	descent = si.descent;
-
-	if (charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
-		underlineStyle = charFormat.underlineStyle();
-	} else if (charFormat.boolProperty(QTextFormat::FontUnderline)
-				|| f->d->underline) {
-		underlineStyle = QTextCharFormat::SingleUnderline;
-	}
-
-	// compat
-	if (underlineStyle == QTextCharFormat::SingleUnderline)
-		flags |= QTextItem::Underline;
-
-	if (f->d->overline || charFormat.fontOverline())
-		flags |= QTextItem::Overline;
-	if (f->d->strikeOut || charFormat.fontStrikeOut())
-		flags |= QTextItem::StrikeOut;
-}
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 97c9a0a..06e1073 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -142,6 +142,32 @@ bool IsBad(QChar ch) {
 		|| (Platform::IsMac() && ch == 6158);
 }
 
+void InitTextItemWithScriptItem(QTextItemInt &ti, const QScriptItem &si) {
+	// explicitly initialize flags so that initFontAttributes can be called
+	// multiple times on the same TextItem
+	ti.flags = { };
+	if (si.analysis.bidiLevel %2)
+		ti.flags |= QTextItem::RightToLeft;
+	ti.ascent = si.ascent;
+	ti.descent = si.descent;
+
+	if (ti.charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
+		ti.underlineStyle = ti.charFormat.underlineStyle();
+	} else if (ti.charFormat.boolProperty(QTextFormat::FontUnderline)
+				|| ti.f->underline()) {
+		ti.underlineStyle = QTextCharFormat::SingleUnderline;
+	}
+
+	// compat
+	if (ti.underlineStyle == QTextCharFormat::SingleUnderline)
+		ti.flags |= QTextItem::Underline;
+
+	if (ti.f->overline() || ti.charFormat.fontOverline())
+		ti.flags |= QTextItem::Overline;
+	if (ti.f->strikeOut() || ti.charFormat.fontStrikeOut())
+		ti.flags |= QTextItem::StrikeOut;
+}
+
 } // namespace
 } // namespace Text
 } // namespace Ui
@@ -1706,14 +1732,16 @@ private:
 				}
 				return false;
 			} else if (_p) {
-				QTextCharFormat format;
-				QTextItemInt gf(glyphs.mid(glyphsStart, glyphsEnd - glyphsStart),
-								&_e->fnt, engine.layoutData->string.unicode() + itemStart,
-								itemEnd - itemStart, engine.fontEngine(si), format);
+				QTextItemInt gf;
+				gf.glyphs = glyphs.mid(glyphsStart, glyphsEnd - glyphsStart);
+				gf.f = &_e->fnt;
+				gf.chars = engine.layoutData->string.unicode() + itemStart;
+				gf.num_chars = itemEnd - itemStart;
+				gf.fontEngine = engine.fontEngine(si);
 				gf.logClusters = logClusters + itemStart - si.position;
 				gf.width = itemWidth;
 				gf.justified = false;
-				gf.initWithScriptItem(si);
+				InitTextItemWithScriptItem(gf, si);
 
 				auto hasSelected = false;
 				auto hasNotSelected = true;

From e2304a3c7661228c3b016fa9a47b0f772bb2aeeb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 30 May 2022 14:03:39 +0300
Subject: [PATCH 108/635] Added ability to set pinned items for vertical layout
 reorder.

---
 ui/wrap/vertical_layout_reorder.cpp | 27 +++++++++++++++++++++++++++
 ui/wrap/vertical_layout_reorder.h   | 14 +++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/ui/wrap/vertical_layout_reorder.cpp b/ui/wrap/vertical_layout_reorder.cpp
index a750dfa..a4cc15f 100644
--- a/ui/wrap/vertical_layout_reorder.cpp
+++ b/ui/wrap/vertical_layout_reorder.cpp
@@ -75,6 +75,24 @@ void VerticalLayoutReorder::start() {
 	}
 }
 
+void VerticalLayoutReorder::addPinnedInterval(int from, int length) {
+	_pinnedIntervals.push_back({ from, length });
+}
+
+void VerticalLayoutReorder::clearPinnedIntervals() {
+	_pinnedIntervals.clear();
+}
+
+bool VerticalLayoutReorder::Interval::isIn(int index) const {
+	return (index >= from) && (index < (from + length));
+}
+
+bool VerticalLayoutReorder::isIndexPinned(int index) const {
+	return ranges::any_of(_pinnedIntervals, [&](const Interval &i) {
+		return i.isIn(index);
+	});
+}
+
 void VerticalLayoutReorder::mouseMove(
 		not_null<RpWidget*> widget,
 		QPoint position) {
@@ -105,6 +123,9 @@ void VerticalLayoutReorder::checkForStart(QPoint position) {
 }
 
 void VerticalLayoutReorder::updateOrder(int index, QPoint position) {
+	if (isIndexPinned(index)) {
+		return;
+	}
 	const auto shift = position.y() - _currentStart;
 	auto &current = _entries[index];
 	current.shiftAnimation.stop();
@@ -120,6 +141,9 @@ void VerticalLayoutReorder::updateOrder(int index, QPoint position) {
 	if (shift > 0) {
 		auto top = current.widget->y() - shift;
 		for (auto next = index + 1; next != count; ++next) {
+			if (isIndexPinned(next)) {
+				return;
+			}
 			const auto &entry = _entries[next];
 			top += entry.widget->height();
 			if (currentMiddle < top) {
@@ -137,6 +161,9 @@ void VerticalLayoutReorder::updateOrder(int index, QPoint position) {
 			moveToShift(next, 0);
 		}
 		for (auto prev = index - 1; prev >= 0; --prev) {
+			if (isIndexPinned(prev)) {
+				return;
+			}
 			const auto &entry = _entries[prev];
 			if (currentMiddle >= entry.widget->y() - entry.shift + currentHeight) {
 				moveToShift(prev, 0);
diff --git a/ui/wrap/vertical_layout_reorder.h b/ui/wrap/vertical_layout_reorder.h
index 1b28e76..87875b6 100644
--- a/ui/wrap/vertical_layout_reorder.h
+++ b/ui/wrap/vertical_layout_reorder.h
@@ -36,6 +36,8 @@ public:
 	void start();
 	void cancel();
 	void finishReordering();
+	void addPinnedInterval(int from, int length);
+	void clearPinnedIntervals();
 	[[nodiscard]] rpl::producer<Single> updates() const;
 
 private:
@@ -46,6 +48,12 @@ private:
 		int finalShift = 0;
 		int deltaShift = 0;
 	};
+	struct Interval {
+		[[nodiscard]] bool isIn(int index) const;
+
+		int from = 0;
+		int length = 0;
+	};
 
 	void mouseMove(not_null<RpWidget*> widget, QPoint position);
 	void mousePress(
@@ -66,13 +74,17 @@ private:
 
 	void updateScrollCallback();
 	void checkForScrollAnimation();
-	int deltaFromEdge();
+	[[nodiscard]] int deltaFromEdge();
+
+	[[nodiscard]] bool isIndexPinned(int index) const;
 
 	const not_null<Ui::VerticalLayout*> _layout;
 	Ui::ScrollArea *_scroll = nullptr;
 
 	Ui::Animations::Basic _scrollAnimation;
 
+	std::vector<Interval> _pinnedIntervals;
+
 	RpWidget *_currentWidget = nullptr;
 	int _currentStart = 0;
 	int _currentDesiredIndex = 0;

From 676d8697c6c704c6c5494f03f0bc78d006052768 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 30 May 2022 14:04:26 +0300
Subject: [PATCH 109/635] Added support of locked state to side bar button.

---
 ui/widgets/side_bar_button.cpp | 115 ++++++++++++++++++++++++++++++++-
 ui/widgets/side_bar_button.h   |  11 ++++
 ui/widgets/widgets.style       |   8 +++
 3 files changed, 133 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/side_bar_button.cpp b/ui/widgets/side_bar_button.cpp
index 654be8c..ba31527 100644
--- a/ui/widgets/side_bar_button.cpp
+++ b/ui/widgets/side_bar_button.cpp
@@ -7,6 +7,7 @@
 #include "ui/widgets/side_bar_button.h"
 
 #include "ui/effects/ripple_animation.h"
+#include "styles/style_widgets.h"
 
 #include <QtGui/QtEvents>
 
@@ -14,6 +15,7 @@ namespace Ui {
 namespace {
 
 constexpr auto kMaxLabelLines = 3;
+constexpr auto kPremiumLockedOpacity = 0.6;
 
 } // namespace
 
@@ -23,6 +25,14 @@ SideBarButton::SideBarButton(
 	const style::SideBarButton &st)
 : RippleButton(parent, st.ripple)
 , _st(st)
+, _arcPen(
+	_st.textFg,
+	// Use a divider to get 1.5.
+	st::sideBarButtonLockPenWidth
+		/ float64(st::sideBarButtonLockPenWidthDivider),
+	Qt::SolidLine,
+	Qt::SquareCap,
+	Qt::RoundJoin)
 , _text(_st.minTextWidth) {
 	_text.setText(_st.style, title);
 	setAttribute(Qt::WA_OpaquePaintEvent);
@@ -30,6 +40,7 @@ SideBarButton::SideBarButton(
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
 		_iconCache = _iconCacheActive = QImage();
+		_lock.iconCache = _lock.iconCacheActive = QImage();
 		update();
 	}, lifetime());
 }
@@ -66,6 +77,26 @@ void SideBarButton::setIconOverride(
 	update();
 }
 
+void SideBarButton::setLocked(bool locked) {
+	if (_lock.locked == locked) {
+		return;
+	}
+	_lock.locked = locked;
+	const auto charFiller = QChar('l');
+	const auto count = std::ceil(st::sideBarButtonLockSize.width()
+		/ float(_st.style.font->width(charFiller)));
+	const auto filler = QString().fill(charFiller, count);
+	const auto result = _lock.locked
+		? (filler + _text.toString())
+		: _text.toString().mid(count);
+	_text.setText(_st.style, result);
+	update();
+}
+
+bool SideBarButton::locked() const {
+	return _lock.locked;
+}
+
 int SideBarButton::resizeGetHeight(int newWidth) {
 	auto result = _st.minHeight;
 	const auto text = std::min(
@@ -79,10 +110,15 @@ void SideBarButton::paintEvent(QPaintEvent *e) {
 	auto p = Painter(this);
 	const auto clip = e->rect();
 
-	p.fillRect(clip, _active ? _st.textBgActive : _st.textBg);
+	const auto &bg = _active ? _st.textBgActive : _st.textBg;
+	p.fillRect(clip, bg);
 
 	RippleButton::paintRipple(p, 0, 0);
 
+	if (_lock.locked) {
+		p.setOpacity(kPremiumLockedOpacity);
+	}
+
 	const auto &icon = computeIcon();
 	const auto x = (_st.iconPosition.x() < 0)
 		? (width() - icon.width()) / 2
@@ -127,6 +163,28 @@ void SideBarButton::paintEvent(QPaintEvent *e) {
 			y + (_st.badgeHeight - _st.badgeStyle.font->height) / 2,
 			width());
 	}
+
+	if (_lock.locked) {
+		auto lineWidths = QVector<int>();
+		lineWidths.reserve(kMaxLabelLines);
+		_text.countLineWidths(width() - 2 * _st.textSkip, &lineWidths);
+		if (lineWidths.isEmpty()) {
+			return;
+		}
+		validateLockIconCache();
+
+		const auto &icon = _active ? _lock.iconCacheActive : _lock.iconCache;
+		const auto size = icon.size() / style::DevicePixelRatio();
+		p.translate(
+			(width() - lineWidths.front()) / 2.,
+			_st.textTop + (_st.style.font->height - size.height()) / 2.);
+		p.setOpacity(1.);
+		p.fillRect(QRect(QPoint(), size), bg);
+		p.setOpacity(kPremiumLockedOpacity);
+		p.translate(-_st.style.font->spacew / 2., 0);
+
+		p.drawImage(0, 0, icon);
+	}
 }
 
 const style::icon &SideBarButton::computeIcon() const {
@@ -182,4 +240,59 @@ void SideBarButton::validateIconCache() {
 	(_active ? _iconCacheActive : _iconCache) = std::move(image);
 }
 
+void SideBarButton::validateLockIconCache() {
+	if (!(_active ? _lock.iconCacheActive : _lock.iconCache).isNull()) {
+		return;
+	}
+	const auto &size = st::sideBarButtonLockSize;
+	auto image = QImage(
+		size * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
+	image.setDevicePixelRatio(style::DevicePixelRatio());
+	image.fill(Qt::transparent);
+	{
+		auto p = QPainter(&image);
+		auto hq = PainterHighQualityEnabler(p);
+
+		const auto &arcOffset = st::sideBarButtonLockArcOffset;
+		const auto arcWidth = size.width() - arcOffset * 2;
+		const auto &arcHeight = st::sideBarButtonLockArcHeight;
+
+		const auto blockRectWidth = size.width();
+		const auto blockRectHeight = st::sideBarButtonLockBlockHeight;
+		const auto blockRectTop = size.height() - blockRectHeight;
+
+		const auto blockRect = QRectF(
+			(size.width() - blockRectWidth) / 2,
+			blockRectTop,
+			blockRectWidth,
+			blockRectHeight);
+		const auto lineHeight = -(blockRect.y() - arcHeight)
+			+ _arcPen.width() / 2.;
+
+		p.setPen(Qt::NoPen);
+		p.setBrush(_st.textFg);
+		{
+			p.drawRoundedRect(blockRect, 2, 2);
+		}
+
+		p.translate(size.width() - arcOffset, blockRect.y());
+
+		p.setPen(_arcPen);
+		const auto rLine = QLineF(0, 0, 0, lineHeight);
+		const auto lLine = rLine.translated(-arcWidth, 0);
+		p.drawLine(rLine);
+		p.drawLine(lLine);
+
+		p.drawArc(
+			-arcWidth,
+			-arcHeight - _arcPen.width() / 2.,
+			arcWidth,
+			arcHeight * 2,
+			0,
+			180 * 16);
+	}
+	(_active ? _lock.iconCacheActive : _lock.iconCache) = std::move(image);
+}
+
 } // namespace Ui
diff --git a/ui/widgets/side_bar_button.h b/ui/widgets/side_bar_button.h
index 4bacb17..042d004 100644
--- a/ui/widgets/side_bar_button.h
+++ b/ui/widgets/side_bar_button.h
@@ -29,18 +29,23 @@ public:
 	void setIconOverride(
 		const style::icon *iconOverride,
 		const style::icon *iconOverrideActive = nullptr);
+	void setLocked(bool locked);
 
 	int resizeGetHeight(int newWidth) override;
 
+	[[nodiscard]] bool locked() const;
+
 private:
 	void paintEvent(QPaintEvent *e) override;
 
 	[[nodiscard]] const style::icon &computeIcon() const;
 	void validateIconCache();
+	void validateLockIconCache();
 
 	const style::SideBarButton &_st;
 	const style::icon *_iconOverride = nullptr;
 	const style::icon *_iconOverrideActive = nullptr;
+	const QPen _arcPen;
 	Ui::Text::String _text;
 	Ui::Text::String _badge;
 	QImage _iconCache;
@@ -49,6 +54,12 @@ private:
 	bool _active = false;
 	bool _badgeMuted = false;
 
+	struct {
+		bool locked = false;
+		QImage iconCache;
+		QImage iconCacheActive;
+	} _lock;
+
 };
 //
 //class SideBarMenu final {
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index ce1032e..ac33b07 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1559,3 +1559,11 @@ callShadow: Shadow {
 	extend: margins(9px, 8px, 9px, 10px);
 	fallback: windowShadowFgFallback;
 }
+
+sideBarButtonLockArcOffset: 2px;
+sideBarButtonLockSize: size(9px, 10px);
+sideBarButtonLockArcHeight: 3px;
+sideBarButtonLockBlockHeight: 5px;
+sideBarButtonLockLineHeight: 1px;
+sideBarButtonLockPenWidth: 3px;
+sideBarButtonLockPenWidthDivider: 2;

From e1ec6a38beae8f90202b8bfa5a247e8f286b810f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 May 2022 17:05:22 +0400
Subject: [PATCH 110/635] Allow clickable links in Ui::Checkbox texts.

---
 ui/widgets/checkbox.cpp | 60 ++++++++++++++++++++++++++++++++++++++++-
 ui/widgets/checkbox.h   |  9 ++++++-
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 9469dc0..6bfe533 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -486,6 +486,9 @@ Checkbox::Checkbox(
 				std::move(value),
 				_checkboxRichOptions);
 			resizeToText();
+			if (_text.hasLinks()) {
+				setMouseTracking(true);
+			}
 			update();
 		}
 	}, lifetime());
@@ -689,6 +692,59 @@ void Checkbox::paintEvent(QPaintEvent *e) {
 	}
 }
 
+void Checkbox::mousePressEvent(QMouseEvent *e) {
+	RippleButton::mousePressEvent(e);
+	ClickHandler::pressed();
+}
+
+void Checkbox::mouseMoveEvent(QMouseEvent *e) {
+	RippleButton::mouseMoveEvent(e);
+	const auto state = getTextState(e->pos());
+	if (state.link != ClickHandler::getActive()) {
+		ClickHandler::setActive(state.link, this);
+		update();
+	}
+}
+
+void Checkbox::mouseReleaseEvent(QMouseEvent *e) {
+	if (auto activated = _activatingHandler = ClickHandler::unpressed()) {
+		const auto button = e->button();
+		crl::on_main(this, [=] {
+			const auto guard = window();
+			ActivateClickHandler(guard, activated, button);
+		});
+	}
+	RippleButton::mouseReleaseEvent(e);
+	_activatingHandler = nullptr;
+}
+
+void Checkbox::leaveEventHook(QEvent *e) {
+	RippleButton::leaveEventHook(e);
+	ClickHandler::clearActive(this);
+}
+
+Text::StateResult Checkbox::getTextState(const QPoint &m) const {
+	if (!(_checkAlignment & Qt::AlignLeft)) {
+		return {};
+	}
+	const auto check = checkRect();
+	const auto textSkip = _st.checkPosition.x()
+		+ check.width()
+		+ _st.textPosition.x();
+	const auto availableTextWidth = std::max(width() - textSkip, 1);
+	const auto textTop = _st.margin.top() + _st.textPosition.y();
+	return !_allowTextLines
+		? _text.getStateElided(
+			m - QPoint(textSkip, textTop),
+			availableTextWidth,
+			{})
+		: _text.getStateElidedLeft(
+			m - QPoint(textSkip, textTop),
+			availableTextWidth,
+			width(),
+			{});
+}
+
 QPixmap Checkbox::grabCheckCache() const {
 	auto checkSize = _check->getSize();
 	auto image = QImage(
@@ -724,7 +780,9 @@ void Checkbox::onStateChanged(State was, StateChangeSource source) {
 }
 
 void Checkbox::handlePress() {
-	setChecked(!checked());
+	if (!_activatingHandler) {
+		setChecked(!checked());
+	}
 }
 
 int Checkbox::resizeGetHeight(int newWidth) {
diff --git a/ui/widgets/checkbox.h b/ui/widgets/checkbox.h
index 9ffe452..bc06065 100644
--- a/ui/widgets/checkbox.h
+++ b/ui/widgets/checkbox.h
@@ -132,7 +132,7 @@ private:
 
 };
 
-class Checkbox : public RippleButton {
+class Checkbox : public RippleButton, public ClickHandlerHost {
 public:
 	Checkbox(
 		QWidget *parent,
@@ -210,6 +210,11 @@ public:
 protected:
 	void paintEvent(QPaintEvent *e) override;
 
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+
 	void onStateChanged(State was, StateChangeSource source) override;
 	int resizeGetHeight(int newWidth) override;
 
@@ -222,10 +227,12 @@ private:
 	void resizeToText();
 	QPixmap grabCheckCache() const;
 	int countTextMinWidth() const;
+	Text::StateResult getTextState(const QPoint &m) const;
 
 	const style::Checkbox &_st;
 	std::unique_ptr<AbstractCheckView> _check;
 	rpl::event_stream<bool> _checkedChanges;
+	ClickHandlerPtr _activatingHandler;
 	QPixmap _checkCache;
 
 	style::align _checkAlignment = style::al_left;

From a812ae65a4ce68f4b7fd8c4b74c950e18d984cea Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 19 May 2022 15:43:44 +0400
Subject: [PATCH 111/635] Get rid of private QHighDpi usage

---
 ui/platform/linux/ui_utility_linux.cpp | 20 ++++++++++----
 ui/platform/mac/ui_utility_mac.mm      | 10 +++----
 ui/platform/win/ui_utility_win.cpp     | 38 ++++++++++++++++++++------
 ui/ui_utility.cpp                      | 24 ++++++++--------
 4 files changed, 59 insertions(+), 33 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 1a50f60..eebd63a 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -208,7 +208,7 @@ std::optional<uint> XCBWindowWorkspace(xcb_window_t window) {
 std::optional<bool> XCBIsOverlapped(
 		not_null<QWidget*> widget,
 		const QRect &rect) {
-	const auto window = widget->window()->winId();
+	const auto window = widget->winId();
 	Expects(window != XCB_WINDOW_NONE);
 
 	const auto connection = base::Platform::XCB::GetConnectionFromQt();
@@ -221,11 +221,8 @@ std::optional<bool> XCBIsOverlapped(
 		return std::nullopt;
 	}
 
-	const auto windowWorkspace = XCBWindowWorkspace(
-		window);
-
+	const auto windowWorkspace = XCBWindowWorkspace(window);
 	const auto currentWorkspace = XCBCurrentWorkspace();
-
 	if (windowWorkspace.has_value()
 		&& currentWorkspace.has_value()
 		&& *windowWorkspace != *currentWorkspace
@@ -233,6 +230,17 @@ std::optional<bool> XCBIsOverlapped(
 		return true;
 	}
 
+	const auto windowGeometry = XCBWindowGeometry(window);
+	if (windowGeometry.isNull()) {
+		return std::nullopt;
+	}
+
+	const auto mappedRect = QRect(
+		rect.topLeft()
+			* widget->devicePixelRatioF()
+			+ windowGeometry.topLeft(),
+		rect.size() * widget->devicePixelRatioF());
+
 	const auto cookie = xcb_query_tree(connection, *root);
 	const auto reply = base::Platform::XCB::MakeReplyPointer(
 		xcb_query_tree_reply(connection, cookie, nullptr));
@@ -255,7 +263,7 @@ std::optional<bool> XCBIsOverlapped(
 		}
 
 		const auto geometry = XCBWindowGeometry(tree[i]);
-		if (!rect.intersects(geometry)) {
+		if (!mappedRect.intersects(geometry)) {
 			continue;
 		}
 
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 1948349..737a992 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -103,18 +103,16 @@ void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio) {
 std::optional<bool> IsOverlapped(
 		not_null<QWidget*> widget,
 		const QRect &rect) {
-	NSWindow *window = [reinterpret_cast<NSView*>(widget->window()->winId()) window];
+	NSWindow *window = [reinterpret_cast<NSView*>(widget->winId()) window];
 	Assert(window != nullptr);
 
 	if (![window isOnActiveSpace]) {
 		return true;
 	}
 
-	const auto nativeRect = CGRectMake(
-		rect.x(),
-		rect.y(),
-		rect.width(),
-		rect.height());
+	const auto nativeRect = QRect(
+		widget->mapToGlobal(rect.topLeft()),
+		rect.size()).toCGRect();
 
 	CGWindowID windowId = (CGWindowID)[window windowNumber];
 	const CGWindowListOption options = kCGWindowListExcludeDesktopElements
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 034299f..15337e1 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -53,7 +53,7 @@ void IgnoreAllActivation(not_null<QWidget*> widget) {
 std::optional<bool> IsOverlapped(
 		not_null<QWidget*> widget,
 		const QRect &rect) {
-	const auto handle = reinterpret_cast<HWND>(widget->window()->winId());
+	const auto handle = HWND(widget->winId());
 	Expects(handle != nullptr);
 
 	ComPtr<IVirtualDesktopManager> virtualDesktopManager;
@@ -73,14 +73,36 @@ std::optional<bool> IsOverlapped(
 		}
 	}
 
-	std::vector<HWND> visited;
-	const RECT nativeRect{
-		rect.left(),
-		rect.top(),
-		rect.right(),
-		rect.bottom(),
-	};
+	const auto nativeRect = [&] {
+		const auto topLeft = [&] {
+			const auto qpoints = rect.topLeft()
+				* widget->devicePixelRatioF();
+			POINT result{
+				qpoints.x(),
+				qpoints.y(),
+			};
+			ClientToScreen(handle, &result);
+			return result;
+		}();
+		const auto bottomRight = [&] {
+			const auto qpoints = rect.bottomRight()
+				* widget->devicePixelRatioF();
+			POINT result{
+				qpoints.x(),
+				qpoints.y(),
+			};
+			ClientToScreen(handle, &result);
+			return result;
+		}();
+		return RECT{
+			topLeft.x,
+			topLeft.y,
+			bottomRight.x,
+			bottomRight.y,
+		};
+	}();
 
+	std::vector<HWND> visited;
 	for (auto curHandle = handle;
 		curHandle != nullptr && !ranges::contains(visited, curHandle);
 		curHandle = GetWindow(curHandle, GW_HWNDPREV)) {
diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp
index 1086704..3e36a29 100644
--- a/ui/ui_utility.cpp
+++ b/ui/ui_utility.cpp
@@ -14,8 +14,6 @@
 #include <QtGui/QtEvents>
 #include <QWheelEvent>
 
-#include <private/qhighdpiscaling_p.h>
-
 #include <array>
 
 namespace Ui {
@@ -193,18 +191,18 @@ bool IsContentVisible(
 			return false;
 		}
 
-		const auto mappedRect = QHighDpi::toNativePixels(
-			rect.isNull()
-				? QRect(
-					widget->mapToGlobal(QPoint()),
-					widget->mapToGlobal(
-						QPoint(widget->width(), widget->height())))
-				: QRect(
-					widget->mapToGlobal(rect.topLeft()),
-					widget->mapToGlobal(rect.bottomRight())),
-			widget->window()->windowHandle());
+		const auto mappedRect = rect.isNull()
+			? QRect(
+				widget->mapTo(widget->window(), QPoint()),
+				widget->size())
+			: QRect(
+				widget->mapTo(widget->window(), rect.topLeft()),
+				rect.size());
+
+		const auto overlapped = Platform::IsOverlapped(
+			widget->window(),
+			mappedRect);
 
-		const auto overlapped = Platform::IsOverlapped(widget, mappedRect);
 		return overlapped.has_value() && !*overlapped;
 	}();
 

From 549edbe5c7a4294649fd8c890561b2dc647f830a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 26 May 2022 17:05:19 +0400
Subject: [PATCH 112/635] Make DisableSystemWindowResize consistent with
 getting winId on macOS

---
 ui/platform/mac/ui_utility_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 737a992..09147a7 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -92,7 +92,7 @@ void IgnoreAllActivation(not_null<QWidget*> widget) {
 }
 
 void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio) {
-	const auto winId = widget->window()->winId();
+	const auto winId = widget->winId();
 	if (const auto view = reinterpret_cast<NSView*>(winId)) {
 		if (const auto window = [view window]) {
 			window.styleMask &= ~NSWindowStyleMaskResizable;

From b9a702f6e0aaf2a4e0c006a264a23d1f38347fb8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 1 Jun 2022 08:19:14 +0300
Subject: [PATCH 113/635] Added masked shadow corners for special layers.

---
 CMakeLists.txt                             |  2 +
 ui/cached_special_layer_shadow_corners.cpp | 71 +++++++++++++++++
 ui/cached_special_layer_shadow_corners.h   | 13 ++++
 ui/layers/layer_widget.cpp                 | 17 +----
 ui/widgets/shadow.cpp                      | 89 ++++++++++++++++++----
 ui/widgets/shadow.h                        |  8 ++
 6 files changed, 172 insertions(+), 28 deletions(-)
 create mode 100644 ui/cached_special_layer_shadow_corners.cpp
 create mode 100644 ui/cached_special_layer_shadow_corners.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00ef694..6d1ddab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,6 +227,8 @@ PRIVATE
     ui/abstract_button.h
     ui/basic_click_handlers.cpp
     ui/basic_click_handlers.h
+    ui/cached_special_layer_shadow_corners.cpp
+    ui/cached_special_layer_shadow_corners.h
     ui/click_handler.cpp
     ui/click_handler.h
     ui/delayed_activation.cpp
diff --git a/ui/cached_special_layer_shadow_corners.cpp b/ui/cached_special_layer_shadow_corners.cpp
new file mode 100644
index 0000000..c60c359
--- /dev/null
+++ b/ui/cached_special_layer_shadow_corners.cpp
@@ -0,0 +1,71 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/cached_special_layer_shadow_corners.h"
+
+#include "ui/effects/ripple_animation.h"
+#include "styles/style_layers.h"
+
+namespace Ui {
+namespace {
+
+[[nodiscard]] std::array<QImage, 4> PrepareSpecialLayerShadowCorners() {
+	const auto &st = st::boxRoundShadow;
+
+	const auto s = QSize(
+		st::boxRadius * 2 + st.extend.left(),
+		st::boxRadius * 2 + st.extend.right());
+	const auto mask = Ui::RippleAnimation::maskByDrawer(s, false, [&](
+			QPainter &p) {
+		p.drawRoundedRect(QRect(QPoint(), s), st::boxRadius, st::boxRadius);
+	});
+	struct Corner {
+		const style::icon &icon;
+		QPoint factor;
+	};
+	const auto corners = std::vector<Corner>{
+		Corner{ st.topLeft, QPoint(1, 1) },
+		Corner{ st.bottomLeft, QPoint(1, 0) },
+		Corner{ st.topRight, QPoint(0, 1) },
+		Corner{ st.bottomRight, QPoint(0, 0) },
+	};
+	const auto processCorner = [&](int i) {
+		const auto &corner = corners[i];
+		auto result = QImage(
+			corner.icon.size() * style::DevicePixelRatio(),
+			QImage::Format_ARGB32_Premultiplied);
+		result.setDevicePixelRatio(style::DevicePixelRatio());
+		result.fill(Qt::transparent);
+
+		{
+			QPainter p(&result);
+			corner.icon.paint(p, 0, 0, corner.icon.width());
+			p.setCompositionMode(QPainter::CompositionMode_DestinationOut);
+			p.drawImage(
+				corner.icon.width() * corner.factor.x()
+					- mask.width() / style::DevicePixelRatio() / 2,
+				corner.icon.height() * corner.factor.y()
+					- mask.height() / style::DevicePixelRatio() / 2,
+				mask);
+		}
+		return result;
+	};
+	return std::array<QImage, 4>{ {
+		processCorner(0),
+		processCorner(1),
+		processCorner(2),
+		processCorner(3),
+	} };
+}
+
+} // namespace
+
+const std::array<QImage, 4> &SpecialLayerShadowCorners() {
+	static const auto custom = PrepareSpecialLayerShadowCorners();
+	return custom;
+}
+
+} // namespace Ui
diff --git a/ui/cached_special_layer_shadow_corners.h b/ui/cached_special_layer_shadow_corners.h
new file mode 100644
index 0000000..10955d4
--- /dev/null
+++ b/ui/cached_special_layer_shadow_corners.h
@@ -0,0 +1,13 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+namespace Ui {
+
+[[nodiscard]] const std::array<QImage, 4> &SpecialLayerShadowCorners();
+
+} // namespace Ui
diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 2b5731d..5f07694 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -6,6 +6,7 @@
 //
 #include "ui/layers/layer_widget.h"
 
+#include "ui/cached_special_layer_shadow_corners.h"
 #include "ui/layers/box_layer_widget.h"
 #include "ui/widgets/shadow.h"
 #include "ui/image/image_prepare.h"
@@ -21,7 +22,7 @@ namespace Ui {
 
 class LayerStackWidget::BackgroundWidget : public TWidget {
 public:
-	explicit BackgroundWidget(QWidget *parent);
+	using TWidget::TWidget;
 
 	void setDoneCallback(Fn<void()> callback) {
 		_doneCallback = std::move(callback);
@@ -63,7 +64,6 @@ private:
 	int _mainMenuCacheWidth = 0;
 	QPixmap _specialLayerCache;
 	QPixmap _layerCache;
-	RoundRect _roundRect;
 
 	Fn<void()> _doneCallback;
 
@@ -84,11 +84,6 @@ private:
 
 };
 
-LayerStackWidget::BackgroundWidget::BackgroundWidget(QWidget *parent)
-: TWidget(parent)
-, _roundRect(st::boxRadius, st::boxBg) {
-}
-
 void LayerStackWidget::BackgroundWidget::setCacheImages(
 		QPixmap &&bodyCache,
 		QPixmap &&mainMenuCache,
@@ -262,15 +257,9 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) {
 		if (topCorners || bottomCorners) {
 			p.setClipRegion(QRegion(rect()) - specialLayerBox.marginsRemoved(QMargins(st::boxRadius, 0, st::boxRadius, 0)) - specialLayerBox.marginsRemoved(QMargins(0, st::boxRadius, 0, st::boxRadius)));
 		}
-		Ui::Shadow::paint(p, specialLayerBox, width(), st::boxRoundShadow, sides);
-
+		Ui::Shadow::paint(p, specialLayerBox, width(), st::boxRoundShadow, sides, Ui::SpecialLayerShadowCorners());
 		if (topCorners || bottomCorners) {
-			// In case of painting the shadow above the special layer we get
-			// glitches in the corners, so we need to paint the corners once more.
 			p.setClipping(false);
-			auto parts = (topCorners ? (RectPart::TopLeft | RectPart::TopRight) : RectPart::None)
-				| (bottomCorners ? (RectPart::BottomLeft | RectPart::BottomRight) : RectPart::None);
-			_roundRect.paint(p, specialLayerBox, parts);
 		}
 	}
 
diff --git a/ui/widgets/shadow.cpp b/ui/widgets/shadow.cpp
index 08198a8..6d790ec 100644
--- a/ui/widgets/shadow.cpp
+++ b/ui/widgets/shadow.cpp
@@ -14,22 +14,42 @@
 #include <QtGui/QtEvents>
 
 namespace Ui {
+namespace {
 
-PlainShadow::PlainShadow(QWidget *parent)
-: PlainShadow(parent, st::shadowFg) {
-}
+struct CustomShadowCorners {
+	struct Image {
+	public:
+		Image(const QImage &image)
+		: _image(image) {
+		}
+		void paint(QPainter &p, int x, int y, int outerw) const {
+			p.drawImage(x, y, _image);
+		}
+		[[nodiscard]] bool empty() const {
+			return _image.isNull();
+		}
+		[[nodiscard]] int width() const {
+			return _image.width() / style::DevicePixelRatio();
+		}
+		[[nodiscard]] int height() const {
+			return _image.height() / style::DevicePixelRatio();
+		}
+	private:
+		const QImage &_image;
+	};
+	const style::icon &left;
+	Image topLeft;
+	const style::icon &top;
+	Image topRight;
+	const style::icon &right;
+	Image bottomRight;
+	const style::icon &bottom;
+	Image bottomLeft;
+	const style::margins &extend;
+};
 
-PlainShadow::PlainShadow(QWidget *parent, style::color color)
-: RpWidget(parent)
-, _color(color) {
-	resize(st::lineWidth, st::lineWidth);
-}
-
-void PlainShadow::paintEvent(QPaintEvent *e) {
-	QPainter(this).fillRect(e->rect(), _color);
-}
-
-void Shadow::paint(QPainter &p, const QRect &box, int outerWidth, const style::Shadow &st, RectParts sides) {
+template <typename Shadow>
+void ShadowPaint(QPainter &p, const QRect &box, int outerWidth, const Shadow &st, RectParts sides) {
 	auto left = (sides & RectPart::Left);
 	auto top = (sides & RectPart::Top);
 	auto right = (sides & RectPart::Right);
@@ -84,6 +104,47 @@ void Shadow::paint(QPainter &p, const QRect &box, int outerWidth, const style::S
 	}
 }
 
+} // namespace
+
+PlainShadow::PlainShadow(QWidget *parent)
+: PlainShadow(parent, st::shadowFg) {
+}
+
+PlainShadow::PlainShadow(QWidget *parent, style::color color)
+: RpWidget(parent)
+, _color(color) {
+	resize(st::lineWidth, st::lineWidth);
+}
+
+void PlainShadow::paintEvent(QPaintEvent *e) {
+	QPainter(this).fillRect(e->rect(), _color);
+}
+
+void Shadow::paint(QPainter &p, const QRect &box, int outerWidth, const style::Shadow &st, RectParts sides) {
+	ShadowPaint<style::Shadow>(p, box, outerWidth, st, std::move(sides));
+}
+
+void Shadow::paint(
+		QPainter &p,
+		const QRect &box,
+		int outerWidth,
+		const style::Shadow &st,
+		RectParts sides,
+		const std::array<QImage, 4> &corners) {
+	const auto shadow = CustomShadowCorners{
+		.left = st.left,
+		.topLeft = CustomShadowCorners::Image(corners[0]),
+		.top = st.top,
+		.topRight = CustomShadowCorners::Image(corners[2]),
+		.right = st.right,
+		.bottomRight = CustomShadowCorners::Image(corners[3]),
+		.bottom = st.bottom,
+		.bottomLeft = CustomShadowCorners::Image(corners[1]),
+		.extend = st.extend,
+	};
+	ShadowPaint<CustomShadowCorners>(p, box, outerWidth, shadow, std::move(sides));
+}
+
 QPixmap Shadow::grab(
 		not_null<TWidget*> target,
 		const style::Shadow &shadow,
diff --git a/ui/widgets/shadow.h b/ui/widgets/shadow.h
index c6709af..b2ee435 100644
--- a/ui/widgets/shadow.h
+++ b/ui/widgets/shadow.h
@@ -46,6 +46,14 @@ public:
 		const style::Shadow &st,
 		RectParts sides = RectPart::AllSides);
 
+	static void paint(
+		QPainter &p,
+		const QRect &box,
+		int outerWidth,
+		const style::Shadow &st,
+		RectParts sides,
+		const std::array<QImage, 4> &corners);
+
 	static QPixmap grab(
 		not_null<TWidget*> target,
 		const style::Shadow &shadow,

From b802516ca73c9b20103b5e98d940490dfcc7fea8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 Jun 2022 17:25:56 +0400
Subject: [PATCH 114/635] Allow DividerLabel with only top / bottom part.

---
 ui/widgets/box_content_divider.cpp | 15 +++++++++++----
 ui/widgets/box_content_divider.h   |  9 +++++----
 ui/widgets/labels.cpp              | 11 +++++++++++
 ui/widgets/labels.h                |  9 ++++++---
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/ui/widgets/box_content_divider.cpp b/ui/widgets/box_content_divider.cpp
index abb4acf..dcd1b4d 100644
--- a/ui/widgets/box_content_divider.cpp
+++ b/ui/widgets/box_content_divider.cpp
@@ -25,17 +25,24 @@ BoxContentDivider::BoxContentDivider(QWidget *parent, int height)
 BoxContentDivider::BoxContentDivider(
 	QWidget *parent,
 	int height,
-	const style::color &bg)
+	const style::color &bg,
+	RectParts parts)
 : RpWidget(parent)
-, _bg(bg) {
+, _bg(bg)
+, _parts(parts) {
 	resize(width(), height);
 }
 
 void BoxContentDivider::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
+
 	p.fillRect(e->rect(), _bg);
-	paintTop(p);
-	paintBottom(p);
+	if (_parts & RectPart::Top) {
+		paintTop(p);
+	}
+	if (_parts & RectPart::Bottom) {
+		paintBottom(p);
+	}
 }
 
 void BoxContentDivider::paintTop(QPainter &p) {
diff --git a/ui/widgets/box_content_divider.h b/ui/widgets/box_content_divider.h
index d46d09c..242d81d 100644
--- a/ui/widgets/box_content_divider.h
+++ b/ui/widgets/box_content_divider.h
@@ -7,19 +7,19 @@
 #pragma once
 
 #include "ui/rp_widget.h"
+#include "ui/rect_part.h"
 
 namespace Ui {
 
 class BoxContentDivider : public Ui::RpWidget {
 public:
 	BoxContentDivider(QWidget *parent);
-	BoxContentDivider(
-		QWidget *parent,
-		int height);
+	BoxContentDivider(QWidget *parent, int height);
 	BoxContentDivider(
 		QWidget *parent,
 		int height,
-		const style::color &bg);
+		const style::color &bg,
+		RectParts parts = RectPart::Top | RectPart::Bottom);
 
 	[[nodiscard]] const style::color &color() const;
 
@@ -31,6 +31,7 @@ protected:
 
 private:
 	const style::color &_bg;
+	const RectParts _parts;
 
 };
 
diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 99f2ddf..08d696e 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -14,6 +14,8 @@
 #include "ui/basic_click_handlers.h" // UrlClickHandler
 #include "ui/inactive_press.h"
 #include "base/qt/qt_common_adapters.h"
+#include "styles/style_layers.h"
+#include "styles/palette.h"
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QClipboard>
@@ -903,6 +905,15 @@ void FlatLabel::paintEvent(QPaintEvent *e) {
 	}
 }
 
+DividerLabel::DividerLabel(
+	QWidget *parent,
+	object_ptr<FlatLabel> &&child,
+	const style::margins &padding,
+	RectParts parts)
+: PaddingWrap(parent, std::move(child), padding)
+, _background(this, st::boxDividerHeight, st::boxDividerBg, parts) {
+}
+
 int DividerLabel::naturalWidth() const {
 	return -1;
 }
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index a63db89..294101e 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -247,7 +247,11 @@ private:
 
 class DividerLabel : public PaddingWrap<FlatLabel> {
 public:
-	using PaddingWrap::PaddingWrap;
+	DividerLabel(
+		QWidget *parent,
+		object_ptr<FlatLabel> &&child,
+		const style::margins &padding,
+		RectParts parts = RectPart::Top | RectPart::Bottom);
 
 	int naturalWidth() const override;
 
@@ -255,8 +259,7 @@ protected:
 	void resizeEvent(QResizeEvent *e) override;
 
 private:
-	object_ptr<BoxContentDivider> _background
-		= object_ptr<BoxContentDivider>(this);
+	object_ptr<BoxContentDivider> _background;
 
 };
 

From 6ae122f1b27332a27316892dada6050e2f225ad8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 Jun 2022 18:05:09 +0400
Subject: [PATCH 115/635] Move Ui::Menu::MenuCallback and st::menuWithIcons
 here.

---
 CMakeLists.txt                                |  4 ++
 ui/layers/layers.style                        |  9 +++
 ui/widgets/menu/menu_add_action_callback.cpp  | 29 +++++++++
 ui/widgets/menu/menu_add_action_callback.h    | 41 ++++++++++++
 .../menu/menu_add_action_callback_factory.cpp | 46 ++++++++++++++
 .../menu/menu_add_action_callback_factory.h   | 23 +++++++
 ui/widgets/separate_panel.cpp                 | 62 ++++++++++++++++++-
 ui/widgets/separate_panel.h                   | 16 ++++-
 ui/widgets/widgets.style                      | 26 ++++++++
 9 files changed, 250 insertions(+), 6 deletions(-)
 create mode 100644 ui/widgets/menu/menu_add_action_callback.cpp
 create mode 100644 ui/widgets/menu/menu_add_action_callback.h
 create mode 100644 ui/widgets/menu/menu_add_action_callback_factory.cpp
 create mode 100644 ui/widgets/menu/menu_add_action_callback_factory.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d1ddab..82084a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,6 +188,10 @@ PRIVATE
     ui/widgets/menu/menu.h
     ui/widgets/menu/menu_action.cpp
     ui/widgets/menu/menu_action.h
+    ui/widgets/menu/menu_add_action_callback.cpp
+    ui/widgets/menu/menu_add_action_callback.h
+    ui/widgets/menu/menu_add_action_callback_factory.cpp
+    ui/widgets/menu/menu_add_action_callback_factory.h
     ui/widgets/menu/menu_common.cpp
     ui/widgets/menu/menu_common.h
     ui/widgets/menu/menu_item_base.cpp
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 75675c1..b8824e9 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -170,6 +170,15 @@ separatePanelClose: IconButton(boxTitleClose) {
 		color: windowBgOver;
 	}
 }
+separatePanelMenu: IconButton(separatePanelClose) {
+	width: 44px;
+
+	icon: icon {{ "title_menu_dots", boxTitleCloseFg }};
+	iconOver: icon {{ "title_menu_dots", boxTitleCloseFgOver }};
+
+	rippleAreaPosition: point(0px, 8px);
+}
+separatePanelMenuPosition: point(0px, 52px);
 separatePanelTitleFont: font(18px semibold);
 separatePanelTitle: FlatLabel(defaultFlatLabel) {
 	textFg: boxTitleFg;
diff --git a/ui/widgets/menu/menu_add_action_callback.cpp b/ui/widgets/menu/menu_add_action_callback.cpp
new file mode 100644
index 0000000..81a9acb
--- /dev/null
+++ b/ui/widgets/menu/menu_add_action_callback.cpp
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/menu/menu_add_action_callback.h"
+
+#include "ui/style/style_core.h"
+
+namespace Ui::Menu {
+
+MenuCallback::MenuCallback(MenuCallback::Callback callback)
+: _callback(std::move(callback)) {
+}
+
+QAction *MenuCallback::operator()(Args &&args) const {
+	return _callback(std::move(args));
+}
+
+QAction *MenuCallback::operator()(
+		const QString &text,
+		Fn<void()> handler,
+		const style::icon *icon) const {
+	return _callback({ text, std::move(handler), icon, nullptr });
+}
+
+} // namespace Ui::Menu
diff --git a/ui/widgets/menu/menu_add_action_callback.h b/ui/widgets/menu/menu_add_action_callback.h
new file mode 100644
index 0000000..368c066
--- /dev/null
+++ b/ui/widgets/menu/menu_add_action_callback.h
@@ -0,0 +1,41 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/style/style_core.h"
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Ui::Menu {
+
+struct MenuCallback final {
+public:
+	struct Args {
+		QString text;
+		Fn<void()> handler;
+		const style::icon *icon;
+		Fn<void(not_null<Ui::PopupMenu*>)> fillSubmenu;
+		bool isSeparator = false;
+		bool isAttention = false;
+	};
+	using Callback = Fn<QAction*(Args&&)>;
+
+	explicit MenuCallback(Callback callback);
+
+	QAction *operator()(Args &&args) const;
+	QAction *operator()(
+		const QString &text,
+		Fn<void()> handler,
+		const style::icon *icon) const;
+private:
+	Callback _callback;
+};
+
+} // namespace Ui::Menu
diff --git a/ui/widgets/menu/menu_add_action_callback_factory.cpp b/ui/widgets/menu/menu_add_action_callback_factory.cpp
new file mode 100644
index 0000000..443fa45
--- /dev/null
+++ b/ui/widgets/menu/menu_add_action_callback_factory.cpp
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
+
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_action.h"
+#include "ui/widgets/popup_menu.h"
+#include "styles/style_widgets.h"
+
+namespace Ui::Menu {
+
+MenuCallback CreateAddActionCallback(
+		const base::unique_qptr<Ui::PopupMenu> &menu) {
+	return MenuCallback([&](MenuCallback::Args a) {
+		if (a.fillSubmenu) {
+			const auto action = menu->addAction(
+				a.text,
+				std::move(a.handler),
+				a.icon);
+			// Dummy menu.
+			action->setMenu(Ui::CreateChild<QMenu>(menu->menu().get()));
+			a.fillSubmenu(menu->ensureSubmenu(action));
+			return action;
+		} else if (a.isSeparator) {
+			return menu->addSeparator();
+		} else if (a.isAttention) {
+			return menu->addAction(base::make_unique_q<Ui::Menu::Action>(
+				menu,
+				st::menuWithIconsAttention,
+				Ui::Menu::CreateAction(
+					menu->menu().get(),
+					a.text,
+					std::move(a.handler)),
+				a.icon,
+				a.icon));
+		}
+		return menu->addAction(a.text, std::move(a.handler), a.icon);
+	});
+}
+
+} // namespace Ui::Menu
diff --git a/ui/widgets/menu/menu_add_action_callback_factory.h b/ui/widgets/menu/menu_add_action_callback_factory.h
new file mode 100644
index 0000000..3d9b37a
--- /dev/null
+++ b/ui/widgets/menu/menu_add_action_callback_factory.h
@@ -0,0 +1,23 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/unique_qptr.h"
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Ui::Menu {
+
+struct MenuCallback;
+
+[[nodiscard]] MenuCallback CreateAddActionCallback(
+	const base::unique_qptr<Ui::PopupMenu> &menu);
+
+} // namespace Ui::Menu
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 8f916ea..893c287 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -10,16 +10,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/toasts/common_toasts.h"
-#include "ui/widgets/tooltip.h"
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/layers/layer_widget.h"
+#include "base/debug_log.h"
 #include "styles/style_widgets.h"
 #include "styles/style_layers.h"
 #include "styles/palette.h"
-#include "base/debug_log.h"
 
 #include <QtGui/QWindow>
 #include <QtGui/QScreen>
@@ -70,7 +73,8 @@ void SeparatePanel::initControls() {
 void SeparatePanel::updateTitleGeometry(int newWidth) {
 	_title->resizeToWidth(newWidth
 		- _padding.left() - _back->width()
-		- _padding.right() - _close->width());
+		- _padding.right() - _close->width()
+		- (_menuToggle ? _menuToggle->width() : 0));
 	updateTitlePosition();
 }
 
@@ -110,6 +114,58 @@ void SeparatePanel::setBackAllowed(bool allowed) {
 	}
 }
 
+void SeparatePanel::setMenuAllowed(
+		Fn<void(const Menu::MenuCallback&)> fill) {
+	_menuToggle.create(this, st::separatePanelMenu);
+	_menuToggle->show();
+	_menuToggle->setClickedCallback([=] { showMenu(fill); });
+
+	widthValue(
+	) | rpl::start_with_next([=](int width) {
+		_menuToggle->moveToRight(
+			_padding.right() + _close->width(),
+			_padding.top());
+	}, _menuToggle->lifetime());
+}
+
+void SeparatePanel::showMenu(Fn<void(const Menu::MenuCallback&)> fill) {
+	const auto created = createMenu(_menuToggle);
+	if (!created) {
+		return;
+	}
+	fill(Menu::CreateAddActionCallback(_menu));
+	if (_menu->empty()) {
+		_menu = nullptr;
+	} else {
+		_menu->setForcedOrigin(PanelAnimation::Origin::TopRight);
+		_menu->popup(mapToGlobal(QPoint(
+			(width()
+				- _padding.right()
+				- _close->width()
+				+ st::separatePanelMenuPosition.x()),
+			st::separatePanelMenuPosition.y())));
+	}
+}
+
+bool SeparatePanel::createMenu(not_null<IconButton*> button) {
+	if (_menu) {
+		return false;
+	}
+	_menu = base::make_unique_q<PopupMenu>(this, st::popupMenuWithIcons);
+	_menu->setDestroyedCallback([
+		weak = Ui::MakeWeak(this),
+			weakButton = Ui::MakeWeak(button),
+			menu = _menu.get()]{
+		if (weak && weak->_menu == menu) {
+			if (weakButton) {
+				weakButton->setForceRippled(false);
+			}
+		}
+		});
+	button->setForceRippled(true);
+	return true;
+}
+
 void SeparatePanel::setHideOnDeactivate(bool hideOnDeactivate) {
 	_hideOnDeactivate = hideOnDeactivate;
 	if (!_hideOnDeactivate) {
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 6758be3..5432b33 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -14,16 +14,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class Painter;
 
+namespace Ui::Menu {
+struct MenuCallback;
+} // namespace Ui::Menu
+
 namespace Ui {
+
 class BoxContent;
 class IconButton;
+class PopupMenu;
 class LayerStackWidget;
 class FlatLabel;
 template <typename Widget>
 class FadeWrapScaled;
-} // namespace Ui
-
-namespace Ui {
 
 class SeparatePanel final : public RpWidget {
 public:
@@ -50,6 +53,8 @@ public:
 	[[nodiscard]] rpl::producer<> closeEvents() const;
 	void setBackAllowed(bool allowed);
 
+	void setMenuAllowed(Fn<void(const Menu::MenuCallback&)> fill);
+
 protected:
 	void paintEvent(QPaintEvent *e) override;
 	void closeEvent(QCloseEvent *e) override;
@@ -83,12 +88,17 @@ private:
 	void finishAnimating();
 	void finishClose();
 
+	void showMenu(Fn<void(const Menu::MenuCallback&)> fill);
+	[[nodiscard]] bool createMenu(not_null<IconButton*> button);
+
 	object_ptr<IconButton> _close;
+	object_ptr<IconButton> _menuToggle = { nullptr };
 	object_ptr<FlatLabel> _title = { nullptr };
 	object_ptr<FadeWrapScaled<IconButton>> _back;
 	object_ptr<RpWidget> _body;
 	base::unique_qptr<RpWidget> _inner;
 	base::unique_qptr<LayerStackWidget> _layer = { nullptr };
+	base::unique_qptr<PopupMenu> _menu;
 	rpl::event_stream<> _synteticBackRequests;
 	rpl::event_stream<> _userCloseRequests;
 	rpl::event_stream<> _closeEvents;
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index ac33b07..230f529 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1567,3 +1567,29 @@ sideBarButtonLockBlockHeight: 5px;
 sideBarButtonLockLineHeight: 1px;
 sideBarButtonLockPenWidth: 3px;
 sideBarButtonLockPenWidthDivider: 2;
+
+menuIconColor: windowBoldFg;
+menuIconAttentionColor: attentionButtonFg;
+
+menuIconSubmenuArrow: icon {{ "menu/submenu_arrow", menuIconColor }};
+
+menuWithIcons: Menu(defaultMenu) {
+	itemIconPosition: point(15px, 5px);
+	itemPadding: margins(54px, 8px, 17px, 8px);
+
+	arrow: menuIconSubmenuArrow;
+}
+menuWithIconsAttention: Menu(menuWithIcons) {
+	itemFg: attentionButtonFg;
+	itemFgOver: attentionButtonFgOver;
+}
+popupMenuWithIcons: PopupMenu(defaultPopupMenu) {
+	scrollPadding: margins(0px, 5px, 0px, 5px);
+	menu: menuWithIcons;
+}
+dropdownMenuWithIcons: DropdownMenu(defaultDropdownMenu) {
+	wrap: InnerDropdown(defaultInnerDropdown) {
+		scrollPadding: margins(0px, 5px, 0px, 5px);
+	}
+	menu: menuWithIcons;
+}

From 797c731d2725dbcec45444bbd163ad28cb467c56 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 3 Jun 2022 20:06:56 +0400
Subject: [PATCH 116/635] Migrate from kwayland to QtWaylandScanner

---
 CMakeLists.txt                                |   8 +-
 .../linux/ui_linux_wayland_integration.cpp    | 116 ++++++++++++++----
 2 files changed, 91 insertions(+), 33 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82084a3..fd55c80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -289,14 +289,8 @@ elseif(LINUX)
     target_link_libraries(lib_ui
     PUBLIC
         desktop-app::lib_waylandshells
-        desktop-app::external_kwayland
+        desktop-app::external_wayland_client
     )
-
-    if (DESKTOP_APP_USE_PACKAGED)
-        find_package(PkgConfig REQUIRED)
-        pkg_check_modules(WAYLAND_CLIENT REQUIRED IMPORTED_TARGET wayland-client)
-        target_link_libraries(lib_ui PRIVATE PkgConfig::WAYLAND_CLIENT)
-    endif()
 endif()
 
 target_include_directories(lib_ui
diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index fa21c7b..d142278 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/platform/linux/ui_linux_wayland_integration.h"
 
 #include "base/platform/base_platform_info.h"
+#include "base/qt_signal_producer.h"
 #include "waylandshells/xdg_shell.h"
 #include "qwayland-xdg-shell.h"
 
@@ -25,48 +26,112 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <private/qwaylandwindow_p.h>
 #include <private/qwaylandinputdevice_p.h>
 
-#include <connection_thread.h>
-#include <registry.h>
+#include <wayland-client.h>
 
 Q_DECLARE_METATYPE(QMargins);
 
 using QtWaylandClient::QWaylandWindow;
-using namespace KWayland::Client;
 
 namespace Ui {
 namespace Platform {
+namespace {
+
+struct WlRegistryDeleter {
+	void operator()(wl_registry *value) {
+		wl_registry_destroy(value);
+	}
+};
+
+struct WlCallbackDeleter {
+	void operator()(wl_callback *value) {
+		wl_callback_destroy(value);
+	}
+};
+
+} // namespace
 
 struct WaylandIntegration::Private {
-	std::unique_ptr<ConnectionThread> connection;
-	Registry registry;
+	std::unique_ptr<wl_registry, WlRegistryDeleter> registry;
+	std::unique_ptr<wl_callback, WlCallbackDeleter> callback;
 	QEventLoop interfacesLoop;
 	bool interfacesAnnounced = false;
+	bool xdgDecorationSupported = false;
+	uint32_t xdgDecorationName = 0;
+	rpl::lifetime lifetime;
+
+	static const struct wl_registry_listener RegistryListener;
+	static const struct wl_callback_listener CallbackListener;
+};
+
+const struct wl_registry_listener WaylandIntegration::Private::RegistryListener = {
+	decltype(wl_registry_listener::global)(+[](
+			Private *data,
+			wl_registry *registry,
+			uint32_t name,
+			const char *interface,
+			uint32_t version) {
+		if (interface == qstr("zxdg_decoration_manager_v1")) {
+			data->xdgDecorationSupported = true;
+		}
+	}),
+	decltype(wl_registry_listener::global_remove)(+[](
+			Private *data,
+			wl_registry *registry,
+			uint32_t name) {
+		if (name == data->xdgDecorationName) {
+			data->xdgDecorationSupported = false;
+		}
+	}),
+};
+
+const struct wl_callback_listener WaylandIntegration::Private::CallbackListener = {
+	decltype(wl_callback_listener::done)(+[](
+			Private *data,
+			wl_callback *callback,
+			uint32_t serial) {
+		data->interfacesAnnounced = true;
+		if (data->interfacesLoop.isRunning()) {
+			data->interfacesLoop.quit();
+		}
+		data->callback = nullptr;
+	}),
 };
 
 WaylandIntegration::WaylandIntegration()
 : _private(std::make_unique<Private>()) {
-	_private->connection = std::unique_ptr<ConnectionThread>{
-		ConnectionThread::fromApplication(),
-	};
+	const auto native = QGuiApplication::platformNativeInterface();
+	if (!native) {
+		return;
+	}
 
-	_private->registry.create(_private->connection.get());
-	_private->registry.setup();
+	const auto display = reinterpret_cast<wl_display*>(
+		native->nativeResourceForIntegration(QByteArray("wl_display")));
 
-	QObject::connect(
-		_private->connection.get(),
-		&ConnectionThread::connectionDied,
-		&_private->registry,
-		&Registry::destroy);
+	if (!display) {
+		return;
+	}
 
-	QObject::connect(
-		&_private->registry,
-		&Registry::interfacesAnnounced,
-		[=] {
-			_private->interfacesAnnounced = true;
-			if (_private->interfacesLoop.isRunning()) {
-				_private->interfacesLoop.quit();
-			}
-		});
+	_private->registry.reset(wl_display_get_registry(display));
+	_private->callback.reset(wl_display_sync(display));
+
+	wl_registry_add_listener(
+		_private->registry.get(),
+		&Private::RegistryListener,
+		_private.get());
+
+	wl_callback_add_listener(
+		_private->callback.get(),
+		&Private::CallbackListener,
+		_private.get());
+
+	base::qt_signal_producer(
+		native,
+		&QObject::destroyed
+	) | rpl::start_with_next([=] {
+		// too late for standard destructors, just free
+		free(_private->callback.release());
+		free(_private->registry.release());
+	}, _private->lifetime);
 }
 
 WaylandIntegration::~WaylandIntegration() = default;
@@ -85,8 +150,7 @@ void WaylandIntegration::waitForInterfaceAnnounce() {
 }
 
 bool WaylandIntegration::xdgDecorationSupported() {
-	return _private->registry.hasInterface(
-		Registry::Interface::XdgDecorationUnstableV1);
+	return _private->xdgDecorationSupported;
 }
 
 bool WaylandIntegration::windowExtentsSupported() {

From 0a713c1c7b9d1890b98eb7c6d1e29bd199914ad7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 5 Jun 2022 14:43:03 +0300
Subject: [PATCH 117/635] Skipped grabbing of widget with invalid rect.

---
 ui/ui_utility.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp
index 3e36a29..ee6173d 100644
--- a/ui/ui_utility.cpp
+++ b/ui/ui_utility.cpp
@@ -128,7 +128,7 @@ QImage GrabWidgetToImage(not_null<QWidget*> target, QRect rect, QColor bg) {
 	if (!target->testAttribute(Qt::WA_OpaquePaintEvent)) {
 		result.fill(bg);
 	}
-	{
+	if (rect.isValid()) {
 		QPainter p(&result);
 		RenderWidget(p, target, QPoint(), rect);
 	}

From 72940a25e30e34361c9ad294007a5d707404d856 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Jun 2022 12:20:22 +0400
Subject: [PATCH 118/635] Fix possible crash in checkbox.

---
 ui/widgets/checkbox.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 6bfe533..00d43f8 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -707,6 +707,7 @@ void Checkbox::mouseMoveEvent(QMouseEvent *e) {
 }
 
 void Checkbox::mouseReleaseEvent(QMouseEvent *e) {
+	const auto weak = Ui::MakeWeak(this);
 	if (auto activated = _activatingHandler = ClickHandler::unpressed()) {
 		const auto button = e->button();
 		crl::on_main(this, [=] {
@@ -715,7 +716,9 @@ void Checkbox::mouseReleaseEvent(QMouseEvent *e) {
 		});
 	}
 	RippleButton::mouseReleaseEvent(e);
-	_activatingHandler = nullptr;
+	if (weak) {
+		_activatingHandler = nullptr;
+	}
 }
 
 void Checkbox::leaveEventHook(QEvent *e) {

From 81b9028e1c44e74c80175749441b2e9169503da0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 Jun 2022 11:09:42 +0400
Subject: [PATCH 119/635] Fix BoxLayerWidget::addTopButton.

Regression was introduced in c468f8b3c6.
---
 ui/layers/box_layer_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index 860fead..42333be 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -286,7 +286,7 @@ void BoxLayerWidget::addLeftButton(object_ptr<AbstractButton> button) {
 }
 
 void BoxLayerWidget::addTopButton(object_ptr<AbstractButton> button) {
-	_topButton = base::make_unique_q<AbstractButton>(button.release());
+	_topButton = base::unique_qptr<AbstractButton>(button.release());
 	const auto raw = _topButton.get();
 	raw->setParent(this);
 	raw->show();

From 8e35ae44070aa7471e17d58074a8c3a810d7817e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 4 Jun 2022 11:46:51 +0400
Subject: [PATCH 120/635] Implement round window with Qt-based custom
 decorations

---
 ui/platform/ui_platform_window.cpp | 92 +++++++++++++++++++++---------
 ui/platform/ui_platform_window.h   |  5 ++
 2 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 09a900e..6b34218 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -13,6 +13,7 @@
 #include "ui/painter.h"
 #include "styles/style_widgets.h"
 #include "styles/style_layers.h"
+#include "styles/palette.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtGui/QWindow>
@@ -26,6 +27,10 @@ namespace {
 	return st::callShadow;
 }
 
+[[nodiscard]] int Radius() {
+	return st::callRadius;
+}
+
 } // namespace
 
 BasicWindowHelper::BasicWindowHelper(not_null<RpWidget*> window)
@@ -181,7 +186,8 @@ void BasicWindowHelper::setupBodyTitleAreaEvents() {
 DefaultWindowHelper::DefaultWindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
 , _title(Ui::CreateChild<DefaultTitleWidget>(window.get()))
-, _body(Ui::CreateChild<RpWidget>(window.get())) {
+, _body(Ui::CreateChild<RpWidget>(window.get()))
+, _roundRect(Radius(), st::windowBg) {
 	init();
 }
 
@@ -230,34 +236,27 @@ void DefaultWindowHelper::init() {
 			area.top() + (titleShown ? titleHeight : 0));
 
 		_body->setGeometry(QRect(topLeft, sizeWithoutMargins));
+		updateRoundingOverlay();
 	}, _body->lifetime());
 
 	window()->paintRequest(
-	) | rpl::start_with_next([=] {
-		const auto area = resizeArea();
-
-		if (area.isNull()) {
-			return;
-		}
-
+	) | rpl::filter([=] {
+		return !hasShadow() && !resizeArea().isNull();
+	}) | rpl::start_with_next([=] {
 		Painter p(window());
-
-		if (hasShadow()) {
-			Ui::Shadow::paint(
-				p,
-				QRect(QPoint(), window()->size()).marginsRemoved(area),
-				window()->width(),
-				Shadow());
-		} else {
-			paintBorders(p);
-		}
+		paintBorders(p);
 	}, window()->lifetime());
 
 	rpl::combine(
 		window()->shownValue(),
+		_title->shownValue(),
 		_windowState.value()
-	) | rpl::start_with_next([=](bool shown, Qt::WindowStates windowState) {
+	) | rpl::start_with_next([=](
+			bool shown,
+			bool titleShown,
+			Qt::WindowStates windowState) {
 		if (shown) {
+			window()->windowHandle()->setFlag(Qt::FramelessWindowHint, titleShown);
 			updateWindowExtents();
 		}
 	}, window()->lifetime());
@@ -279,6 +278,52 @@ void DefaultWindowHelper::init() {
 	QCoreApplication::instance()->installEventFilter(this);
 }
 
+void DefaultWindowHelper::updateRoundingOverlay() {
+	if (!hasShadow() || resizeArea().isNull()) {
+		_roundingOverlay.destroy();
+		return;
+	} else if (_roundingOverlay) {
+		return;
+	}
+
+	_roundingOverlay.create(window());
+	_roundingOverlay->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_roundingOverlay->show();
+
+	window()->sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		_roundingOverlay->setGeometry(QRect(QPoint(), size));
+	}, _roundingOverlay->lifetime());
+
+	_roundingOverlay->paintRequest(
+	) | rpl::filter([=](QRect clip) {
+		const auto rect = window()->rect().marginsRemoved(resizeArea());
+		const auto radius = Radius();
+		const auto radiusWithFix = radius - 1;
+		const auto radiusSize = QSize(radius, radius);
+		return clip.intersects(QRect(
+				rect.topLeft(),
+				radiusSize
+			)) || clip.intersects(QRect(
+				rect.topRight() - QPoint(radiusWithFix, 0),
+				radiusSize
+			)) || clip.intersects(QRect(
+				rect.bottomRight() - QPoint(0, radiusWithFix),
+				radiusSize
+			)) || clip.intersects(QRect(
+				rect.bottomRight() - QPoint(radiusWithFix, radiusWithFix),
+				radiusSize
+			)) || !rect.contains(clip);
+	}) | rpl::start_with_next([=] {
+		Painter p(_roundingOverlay);
+		const auto rect = window()->rect().marginsRemoved(resizeArea());
+		p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+		_roundRect.paint(p, rect, RectPart::AllCorners);
+		p.setCompositionMode(QPainter::CompositionMode_DestinationOver);
+		Shadow::paint(p, rect, window()->width(), Shadow());
+	}, _roundingOverlay->lifetime());
+}
+
 not_null<RpWidget*> DefaultWindowHelper::body() {
 	return _body;
 }
@@ -375,9 +420,7 @@ void DefaultWindowHelper::setTitleStyle(const style::WindowTitle &st) {
 }
 
 void DefaultWindowHelper::setNativeFrame(bool enabled) {
-	window()->windowHandle()->setFlag(Qt::FramelessWindowHint, !enabled);
 	_title->setVisible(!enabled);
-	updateWindowExtents();
 }
 
 void DefaultWindowHelper::setMinimumSize(QSize size) {
@@ -441,13 +484,10 @@ void DefaultWindowHelper::paintBorders(QPainter &p) {
 
 void DefaultWindowHelper::updateWindowExtents() {
 	if (hasShadow() && !_title->isHidden()) {
-		Platform::SetWindowExtents(
-			window()->windowHandle(),
-			resizeArea());
-
+		SetWindowExtents(window()->windowHandle(), resizeArea());
 		_extentsSet = true;
 	} else if (_extentsSet) {
-		Platform::UnsetWindowExtents(window()->windowHandle());
+		UnsetWindowExtents(window()->windowHandle());
 		_extentsSet = false;
 	}
 }
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index 230e3d9..e34f1d7 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -7,6 +7,8 @@
 #pragma once
 
 #include "base/flags.h"
+#include "base/object_ptr.h"
+#include "ui/round_rect.h"
 
 namespace style {
 struct WindowTitle;
@@ -95,6 +97,7 @@ protected:
 
 private:
 	void init();
+	void updateRoundingOverlay();
 	[[nodiscard]] bool hasShadow() const;
 	[[nodiscard]] QMargins resizeArea() const;
 	[[nodiscard]] Qt::Edges edgesFromPos(const QPoint &pos) const;
@@ -106,6 +109,8 @@ private:
 
 	const not_null<DefaultTitleWidget*> _title;
 	const not_null<RpWidget*> _body;
+	RoundRect _roundRect;
+	object_ptr<RpWidget> _roundingOverlay = { nullptr };
 	bool _extentsSet = false;
 	rpl::variable<Qt::WindowStates> _windowState = Qt::WindowNoState;
 

From 851444a172536a53b941c6295450602d82d0e34a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 5 Jun 2022 13:28:00 +0400
Subject: [PATCH 121/635] Use brackets include zlib

---
 ui/image/image_prepare.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index f86a16c..5419eb4 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -15,7 +15,7 @@
 #include "styles/palette.h"
 #include "styles/style_basic.h"
 
-#include "zlib.h"
+#include <zlib.h>
 #include <QtCore/QFile>
 #include <QtCore/QBuffer>
 #include <QtCore/QMutex>

From 74224fe06ef41531ec9b370f95f3c79a7c6ae64e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 Jun 2022 16:06:17 +0400
Subject: [PATCH 122/635] Add gradient_color_at(QGradientStops, ratio).

---
 ui/effects/gradient.cpp | 8 +++++---
 ui/effects/gradient.h   | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ui/effects/gradient.cpp b/ui/effects/gradient.cpp
index 55b5dda..4a99d32 100644
--- a/ui/effects/gradient.cpp
+++ b/ui/effects/gradient.cpp
@@ -8,9 +8,7 @@
 
 namespace anim {
 
-QColor gradient_color_at(const QGradient &gradient, float64 ratio) {
-	const auto &stops = gradient.stops();
-
+QColor gradient_color_at(const QGradientStops & stops, float64 ratio) {
 	for (auto i = 1; i < stops.size(); i++) {
 		const auto currentPoint = stops[i].first;
 		const auto previousPoint = stops[i - 1].first;
@@ -25,4 +23,8 @@ QColor gradient_color_at(const QGradient &gradient, float64 ratio) {
 	return QColor();
 }
 
+QColor gradient_color_at(const QGradient &gradient, float64 ratio) {
+	return gradient_color_at(gradient.stops(), ratio);
+}
+
 } // namespace anim
diff --git a/ui/effects/gradient.h b/ui/effects/gradient.h
index ddf6949..732492c 100644
--- a/ui/effects/gradient.h
+++ b/ui/effects/gradient.h
@@ -14,6 +14,10 @@
 
 namespace anim {
 
+[[nodiscard]] QColor gradient_color_at(
+	const QGradientStops &stops,
+	float64 ratio);
+
 [[nodiscard]] QColor gradient_color_at(
 	const QGradient &gradient,
 	float64 ratio);

From 94c5754b422ed5cdb2c20f0a480656e988b90ce8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 13 Jun 2022 12:15:31 +0400
Subject: [PATCH 123/635] Hide titlebar & border when there are no controls

If the user doesn't want to control the window with buttons, then he moves/resizes the window in other way as well
---
 ui/platform/ui_platform_utility.cpp      | 14 +++++++++++---
 ui/platform/ui_platform_utility.h        |  3 ++-
 ui/platform/ui_platform_window.cpp       | 19 +++++++++++++------
 ui/platform/ui_platform_window_title.cpp | 13 +++++++------
 ui/platform/ui_platform_window_title.h   |  1 +
 5 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/ui/platform/ui_platform_utility.cpp b/ui/platform/ui_platform_utility.cpp
index 2d07ec5..9a5d462 100644
--- a/ui/platform/ui_platform_utility.cpp
+++ b/ui/platform/ui_platform_utility.cpp
@@ -10,16 +10,24 @@ namespace Ui {
 namespace Platform {
 namespace {
 
-rpl::event_stream<> TitleControlsLayoutChanges;
+rpl::event_stream<TitleControls::Layout> TitleControlsLayoutChanges;
 
 } // namespace
 
-rpl::producer<> TitleControlsLayoutChanged() {
+rpl::producer<TitleControls::Layout> TitleControlsLayoutValue() {
+	return rpl::single(
+		TitleControlsLayout()
+	) | rpl::then(
+		TitleControlsLayoutChanged()
+	);
+}
+
+rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged() {
 	return TitleControlsLayoutChanges.events();
 }
 
 void NotifyTitleControlsLayoutChanged() {
-	TitleControlsLayoutChanges.fire({});
+	TitleControlsLayoutChanges.fire_copy(TitleControlsLayout());
 }
 
 } // namespace Platform
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 4452332..e85d64b 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -44,7 +44,8 @@ void UnsetWindowExtents(QWindow *window);
 bool ShowWindowMenu(QWindow *window);
 
 [[nodiscard]] TitleControls::Layout TitleControlsLayout();
-[[nodiscard]] rpl::producer<> TitleControlsLayoutChanged();
+[[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutValue();
+[[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged();
 void NotifyTitleControlsLayoutChanged();
 
 } // namespace Platform
diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 6b34218..54c7ca6 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -202,29 +202,35 @@ void DefaultWindowHelper::init() {
 	rpl::combine(
 		window()->widthValue(),
 		_windowState.value(),
-		_title->shownValue()
+		_title->shownValue(),
+		TitleControlsLayoutValue()
 	) | rpl::start_with_next([=](
 			int width,
 			Qt::WindowStates windowState,
-			bool shown) {
+			bool shown,
+			TitleControls::Layout controlsLayout) {
 		const auto area = resizeArea();
 		_title->setGeometry(
 			area.left(),
 			area.top(),
 			width - area.left() - area.right(),
-			_title->st()->height);
+			_title->controlsGeometry().height()
+				? _title->st()->height
+				: 0);
 	}, _title->lifetime());
 
 	rpl::combine(
 		window()->sizeValue(),
 		_windowState.value(),
 		_title->heightValue(),
-		_title->shownValue()
+		_title->shownValue(),
+		TitleControlsLayoutValue()
 	) | rpl::start_with_next([=](
 			QSize size,
 			Qt::WindowStates windowState,
 			int titleHeight,
-			bool titleShown) {
+			bool titleShown,
+			TitleControls::Layout controlsLayout) {
 		const auto area = resizeArea();
 
 		const auto sizeWithoutMargins = size
@@ -342,7 +348,8 @@ bool DefaultWindowHelper::hasShadow() const {
 QMargins DefaultWindowHelper::resizeArea() const {
 	if (window()->isMaximized()
 		|| window()->isFullScreen()
-		|| _title->isHidden()) {
+		|| _title->isHidden()
+		|| (!hasShadow() && !_title->controlsGeometry().height())) {
 		return QMargins();
 	}
 
diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index 420e198..fadbcae 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -167,12 +167,9 @@ void TitleControls::init(Fn<void(bool maximized)> maximize) {
 	});
 	_close->setPointerCursor(false);
 
-	parent()->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		updateControlsPosition();
-	}, _close->lifetime());
-
-	TitleControlsLayoutChanged(
+	rpl::combine(
+		parent()->widthValue(),
+		TitleControlsLayoutValue()
 	) | rpl::start_with_next([=] {
 		updateControlsPosition();
 	}, _close->lifetime());
@@ -417,6 +414,10 @@ not_null<const style::WindowTitle*> DefaultTitleWidget::st() const {
 	return _controls.st();
 }
 
+QRect DefaultTitleWidget::controlsGeometry() const {
+	return _controls.geometry();
+}
+
 void DefaultTitleWidget::setText(const QString &text) {
 	window()->setWindowTitle(text);
 }
diff --git a/ui/platform/ui_platform_window_title.h b/ui/platform/ui_platform_window_title.h
index 863171e..278dbad 100644
--- a/ui/platform/ui_platform_window_title.h
+++ b/ui/platform/ui_platform_window_title.h
@@ -118,6 +118,7 @@ public:
 	explicit DefaultTitleWidget(not_null<RpWidget*> parent);
 
 	[[nodiscard]] not_null<const style::WindowTitle*> st() const;
+	[[nodiscard]] QRect controlsGeometry() const;
 	void setText(const QString &text);
 	void setStyle(const style::WindowTitle &st);
 	void setResizeEnabled(bool enabled);

From e72706f24902be4ba379e5236be59affbb1b801f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 26 May 2022 17:17:40 +0400
Subject: [PATCH 124/635] Make FindTaskbarWindow/IsTaskbarAutoHidden nodiscard

---
 ui/platform/win/ui_window_win.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 09cbc5a..eea2221 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -42,7 +42,7 @@ constexpr auto kDWMWA_TEXT_COLOR = DWORD(36);
 	return success && result;
 }
 
-HWND FindTaskbarWindow(LPRECT rcMon = nullptr) {
+[[nodiscard]] HWND FindTaskbarWindow(LPRECT rcMon = nullptr) {
 	HWND hTaskbar = nullptr;
 	RECT rcTaskbar, rcMatch;
 
@@ -63,7 +63,9 @@ HWND FindTaskbarWindow(LPRECT rcMon = nullptr) {
 	return hTaskbar;
 }
 
-bool IsTaskbarAutoHidden(LPRECT rcMon = nullptr, PUINT pEdge = nullptr) {
+[[nodiscard]] bool IsTaskbarAutoHidden(
+		LPRECT rcMon = nullptr,
+		PUINT pEdge = nullptr) {
 	HWND hTaskbar = FindTaskbarWindow(rcMon);
 	if (!hTaskbar) {
 		if (pEdge) {

From cdfa6ea2bfe1549d6a4b1d4c27e673fe07d6ce59 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 26 May 2022 17:20:53 +0400
Subject: [PATCH 125/635] Handle DPI change on Windows to avoid the window be
 resized by Qt

---
 ui/platform/win/ui_window_win.cpp | 23 ++++++++++++++++++++++-
 ui/platform/win/ui_window_win.h   |  1 +
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index eea2221..5286e27 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -9,6 +9,7 @@
 #include "ui/inactive_press.h"
 #include "ui/platform/win/ui_window_title_win.h"
 #include "ui/widgets/rp_window.h"
+#include "base/platform/win/base_windows_safe_library.h"
 #include "base/platform/base_platform_info.h"
 #include "base/integration.h"
 #include "base/debug_log.h"
@@ -36,6 +37,18 @@ constexpr auto kDWMWA_WINDOW_CORNER_PREFERENCE = DWORD(33);
 constexpr auto kDWMWA_CAPTION_COLOR = DWORD(35);
 constexpr auto kDWMWA_TEXT_COLOR = DWORD(36);
 
+UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
+
+[[nodiscard]] bool GetDpiForWindowSupported() {
+	static const auto Result = [&] {
+#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
+		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
+		return LOAD_SYMBOL(user32, GetDpiForWindow);
+#undef LOAD_SYMBOL
+	}();
+	return Result;
+}
+
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -163,7 +176,8 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 , _handle(ResolveWindowHandle(window))
 , _title(Ui::CreateChild<TitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
-, _shadow(std::in_place, window, st::windowShadowFg->c) {
+, _shadow(std::in_place, window, st::windowShadowFg->c)
+, _dpi(GetDpiForWindowSupported() ? GetDpiForWindow(_handle) : 0) {
 	Expects(_handle != nullptr);
 
 	init();
@@ -595,6 +609,13 @@ bool WindowHelper::handleNativeEvent(
 		}
 	} return true;
 
+	// should return true for Qt not to change window size
+	// when moving the window between screens
+	// change to false once runtime scale change would be supported
+	case WM_DPICHANGED: {
+		_dpi = LOWORD(wParam);
+	} return true;
+
 	}
 	return false;
 }
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index 1882a61..9ae881f 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -81,6 +81,7 @@ private:
 	rpl::event_stream<HitTestResult> _systemButtonOver;
 	rpl::event_stream<HitTestResult> _systemButtonDown;
 	std::optional<WindowShadow> _shadow;
+	rpl::variable<uint> _dpi;
 	QMargins _marginsDelta;
 	HMENU _menu = nullptr;
 	bool _updatingMargins = false;

From b5da6e709d835de8920d11516143a7c01c7c2aa7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 21 May 2022 17:10:21 +0400
Subject: [PATCH 126/635] Make window resize less lagged on Windows

---
 ui/platform/win/ui_window_win.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 5286e27..97c38e5 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -242,6 +242,18 @@ void WindowHelper::setNativeFrame(bool enabled) {
 	updateMargins();
 	updateWindowFrameColors();
 	fixMaximizedWindow();
+	SetWindowPos(
+		_handle,
+		0,
+		0,
+		0,
+		0,
+		0,
+		SWP_FRAMECHANGED
+			| SWP_NOMOVE
+			| SWP_NOSIZE
+			| SWP_NOZORDER
+			| SWP_NOACTIVATE);
 }
 
 void WindowHelper::initialShadowUpdate() {
@@ -405,17 +417,14 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCCALCSIZE: {
-		if (_title->isHidden()) {
+		if (_title->isHidden() || !wParam) {
 			return false;
 		}
 		WINDOWPLACEMENT wp;
 		wp.length = sizeof(WINDOWPLACEMENT);
 		if (GetWindowPlacement(_handle, &wp)
 			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
-			const auto params = (LPNCCALCSIZE_PARAMS)lParam;
-			const auto r = (wParam == TRUE)
-				? &params->rgrc[0]
-				: (LPRECT)lParam;
+			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
 			const auto hMonitor = MonitorFromPoint(
 				{ (r->left + r->right) / 2, (r->top + r->bottom) / 2 },
 				MONITOR_DEFAULTTONEAREST);
@@ -435,8 +444,10 @@ bool WindowHelper::handleNativeEvent(
 					}
 				}
 			}
+			if (result) *result = 0;
+		} else {
+			if (result) *result = WVR_REDRAW;
 		}
-		if (result) *result = 0;
 		return true;
 	}
 

From b05b7bd502695071c5aaa7e7479f220e676bcfc7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 21 May 2022 17:12:23 +0400
Subject: [PATCH 127/635] Make maximized geometry handling less bugged on
 Windows

---
 ui/platform/win/ui_window_win.cpp | 222 ++++++++++--------------------
 ui/platform/win/ui_window_win.h   |   4 -
 2 files changed, 71 insertions(+), 155 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 97c38e5..3a796a4 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -20,12 +20,10 @@
 #include <QtGui/QWindow>
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QApplication>
-#include <qpa/qplatformnativeinterface.h>
 
 #include <dwmapi.h>
 #include <uxtheme.h>
-
-Q_DECLARE_METATYPE(QMargins);
+#include <windowsx.h>
 
 namespace Ui {
 namespace Platform {
@@ -39,6 +37,10 @@ constexpr auto kDWMWA_TEXT_COLOR = DWORD(36);
 
 UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
 
+int(__stdcall *GetSystemMetricsForDpi)(
+	_In_ int nIndex,
+	_In_ UINT dpi);
+
 [[nodiscard]] bool GetDpiForWindowSupported() {
 	static const auto Result = [&] {
 #define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
@@ -49,6 +51,16 @@ UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
 	return Result;
 }
 
+[[nodiscard]] bool GetSystemMetricsForDpiSupported() {
+	static const auto Result = [&] {
+#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
+		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
+		return LOAD_SYMBOL(user32, GetSystemMetricsForDpi);
+#undef LOAD_SYMBOL
+	}();
+	return Result;
+}
+
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -107,24 +119,6 @@ UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
 	return bAutoHidden;
 }
 
-void FixAeroSnap(HWND handle) {
-	SetWindowLongPtr(
-		handle,
-		GWL_STYLE,
-		GetWindowLongPtr(handle, GWL_STYLE) | WS_CAPTION | WS_THICKFRAME);
-}
-
-[[nodiscard]] HWND ResolveWindowHandle(not_null<QWidget*> widget) {
-	if (!::Platform::IsWindows8OrGreater()) {
-		widget->setWindowFlag(Qt::FramelessWindowHint);
-	}
-	const auto result = GetWindowHandle(widget);
-	if (!::Platform::IsWindows8OrGreater()) {
-		FixAeroSnap(result);
-	}
-	return result;
-}
-
 } // namespace
 
 class WindowHelper::NativeFilter final : public QAbstractNativeEventFilter {
@@ -173,7 +167,7 @@ bool WindowHelper::NativeFilter::nativeEventFilter(
 
 WindowHelper::WindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
-, _handle(ResolveWindowHandle(window))
+, _handle(GetWindowHandle(window))
 , _title(Ui::CreateChild<TitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
 , _shadow(std::in_place, window, st::windowShadowFg->c)
@@ -226,10 +220,11 @@ void WindowHelper::setTitleStyle(const style::WindowTitle &st) {
 
 void WindowHelper::setNativeFrame(bool enabled) {
 	if (!::Platform::IsWindows8OrGreater()) {
-		window()->windowHandle()->setFlag(Qt::FramelessWindowHint, !enabled);
-		if (!enabled) {
-			FixAeroSnap(_handle);
-		}
+		const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+		SetWindowLongPtr(
+			_handle,
+			GWL_STYLE,
+			enabled ? (style | WS_CAPTION) : (style & ~WS_CAPTION));
 	}
 	_title->setVisible(!enabled);
 	if (enabled) {
@@ -239,9 +234,7 @@ void WindowHelper::setNativeFrame(bool enabled) {
 		_shadow->setResizeEnabled(!fixedSize());
 		initialShadowUpdate();
 	}
-	updateMargins();
 	updateWindowFrameColors();
-	fixMaximizedWindow();
 	SetWindowPos(
 		_handle,
 		0,
@@ -298,7 +291,6 @@ void WindowHelper::setGeometry(QRect rect) {
 void WindowHelper::showFullScreen() {
 	if (!_isFullScreen) {
 		_isFullScreen = true;
-		updateMargins();
 		updateCornersRounding();
 	}
 	window()->showFullScreen();
@@ -308,7 +300,6 @@ void WindowHelper::showNormal() {
 	window()->showNormal();
 	if (_isFullScreen) {
 		_isFullScreen = false;
-		updateMargins();
 		updateCornersRounding();
 	}
 }
@@ -354,8 +345,6 @@ void WindowHelper::init() {
 			size.height() - (titleShown ? titleHeight : 0));
 	}, _body->lifetime());
 
-	updateMargins();
-
 	if (!::Platform::IsWindows8OrGreater()) {
 		SetWindowTheme(_handle, L" ", L" ");
 		QApplication::setStyle(QStyleFactory::create("Windows"));
@@ -417,7 +406,7 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCCALCSIZE: {
-		if (_title->isHidden() || !wParam) {
+		if (_title->isHidden() || window()->isFullScreen() || !wParam) {
 			return false;
 		}
 		WINDOWPLACEMENT wp;
@@ -425,31 +414,38 @@ bool WindowHelper::handleNativeEvent(
 		if (GetWindowPlacement(_handle, &wp)
 			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
 			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
-			const auto hMonitor = MonitorFromPoint(
-				{ (r->left + r->right) / 2, (r->top + r->bottom) / 2 },
+			const auto dpi = _dpi.current();
+			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+			const auto borderWidth = ((GetSystemMetricsForDpiSupported() && dpi)
+				? GetSystemMetricsForDpi(SM_CXSIZEFRAME, dpi)
+					+ GetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi)
+				: GetSystemMetrics(SM_CXSIZEFRAME)
+					+ GetSystemMetrics(SM_CXPADDEDBORDER))
+				- ((style & WS_CAPTION) ? 0 : 1);
+			r->left += borderWidth;
+			r->right -= borderWidth;
+			r->top += borderWidth;
+			r->bottom -= borderWidth;
+			const auto hMonitor = MonitorFromWindow(
+				_handle,
 				MONITOR_DEFAULTTONEAREST);
-			if (hMonitor) {
-				MONITORINFO mi;
-				mi.cbSize = sizeof(mi);
-				if (GetMonitorInfo(hMonitor, &mi)) {
-					*r = mi.rcWork;
-					UINT uEdge = (UINT)-1;
-					if (IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
-						switch (uEdge) {
-						case ABE_LEFT: r->left += 1; break;
-						case ABE_RIGHT: r->right -= 1; break;
-						case ABE_TOP: r->top += 1; break;
-						case ABE_BOTTOM: r->bottom -= 1; break;
-						}
-					}
+			MONITORINFO mi;
+			mi.cbSize = sizeof(mi);
+			UINT uEdge = (UINT)-1;
+			if (GetMonitorInfo(hMonitor, &mi)
+				&& IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
+				switch (uEdge) {
+				case ABE_LEFT: r->left += 1; break;
+				case ABE_RIGHT: r->right -= 1; break;
+				case ABE_TOP: r->top += 1; break;
+				case ABE_BOTTOM: r->bottom -= 1; break;
 				}
 			}
 			if (result) *result = 0;
 		} else {
 			if (result) *result = WVR_REDRAW;
 		}
-		return true;
-	}
+	} return true;
 
 	case WM_NCRBUTTONUP: {
 		if (_title->isHidden()) {
@@ -508,7 +504,6 @@ bool WindowHelper::handleNativeEvent(
 				}
 				window()->windowHandle()->windowStateChanged(state);
 			}
-			updateMargins();
 			if (_shadow) {
 				_title->refreshAdditionalPaddings(_handle);
 				const auto changes = (wParam == SIZE_MINIMIZED
@@ -522,6 +517,27 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_SHOWWINDOW: {
+		const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+		if (!::Platform::IsWindows8OrGreater()
+			&& !_title->isHidden()
+			&& (style & WS_CAPTION)) {
+			SetWindowLongPtr(
+				_handle,
+				GWL_STYLE,
+				style & ~WS_CAPTION);
+			SetWindowPos(
+				_handle,
+				0,
+				0,
+				0,
+				0,
+				0,
+				SWP_FRAMECHANGED
+					| SWP_NOMOVE
+					| SWP_NOSIZE
+					| SWP_NOZORDER
+					| SWP_NOACTIVATE);
+		}
 		if (_shadow) {
 			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 			const auto changes = WindowShadow::Change::Resized
@@ -544,12 +560,9 @@ bool WindowHelper::handleNativeEvent(
 			return false;
 		}
 
-		const auto p = MAKEPOINTS(lParam);
-		auto r = RECT();
-		GetWindowRect(_handle, &r);
-		const auto mapped = QPoint(
-			p.x - r.left + _marginsDelta.left(),
-			p.y - r.top + _marginsDelta.top());
+		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
+		ScreenToClient(_handle, &p);
+		const auto mapped = QPoint(p.x, p.y) / window()->devicePixelRatioF();
 		*result = [&] {
 			if (!window()->rect().contains(mapped)) {
 				return HTTRANSPARENT;
@@ -748,80 +761,6 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 		sizeof(COLORREF));
 }
 
-void WindowHelper::updateMargins() {
-	if (_updatingMargins) return;
-
-	_updatingMargins = true;
-	const auto guard = gsl::finally([&] { _updatingMargins = false; });
-
-	RECT r, a;
-
-	GetClientRect(_handle, &r);
-	a = r;
-
-	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-	AdjustWindowRectEx(&a, style, false, styleEx);
-	auto margins = QMargins(
-		a.left - r.left,
-		a.top - r.top,
-		r.right - a.right,
-		r.bottom - a.bottom);
-	if (style & WS_MAXIMIZE) {
-		RECT w, m;
-		GetWindowRect(_handle , &w);
-		m = w;
-
-		HMONITOR hMonitor = MonitorFromRect(&w, MONITOR_DEFAULTTONEAREST);
-		if (hMonitor) {
-			MONITORINFO mi;
-			mi.cbSize = sizeof(mi);
-			GetMonitorInfo(hMonitor, &mi);
-			m = mi.rcWork;
-		}
-
-		_marginsDelta = QMargins(
-			w.left - m.left,
-			w.top - m.top,
-			m.right - w.right,
-			m.bottom - w.bottom);
-
-		margins.setLeft(margins.left() - _marginsDelta.left());
-		margins.setRight(margins.right() - _marginsDelta.right());
-		margins.setBottom(margins.bottom() - _marginsDelta.bottom());
-		margins.setTop(margins.top() - _marginsDelta.top());
-	} else if (!_marginsDelta.isNull()) {
-		RECT w;
-		GetWindowRect(_handle, &w);
-		SetWindowPos(
-			_handle,
-			0,
-			0,
-			0,
-			w.right - w.left - _marginsDelta.left() - _marginsDelta.right(),
-			w.bottom - w.top - _marginsDelta.top() - _marginsDelta.bottom(),
-			(SWP_NOMOVE
-				| SWP_NOSENDCHANGING
-				| SWP_NOZORDER
-				| SWP_NOACTIVATE
-				| SWP_NOREPOSITION));
-		_marginsDelta = QMargins();
-	}
-
-	if (_isFullScreen || _title->isHidden()) {
-		margins = QMargins();
-		if (_title->isHidden()) {
-			_marginsDelta = QMargins();
-		}
-	}
-	if (const auto native = QGuiApplication::platformNativeInterface()) {
-		native->setWindowProperty(
-			window()->windowHandle()->handle(),
-			"WindowsCustomMargins",
-			QVariant::fromValue<QMargins>(margins));
-	}
-}
-
 void WindowHelper::updateSystemMenu() {
 	updateSystemMenu(window()->windowHandle()->windowState());
 }
@@ -865,25 +804,6 @@ void WindowHelper::updateSystemMenu(Qt::WindowState state) {
 	}
 }
 
-void WindowHelper::fixMaximizedWindow() {
-	auto r = RECT();
-	GetClientRect(_handle, &r);
-	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-	AdjustWindowRectEx(&r, style, false, styleEx);
-	if (style & WS_MAXIMIZE) {
-		auto w = RECT();
-		GetWindowRect(_handle, &w);
-		if (const auto hMonitor = MonitorFromRect(&w, MONITOR_DEFAULTTONEAREST)) {
-			MONITORINFO mi;
-			mi.cbSize = sizeof(mi);
-			GetMonitorInfo(hMonitor, &mi);
-			const auto m = mi.rcWork;
-			SetWindowPos(_handle, 0, 0, 0, m.right - m.left - _marginsDelta.left() - _marginsDelta.right(), m.bottom - m.top - _marginsDelta.top() - _marginsDelta.bottom(), SWP_NOMOVE | SWP_NOSENDCHANGING | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION);
-		}
-	}
-}
-
 not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() {
 	Expects(QCoreApplication::instance() != nullptr);
 
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index 9ae881f..8a2396c 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -49,14 +49,12 @@ private:
 	friend class NativeFilter;
 
 	void init();
-	void updateMargins();
 	void updateWindowFrameColors();
 	void updateWindowFrameColors(bool active);
 	void updateSystemMenu();
 	void updateSystemMenu(Qt::WindowState state);
 	void initialShadowUpdate();
 	void updateCornersRounding();
-	void fixMaximizedWindow();
 	[[nodiscard]] bool handleNativeEvent(
 		UINT msg,
 		WPARAM wParam,
@@ -82,9 +80,7 @@ private:
 	rpl::event_stream<HitTestResult> _systemButtonDown;
 	std::optional<WindowShadow> _shadow;
 	rpl::variable<uint> _dpi;
-	QMargins _marginsDelta;
 	HMENU _menu = nullptr;
-	bool _updatingMargins = false;
 	bool _isFullScreen = false;
 
 };

From 2e9aec239dd5f2e315d12d1038fb2d8d3e3f136f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 22 May 2022 19:24:33 +0400
Subject: [PATCH 128/635] Use native window resize on Windows 11

---
 ui/platform/ui_platform_window_title.cpp |  12 ++-
 ui/platform/win/ui_window_shadow_win.cpp |   5 +-
 ui/platform/win/ui_window_shadow_win.h   |   1 -
 ui/platform/win/ui_window_title_win.cpp  |  12 ++-
 ui/platform/win/ui_window_title_win.h    |   4 +-
 ui/platform/win/ui_window_win.cpp        | 106 +++++++++++++++++------
 6 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index fadbcae..ee77d4f 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -218,10 +218,14 @@ void TitleControls::raise() {
 HitTestResult TitleControls::hitTest(QPoint point, int padding) const {
 	const auto test = [&](const object_ptr<Button> &button, bool close) {
 		return button && button->geometry().marginsAdded(
-			{ close ? padding : 0, padding, close ? padding : 0, 0 }
+			{ 0, padding, 0, 0 }
 		).contains(point);
 	};
-	if (test(_minimize, false)) {
+	if (::Platform::IsWindows11OrGreater()
+		&& !_maximizedState
+		&& (point.y() < style::ConvertScale(style::DevicePixelRatio()))) {
+		return HitTestResult::Top;
+	} else if (test(_minimize, false)) {
 		return HitTestResult::Minimize;
 	} else if (test(_maximizeRestore, false)) {
 		return HitTestResult::MaximizeRestore;
@@ -497,9 +501,9 @@ std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 		controlsTop ? std::move(controlsTop) : rpl::single(0)
 	) | rpl::start_with_next([=](int width, int padding, int top) {
 		raw->wrap.setGeometry(
-			padding,
+			0,
 			top,
-			width - 2 * padding,
+			width,
 			raw->controls.geometry().height());
 	}, lifetime);
 
diff --git a/ui/platform/win/ui_window_shadow_win.cpp b/ui/platform/win/ui_window_shadow_win.cpp
index 79abd98..59bbe55 100644
--- a/ui/platform/win/ui_window_shadow_win.cpp
+++ b/ui/platform/win/ui_window_shadow_win.cpp
@@ -43,8 +43,7 @@ base::flat_map<HWND, not_null<WindowShadow*>> ShadowByHandle;
 
 WindowShadow::WindowShadow(not_null<RpWidget*> window, QColor color)
 : _window(window)
-, _handle(GetWindowHandle(window))
-, _windows11(::Platform::IsWindows11OrGreater()) {
+, _handle(GetWindowHandle(window)) {
 	init(color);
 }
 
@@ -317,7 +316,7 @@ void WindowShadow::horCorners(int w, Gdiplus::Graphics *pgraphics0, Gdiplus::Gra
 }
 
 Gdiplus::Color WindowShadow::getColor(uchar alpha) const {
-	return Gdiplus::Color(BYTE(_windows11 ? 1 : alpha), _r, _g, _b);
+	return Gdiplus::Color(BYTE(alpha), _r, _g, _b);
 }
 
 Gdiplus::SolidBrush WindowShadow::getBrush(uchar alpha) const {
diff --git a/ui/platform/win/ui_window_shadow_win.h b/ui/platform/win/ui_window_shadow_win.h
index db63914..c157fa5 100644
--- a/ui/platform/win/ui_window_shadow_win.h
+++ b/ui/platform/win/ui_window_shadow_win.h
@@ -78,7 +78,6 @@ private:
 
 	const not_null<RpWidget*> _window;
 	const HWND _handle;
-	const bool _windows11 = false;
 
 	int _x = 0;
 	int _y = 0;
diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index 4defa64..b4e49e9 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -74,7 +74,7 @@ void TitleWidget::initInWindow(not_null<RpWindow*> window) {
 	) | rpl::filter([=](not_null<HitTestRequest*> request) {
 		return !isHidden() && geometry().contains(request->point);
 	}) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
-		request->result = hitTest(request->point);
+		request->result = hitTest(request->point, request->result);
 	}, lifetime());
 
 	SetupSemiNativeSystemButtons(&_controls, window, lifetime(), [=] {
@@ -98,9 +98,9 @@ void TitleWidget::refreshGeometryWithWidth(int width) {
 	setGeometry(0, 0, width, _controls.st()->height + add);
 	if (_paddingHelper) {
 		_paddingHelper->controlsParent.setGeometry(
+			0,
 			add,
-			add,
-			width - 2 * add,
+			width,
 			_controls.st()->height);
 	}
 	update();
@@ -126,7 +126,9 @@ void TitleWidget::resizeEvent(QResizeEvent *e) {
 	_shadow->setGeometry(0, height() - thickness, width(), thickness);
 }
 
-HitTestResult TitleWidget::hitTest(QPoint point) const {
+HitTestResult TitleWidget::hitTest(
+		QPoint point,
+		HitTestResult oldResult) const {
 	const auto origin = _paddingHelper
 		? _paddingHelper->controlsParent.pos()
 		: QPoint();
@@ -136,6 +138,8 @@ HitTestResult TitleWidget::hitTest(QPoint point) const {
 	const auto controlsResult = _controls.hitTest(point - origin, padding);
 	return (controlsResult != HitTestResult::None)
 		? controlsResult
+		: (oldResult != HitTestResult::Client)
+		? oldResult
 		: HitTestResult::Caption;
 }
 
diff --git a/ui/platform/win/ui_window_title_win.h b/ui/platform/win/ui_window_title_win.h
index 39177e6..7cce4dc 100644
--- a/ui/platform/win/ui_window_title_win.h
+++ b/ui/platform/win/ui_window_title_win.h
@@ -55,7 +55,9 @@ protected:
 private:
 	struct PaddingHelper;
 
-	[[nodiscard]] HitTestResult hitTest(QPoint point) const;
+	[[nodiscard]] HitTestResult hitTest(
+		QPoint point,
+		HitTestResult oldResult) const;
 	[[nodiscard]] bool additionalPaddingRequired() const;
 	void refreshGeometryWithWidth(int width);
 	void setAdditionalPadding(int padding);
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 3a796a4..158faad 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -41,6 +41,13 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	_In_ int nIndex,
 	_In_ UINT dpi);
 
+BOOL(__stdcall *AdjustWindowRectExForDpi)(
+	_Inout_ LPRECT lpRect,
+	_In_ DWORD dwStyle,
+	_In_ BOOL bMenu,
+	_In_ DWORD dwExStyle,
+	_In_ UINT dpi);
+
 [[nodiscard]] bool GetDpiForWindowSupported() {
 	static const auto Result = [&] {
 #define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
@@ -61,6 +68,16 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	return Result;
 }
 
+[[nodiscard]] bool AdjustWindowRectExForDpiSupported() {
+	static const auto Result = [&] {
+#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
+		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
+		return LOAD_SYMBOL(user32, AdjustWindowRectExForDpi);
+#undef LOAD_SYMBOL
+	}();
+	return Result;
+}
+
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -170,7 +187,6 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 , _handle(GetWindowHandle(window))
 , _title(Ui::CreateChild<TitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
-, _shadow(std::in_place, window, st::windowShadowFg->c)
 , _dpi(GetDpiForWindowSupported() ? GetDpiForWindow(_handle) : 0) {
 	Expects(_handle != nullptr);
 
@@ -227,13 +243,14 @@ void WindowHelper::setNativeFrame(bool enabled) {
 			enabled ? (style | WS_CAPTION) : (style & ~WS_CAPTION));
 	}
 	_title->setVisible(!enabled);
-	if (enabled) {
+	if (enabled || ::Platform::IsWindows11OrGreater()) {
 		_shadow.reset();
 	} else {
 		_shadow.emplace(window(), st::windowShadowFg->c);
 		_shadow->setResizeEnabled(!fixedSize());
 		initialShadowUpdate();
 	}
+	updateCornersRounding();
 	updateWindowFrameColors();
 	SetWindowPos(
 		_handle,
@@ -250,6 +267,9 @@ void WindowHelper::setNativeFrame(bool enabled) {
 }
 
 void WindowHelper::initialShadowUpdate() {
+	if (!_shadow) {
+		return;
+	}
 	using Change = WindowShadow::Change;
 	const auto noShadowStates = (Qt::WindowMinimized | Qt::WindowMaximized);
 	if ((window()->windowState() & noShadowStates) || window()->isHidden()) {
@@ -257,7 +277,6 @@ void WindowHelper::initialShadowUpdate() {
 	} else {
 		_shadow->update(Change::Moved | Change::Resized | Change::Shown);
 	}
-	updateCornersRounding();
 }
 
 void WindowHelper::updateCornersRounding() {
@@ -345,10 +364,39 @@ void WindowHelper::init() {
 			size.height() - (titleShown ? titleHeight : 0));
 	}, _body->lifetime());
 
+	hitTestRequests(
+	) | rpl::filter([=](not_null<HitTestRequest*> request) {
+		return ::Platform::IsWindows11OrGreater();
+	}) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
+		request->result = [=] {
+			RECT r{};
+			const auto style = GetWindowLongPtr(_handle, GWL_STYLE)
+				& ~WS_CAPTION;
+			const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
+			const auto dpi = style::ConvertScale(
+				96 * style::DevicePixelRatio());
+			if (AdjustWindowRectExForDpiSupported() && dpi) {
+				AdjustWindowRectExForDpi(&r, style, false, styleEx, dpi);
+			} else {
+				AdjustWindowRectEx(&r, style, false, styleEx);
+			}
+			const auto maximized = window()->isMaximized()
+				|| window()->isFullScreen();
+			return (!maximized && (request->point.y() < -r.top))
+				? HitTestResult::Top
+				: HitTestResult::Client;
+		}();
+	}, window()->lifetime());
+
+	if (!::Platform::IsWindows11OrGreater()) {
+		_shadow.emplace(window(), st::windowShadowFg->c);
+	}
+
 	if (!::Platform::IsWindows8OrGreater()) {
 		SetWindowTheme(_handle, L" ", L" ");
 		QApplication::setStyle(QStyleFactory::create("Windows"));
 	}
+
 	updateWindowFrameColors();
 
 	_menu = GetSystemMenu(_handle, FALSE);
@@ -369,6 +417,7 @@ void WindowHelper::init() {
 		handleStateChanged);
 
 	initialShadowUpdate();
+	updateCornersRounding();
 }
 
 bool WindowHelper::handleNativeEvent(
@@ -409,11 +458,16 @@ bool WindowHelper::handleNativeEvent(
 		if (_title->isHidden() || window()->isFullScreen() || !wParam) {
 			return false;
 		}
-		WINDOWPLACEMENT wp;
-		wp.length = sizeof(WINDOWPLACEMENT);
-		if (GetWindowPlacement(_handle, &wp)
-			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
-			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
+		const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
+		const auto maximized = [&] {
+			WINDOWPLACEMENT wp;
+			wp.length = sizeof(WINDOWPLACEMENT);
+			return GetWindowPlacement(_handle, &wp)
+				&& (wp.showCmd == SW_SHOWMAXIMIZED);
+		}();
+		const auto addBorders = maximized
+			|| ::Platform::IsWindows11OrGreater();
+		if (addBorders) {
 			const auto dpi = _dpi.current();
 			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 			const auto borderWidth = ((GetSystemMetricsForDpiSupported() && dpi)
@@ -424,8 +478,12 @@ bool WindowHelper::handleNativeEvent(
 				- ((style & WS_CAPTION) ? 0 : 1);
 			r->left += borderWidth;
 			r->right -= borderWidth;
-			r->top += borderWidth;
+			if (maximized) {
+				r->top += borderWidth;
+			}
 			r->bottom -= borderWidth;
+		}
+		if (maximized) {
 			const auto hMonitor = MonitorFromWindow(
 				_handle,
 				MONITOR_DEFAULTTONEAREST);
@@ -441,10 +499,8 @@ bool WindowHelper::handleNativeEvent(
 				case ABE_BOTTOM: r->bottom -= 1; break;
 				}
 			}
-			if (result) *result = 0;
-		} else {
-			if (result) *result = WVR_REDRAW;
 		}
+		if (result) *result = addBorders ? 0 : WVR_REDRAW;
 	} return true;
 
 	case WM_NCRBUTTONUP: {
@@ -470,15 +526,15 @@ bool WindowHelper::handleNativeEvent(
 
 	case WM_WINDOWPOSCHANGING:
 	case WM_WINDOWPOSCHANGED: {
+		auto placement = WINDOWPLACEMENT{
+			.length = sizeof(WINDOWPLACEMENT),
+		};
+		if (!GetWindowPlacement(_handle, &placement)) {
+			LOG(("System Error: GetWindowPlacement failed."));
+			return false;
+		}
+		_title->refreshAdditionalPaddings(_handle, placement);
 		if (_shadow) {
-			auto placement = WINDOWPLACEMENT{
-				.length = sizeof(WINDOWPLACEMENT),
-			};
-			if (!GetWindowPlacement(_handle, &placement)) {
-				LOG(("System Error: GetWindowPlacement failed."));
-				return false;
-			}
-			_title->refreshAdditionalPaddings(_handle, placement);
 			if (placement.showCmd == SW_SHOWMAXIMIZED
 				|| placement.showCmd == SW_SHOWMINIMIZED) {
 				_shadow->update(WindowShadow::Change::Hidden);
@@ -504,8 +560,8 @@ bool WindowHelper::handleNativeEvent(
 				}
 				window()->windowHandle()->windowStateChanged(state);
 			}
+			_title->refreshAdditionalPaddings(_handle);
 			if (_shadow) {
-				_title->refreshAdditionalPaddings(_handle);
 				const auto changes = (wParam == SIZE_MINIMIZED
 					|| wParam == SIZE_MAXIMIZED)
 					? WindowShadow::Change::Hidden
@@ -549,8 +605,8 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_MOVE: {
+		_title->refreshAdditionalPaddings(_handle);
 		if (_shadow) {
-			_title->refreshAdditionalPaddings(_handle);
 			_shadow->update(WindowShadow::Change::Moved);
 		}
 	} return false;
@@ -563,9 +619,9 @@ bool WindowHelper::handleNativeEvent(
 		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 		ScreenToClient(_handle, &p);
 		const auto mapped = QPoint(p.x, p.y) / window()->devicePixelRatioF();
-		*result = [&] {
+		*result = [&]() -> LRESULT {
 			if (!window()->rect().contains(mapped)) {
-				return HTTRANSPARENT;
+				return DefWindowProc(_handle, msg, wParam, lParam);
 			}
 			auto request = HitTestRequest{
 				.point = mapped,
@@ -588,7 +644,7 @@ bool WindowHelper::handleNativeEvent(
 			case HitTestResult::Close: return systemButtonHitTest(result);
 
 			case HitTestResult::None:
-			default: return HTTRANSPARENT;
+			default: return DefWindowProc(_handle, msg, wParam, lParam);
 			};
 		}();
 		_systemButtonOver.fire(systemButtonHitTest(*result));

From 3255de2e5a19eefac3cbea572ca513e25d4d1f21 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 22 May 2022 22:28:24 +0400
Subject: [PATCH 129/635] Use native system window menu with custom titlebar on
 Windows

---
 ui/platform/win/ui_utility_win.cpp |  4 +-
 ui/platform/win/ui_window_win.cpp  | 88 +-----------------------------
 ui/platform/win/ui_window_win.h    |  3 -
 3 files changed, 3 insertions(+), 92 deletions(-)

diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 15337e1..61b5577 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -126,8 +126,8 @@ bool ShowWindowMenu(QWindow *window) {
 
 	SendMessage(
 		HWND(window->winId()),
-		WM_SYSCOMMAND,
-		SC_MOUSEMENU,
+		0x313 /* WM_POPUPSYSTEMMENU */,
+		0,
 		MAKELPARAM(pos.x(), pos.y()));
 
 	return true;
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 158faad..7bf3171 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -399,11 +399,7 @@ void WindowHelper::init() {
 
 	updateWindowFrameColors();
 
-	_menu = GetSystemMenu(_handle, FALSE);
-	updateSystemMenu();
-
 	const auto handleStateChanged = [=](Qt::WindowState state) {
-		updateSystemMenu(state);
 		if (fixedSize() && (state & Qt::WindowMaximized)) {
 			crl::on_main(window().get(), [=] {
 				window()->setWindowState(
@@ -507,7 +503,7 @@ bool WindowHelper::handleNativeEvent(
 		if (_title->isHidden()) {
 			return false;
 		}
-		SendMessage(_handle, WM_SYSCOMMAND, SC_MOUSEMENU, lParam);
+		SendMessage(_handle, 0x313 /* WM_POPUPSYSTEMMENU */, 0, lParam);
 		if (result) *result = 0;
 	} return true;
 
@@ -650,45 +646,6 @@ bool WindowHelper::handleNativeEvent(
 		_systemButtonOver.fire(systemButtonHitTest(*result));
 	} return true;
 
-	case WM_SYSCOMMAND: {
-		if (wParam == SC_MOUSEMENU && !fixedSize()) {
-			POINTS p = MAKEPOINTS(lParam);
-			updateSystemMenu(window()->windowHandle()->windowState());
-			TrackPopupMenu(
-				_menu,
-				TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON,
-				p.x,
-				p.y,
-				0,
-				_handle,
-				0);
-		}
-	} return false;
-
-	case WM_COMMAND: {
-		if (HIWORD(wParam)) {
-			return false;
-		}
-		const auto command = LOWORD(wParam);
-		switch (command) {
-		case SC_CLOSE:
-			window()->close();
-			return true;
-		case SC_MINIMIZE:
-			window()->setWindowState(
-				window()->windowState() | Qt::WindowMinimized);
-			return true;
-		case SC_MAXIMIZE:
-			if (!fixedSize()) {
-				window()->setWindowState(Qt::WindowMaximized);
-			}
-			return true;
-		case SC_RESTORE:
-			window()->setWindowState(Qt::WindowNoState);
-			return true;
-		}
-	} return true;
-
 	// should return true for Qt not to change window size
 	// when moving the window between screens
 	// change to false once runtime scale change would be supported
@@ -817,49 +774,6 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 		sizeof(COLORREF));
 }
 
-void WindowHelper::updateSystemMenu() {
-	updateSystemMenu(window()->windowHandle()->windowState());
-}
-
-void WindowHelper::updateSystemMenu(Qt::WindowState state) {
-	if (!_menu) {
-		return;
-	}
-
-	const auto menuToDisable = (state == Qt::WindowMaximized)
-		? SC_MAXIMIZE
-		: (state == Qt::WindowMinimized)
-		? SC_MINIMIZE
-		: SC_RESTORE;
-	const auto itemCount = GetMenuItemCount(_menu);
-	for (int i = 0; i < itemCount; ++i) {
-		MENUITEMINFO itemInfo = { 0 };
-		itemInfo.cbSize = sizeof(itemInfo);
-		itemInfo.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID;
-		if (!GetMenuItemInfo(_menu, i, TRUE, &itemInfo)) {
-			break;
-		}
-		if (itemInfo.fType & MFT_SEPARATOR) {
-			continue;
-		} else if (!itemInfo.wID || itemInfo.wID == SC_CLOSE) {
-			continue;
-		}
-		UINT fOldState = itemInfo.fState;
-		UINT fState = itemInfo.fState & ~(MFS_DISABLED | MFS_DEFAULT);
-		if (itemInfo.wID == menuToDisable
-			|| (itemInfo.wID != SC_MINIMIZE
-				&& itemInfo.wID != SC_MAXIMIZE
-				&& itemInfo.wID != SC_RESTORE)) {
-			fState |= MFS_DISABLED;
-		}
-		itemInfo.fMask = MIIM_STATE;
-		itemInfo.fState = fState;
-		if (!SetMenuItemInfo(_menu, i, TRUE, &itemInfo)) {
-			break;
-		}
-	}
-}
-
 not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() {
 	Expects(QCoreApplication::instance() != nullptr);
 
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index 8a2396c..0f823b4 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -51,8 +51,6 @@ private:
 	void init();
 	void updateWindowFrameColors();
 	void updateWindowFrameColors(bool active);
-	void updateSystemMenu();
-	void updateSystemMenu(Qt::WindowState state);
 	void initialShadowUpdate();
 	void updateCornersRounding();
 	[[nodiscard]] bool handleNativeEvent(
@@ -80,7 +78,6 @@ private:
 	rpl::event_stream<HitTestResult> _systemButtonDown;
 	std::optional<WindowShadow> _shadow;
 	rpl::variable<uint> _dpi;
-	HMENU _menu = nullptr;
 	bool _isFullScreen = false;
 
 };

From de5aa43f1538b9614bed634501d861cdaa386305 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 23 May 2022 23:24:46 +0400
Subject: [PATCH 130/635] Use native window titlebar on Windows 11

---
 ui/platform/win/ui_window_win.cpp | 132 ++++++++++++++++++++++++++----
 ui/platform/win/ui_window_win.h   |   3 +
 2 files changed, 121 insertions(+), 14 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 7bf3171..c2c8152 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -9,6 +9,7 @@
 #include "ui/inactive_press.h"
 #include "ui/platform/win/ui_window_title_win.h"
 #include "ui/widgets/rp_window.h"
+#include "ui/painter.h"
 #include "base/platform/win/base_windows_safe_library.h"
 #include "base/platform/base_platform_info.h"
 #include "base/integration.h"
@@ -206,7 +207,9 @@ not_null<RpWidget*> WindowHelper::body() {
 }
 
 QMargins WindowHelper::frameMargins() {
-	return _title->isHidden()
+	return frameMarginsSet()
+		? *_frameMargins.current()
+		: _title->isHidden()
 		? BasicWindowHelper::nativeFrameMargins()
 		: QMargins{ 0, _title->height(), 0, 0 };
 }
@@ -242,6 +245,14 @@ void WindowHelper::setNativeFrame(bool enabled) {
 			GWL_STYLE,
 			enabled ? (style | WS_CAPTION) : (style & ~WS_CAPTION));
 	}
+	if (::Platform::IsWindows11OrGreater()) {
+		if (enabled) {
+			_frameMargins = QMargins();
+			updateFrameMargins();
+		} else {
+			_frameMargins = std::nullopt;
+		}
+	}
 	_title->setVisible(!enabled);
 	if (enabled || ::Platform::IsWindows11OrGreater()) {
 		_shadow.reset();
@@ -352,16 +363,24 @@ void WindowHelper::init() {
 	rpl::combine(
 		window()->sizeValue(),
 		_title->heightValue(),
-		_title->shownValue()
+		_title->shownValue(),
+		_frameMargins.value()
 	) | rpl::start_with_next([=](
 			QSize size,
 			int titleHeight,
-			bool titleShown) {
-		_body->setGeometry(
+			bool titleShown,
+			std::optional<QMargins> frameMargins) {
+		_body->setGeometry(QRect(
+			0,
+			0,
+			size.width(),
+			size.height()
+		).marginsRemoved(QMargins(
 			0,
 			titleShown ? titleHeight : 0,
-			size.width(),
-			size.height() - (titleShown ? titleHeight : 0));
+			0,
+			0
+		)).marginsRemoved(frameMargins ? *frameMargins : QMargins()));
 	}, _body->lifetime());
 
 	hitTestRequests(
@@ -373,21 +392,64 @@ void WindowHelper::init() {
 			const auto style = GetWindowLongPtr(_handle, GWL_STYLE)
 				& ~WS_CAPTION;
 			const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-			const auto dpi = style::ConvertScale(
-				96 * style::DevicePixelRatio());
+			const auto dpi = frameMarginsSet()
+				? _dpi.current()
+				: style::ConvertScale(96 * style::DevicePixelRatio());
 			if (AdjustWindowRectExForDpiSupported() && dpi) {
 				AdjustWindowRectExForDpi(&r, style, false, styleEx, dpi);
 			} else {
 				AdjustWindowRectEx(&r, style, false, styleEx);
 			}
+			const auto frameMargins = _frameMargins.current()
+				? *_frameMargins.current()
+				: QMargins();
 			const auto maximized = window()->isMaximized()
 				|| window()->isFullScreen();
 			return (!maximized && (request->point.y() < -r.top))
 				? HitTestResult::Top
+				: (request->point.y() < frameMargins.top())
+				? HitTestResult::Caption
 				: HitTestResult::Client;
 		}();
 	}, window()->lifetime());
 
+	_dpi.value(
+	) | rpl::start_with_next([=](uint dpi) {
+		updateFrameMargins();
+	}, window()->lifetime());
+
+	_frameMargins.value(
+	) | rpl::start_with_next([=](std::optional<QMargins> frameMargins) {
+		const auto deviceDependentMargins = frameMargins
+			? *frameMargins * window()->devicePixelRatioF()
+			: QMargins();
+		const MARGINS m{
+			deviceDependentMargins.left(),
+			deviceDependentMargins.right(),
+			deviceDependentMargins.top(),
+			deviceDependentMargins.bottom(),
+		};
+		DwmExtendFrameIntoClientArea(_handle, &m);
+	}, window()->lifetime());
+
+	window()->paintRequest(
+	) | rpl::filter([=](QRect clip) {
+		return frameMarginsSet() && clip.intersects(QRect(
+			0,
+			0,
+			window()->width(),
+			_frameMargins.current()->top()));
+	}) | rpl::start_with_next([=] {
+		Painter p(window());
+		p.setCompositionMode(QPainter::CompositionMode_Clear);
+		p.fillRect(
+			0,
+			0,
+			window()->width(),
+			_frameMargins.current()->top(),
+			Qt::black);
+	}, window()->lifetime());
+
 	if (!::Platform::IsWindows11OrGreater()) {
 		_shadow.emplace(window(), st::windowShadowFg->c);
 	}
@@ -451,7 +513,9 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCCALCSIZE: {
-		if (_title->isHidden() || window()->isFullScreen() || !wParam) {
+		if ((_title->isHidden() && !frameMarginsSet())
+			|| window()->isFullScreen()
+			|| !wParam) {
 			return false;
 		}
 		const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
@@ -474,7 +538,7 @@ bool WindowHelper::handleNativeEvent(
 				- ((style & WS_CAPTION) ? 0 : 1);
 			r->left += borderWidth;
 			r->right -= borderWidth;
-			if (maximized) {
+			if (maximized && !frameMarginsSet()) {
 				r->top += borderWidth;
 			}
 			r->bottom -= borderWidth;
@@ -491,7 +555,9 @@ bool WindowHelper::handleNativeEvent(
 				switch (uEdge) {
 				case ABE_LEFT: r->left += 1; break;
 				case ABE_RIGHT: r->right -= 1; break;
-				case ABE_TOP: r->top += 1; break;
+				if (!frameMarginsSet()) {
+					case ABE_TOP: r->top += 1; break;
+				}
 				case ABE_BOTTOM: r->bottom -= 1; break;
 				}
 			}
@@ -500,7 +566,7 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCRBUTTONUP: {
-		if (_title->isHidden()) {
+		if (_title->isHidden() && !frameMarginsSet()) {
 			return false;
 		}
 		SendMessage(_handle, 0x313 /* WM_POPUPSYSTEMMENU */, 0, lParam);
@@ -608,7 +674,16 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_NCHITTEST: {
-		if (!result || _title->isHidden()) {
+		if (!result) {
+			return false;
+		} else if (frameMarginsSet()) {
+			LRESULT lRet = 0;
+			DwmDefWindowProc(_handle, msg, wParam, lParam, &lRet);
+			if (lRet) {
+				*result = lRet;
+				return true;
+			}
+		} else if (_title->isHidden()) {
 			return false;
 		}
 
@@ -646,6 +721,12 @@ bool WindowHelper::handleNativeEvent(
 		_systemButtonOver.fire(systemButtonHitTest(*result));
 	} return true;
 
+	case WM_NCMOUSELEAVE: {
+		if (result && frameMarginsSet()) {
+			return DwmDefWindowProc(_handle, msg, wParam, lParam, result);
+		}
+	} return false;
+
 	// should return true for Qt not to change window size
 	// when moving the window between screens
 	// change to false once runtime scale change would be supported
@@ -743,7 +824,11 @@ HitTestResult WindowHelper::systemButtonHitTest(int result) const {
 }
 
 int WindowHelper::titleHeight() const {
-	return _title->isHidden() ? 0 : _title->height();
+	return frameMarginsSet()
+		? _frameMargins.current()->top()
+		: _title->isHidden()
+		? 0
+		: _title->height();
 }
 
 void WindowHelper::updateWindowFrameColors() {
@@ -774,6 +859,25 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 		sizeof(COLORREF));
 }
 
+bool WindowHelper::frameMarginsSet() const {
+	return _frameMargins.current() && !_frameMargins.current()->isNull();
+}
+
+void WindowHelper::updateFrameMargins() {
+	if (!_frameMargins.current()) {
+		return;
+	}
+	RECT r{};
+	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
+	if (AdjustWindowRectExForDpiSupported() && _dpi.current()) {
+		AdjustWindowRectExForDpi(&r, style, false, styleEx, _dpi.current());
+	} else {
+		AdjustWindowRectEx(&r, style, false, styleEx);
+	}
+	_frameMargins = QMargins(0, -r.top, 0, 0) / window()->devicePixelRatioF();
+}
+
 not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() {
 	Expects(QCoreApplication::instance() != nullptr);
 
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index 0f823b4..5cd022e 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -49,6 +49,7 @@ private:
 	friend class NativeFilter;
 
 	void init();
+	void updateFrameMargins();
 	void updateWindowFrameColors();
 	void updateWindowFrameColors(bool active);
 	void initialShadowUpdate();
@@ -64,6 +65,7 @@ private:
 		LPARAM lParam,
 		LRESULT *result);
 	[[nodiscard]] bool fixedSize() const;
+	[[nodiscard]] bool frameMarginsSet() const;
 	[[nodiscard]] int systemButtonHitTest(HitTestResult result) const;
 	[[nodiscard]] HitTestResult systemButtonHitTest(int result) const;
 
@@ -78,6 +80,7 @@ private:
 	rpl::event_stream<HitTestResult> _systemButtonDown;
 	std::optional<WindowShadow> _shadow;
 	rpl::variable<uint> _dpi;
+	rpl::variable<std::optional<QMargins>> _frameMargins;
 	bool _isFullScreen = false;
 
 };

From a714fb0070580076bde16d0c8fe3bc1d03a7056d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 24 May 2022 10:12:24 +0400
Subject: [PATCH 131/635] Refactor all ui_platform_utility functions to accept
 QWidget

Also let ShowWindowMenu accept the point and remove unused return data
---
 .../linux/ui_linux_wayland_integration.cpp    | 28 ++++----
 .../linux/ui_linux_wayland_integration.h      |  6 +-
 .../ui_linux_wayland_integration_dummy.cpp    |  9 +--
 ui/platform/linux/ui_utility_linux.cpp        | 64 +++++++++----------
 ui/platform/mac/ui_utility_mac.h              |  7 +-
 ui/platform/ui_platform_utility.h             |  6 +-
 ui/platform/ui_platform_window.cpp            |  4 +-
 ui/platform/ui_platform_window_title.cpp      |  2 +-
 ui/platform/win/ui_utility_win.cpp            | 15 ++---
 ui/platform/win/ui_utility_win.h              |  4 +-
 ui/platform/win/ui_window_win.cpp             |  6 +-
 11 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index d142278..32666b3 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -158,7 +158,7 @@ bool WaylandIntegration::windowExtentsSupported() {
 }
 
 void WaylandIntegration::setWindowExtents(
-		QWindow *window,
+		not_null<QWidget*> widget,
 		const QMargins &extents) {
 	const auto native = QGuiApplication::platformNativeInterface();
 	if (!native) {
@@ -166,38 +166,42 @@ void WaylandIntegration::setWindowExtents(
 	}
 
 	native->setWindowProperty(
-		window->handle(),
+		widget->windowHandle()->handle(),
 		"_desktopApp_waylandCustomMargins",
 		QVariant::fromValue<QMargins>(extents));
 }
 
-void WaylandIntegration::unsetWindowExtents(QWindow *window) {
+void WaylandIntegration::unsetWindowExtents(not_null<QWidget*> widget) {
 	const auto native = QGuiApplication::platformNativeInterface();
 	if (!native) {
 		return;
 	}
 
 	native->setWindowProperty(
-		window->handle(),
+		widget->windowHandle()->handle(),
 		"_desktopApp_waylandCustomMargins",
 		QVariant());
 }
 
-bool WaylandIntegration::showWindowMenu(QWindow *window) {
+void WaylandIntegration::showWindowMenu(
+		not_null<QWidget*> widget,
+		const QPoint &point) {
 	const auto native = QGuiApplication::platformNativeInterface();
 	if (!native) {
-		return false;
+		return;
 	}
 
 	const auto toplevel = reinterpret_cast<xdg_toplevel*>(
-		native->nativeResourceForWindow(QByteArray("xdg_toplevel"), window));
+		native->nativeResourceForWindow(
+			QByteArray("xdg_toplevel"),
+			widget->windowHandle()));
 
 	const auto seat = reinterpret_cast<wl_seat*>(
 		native->nativeResourceForIntegration(QByteArray("wl_seat")));
 	
 	const auto serial = [&]() -> std::optional<uint32_t> {
 		const auto waylandWindow = static_cast<QWaylandWindow*>(
-			window->handle());
+			widget->windowHandle()->handle());
 		if (!waylandWindow) {
 			return std::nullopt;
 		}
@@ -205,14 +209,10 @@ bool WaylandIntegration::showWindowMenu(QWindow *window) {
 	}();
 
 	if (!toplevel || !seat || !serial) {
-		return false;
+		return;
 	}
 
-	const auto pos = window->mapFromGlobal(QCursor::pos())
-		* window->devicePixelRatio();
-
-	xdg_toplevel_show_window_menu(toplevel, seat, *serial, pos.x(), pos.y());
-	return true;
+	xdg_toplevel_show_window_menu(toplevel, seat, *serial, point.x(), point.y());
 }
 
 } // namespace Platform
diff --git a/ui/platform/linux/ui_linux_wayland_integration.h b/ui/platform/linux/ui_linux_wayland_integration.h
index c975539..543f871 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.h
+++ b/ui/platform/linux/ui_linux_wayland_integration.h
@@ -19,9 +19,9 @@ public:
 	void waitForInterfaceAnnounce();
 	[[nodiscard]] bool xdgDecorationSupported();
 	[[nodiscard]] bool windowExtentsSupported();
-	void setWindowExtents(QWindow *window, const QMargins &extents);
-	void unsetWindowExtents(QWindow *window);
-	bool showWindowMenu(QWindow *window);
+	void setWindowExtents(not_null<QWidget*> widget, const QMargins &extents);
+	void unsetWindowExtents(not_null<QWidget*> widget);
+	void showWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 private:
 	WaylandIntegration();
diff --git a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
index 0239433..1d3fa27 100644
--- a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
@@ -38,15 +38,16 @@ bool WaylandIntegration::windowExtentsSupported() {
 }
 
 void WaylandIntegration::setWindowExtents(
-		QWindow *window,
+		not_null<QWidget*> widget,
 		const QMargins &extents) {
 }
 
-void WaylandIntegration::unsetWindowExtents(QWindow *window) {
+void WaylandIntegration::unsetWindowExtents(not_null<QWidget*> widget) {
 }
 
-bool WaylandIntegration::showWindowMenu(QWindow *window) {
-	return false;
+void WaylandIntegration::showWindowMenu(
+		not_null<QWidget*> widget,
+		const QPoint &point) {
 }
 
 } // namespace Platform
diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index eebd63a..9414c55 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -21,7 +21,6 @@
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 #include <QtCore/QPoint>
-#include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
 
 namespace Ui {
@@ -291,7 +290,7 @@ std::optional<bool> XCBIsOverlapped(
 	return false;
 }
 
-void SetXCBFrameExtents(QWindow *window, const QMargins &extents) {
+void SetXCBFrameExtents(not_null<QWidget*> widget, const QMargins &extents) {
 	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
 		return;
@@ -305,17 +304,18 @@ void SetXCBFrameExtents(QWindow *window, const QMargins &extents) {
 		return;
 	}
 
+	const auto nativeExtents = extents * widget->devicePixelRatioF();
 	const auto extentsVector = std::vector<uint>{
-		uint(extents.left()),
-		uint(extents.right()),
-		uint(extents.top()),
-		uint(extents.bottom()),
+		uint(nativeExtents.left()),
+		uint(nativeExtents.right()),
+		uint(nativeExtents.top()),
+		uint(nativeExtents.bottom()),
 	};
 
 	xcb_change_property(
 		connection,
 		XCB_PROP_MODE_REPLACE,
-		window->winId(),
+		widget->winId(),
 		*frameExtentsAtom,
 		XCB_ATOM_CARDINAL,
 		32,
@@ -323,7 +323,7 @@ void SetXCBFrameExtents(QWindow *window, const QMargins &extents) {
 		extentsVector.data());
 }
 
-void UnsetXCBFrameExtents(QWindow *window) {
+void UnsetXCBFrameExtents(not_null<QWidget*> widget) {
 	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
 		return;
@@ -339,19 +339,19 @@ void UnsetXCBFrameExtents(QWindow *window) {
 
 	xcb_delete_property(
 		connection,
-		window->winId(),
+		widget->winId(),
 		*frameExtentsAtom);
 }
 
-bool ShowXCBWindowMenu(QWindow *window) {
+void ShowXCBWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 	const auto connection = base::Platform::XCB::GetConnectionFromQt();
 	if (!connection) {
-		return false;
+		return;
 	}
 
 	const auto root = base::Platform::XCB::GetRootWindow(connection);
 	if (!root.has_value()) {
-		return false;
+		return;
 	}
 
 	const auto showWindowMenuAtom = base::Platform::XCB::GetAtom(
@@ -359,16 +359,23 @@ bool ShowXCBWindowMenu(QWindow *window) {
 		"_GTK_SHOW_WINDOW_MENU");
 
 	if (!showWindowMenuAtom.has_value()) {
-		return false;
+		return;
 	}
 
-	const auto globalPos = QCursor::pos();
+	const auto windowGeometry = XCBWindowGeometry(widget->winId());
+	if (windowGeometry.isNull()) {
+		return;
+	}
+
+	const auto globalPos = point
+		* widget->devicePixelRatioF()
+		+ windowGeometry.topLeft();
 
 	xcb_client_message_event_t xev;
 	xev.response_type = XCB_CLIENT_MESSAGE;
 	xev.type = *showWindowMenuAtom;
 	xev.sequence = 0;
-	xev.window = window->winId();
+	xev.window = widget->winId();
 	xev.format = 32;
 	xev.data.data32[0] = 0;
 	xev.data.data32[1] = globalPos.x();
@@ -384,8 +391,6 @@ bool ShowXCBWindowMenu(QWindow *window) {
 		XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT
 			| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY,
 		reinterpret_cast<const char*>(&xev));
-
-	return true;
 }
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
@@ -513,39 +518,34 @@ bool WindowExtentsSupported() {
 	return false;
 }
 
-void SetWindowExtents(QWindow *window, const QMargins &extents) {
-	const auto nativeExtents = extents * window->devicePixelRatio();
+void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents) {
 	if (const auto integration = WaylandIntegration::Instance()) {
-		integration->setWindowExtents(window, nativeExtents);
+		integration->setWindowExtents(widget, extents);
 	} else if (::Platform::IsX11()) {
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-		SetXCBFrameExtents(window, nativeExtents);
+		SetXCBFrameExtents(widget, extents);
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 	}
 }
 
-void UnsetWindowExtents(QWindow *window) {
+void UnsetWindowExtents(not_null<QWidget*> widget) {
 	if (const auto integration = WaylandIntegration::Instance()) {
-		integration->unsetWindowExtents(window);
+		integration->unsetWindowExtents(widget);
 	} else if (::Platform::IsX11()) {
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-		UnsetXCBFrameExtents(window);
+		UnsetXCBFrameExtents(widget);
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 	}
 }
 
-bool ShowWindowMenu(QWindow *window) {
+void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 	if (const auto integration = WaylandIntegration::Instance()) {
-		return integration->showWindowMenu(window);
+		integration->showWindowMenu(widget, point);
 	} else if (::Platform::IsX11()) {
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-		return ShowXCBWindowMenu(window);
-#else // !DESKTOP_APP_DISABLE_X11_INTEGRATION
-		return false;
-#endif // DESKTOP_APP_DISABLE_X11_INTEGRATION
+		ShowXCBWindowMenu(widget, point);
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 	}
-
-	return false;
 }
 
 TitleControls::Layout TitleControlsLayout() {
diff --git a/ui/platform/mac/ui_utility_mac.h b/ui/platform/mac/ui_utility_mac.h
index de4787b..b2d4926 100644
--- a/ui/platform/mac/ui_utility_mac.h
+++ b/ui/platform/mac/ui_utility_mac.h
@@ -31,14 +31,13 @@ inline bool WindowExtentsSupported() {
 	return false;
 }
 
-inline void SetWindowExtents(QWindow *window, const QMargins &extents) {
+inline void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents) {
 }
 
-inline void UnsetWindowExtents(QWindow *window) {
+inline void UnsetWindowExtents(not_null<QWidget*> widget) {
 }
 
-inline bool ShowWindowMenu(QWindow *window) {
-	return false;
+inline void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 }
 
 } // namespace Platform
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index e85d64b..50e5bb3 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -39,9 +39,9 @@ void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio);
 void DrainMainQueue(); // Needed only if UseMainQueueGeneric() is false.
 
 [[nodiscard]] bool WindowExtentsSupported();
-void SetWindowExtents(QWindow *window, const QMargins &extents);
-void UnsetWindowExtents(QWindow *window);
-bool ShowWindowMenu(QWindow *window);
+void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents);
+void UnsetWindowExtents(not_null<QWidget*> widget);
+void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 [[nodiscard]] TitleControls::Layout TitleControlsLayout();
 [[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutValue();
diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 54c7ca6..cf002e5 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -491,10 +491,10 @@ void DefaultWindowHelper::paintBorders(QPainter &p) {
 
 void DefaultWindowHelper::updateWindowExtents() {
 	if (hasShadow() && !_title->isHidden()) {
-		SetWindowExtents(window()->windowHandle(), resizeArea());
+		SetWindowExtents(window(), resizeArea());
 		_extentsSet = true;
 	} else if (_extentsSet) {
-		UnsetWindowExtents(window()->windowHandle());
+		UnsetWindowExtents(window());
 		_extentsSet = false;
 	}
 }
diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index ee77d4f..c14244b 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -450,7 +450,7 @@ void DefaultTitleWidget::mousePressEvent(QMouseEvent *e) {
 	if (e->button() == Qt::LeftButton) {
 		_mousePressed = true;
 	} else if (e->button() == Qt::RightButton) {
-		ShowWindowMenu(window()->windowHandle());
+		ShowWindowMenu(window(), e->windowPos().toPoint());
 	}
 }
 
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 61b5577..b63a936 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -9,7 +9,6 @@
 #include "base/platform/win/base_windows_h.h"
 
 #include <QtWidgets/QApplication>
-#include <QtGui/QWindow>
 
 #include <wrl/client.h>
 #include <Shobjidl.h>
@@ -121,16 +120,16 @@ std::optional<bool> IsOverlapped(
 	return false;
 }
 
-bool ShowWindowMenu(QWindow *window) {
-	const auto pos = QCursor::pos();
-
+void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
+	const auto handle = HWND(widget->winId());
+	const auto mapped = point * widget->devicePixelRatioF();
+	POINT p{ mapped.x(), mapped.y() };
+	ClientToScreen(handle, &p);
 	SendMessage(
-		HWND(window->winId()),
+		handle,
 		0x313 /* WM_POPUPSYSTEMMENU */,
 		0,
-		MAKELPARAM(pos.x(), pos.y()));
-
-	return true;
+		MAKELPARAM(p.x, p.y));
 }
 
 TitleControls::Layout TitleControlsLayout() {
diff --git a/ui/platform/win/ui_utility_win.h b/ui/platform/win/ui_utility_win.h
index 67d8d89..c69eaa6 100644
--- a/ui/platform/win/ui_utility_win.h
+++ b/ui/platform/win/ui_utility_win.h
@@ -49,10 +49,10 @@ inline bool WindowExtentsSupported() {
 	return false;
 }
 
-inline void SetWindowExtents(QWindow *window, const QMargins &extents) {
+inline void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents) {
 }
 
-inline void UnsetWindowExtents(QWindow *window) {
+inline void UnsetWindowExtents(not_null<QWidget*> widget) {
 }
 
 } // namespace Platform
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index c2c8152..9042cfb 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -8,6 +8,7 @@
 
 #include "ui/inactive_press.h"
 #include "ui/platform/win/ui_window_title_win.h"
+#include "ui/platform/ui_platform_utility.h"
 #include "ui/widgets/rp_window.h"
 #include "ui/painter.h"
 #include "base/platform/win/base_windows_safe_library.h"
@@ -569,7 +570,10 @@ bool WindowHelper::handleNativeEvent(
 		if (_title->isHidden() && !frameMarginsSet()) {
 			return false;
 		}
-		SendMessage(_handle, 0x313 /* WM_POPUPSYSTEMMENU */, 0, lParam);
+		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
+		ScreenToClient(_handle, &p);
+		const auto mapped = QPoint(p.x, p.y) / window()->devicePixelRatioF();
+		ShowWindowMenu(window(), mapped);
 		if (result) *result = 0;
 	} return true;
 

From ce35425670d01e51aa26849a20ae721c09b38cf9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 26 May 2022 00:33:02 +0400
Subject: [PATCH 132/635] Simplify Windows native event filter

There's no need for a global event filter as it checks for the window hwnd anyway. And, moreover, that creates problems as Qt filters some events to global event filters.
---
 ui/platform/ui_platform_window.cpp |  7 +++
 ui/platform/ui_platform_window.h   |  5 ++
 ui/platform/win/ui_window_win.cpp  | 75 +++++++-----------------------
 ui/platform/win/ui_window_win.h    |  9 ++--
 ui/widgets/rp_window.cpp           | 15 ++++++
 ui/widgets/rp_window.h             |  8 ++++
 6 files changed, 56 insertions(+), 63 deletions(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index cf002e5..ec46060 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -70,6 +70,13 @@ rpl::producer<HitTestResult> BasicWindowHelper::systemButtonDown() const {
 	return rpl::never<HitTestResult>();
 }
 
+bool BasicWindowHelper::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		base::NativeEventResult *result) {
+	return false;
+}
+
 void BasicWindowHelper::setTitle(const QString &title) {
 	_window->setWindowTitle(title);
 }
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index e34f1d7..eadcbca 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -8,6 +8,7 @@
 
 #include "base/flags.h"
 #include "base/object_ptr.h"
+#include "base/qt/qt_common_adapters.h"
 #include "ui/round_rect.h"
 
 namespace style {
@@ -48,6 +49,10 @@ public:
 		-> rpl::producer<HitTestResult>;
 	[[nodiscard]] virtual auto systemButtonDown() const
 		-> rpl::producer<HitTestResult>;
+	[[nodiscard]] virtual bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		base::NativeEventResult *result);
 	virtual void setTitle(const QString &title);
 	virtual void setTitleStyle(const style::WindowTitle &st);
 	virtual void setNativeFrame(bool enabled);
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 9042cfb..2566674 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -18,7 +18,6 @@
 #include "styles/palette.h"
 #include "styles/style_widgets.h"
 
-#include <QtCore/QAbstractNativeEventFilter>
 #include <QtGui/QWindow>
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QApplication>
@@ -140,50 +139,6 @@ BOOL(__stdcall *AdjustWindowRectExForDpi)(
 
 } // namespace
 
-class WindowHelper::NativeFilter final : public QAbstractNativeEventFilter {
-public:
-	void registerWindow(HWND handle, not_null<WindowHelper*> helper);
-	void unregisterWindow(HWND handle);
-
-	bool nativeEventFilter(
-		const QByteArray &eventType,
-		void *message,
-		long *result) override;
-
-private:
-	base::flat_map<HWND, not_null<WindowHelper*>> _windowByHandle;
-
-};
-
-void WindowHelper::NativeFilter::registerWindow(
-		HWND handle,
-		not_null<WindowHelper*> helper) {
-	_windowByHandle.emplace(handle, helper);
-}
-
-void WindowHelper::NativeFilter::unregisterWindow(HWND handle) {
-	_windowByHandle.remove(handle);
-}
-
-bool WindowHelper::NativeFilter::nativeEventFilter(
-		const QByteArray &eventType,
-		void *message,
-		long *result) {
-	auto filtered = false;
-	const auto msg = static_cast<MSG*>(message);
-	const auto i = _windowByHandle.find(msg->hwnd);
-	if (i != end(_windowByHandle)) {
-		base::Integration::Instance().enterFromEventLoop([&] {
-			filtered = i->second->handleNativeEvent(
-				msg->message,
-				msg->wParam,
-				msg->lParam,
-				reinterpret_cast<LRESULT*>(result));
-		});
-	}
-	return filtered;
-}
-
 WindowHelper::WindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
 , _handle(GetWindowHandle(window))
@@ -196,7 +151,6 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 }
 
 WindowHelper::~WindowHelper() {
-	GetNativeFilter()->unregisterWindow(_handle);
 }
 
 void WindowHelper::initInWindow(not_null<RpWindow*> window) {
@@ -350,7 +304,6 @@ rpl::producer<HitTestResult> WindowHelper::systemButtonDown() const {
 
 void WindowHelper::init() {
 	_title->show();
-	GetNativeFilter()->registerWindow(_handle, this);
 
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
@@ -479,6 +432,22 @@ void WindowHelper::init() {
 	updateCornersRounding();
 }
 
+bool WindowHelper::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		base::NativeEventResult *result) {
+	const auto msg = static_cast<MSG*>(message);
+	auto lresult = LRESULT(*result);
+	const auto guard = gsl::finally([&] {
+		*result = base::NativeEventResult(lresult);
+	});
+	return handleNativeEvent(
+		msg->message,
+		msg->wParam,
+		msg->lParam,
+		&lresult);
+}
+
 bool WindowHelper::handleNativeEvent(
 		UINT msg,
 		WPARAM wParam,
@@ -882,18 +851,6 @@ void WindowHelper::updateFrameMargins() {
 	_frameMargins = QMargins(0, -r.top, 0, 0) / window()->devicePixelRatioF();
 }
 
-not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() {
-	Expects(QCoreApplication::instance() != nullptr);
-
-	static const auto GlobalFilter = [&] {
-		const auto application = QCoreApplication::instance();
-		const auto filter = Ui::CreateChild<NativeFilter>(application);
-		application->installNativeEventFilter(filter);
-		return filter;
-	}();
-	return GlobalFilter;
-}
-
 HWND GetWindowHandle(not_null<QWidget*> widget) {
 	const auto toplevel = widget->window();
 	toplevel->createWinId();
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index 5cd022e..fb651a4 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -44,10 +44,12 @@ public:
 	[[nodiscard]] auto systemButtonDown() const
 		-> rpl::producer<HitTestResult> override;
 
-private:
-	class NativeFilter;
-	friend class NativeFilter;
+	[[nodiscard]] bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		base::NativeEventResult *result) override;
 
+private:
 	void init();
 	void updateFrameMargins();
 	void updateWindowFrameColors();
@@ -70,7 +72,6 @@ private:
 	[[nodiscard]] HitTestResult systemButtonHitTest(int result) const;
 
 	[[nodiscard]] int titleHeight() const;
-	static not_null<NativeFilter*> GetNativeFilter();
 
 	const HWND _handle = nullptr;
 	const not_null<TitleWidget*> _title;
diff --git a/ui/widgets/rp_window.cpp b/ui/widgets/rp_window.cpp
index d1c38a6..f1dc292 100644
--- a/ui/widgets/rp_window.cpp
+++ b/ui/widgets/rp_window.cpp
@@ -17,6 +17,8 @@ RpWindow::RpWindow(QWidget *parent)
 
 	_helper->initInWindow(this);
 	hide();
+
+	_initialized = true;
 }
 
 RpWindow::~RpWindow() = default;
@@ -99,4 +101,17 @@ void RpWindow::setBodyTitleArea(
 	_helper->setBodyTitleArea(std::move(testMethod));
 }
 
+bool RpWindow::nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		base::NativeEventResult *result) {
+	if (_initialized && _helper->nativeEvent(
+		eventType,
+		message,
+		result)) {
+		return true;
+	}
+	return RpWidget::nativeEvent(eventType, message, result);
+}
+
 } // namespace Ui
diff --git a/ui/widgets/rp_window.h b/ui/widgets/rp_window.h
index 04b4d99..77311fc 100644
--- a/ui/widgets/rp_window.h
+++ b/ui/widgets/rp_window.h
@@ -8,6 +8,7 @@
 
 #include "ui/rp_widget.h"
 #include "base/flags.h"
+#include "base/qt/qt_common_adapters.h"
 
 namespace style {
 struct WindowTitle;
@@ -67,7 +68,14 @@ public:
 	void close();
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
+protected:
+	bool nativeEvent(
+		const QByteArray &eventType,
+		void *message,
+		base::NativeEventResult *result) override;
+
 private:
+	bool _initialized = false;
 	const std::unique_ptr<Platform::BasicWindowHelper> _helper;
 
 };

From 1679da738b2739820287fbf810981c91de48b73d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 13 Jun 2022 15:34:08 +0400
Subject: [PATCH 133/635] ui_window_win: use value_or for _frameMargins

---
 ui/platform/win/ui_window_win.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 2566674..1265838 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -334,7 +334,7 @@ void WindowHelper::init() {
 			titleShown ? titleHeight : 0,
 			0,
 			0
-		)).marginsRemoved(frameMargins ? *frameMargins : QMargins()));
+		)).marginsRemoved(frameMargins.value_or(QMargins())));
 	}, _body->lifetime());
 
 	hitTestRequests(
@@ -354,9 +354,8 @@ void WindowHelper::init() {
 			} else {
 				AdjustWindowRectEx(&r, style, false, styleEx);
 			}
-			const auto frameMargins = _frameMargins.current()
-				? *_frameMargins.current()
-				: QMargins();
+			const auto frameMargins = _frameMargins.current().value_or(
+				QMargins());
 			const auto maximized = window()->isMaximized()
 				|| window()->isFullScreen();
 			return (!maximized && (request->point.y() < -r.top))
@@ -374,9 +373,8 @@ void WindowHelper::init() {
 
 	_frameMargins.value(
 	) | rpl::start_with_next([=](std::optional<QMargins> frameMargins) {
-		const auto deviceDependentMargins = frameMargins
-			? *frameMargins * window()->devicePixelRatioF()
-			: QMargins();
+		const auto deviceDependentMargins = frameMargins.value_or(QMargins())
+			* window()->devicePixelRatioF();
 		const MARGINS m{
 			deviceDependentMargins.left(),
 			deviceDependentMargins.right(),
@@ -833,7 +831,7 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 }
 
 bool WindowHelper::frameMarginsSet() const {
-	return _frameMargins.current() && !_frameMargins.current()->isNull();
+	return !_frameMargins.current().value_or(QMargins()).isNull();
 }
 
 void WindowHelper::updateFrameMargins() {

From 3aa78fb00043e83bb000cec091bdbd93a8233794 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 Jun 2022 16:02:30 +0400
Subject: [PATCH 134/635] Fix box close button style.

---
 ui/layers/layers.style | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index b8824e9..4292a71 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -102,8 +102,8 @@ boxTitleClose: IconButton(defaultIconButton) {
 	icon: boxTitleCloseIcon;
 	iconOver: boxTitleCloseIconOver;
 
-	rippleAreaPosition: point(6px, 6px);
-	rippleAreaSize: 44px;
+	rippleAreaPosition: point(4px, 4px);
+	rippleAreaSize: 40px;
 	ripple: RippleAnimation(defaultRippleAnimation) {
 		color: windowBgOver;
 	}

From 2246d16daf0aa7b53ac1370c98c3aaf19b514f6a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 17 Jun 2022 19:42:31 +0400
Subject: [PATCH 135/635] Revert "Use native window titlebar on Windows 11"

This reverts commit de5aa43f1538b9614bed634501d861cdaa386305.
---
 ui/platform/win/ui_window_win.cpp | 130 ++++--------------------------
 ui/platform/win/ui_window_win.h   |   3 -
 2 files changed, 14 insertions(+), 119 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 1265838..dd67c75 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -10,7 +10,6 @@
 #include "ui/platform/win/ui_window_title_win.h"
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/widgets/rp_window.h"
-#include "ui/painter.h"
 #include "base/platform/win/base_windows_safe_library.h"
 #include "base/platform/base_platform_info.h"
 #include "base/integration.h"
@@ -162,9 +161,7 @@ not_null<RpWidget*> WindowHelper::body() {
 }
 
 QMargins WindowHelper::frameMargins() {
-	return frameMarginsSet()
-		? *_frameMargins.current()
-		: _title->isHidden()
+	return _title->isHidden()
 		? BasicWindowHelper::nativeFrameMargins()
 		: QMargins{ 0, _title->height(), 0, 0 };
 }
@@ -200,14 +197,6 @@ void WindowHelper::setNativeFrame(bool enabled) {
 			GWL_STYLE,
 			enabled ? (style | WS_CAPTION) : (style & ~WS_CAPTION));
 	}
-	if (::Platform::IsWindows11OrGreater()) {
-		if (enabled) {
-			_frameMargins = QMargins();
-			updateFrameMargins();
-		} else {
-			_frameMargins = std::nullopt;
-		}
-	}
 	_title->setVisible(!enabled);
 	if (enabled || ::Platform::IsWindows11OrGreater()) {
 		_shadow.reset();
@@ -317,24 +306,16 @@ void WindowHelper::init() {
 	rpl::combine(
 		window()->sizeValue(),
 		_title->heightValue(),
-		_title->shownValue(),
-		_frameMargins.value()
+		_title->shownValue()
 	) | rpl::start_with_next([=](
 			QSize size,
 			int titleHeight,
-			bool titleShown,
-			std::optional<QMargins> frameMargins) {
-		_body->setGeometry(QRect(
-			0,
-			0,
-			size.width(),
-			size.height()
-		).marginsRemoved(QMargins(
+			bool titleShown) {
+		_body->setGeometry(
 			0,
 			titleShown ? titleHeight : 0,
-			0,
-			0
-		)).marginsRemoved(frameMargins.value_or(QMargins())));
+			size.width(),
+			size.height() - (titleShown ? titleHeight : 0));
 	}, _body->lifetime());
 
 	hitTestRequests(
@@ -346,62 +327,21 @@ void WindowHelper::init() {
 			const auto style = GetWindowLongPtr(_handle, GWL_STYLE)
 				& ~WS_CAPTION;
 			const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-			const auto dpi = frameMarginsSet()
-				? _dpi.current()
-				: style::ConvertScale(96 * style::DevicePixelRatio());
+			const auto dpi = style::ConvertScale(
+				96 * style::DevicePixelRatio());
 			if (AdjustWindowRectExForDpiSupported() && dpi) {
 				AdjustWindowRectExForDpi(&r, style, false, styleEx, dpi);
 			} else {
 				AdjustWindowRectEx(&r, style, false, styleEx);
 			}
-			const auto frameMargins = _frameMargins.current().value_or(
-				QMargins());
 			const auto maximized = window()->isMaximized()
 				|| window()->isFullScreen();
 			return (!maximized && (request->point.y() < -r.top))
 				? HitTestResult::Top
-				: (request->point.y() < frameMargins.top())
-				? HitTestResult::Caption
 				: HitTestResult::Client;
 		}();
 	}, window()->lifetime());
 
-	_dpi.value(
-	) | rpl::start_with_next([=](uint dpi) {
-		updateFrameMargins();
-	}, window()->lifetime());
-
-	_frameMargins.value(
-	) | rpl::start_with_next([=](std::optional<QMargins> frameMargins) {
-		const auto deviceDependentMargins = frameMargins.value_or(QMargins())
-			* window()->devicePixelRatioF();
-		const MARGINS m{
-			deviceDependentMargins.left(),
-			deviceDependentMargins.right(),
-			deviceDependentMargins.top(),
-			deviceDependentMargins.bottom(),
-		};
-		DwmExtendFrameIntoClientArea(_handle, &m);
-	}, window()->lifetime());
-
-	window()->paintRequest(
-	) | rpl::filter([=](QRect clip) {
-		return frameMarginsSet() && clip.intersects(QRect(
-			0,
-			0,
-			window()->width(),
-			_frameMargins.current()->top()));
-	}) | rpl::start_with_next([=] {
-		Painter p(window());
-		p.setCompositionMode(QPainter::CompositionMode_Clear);
-		p.fillRect(
-			0,
-			0,
-			window()->width(),
-			_frameMargins.current()->top(),
-			Qt::black);
-	}, window()->lifetime());
-
 	if (!::Platform::IsWindows11OrGreater()) {
 		_shadow.emplace(window(), st::windowShadowFg->c);
 	}
@@ -481,9 +421,7 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCCALCSIZE: {
-		if ((_title->isHidden() && !frameMarginsSet())
-			|| window()->isFullScreen()
-			|| !wParam) {
+		if (_title->isHidden() || window()->isFullScreen() || !wParam) {
 			return false;
 		}
 		const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
@@ -506,7 +444,7 @@ bool WindowHelper::handleNativeEvent(
 				- ((style & WS_CAPTION) ? 0 : 1);
 			r->left += borderWidth;
 			r->right -= borderWidth;
-			if (maximized && !frameMarginsSet()) {
+			if (maximized) {
 				r->top += borderWidth;
 			}
 			r->bottom -= borderWidth;
@@ -523,9 +461,7 @@ bool WindowHelper::handleNativeEvent(
 				switch (uEdge) {
 				case ABE_LEFT: r->left += 1; break;
 				case ABE_RIGHT: r->right -= 1; break;
-				if (!frameMarginsSet()) {
-					case ABE_TOP: r->top += 1; break;
-				}
+				case ABE_TOP: r->top += 1; break;
 				case ABE_BOTTOM: r->bottom -= 1; break;
 				}
 			}
@@ -534,7 +470,7 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCRBUTTONUP: {
-		if (_title->isHidden() && !frameMarginsSet()) {
+		if (_title->isHidden()) {
 			return false;
 		}
 		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
@@ -645,16 +581,7 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_NCHITTEST: {
-		if (!result) {
-			return false;
-		} else if (frameMarginsSet()) {
-			LRESULT lRet = 0;
-			DwmDefWindowProc(_handle, msg, wParam, lParam, &lRet);
-			if (lRet) {
-				*result = lRet;
-				return true;
-			}
-		} else if (_title->isHidden()) {
+		if (!result || _title->isHidden()) {
 			return false;
 		}
 
@@ -692,12 +619,6 @@ bool WindowHelper::handleNativeEvent(
 		_systemButtonOver.fire(systemButtonHitTest(*result));
 	} return true;
 
-	case WM_NCMOUSELEAVE: {
-		if (result && frameMarginsSet()) {
-			return DwmDefWindowProc(_handle, msg, wParam, lParam, result);
-		}
-	} return false;
-
 	// should return true for Qt not to change window size
 	// when moving the window between screens
 	// change to false once runtime scale change would be supported
@@ -795,11 +716,7 @@ HitTestResult WindowHelper::systemButtonHitTest(int result) const {
 }
 
 int WindowHelper::titleHeight() const {
-	return frameMarginsSet()
-		? _frameMargins.current()->top()
-		: _title->isHidden()
-		? 0
-		: _title->height();
+	return _title->isHidden() ? 0 : _title->height();
 }
 
 void WindowHelper::updateWindowFrameColors() {
@@ -830,25 +747,6 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 		sizeof(COLORREF));
 }
 
-bool WindowHelper::frameMarginsSet() const {
-	return !_frameMargins.current().value_or(QMargins()).isNull();
-}
-
-void WindowHelper::updateFrameMargins() {
-	if (!_frameMargins.current()) {
-		return;
-	}
-	RECT r{};
-	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-	if (AdjustWindowRectExForDpiSupported() && _dpi.current()) {
-		AdjustWindowRectExForDpi(&r, style, false, styleEx, _dpi.current());
-	} else {
-		AdjustWindowRectEx(&r, style, false, styleEx);
-	}
-	_frameMargins = QMargins(0, -r.top, 0, 0) / window()->devicePixelRatioF();
-}
-
 HWND GetWindowHandle(not_null<QWidget*> widget) {
 	const auto toplevel = widget->window();
 	toplevel->createWinId();
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index fb651a4..b5b1450 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -51,7 +51,6 @@ public:
 
 private:
 	void init();
-	void updateFrameMargins();
 	void updateWindowFrameColors();
 	void updateWindowFrameColors(bool active);
 	void initialShadowUpdate();
@@ -67,7 +66,6 @@ private:
 		LPARAM lParam,
 		LRESULT *result);
 	[[nodiscard]] bool fixedSize() const;
-	[[nodiscard]] bool frameMarginsSet() const;
 	[[nodiscard]] int systemButtonHitTest(HitTestResult result) const;
 	[[nodiscard]] HitTestResult systemButtonHitTest(int result) const;
 
@@ -81,7 +79,6 @@ private:
 	rpl::event_stream<HitTestResult> _systemButtonDown;
 	std::optional<WindowShadow> _shadow;
 	rpl::variable<uint> _dpi;
-	rpl::variable<std::optional<QMargins>> _frameMargins;
 	bool _isFullScreen = false;
 
 };

From 74cd53e1d1e8f7688bd59b02aa5c789cf37ed975 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 17 Jun 2022 19:42:31 +0400
Subject: [PATCH 136/635] Revert "Use native window resize on Windows 11"

This reverts commit 2e9aec239dd5f2e315d12d1038fb2d8d3e3f136f.
---
 ui/platform/ui_platform_window_title.cpp |  12 +--
 ui/platform/win/ui_window_shadow_win.cpp |   5 +-
 ui/platform/win/ui_window_shadow_win.h   |   1 +
 ui/platform/win/ui_window_title_win.cpp  |  12 +--
 ui/platform/win/ui_window_title_win.h    |   4 +-
 ui/platform/win/ui_window_win.cpp        | 106 ++++++-----------------
 6 files changed, 38 insertions(+), 102 deletions(-)

diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index c14244b..4e826c1 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -218,14 +218,10 @@ void TitleControls::raise() {
 HitTestResult TitleControls::hitTest(QPoint point, int padding) const {
 	const auto test = [&](const object_ptr<Button> &button, bool close) {
 		return button && button->geometry().marginsAdded(
-			{ 0, padding, 0, 0 }
+			{ close ? padding : 0, padding, close ? padding : 0, 0 }
 		).contains(point);
 	};
-	if (::Platform::IsWindows11OrGreater()
-		&& !_maximizedState
-		&& (point.y() < style::ConvertScale(style::DevicePixelRatio()))) {
-		return HitTestResult::Top;
-	} else if (test(_minimize, false)) {
+	if (test(_minimize, false)) {
 		return HitTestResult::Minimize;
 	} else if (test(_maximizeRestore, false)) {
 		return HitTestResult::MaximizeRestore;
@@ -501,9 +497,9 @@ std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 		controlsTop ? std::move(controlsTop) : rpl::single(0)
 	) | rpl::start_with_next([=](int width, int padding, int top) {
 		raw->wrap.setGeometry(
-			0,
+			padding,
 			top,
-			width,
+			width - 2 * padding,
 			raw->controls.geometry().height());
 	}, lifetime);
 
diff --git a/ui/platform/win/ui_window_shadow_win.cpp b/ui/platform/win/ui_window_shadow_win.cpp
index 59bbe55..79abd98 100644
--- a/ui/platform/win/ui_window_shadow_win.cpp
+++ b/ui/platform/win/ui_window_shadow_win.cpp
@@ -43,7 +43,8 @@ base::flat_map<HWND, not_null<WindowShadow*>> ShadowByHandle;
 
 WindowShadow::WindowShadow(not_null<RpWidget*> window, QColor color)
 : _window(window)
-, _handle(GetWindowHandle(window)) {
+, _handle(GetWindowHandle(window))
+, _windows11(::Platform::IsWindows11OrGreater()) {
 	init(color);
 }
 
@@ -316,7 +317,7 @@ void WindowShadow::horCorners(int w, Gdiplus::Graphics *pgraphics0, Gdiplus::Gra
 }
 
 Gdiplus::Color WindowShadow::getColor(uchar alpha) const {
-	return Gdiplus::Color(BYTE(alpha), _r, _g, _b);
+	return Gdiplus::Color(BYTE(_windows11 ? 1 : alpha), _r, _g, _b);
 }
 
 Gdiplus::SolidBrush WindowShadow::getBrush(uchar alpha) const {
diff --git a/ui/platform/win/ui_window_shadow_win.h b/ui/platform/win/ui_window_shadow_win.h
index c157fa5..db63914 100644
--- a/ui/platform/win/ui_window_shadow_win.h
+++ b/ui/platform/win/ui_window_shadow_win.h
@@ -78,6 +78,7 @@ private:
 
 	const not_null<RpWidget*> _window;
 	const HWND _handle;
+	const bool _windows11 = false;
 
 	int _x = 0;
 	int _y = 0;
diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index b4e49e9..4defa64 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -74,7 +74,7 @@ void TitleWidget::initInWindow(not_null<RpWindow*> window) {
 	) | rpl::filter([=](not_null<HitTestRequest*> request) {
 		return !isHidden() && geometry().contains(request->point);
 	}) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
-		request->result = hitTest(request->point, request->result);
+		request->result = hitTest(request->point);
 	}, lifetime());
 
 	SetupSemiNativeSystemButtons(&_controls, window, lifetime(), [=] {
@@ -98,9 +98,9 @@ void TitleWidget::refreshGeometryWithWidth(int width) {
 	setGeometry(0, 0, width, _controls.st()->height + add);
 	if (_paddingHelper) {
 		_paddingHelper->controlsParent.setGeometry(
-			0,
 			add,
-			width,
+			add,
+			width - 2 * add,
 			_controls.st()->height);
 	}
 	update();
@@ -126,9 +126,7 @@ void TitleWidget::resizeEvent(QResizeEvent *e) {
 	_shadow->setGeometry(0, height() - thickness, width(), thickness);
 }
 
-HitTestResult TitleWidget::hitTest(
-		QPoint point,
-		HitTestResult oldResult) const {
+HitTestResult TitleWidget::hitTest(QPoint point) const {
 	const auto origin = _paddingHelper
 		? _paddingHelper->controlsParent.pos()
 		: QPoint();
@@ -138,8 +136,6 @@ HitTestResult TitleWidget::hitTest(
 	const auto controlsResult = _controls.hitTest(point - origin, padding);
 	return (controlsResult != HitTestResult::None)
 		? controlsResult
-		: (oldResult != HitTestResult::Client)
-		? oldResult
 		: HitTestResult::Caption;
 }
 
diff --git a/ui/platform/win/ui_window_title_win.h b/ui/platform/win/ui_window_title_win.h
index 7cce4dc..39177e6 100644
--- a/ui/platform/win/ui_window_title_win.h
+++ b/ui/platform/win/ui_window_title_win.h
@@ -55,9 +55,7 @@ protected:
 private:
 	struct PaddingHelper;
 
-	[[nodiscard]] HitTestResult hitTest(
-		QPoint point,
-		HitTestResult oldResult) const;
+	[[nodiscard]] HitTestResult hitTest(QPoint point) const;
 	[[nodiscard]] bool additionalPaddingRequired() const;
 	void refreshGeometryWithWidth(int width);
 	void setAdditionalPadding(int padding);
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index dd67c75..fc3fb18 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -41,13 +41,6 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	_In_ int nIndex,
 	_In_ UINT dpi);
 
-BOOL(__stdcall *AdjustWindowRectExForDpi)(
-	_Inout_ LPRECT lpRect,
-	_In_ DWORD dwStyle,
-	_In_ BOOL bMenu,
-	_In_ DWORD dwExStyle,
-	_In_ UINT dpi);
-
 [[nodiscard]] bool GetDpiForWindowSupported() {
 	static const auto Result = [&] {
 #define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
@@ -68,16 +61,6 @@ BOOL(__stdcall *AdjustWindowRectExForDpi)(
 	return Result;
 }
 
-[[nodiscard]] bool AdjustWindowRectExForDpiSupported() {
-	static const auto Result = [&] {
-#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
-		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
-		return LOAD_SYMBOL(user32, AdjustWindowRectExForDpi);
-#undef LOAD_SYMBOL
-	}();
-	return Result;
-}
-
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -143,6 +126,7 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 , _handle(GetWindowHandle(window))
 , _title(Ui::CreateChild<TitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
+, _shadow(std::in_place, window, st::windowShadowFg->c)
 , _dpi(GetDpiForWindowSupported() ? GetDpiForWindow(_handle) : 0) {
 	Expects(_handle != nullptr);
 
@@ -198,14 +182,13 @@ void WindowHelper::setNativeFrame(bool enabled) {
 			enabled ? (style | WS_CAPTION) : (style & ~WS_CAPTION));
 	}
 	_title->setVisible(!enabled);
-	if (enabled || ::Platform::IsWindows11OrGreater()) {
+	if (enabled) {
 		_shadow.reset();
 	} else {
 		_shadow.emplace(window(), st::windowShadowFg->c);
 		_shadow->setResizeEnabled(!fixedSize());
 		initialShadowUpdate();
 	}
-	updateCornersRounding();
 	updateWindowFrameColors();
 	SetWindowPos(
 		_handle,
@@ -222,9 +205,6 @@ void WindowHelper::setNativeFrame(bool enabled) {
 }
 
 void WindowHelper::initialShadowUpdate() {
-	if (!_shadow) {
-		return;
-	}
 	using Change = WindowShadow::Change;
 	const auto noShadowStates = (Qt::WindowMinimized | Qt::WindowMaximized);
 	if ((window()->windowState() & noShadowStates) || window()->isHidden()) {
@@ -232,6 +212,7 @@ void WindowHelper::initialShadowUpdate() {
 	} else {
 		_shadow->update(Change::Moved | Change::Resized | Change::Shown);
 	}
+	updateCornersRounding();
 }
 
 void WindowHelper::updateCornersRounding() {
@@ -318,39 +299,10 @@ void WindowHelper::init() {
 			size.height() - (titleShown ? titleHeight : 0));
 	}, _body->lifetime());
 
-	hitTestRequests(
-	) | rpl::filter([=](not_null<HitTestRequest*> request) {
-		return ::Platform::IsWindows11OrGreater();
-	}) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
-		request->result = [=] {
-			RECT r{};
-			const auto style = GetWindowLongPtr(_handle, GWL_STYLE)
-				& ~WS_CAPTION;
-			const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-			const auto dpi = style::ConvertScale(
-				96 * style::DevicePixelRatio());
-			if (AdjustWindowRectExForDpiSupported() && dpi) {
-				AdjustWindowRectExForDpi(&r, style, false, styleEx, dpi);
-			} else {
-				AdjustWindowRectEx(&r, style, false, styleEx);
-			}
-			const auto maximized = window()->isMaximized()
-				|| window()->isFullScreen();
-			return (!maximized && (request->point.y() < -r.top))
-				? HitTestResult::Top
-				: HitTestResult::Client;
-		}();
-	}, window()->lifetime());
-
-	if (!::Platform::IsWindows11OrGreater()) {
-		_shadow.emplace(window(), st::windowShadowFg->c);
-	}
-
 	if (!::Platform::IsWindows8OrGreater()) {
 		SetWindowTheme(_handle, L" ", L" ");
 		QApplication::setStyle(QStyleFactory::create("Windows"));
 	}
-
 	updateWindowFrameColors();
 
 	const auto handleStateChanged = [=](Qt::WindowState state) {
@@ -367,7 +319,6 @@ void WindowHelper::init() {
 		handleStateChanged);
 
 	initialShadowUpdate();
-	updateCornersRounding();
 }
 
 bool WindowHelper::nativeEvent(
@@ -424,16 +375,11 @@ bool WindowHelper::handleNativeEvent(
 		if (_title->isHidden() || window()->isFullScreen() || !wParam) {
 			return false;
 		}
-		const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
-		const auto maximized = [&] {
-			WINDOWPLACEMENT wp;
-			wp.length = sizeof(WINDOWPLACEMENT);
-			return GetWindowPlacement(_handle, &wp)
-				&& (wp.showCmd == SW_SHOWMAXIMIZED);
-		}();
-		const auto addBorders = maximized
-			|| ::Platform::IsWindows11OrGreater();
-		if (addBorders) {
+		WINDOWPLACEMENT wp;
+		wp.length = sizeof(WINDOWPLACEMENT);
+		if (GetWindowPlacement(_handle, &wp)
+			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
+			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
 			const auto dpi = _dpi.current();
 			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 			const auto borderWidth = ((GetSystemMetricsForDpiSupported() && dpi)
@@ -444,12 +390,8 @@ bool WindowHelper::handleNativeEvent(
 				- ((style & WS_CAPTION) ? 0 : 1);
 			r->left += borderWidth;
 			r->right -= borderWidth;
-			if (maximized) {
-				r->top += borderWidth;
-			}
+			r->top += borderWidth;
 			r->bottom -= borderWidth;
-		}
-		if (maximized) {
 			const auto hMonitor = MonitorFromWindow(
 				_handle,
 				MONITOR_DEFAULTTONEAREST);
@@ -465,8 +407,10 @@ bool WindowHelper::handleNativeEvent(
 				case ABE_BOTTOM: r->bottom -= 1; break;
 				}
 			}
+			if (result) *result = 0;
+		} else {
+			if (result) *result = WVR_REDRAW;
 		}
-		if (result) *result = addBorders ? 0 : WVR_REDRAW;
 	} return true;
 
 	case WM_NCRBUTTONUP: {
@@ -495,15 +439,15 @@ bool WindowHelper::handleNativeEvent(
 
 	case WM_WINDOWPOSCHANGING:
 	case WM_WINDOWPOSCHANGED: {
-		auto placement = WINDOWPLACEMENT{
-			.length = sizeof(WINDOWPLACEMENT),
-		};
-		if (!GetWindowPlacement(_handle, &placement)) {
-			LOG(("System Error: GetWindowPlacement failed."));
-			return false;
-		}
-		_title->refreshAdditionalPaddings(_handle, placement);
 		if (_shadow) {
+			auto placement = WINDOWPLACEMENT{
+				.length = sizeof(WINDOWPLACEMENT),
+			};
+			if (!GetWindowPlacement(_handle, &placement)) {
+				LOG(("System Error: GetWindowPlacement failed."));
+				return false;
+			}
+			_title->refreshAdditionalPaddings(_handle, placement);
 			if (placement.showCmd == SW_SHOWMAXIMIZED
 				|| placement.showCmd == SW_SHOWMINIMIZED) {
 				_shadow->update(WindowShadow::Change::Hidden);
@@ -529,8 +473,8 @@ bool WindowHelper::handleNativeEvent(
 				}
 				window()->windowHandle()->windowStateChanged(state);
 			}
-			_title->refreshAdditionalPaddings(_handle);
 			if (_shadow) {
+				_title->refreshAdditionalPaddings(_handle);
 				const auto changes = (wParam == SIZE_MINIMIZED
 					|| wParam == SIZE_MAXIMIZED)
 					? WindowShadow::Change::Hidden
@@ -574,8 +518,8 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_MOVE: {
-		_title->refreshAdditionalPaddings(_handle);
 		if (_shadow) {
+			_title->refreshAdditionalPaddings(_handle);
 			_shadow->update(WindowShadow::Change::Moved);
 		}
 	} return false;
@@ -588,9 +532,9 @@ bool WindowHelper::handleNativeEvent(
 		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 		ScreenToClient(_handle, &p);
 		const auto mapped = QPoint(p.x, p.y) / window()->devicePixelRatioF();
-		*result = [&]() -> LRESULT {
+		*result = [&] {
 			if (!window()->rect().contains(mapped)) {
-				return DefWindowProc(_handle, msg, wParam, lParam);
+				return HTTRANSPARENT;
 			}
 			auto request = HitTestRequest{
 				.point = mapped,
@@ -613,7 +557,7 @@ bool WindowHelper::handleNativeEvent(
 			case HitTestResult::Close: return systemButtonHitTest(result);
 
 			case HitTestResult::None:
-			default: return DefWindowProc(_handle, msg, wParam, lParam);
+			default: return HTTRANSPARENT;
 			};
 		}();
 		_systemButtonOver.fire(systemButtonHitTest(*result));

From 30810032dc1d3e99f2ee757e7dcacc8aa4bdcf1c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 17 Jun 2022 19:45:03 +0400
Subject: [PATCH 137/635] Revert "Make maximized geometry handling less bugged
 on Windows"

This reverts commit b05b7bd502695071c5aaa7e7479f220e676bcfc7.
---
 ui/platform/win/ui_window_win.cpp | 222 ++++++++++++++++++++----------
 ui/platform/win/ui_window_win.h   |   4 +
 2 files changed, 155 insertions(+), 71 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index fc3fb18..89c2793 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -20,10 +20,12 @@
 #include <QtGui/QWindow>
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QApplication>
+#include <qpa/qplatformnativeinterface.h>
 
 #include <dwmapi.h>
 #include <uxtheme.h>
-#include <windowsx.h>
+
+Q_DECLARE_METATYPE(QMargins);
 
 namespace Ui {
 namespace Platform {
@@ -37,10 +39,6 @@ constexpr auto kDWMWA_TEXT_COLOR = DWORD(36);
 
 UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
 
-int(__stdcall *GetSystemMetricsForDpi)(
-	_In_ int nIndex,
-	_In_ UINT dpi);
-
 [[nodiscard]] bool GetDpiForWindowSupported() {
 	static const auto Result = [&] {
 #define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
@@ -51,16 +49,6 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	return Result;
 }
 
-[[nodiscard]] bool GetSystemMetricsForDpiSupported() {
-	static const auto Result = [&] {
-#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
-		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
-		return LOAD_SYMBOL(user32, GetSystemMetricsForDpi);
-#undef LOAD_SYMBOL
-	}();
-	return Result;
-}
-
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -119,11 +107,29 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	return bAutoHidden;
 }
 
+void FixAeroSnap(HWND handle) {
+	SetWindowLongPtr(
+		handle,
+		GWL_STYLE,
+		GetWindowLongPtr(handle, GWL_STYLE) | WS_CAPTION | WS_THICKFRAME);
+}
+
+[[nodiscard]] HWND ResolveWindowHandle(not_null<QWidget*> widget) {
+	if (!::Platform::IsWindows8OrGreater()) {
+		widget->setWindowFlag(Qt::FramelessWindowHint);
+	}
+	const auto result = GetWindowHandle(widget);
+	if (!::Platform::IsWindows8OrGreater()) {
+		FixAeroSnap(result);
+	}
+	return result;
+}
+
 } // namespace
 
 WindowHelper::WindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
-, _handle(GetWindowHandle(window))
+, _handle(ResolveWindowHandle(window))
 , _title(Ui::CreateChild<TitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
 , _shadow(std::in_place, window, st::windowShadowFg->c)
@@ -175,11 +181,10 @@ void WindowHelper::setTitleStyle(const style::WindowTitle &st) {
 
 void WindowHelper::setNativeFrame(bool enabled) {
 	if (!::Platform::IsWindows8OrGreater()) {
-		const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-		SetWindowLongPtr(
-			_handle,
-			GWL_STYLE,
-			enabled ? (style | WS_CAPTION) : (style & ~WS_CAPTION));
+		window()->windowHandle()->setFlag(Qt::FramelessWindowHint, !enabled);
+		if (!enabled) {
+			FixAeroSnap(_handle);
+		}
 	}
 	_title->setVisible(!enabled);
 	if (enabled) {
@@ -189,7 +194,9 @@ void WindowHelper::setNativeFrame(bool enabled) {
 		_shadow->setResizeEnabled(!fixedSize());
 		initialShadowUpdate();
 	}
+	updateMargins();
 	updateWindowFrameColors();
+	fixMaximizedWindow();
 	SetWindowPos(
 		_handle,
 		0,
@@ -246,6 +253,7 @@ void WindowHelper::setGeometry(QRect rect) {
 void WindowHelper::showFullScreen() {
 	if (!_isFullScreen) {
 		_isFullScreen = true;
+		updateMargins();
 		updateCornersRounding();
 	}
 	window()->showFullScreen();
@@ -255,6 +263,7 @@ void WindowHelper::showNormal() {
 	window()->showNormal();
 	if (_isFullScreen) {
 		_isFullScreen = false;
+		updateMargins();
 		updateCornersRounding();
 	}
 }
@@ -299,6 +308,8 @@ void WindowHelper::init() {
 			size.height() - (titleShown ? titleHeight : 0));
 	}, _body->lifetime());
 
+	updateMargins();
+
 	if (!::Platform::IsWindows8OrGreater()) {
 		SetWindowTheme(_handle, L" ", L" ");
 		QApplication::setStyle(QStyleFactory::create("Windows"));
@@ -372,7 +383,7 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCCALCSIZE: {
-		if (_title->isHidden() || window()->isFullScreen() || !wParam) {
+		if (_title->isHidden() || !wParam) {
 			return false;
 		}
 		WINDOWPLACEMENT wp;
@@ -380,38 +391,31 @@ bool WindowHelper::handleNativeEvent(
 		if (GetWindowPlacement(_handle, &wp)
 			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
 			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
-			const auto dpi = _dpi.current();
-			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-			const auto borderWidth = ((GetSystemMetricsForDpiSupported() && dpi)
-				? GetSystemMetricsForDpi(SM_CXSIZEFRAME, dpi)
-					+ GetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi)
-				: GetSystemMetrics(SM_CXSIZEFRAME)
-					+ GetSystemMetrics(SM_CXPADDEDBORDER))
-				- ((style & WS_CAPTION) ? 0 : 1);
-			r->left += borderWidth;
-			r->right -= borderWidth;
-			r->top += borderWidth;
-			r->bottom -= borderWidth;
-			const auto hMonitor = MonitorFromWindow(
-				_handle,
+			const auto hMonitor = MonitorFromPoint(
+				{ (r->left + r->right) / 2, (r->top + r->bottom) / 2 },
 				MONITOR_DEFAULTTONEAREST);
-			MONITORINFO mi;
-			mi.cbSize = sizeof(mi);
-			UINT uEdge = (UINT)-1;
-			if (GetMonitorInfo(hMonitor, &mi)
-				&& IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
-				switch (uEdge) {
-				case ABE_LEFT: r->left += 1; break;
-				case ABE_RIGHT: r->right -= 1; break;
-				case ABE_TOP: r->top += 1; break;
-				case ABE_BOTTOM: r->bottom -= 1; break;
+			if (hMonitor) {
+				MONITORINFO mi;
+				mi.cbSize = sizeof(mi);
+				if (GetMonitorInfo(hMonitor, &mi)) {
+					*r = mi.rcWork;
+					UINT uEdge = (UINT)-1;
+					if (IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
+						switch (uEdge) {
+						case ABE_LEFT: r->left += 1; break;
+						case ABE_RIGHT: r->right -= 1; break;
+						case ABE_TOP: r->top += 1; break;
+						case ABE_BOTTOM: r->bottom -= 1; break;
+						}
+					}
 				}
 			}
 			if (result) *result = 0;
 		} else {
 			if (result) *result = WVR_REDRAW;
 		}
-	} return true;
+		return true;
+	}
 
 	case WM_NCRBUTTONUP: {
 		if (_title->isHidden()) {
@@ -473,6 +477,7 @@ bool WindowHelper::handleNativeEvent(
 				}
 				window()->windowHandle()->windowStateChanged(state);
 			}
+			updateMargins();
 			if (_shadow) {
 				_title->refreshAdditionalPaddings(_handle);
 				const auto changes = (wParam == SIZE_MINIMIZED
@@ -486,27 +491,6 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_SHOWWINDOW: {
-		const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-		if (!::Platform::IsWindows8OrGreater()
-			&& !_title->isHidden()
-			&& (style & WS_CAPTION)) {
-			SetWindowLongPtr(
-				_handle,
-				GWL_STYLE,
-				style & ~WS_CAPTION);
-			SetWindowPos(
-				_handle,
-				0,
-				0,
-				0,
-				0,
-				0,
-				SWP_FRAMECHANGED
-					| SWP_NOMOVE
-					| SWP_NOSIZE
-					| SWP_NOZORDER
-					| SWP_NOACTIVATE);
-		}
 		if (_shadow) {
 			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 			const auto changes = WindowShadow::Change::Resized
@@ -529,9 +513,12 @@ bool WindowHelper::handleNativeEvent(
 			return false;
 		}
 
-		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
-		ScreenToClient(_handle, &p);
-		const auto mapped = QPoint(p.x, p.y) / window()->devicePixelRatioF();
+		const auto p = MAKEPOINTS(lParam);
+		auto r = RECT();
+		GetWindowRect(_handle, &r);
+		const auto mapped = QPoint(
+			p.x - r.left + _marginsDelta.left(),
+			p.y - r.top + _marginsDelta.top());
 		*result = [&] {
 			if (!window()->rect().contains(mapped)) {
 				return HTTRANSPARENT;
@@ -691,6 +678,99 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 		sizeof(COLORREF));
 }
 
+void WindowHelper::updateMargins() {
+	if (_updatingMargins) return;
+
+	_updatingMargins = true;
+	const auto guard = gsl::finally([&] { _updatingMargins = false; });
+
+	RECT r, a;
+
+	GetClientRect(_handle, &r);
+	a = r;
+
+	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
+	AdjustWindowRectEx(&a, style, false, styleEx);
+	auto margins = QMargins(
+		a.left - r.left,
+		a.top - r.top,
+		r.right - a.right,
+		r.bottom - a.bottom);
+	if (style & WS_MAXIMIZE) {
+		RECT w, m;
+		GetWindowRect(_handle , &w);
+		m = w;
+
+		HMONITOR hMonitor = MonitorFromRect(&w, MONITOR_DEFAULTTONEAREST);
+		if (hMonitor) {
+			MONITORINFO mi;
+			mi.cbSize = sizeof(mi);
+			GetMonitorInfo(hMonitor, &mi);
+			m = mi.rcWork;
+		}
+
+		_marginsDelta = QMargins(
+			w.left - m.left,
+			w.top - m.top,
+			m.right - w.right,
+			m.bottom - w.bottom);
+
+		margins.setLeft(margins.left() - _marginsDelta.left());
+		margins.setRight(margins.right() - _marginsDelta.right());
+		margins.setBottom(margins.bottom() - _marginsDelta.bottom());
+		margins.setTop(margins.top() - _marginsDelta.top());
+	} else if (!_marginsDelta.isNull()) {
+		RECT w;
+		GetWindowRect(_handle, &w);
+		SetWindowPos(
+			_handle,
+			0,
+			0,
+			0,
+			w.right - w.left - _marginsDelta.left() - _marginsDelta.right(),
+			w.bottom - w.top - _marginsDelta.top() - _marginsDelta.bottom(),
+			(SWP_NOMOVE
+				| SWP_NOSENDCHANGING
+				| SWP_NOZORDER
+				| SWP_NOACTIVATE
+				| SWP_NOREPOSITION));
+		_marginsDelta = QMargins();
+	}
+
+	if (_isFullScreen || _title->isHidden()) {
+		margins = QMargins();
+		if (_title->isHidden()) {
+			_marginsDelta = QMargins();
+		}
+	}
+	if (const auto native = QGuiApplication::platformNativeInterface()) {
+		native->setWindowProperty(
+			window()->windowHandle()->handle(),
+			"WindowsCustomMargins",
+			QVariant::fromValue<QMargins>(margins));
+	}
+}
+
+void WindowHelper::fixMaximizedWindow() {
+	auto r = RECT();
+	GetClientRect(_handle, &r);
+	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
+	AdjustWindowRectEx(&r, style, false, styleEx);
+	if (style & WS_MAXIMIZE) {
+		auto w = RECT();
+		GetWindowRect(_handle, &w);
+		if (const auto hMonitor = MonitorFromRect(&w, MONITOR_DEFAULTTONEAREST)) {
+			MONITORINFO mi;
+			mi.cbSize = sizeof(mi);
+			GetMonitorInfo(hMonitor, &mi);
+			const auto m = mi.rcWork;
+			SetWindowPos(_handle, 0, 0, 0, m.right - m.left - _marginsDelta.left() - _marginsDelta.right(), m.bottom - m.top - _marginsDelta.top() - _marginsDelta.bottom(), SWP_NOMOVE | SWP_NOSENDCHANGING | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREPOSITION);
+		}
+	}
+}
+
 HWND GetWindowHandle(not_null<QWidget*> widget) {
 	const auto toplevel = widget->window();
 	toplevel->createWinId();
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index b5b1450..eada67c 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -51,10 +51,12 @@ public:
 
 private:
 	void init();
+	void updateMargins();
 	void updateWindowFrameColors();
 	void updateWindowFrameColors(bool active);
 	void initialShadowUpdate();
 	void updateCornersRounding();
+	void fixMaximizedWindow();
 	[[nodiscard]] bool handleNativeEvent(
 		UINT msg,
 		WPARAM wParam,
@@ -79,6 +81,8 @@ private:
 	rpl::event_stream<HitTestResult> _systemButtonDown;
 	std::optional<WindowShadow> _shadow;
 	rpl::variable<uint> _dpi;
+	QMargins _marginsDelta;
+	bool _updatingMargins = false;
 	bool _isFullScreen = false;
 
 };

From 6f856ce495872bb202be03c056fdbcd13ec162f3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 18 Jun 2022 08:37:54 +0400
Subject: [PATCH 138/635] Use ScreenToClient for point convertion in
 WM_NCHITTEST

---
 ui/platform/win/ui_window_win.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 89c2793..1f02692 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -24,6 +24,7 @@
 
 #include <dwmapi.h>
 #include <uxtheme.h>
+#include <windowsx.h>
 
 Q_DECLARE_METATYPE(QMargins);
 
@@ -513,12 +514,9 @@ bool WindowHelper::handleNativeEvent(
 			return false;
 		}
 
-		const auto p = MAKEPOINTS(lParam);
-		auto r = RECT();
-		GetWindowRect(_handle, &r);
-		const auto mapped = QPoint(
-			p.x - r.left + _marginsDelta.left(),
-			p.y - r.top + _marginsDelta.top());
+		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
+		ScreenToClient(_handle, &p);
+		const auto mapped = QPoint(p.x, p.y) / window()->devicePixelRatioF();
 		*result = [&] {
 			if (!window()->rect().contains(mapped)) {
 				return HTTRANSPARENT;

From 7a4ea49959de92c8f93140dd0b177d4abb0f0f20 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 Jun 2022 17:12:26 +0400
Subject: [PATCH 139/635] Allow custom actions on Checkbox click-handlers.

---
 ui/widgets/checkbox.cpp | 29 ++++++++++++++++++++++++++++-
 ui/widgets/checkbox.h   |  8 ++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 00d43f8..7338158 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -7,6 +7,7 @@
 #include "ui/widgets/checkbox.h"
 
 #include "ui/effects/ripple_animation.h"
+#include "ui/basic_click_handlers.h"
 #include "ui/ui_utility.h"
 
 #include <QtGui/QtEvents>
@@ -543,6 +544,27 @@ void Checkbox::setTextBreakEverywhere(bool allow) {
 	_textBreakEverywhere = allow;
 }
 
+void Checkbox::setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk) {
+	_text.setLink(lnkIndex, lnk);
+}
+
+void Checkbox::setLinksTrusted() {
+	static const auto TrustedLinksFilter = [](
+			const ClickHandlerPtr &link,
+			Qt::MouseButton button) {
+		if (const auto url = dynamic_cast<UrlClickHandler*>(link.get())) {
+			url->UrlClickHandler::onClick({ button });
+			return false;
+		}
+		return true;
+	};
+	setClickHandlerFilter(TrustedLinksFilter);
+}
+
+void Checkbox::setClickHandlerFilter(ClickHandlerFilter &&filter) {
+	_clickHandlerFilter = std::move(filter);
+}
+
 bool Checkbox::checked() const {
 	return _check->checked();
 }
@@ -709,10 +731,15 @@ void Checkbox::mouseMoveEvent(QMouseEvent *e) {
 void Checkbox::mouseReleaseEvent(QMouseEvent *e) {
 	const auto weak = Ui::MakeWeak(this);
 	if (auto activated = _activatingHandler = ClickHandler::unpressed()) {
+		// _clickHandlerFilter may delete `this`. In that case we don't want
+		// to try to show a context menu or smth like that.
 		const auto button = e->button();
 		crl::on_main(this, [=] {
 			const auto guard = window();
-			ActivateClickHandler(guard, activated, button);
+			if (!_clickHandlerFilter
+				|| _clickHandlerFilter(activated, button)) {
+				ActivateClickHandler(guard, activated, button);
+			}
 		});
 	}
 	RippleButton::mouseReleaseEvent(e);
diff --git a/ui/widgets/checkbox.h b/ui/widgets/checkbox.h
index bc06065..a33f4c5 100644
--- a/ui/widgets/checkbox.h
+++ b/ui/widgets/checkbox.h
@@ -180,6 +180,12 @@ public:
 	void setAllowTextLines(int lines = 0);
 	void setTextBreakEverywhere(bool allow = true);
 
+	void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk);
+	void setLinksTrusted();
+
+	using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
+	void setClickHandlerFilter(ClickHandlerFilter &&filter);
+
 	bool checked() const;
 	rpl::producer<bool> checkedChanges() const;
 	rpl::producer<bool> checkedValue() const;
@@ -235,6 +241,8 @@ private:
 	ClickHandlerPtr _activatingHandler;
 	QPixmap _checkCache;
 
+	ClickHandlerFilter _clickHandlerFilter;
+
 	style::align _checkAlignment = style::al_left;
 	Text::String _text;
 	int _allowTextLines = 1;

From b305df8cc5c853b564ec0fe0b8b121c2a4e10b19 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 Jun 2022 17:12:45 +0400
Subject: [PATCH 140/635] Allow getting Ui::Show of a SeparatePanel.

---
 ui/widgets/separate_panel.cpp | 71 ++++++++++++++++++++++++++++++++++-
 ui/widgets/separate_panel.h   |  2 +
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 893c287..f302edf 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toasts/common_toasts.h"
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/layers/layer_widget.h"
+#include "ui/layers/show.h"
 #include "base/debug_log.h"
 #include "styles/style_widgets.h"
 #include "styles/style_layers.h"
@@ -29,6 +30,64 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtWidgets/QApplication>
 
 namespace Ui {
+namespace {
+
+class PanelShow final : public Show {
+public:
+	explicit PanelShow(not_null<SeparatePanel*> panel);
+	~PanelShow();
+	void showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options = Ui::LayerOption::KeepOther) const override;
+	void hideLayer() const override;
+	[[nodiscard]] not_null<QWidget*> toastParent() const override;
+	[[nodiscard]] bool valid() const override;
+	operator bool() const override;
+
+private:
+	const QPointer<SeparatePanel> _panel;
+
+};
+
+PanelShow::PanelShow(not_null<SeparatePanel*> panel)
+: _panel(panel.get()) {
+}
+
+PanelShow::~PanelShow() = default;
+
+void PanelShow::showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options) const {
+	if (const auto panel = _panel.data()) {
+		panel->showBox(std::move(content), options, anim::type::normal);
+	}
+}
+
+void PanelShow::hideLayer() const {
+	if (const auto panel = _panel.data()) {
+		panel->showBox(
+			object_ptr<Ui::BoxContent>{ nullptr },
+			Ui::LayerOption::CloseOther,
+			anim::type::normal);
+	}
+}
+
+not_null<QWidget*> PanelShow::toastParent() const {
+	const auto panel = _panel.data();
+
+	Ensures(panel != nullptr);
+	return panel;
+}
+
+bool PanelShow::valid() const {
+	return (_panel.data() != nullptr);
+}
+
+PanelShow::operator bool() const {
+	return valid();
+}
+
+} // namespace
 
 SeparatePanel::SeparatePanel(QWidget *parent)
 : RpWidget(parent)
@@ -331,8 +390,16 @@ void SeparatePanel::showBox(
 		object_ptr<Ui::BoxContent> box,
 		Ui::LayerOptions options,
 		anim::type animated) {
-	ensureLayerCreated();
-	_layer->showBox(std::move(box), options, animated);
+	if (box) {
+		ensureLayerCreated();
+		_layer->showBox(std::move(box), options, animated);
+	} else if (_layer) {
+		_layer->hideAll(animated);
+	}
+}
+
+std::shared_ptr<Show> SeparatePanel::uiShow() {
+	return std::make_shared<PanelShow>(this);
 }
 
 void SeparatePanel::showToast(const TextWithEntities &text) {
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 5432b33..029dc8f 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -20,6 +20,7 @@ struct MenuCallback;
 
 namespace Ui {
 
+class Show;
 class BoxContent;
 class IconButton;
 class PopupMenu;
@@ -54,6 +55,7 @@ public:
 	void setBackAllowed(bool allowed);
 
 	void setMenuAllowed(Fn<void(const Menu::MenuCallback&)> fill);
+	[[nodiscard]] std::shared_ptr<Show> uiShow();
 
 protected:
 	void paintEvent(QPaintEvent *e) override;

From dbc0e87c8058b77d79c20a1c24e5c6d9fe8cacea Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 Jun 2022 18:08:42 +0400
Subject: [PATCH 141/635] Fix possible crash in native event filter.

---
 ui/platform/win/ui_window_win.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 1f02692..1ad1454 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -342,11 +342,15 @@ bool WindowHelper::nativeEvent(
 	const auto guard = gsl::finally([&] {
 		*result = base::NativeEventResult(lresult);
 	});
-	return handleNativeEvent(
-		msg->message,
-		msg->wParam,
-		msg->lParam,
-		&lresult);
+	auto filtered = false;
+	base::Integration::Instance().enterFromEventLoop([&] {
+		filtered = handleNativeEvent(
+			msg->message,
+			msg->wParam,
+			msg->lParam,
+			&lresult);
+	});
+	return filtered;
 }
 
 bool WindowHelper::handleNativeEvent(

From 9ebfd80b2980600f0c7230575896537b6e5485a2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 20 Jun 2022 23:44:44 +0400
Subject: [PATCH 142/635] Fix possible stack overflow crash.

---
 ui/widgets/scroll_area.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/scroll_area.cpp b/ui/widgets/scroll_area.cpp
index b7bd1d2..706bc14 100644
--- a/ui/widgets/scroll_area.cpp
+++ b/ui/widgets/scroll_area.cpp
@@ -254,6 +254,7 @@ void ScrollBar::mousePressEvent(QMouseEvent *e) {
 	if (!width() || !height()) return;
 
 	_dragStart = e->globalPos();
+	area()->setMovingByScrollBar(true);
 	setMoving(true);
 	if (_overbar) {
 		_startFrom = _connected->value();
@@ -265,15 +266,12 @@ void ScrollBar::mousePressEvent(QMouseEvent *e) {
 		_connected->setValue(_startFrom);
 		setOverBar(true);
 	}
-
-	area()->setMovingByScrollBar(true);
 }
 
 void ScrollBar::mouseReleaseEvent(QMouseEvent *e) {
 	if (_moving) {
-		setMoving(false);
-
 		area()->setMovingByScrollBar(false);
+		setMoving(false);
 	}
 	if (!_over) {
 		setMouseTracking(false);

From 8de2eee8cc728d19be06cc0a6e9e35496fefc732 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 20 Jun 2022 23:55:23 +0400
Subject: [PATCH 143/635] Use QWindow::setScreen instead of QWidget::setScreen

---
 ui/widgets/popup_menu.cpp | 5 +++--
 ui/widgets/tooltip.cpp    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index b4510ca..978fc57 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -770,10 +770,11 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 	}
 	_parent = parent;
 
+	createWinId();
 	if (_parent) {
-		setScreen(_parent->screen());
+		windowHandle()->setScreen(_parent->screen());
 	} else if (screen) {
-		setScreen(screen);
+		windowHandle()->setScreen(screen);
 	}
 
 	using Origin = PanelAnimation::Origin;
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index e7621fa..eede3e1 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -117,7 +117,8 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *
 
 	// adjust tooltip position
 	if (screen) {
-		setScreen(screen);
+		createWinId();
+		windowHandle()->setScreen(screen);
 		const auto r = screen->availableGeometry();
 		if (r.x() + r.width() - _st->skip < p.x() + s.width() && p.x() + s.width() > m.x()) {
 			p.setX(qMax(r.x() + r.width() - int32(_st->skip) - s.width(), m.x() - s.width()));

From 8e0f9282056f418145b53c2d99e695e48775816c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 Jun 2022 00:57:35 +0400
Subject: [PATCH 144/635] Fix build.

---
 ui/widgets/popup_menu.cpp | 1 +
 ui/widgets/tooltip.cpp    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 978fc57..c783372 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -21,6 +21,7 @@
 #include <QtGui/QtEvents>
 #include <QtGui/QPainter>
 #include <QtGui/QScreen>
+#include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
 
 namespace Ui {
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index eede3e1..839fc81 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -13,6 +13,7 @@
 #include "base/platform/base_platform_info.h"
 
 #include <QtGui/QScreen>
+#include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
 
 namespace Ui {

From adf267a3a28079b2a34b338d5c40b42809a19025 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 18 Jun 2022 14:30:10 +0400
Subject: [PATCH 145/635] Remove WS_CAPTION manually on Windows 7

---
 ui/platform/win/ui_window_win.cpp | 50 +++++++++++++++++--------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 1ad1454..f20455c 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -108,29 +108,11 @@ UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
 	return bAutoHidden;
 }
 
-void FixAeroSnap(HWND handle) {
-	SetWindowLongPtr(
-		handle,
-		GWL_STYLE,
-		GetWindowLongPtr(handle, GWL_STYLE) | WS_CAPTION | WS_THICKFRAME);
-}
-
-[[nodiscard]] HWND ResolveWindowHandle(not_null<QWidget*> widget) {
-	if (!::Platform::IsWindows8OrGreater()) {
-		widget->setWindowFlag(Qt::FramelessWindowHint);
-	}
-	const auto result = GetWindowHandle(widget);
-	if (!::Platform::IsWindows8OrGreater()) {
-		FixAeroSnap(result);
-	}
-	return result;
-}
-
 } // namespace
 
 WindowHelper::WindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
-, _handle(ResolveWindowHandle(window))
+, _handle(GetWindowHandle(window))
 , _title(Ui::CreateChild<TitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
 , _shadow(std::in_place, window, st::windowShadowFg->c)
@@ -182,10 +164,11 @@ void WindowHelper::setTitleStyle(const style::WindowTitle &st) {
 
 void WindowHelper::setNativeFrame(bool enabled) {
 	if (!::Platform::IsWindows8OrGreater()) {
-		window()->windowHandle()->setFlag(Qt::FramelessWindowHint, !enabled);
-		if (!enabled) {
-			FixAeroSnap(_handle);
-		}
+		const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+		SetWindowLongPtr(
+			_handle,
+			GWL_STYLE,
+			enabled ? (style | WS_CAPTION) : (style & ~WS_CAPTION));
 	}
 	_title->setVisible(!enabled);
 	if (enabled) {
@@ -496,6 +479,27 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_SHOWWINDOW: {
+		const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+		if (!::Platform::IsWindows8OrGreater()
+			&& !_title->isHidden()
+			&& (style & WS_CAPTION)) {
+			SetWindowLongPtr(
+				_handle,
+				GWL_STYLE,
+				style & ~WS_CAPTION);
+			SetWindowPos(
+				_handle,
+				0,
+				0,
+				0,
+				0,
+				0,
+				SWP_FRAMECHANGED
+					| SWP_NOMOVE
+					| SWP_NOSIZE
+					| SWP_NOZORDER
+					| SWP_NOACTIVATE);
+		}
 		if (_shadow) {
 			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 			const auto changes = WindowShadow::Change::Resized

From 941dc48366268688f05f6260bf38ed717112ef1a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 21 Jun 2022 22:29:00 +0400
Subject: [PATCH 146/635] Change FramelessWindowHint not only when the window
 is shown

---
 ui/platform/ui_platform_window.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index ec46060..cbdf4de 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -200,7 +200,6 @@ DefaultWindowHelper::DefaultWindowHelper(not_null<RpWidget*> window)
 
 void DefaultWindowHelper::init() {
 	_title->show();
-	window()->setWindowFlag(Qt::FramelessWindowHint);
 
 	if (WindowExtentsSupported()) {
 		window()->setAttribute(Qt::WA_TranslucentBackground);
@@ -268,10 +267,8 @@ void DefaultWindowHelper::init() {
 			bool shown,
 			bool titleShown,
 			Qt::WindowStates windowState) {
-		if (shown) {
-			window()->windowHandle()->setFlag(Qt::FramelessWindowHint, titleShown);
-			updateWindowExtents();
-		}
+		window()->windowHandle()->setFlag(Qt::FramelessWindowHint, titleShown);
+		updateWindowExtents();
 	}, window()->lifetime());
 
 	window()->events() | rpl::start_with_next([=](not_null<QEvent*> e) {

From 1254ee00db7d949ea42eb47430fe0c7d2c8073da Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 Jun 2022 20:19:16 +0400
Subject: [PATCH 147/635] Revert "Remove WS_CAPTION manually on Windows 7"

This reverts commit adf267a3a28079b2a34b338d5c40b42809a19025.
---
 ui/platform/win/ui_window_win.cpp | 50 ++++++++++++++-----------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index f20455c..1ad1454 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -108,11 +108,29 @@ UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
 	return bAutoHidden;
 }
 
+void FixAeroSnap(HWND handle) {
+	SetWindowLongPtr(
+		handle,
+		GWL_STYLE,
+		GetWindowLongPtr(handle, GWL_STYLE) | WS_CAPTION | WS_THICKFRAME);
+}
+
+[[nodiscard]] HWND ResolveWindowHandle(not_null<QWidget*> widget) {
+	if (!::Platform::IsWindows8OrGreater()) {
+		widget->setWindowFlag(Qt::FramelessWindowHint);
+	}
+	const auto result = GetWindowHandle(widget);
+	if (!::Platform::IsWindows8OrGreater()) {
+		FixAeroSnap(result);
+	}
+	return result;
+}
+
 } // namespace
 
 WindowHelper::WindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
-, _handle(GetWindowHandle(window))
+, _handle(ResolveWindowHandle(window))
 , _title(Ui::CreateChild<TitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
 , _shadow(std::in_place, window, st::windowShadowFg->c)
@@ -164,11 +182,10 @@ void WindowHelper::setTitleStyle(const style::WindowTitle &st) {
 
 void WindowHelper::setNativeFrame(bool enabled) {
 	if (!::Platform::IsWindows8OrGreater()) {
-		const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-		SetWindowLongPtr(
-			_handle,
-			GWL_STYLE,
-			enabled ? (style | WS_CAPTION) : (style & ~WS_CAPTION));
+		window()->windowHandle()->setFlag(Qt::FramelessWindowHint, !enabled);
+		if (!enabled) {
+			FixAeroSnap(_handle);
+		}
 	}
 	_title->setVisible(!enabled);
 	if (enabled) {
@@ -479,27 +496,6 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_SHOWWINDOW: {
-		const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-		if (!::Platform::IsWindows8OrGreater()
-			&& !_title->isHidden()
-			&& (style & WS_CAPTION)) {
-			SetWindowLongPtr(
-				_handle,
-				GWL_STYLE,
-				style & ~WS_CAPTION);
-			SetWindowPos(
-				_handle,
-				0,
-				0,
-				0,
-				0,
-				0,
-				SWP_FRAMECHANGED
-					| SWP_NOMOVE
-					| SWP_NOSIZE
-					| SWP_NOZORDER
-					| SWP_NOACTIVATE);
-		}
 		if (_shadow) {
 			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 			const auto changes = WindowShadow::Change::Resized

From 7aedf7703fdf24c11375b7e67c2a6d9e16b0008b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 Jun 2022 20:23:24 +0400
Subject: [PATCH 148/635] Revert "Make window resize less lagged on Windows"

This reverts commit b5da6e709d835de8920d11516143a7c01c7c2aa7.
---
 ui/platform/win/ui_window_win.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 1ad1454..9357993 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -198,18 +198,6 @@ void WindowHelper::setNativeFrame(bool enabled) {
 	updateMargins();
 	updateWindowFrameColors();
 	fixMaximizedWindow();
-	SetWindowPos(
-		_handle,
-		0,
-		0,
-		0,
-		0,
-		0,
-		SWP_FRAMECHANGED
-			| SWP_NOMOVE
-			| SWP_NOSIZE
-			| SWP_NOZORDER
-			| SWP_NOACTIVATE);
 }
 
 void WindowHelper::initialShadowUpdate() {
@@ -388,14 +376,17 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCCALCSIZE: {
-		if (_title->isHidden() || !wParam) {
+		if (_title->isHidden()) {
 			return false;
 		}
 		WINDOWPLACEMENT wp;
 		wp.length = sizeof(WINDOWPLACEMENT);
 		if (GetWindowPlacement(_handle, &wp)
 			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
-			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
+			const auto params = (LPNCCALCSIZE_PARAMS)lParam;
+			const auto r = (wParam == TRUE)
+				? &params->rgrc[0]
+				: (LPRECT)lParam;
 			const auto hMonitor = MonitorFromPoint(
 				{ (r->left + r->right) / 2, (r->top + r->bottom) / 2 },
 				MONITOR_DEFAULTTONEAREST);
@@ -415,10 +406,8 @@ bool WindowHelper::handleNativeEvent(
 					}
 				}
 			}
-			if (result) *result = 0;
-		} else {
-			if (result) *result = WVR_REDRAW;
 		}
+		if (result) *result = 0;
 		return true;
 	}
 

From 8e5c8c96bd610c9e7b7c2af2767ce3528ad02ae5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 23 Jun 2022 02:47:24 +0400
Subject: [PATCH 149/635] Fix a crash while setting FramelessWindowHint

---
 ui/platform/ui_platform_window.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index cbdf4de..b11831f 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -267,7 +267,11 @@ void DefaultWindowHelper::init() {
 			bool shown,
 			bool titleShown,
 			Qt::WindowStates windowState) {
-		window()->windowHandle()->setFlag(Qt::FramelessWindowHint, titleShown);
+		if (const auto handle = window()->windowHandle()) {
+			handle->setFlag(Qt::FramelessWindowHint, titleShown);
+		} else {
+			window()->setWindowFlag(Qt::FramelessWindowHint, titleShown);
+		}
 		updateWindowExtents();
 	}, window()->lifetime());
 

From 87cd0b6127845b93e2a4db3433816b9ea305b14d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 Jun 2022 15:06:37 +0400
Subject: [PATCH 150/635] Add initial support for custom emoji.

---
 ui/integration.cpp     |   7 +++
 ui/integration.h       |   7 +++
 ui/text/text.cpp       | 126 +++++++++++++++++++++++++++++++----------
 ui/text/text.h         |   4 +-
 ui/text/text_block.cpp | 100 +++++++++++++++++---------------
 ui/text/text_block.h   |  50 ++++++++++++++--
 ui/text/text_entity.h  |   1 +
 7 files changed, 212 insertions(+), 83 deletions(-)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index e34243d..d0694e7 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -8,6 +8,7 @@
 
 #include "ui/gl/gl_detection.h"
 #include "ui/text/text_entity.h"
+#include "ui/text/text_block.h"
 #include "ui/basic_click_handlers.h"
 #include "base/platform/base_platform_info.h"
 
@@ -69,6 +70,12 @@ std::shared_ptr<ClickHandler> Integration::createLinkHandler(
 	return nullptr;
 }
 
+std::unique_ptr<Text::CustomEmoji> Integration::createCustomEmoji(
+		const QString &data,
+		const std::any &context) {
+	return nullptr;
+}
+
 bool Integration::handleUrlClick(
 		const QString &url,
 		const QVariant &context) {
diff --git a/ui/integration.h b/ui/integration.h
index 67a953e..701d8e3 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -27,6 +27,10 @@ namespace Emoji {
 class One;
 } // namespace Emoji
 
+namespace Text {
+class CustomEmoji;
+} // namespace Text
+
 class Integration {
 public:
 	static void Set(not_null<Integration*> instance);
@@ -56,6 +60,9 @@ public:
 	[[nodiscard]] virtual QString convertTagToMimeTag(const QString &tagId);
 	[[nodiscard]] virtual const Emoji::One *defaultEmojiVariant(
 		const Emoji::One *emoji);
+	[[nodiscard]] virtual auto createCustomEmoji(
+		const QString &data,
+		const std::any &context) -> std::unique_ptr<Text::CustomEmoji>;
 
 	[[nodiscard]] virtual rpl::producer<> forcePopupMenuHideRequests();
 
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 06e1073..2073ea8 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -272,6 +272,7 @@ private:
 	const QChar *_ptr = nullptr;
 	const EntitiesInText::const_iterator _entitiesEnd;
 	EntitiesInText::const_iterator _waitingEntity;
+	QString _customEmojiData;
 	const bool _multiline = false;
 
 	const QFixed _stopAfterWidth; // summary width of all added words
@@ -406,9 +407,16 @@ void Parser::createBlock(int32 skipBack) {
 		}
 		_lastSkipped = false;
 		const auto lnkIndex = _monoIndex ? _monoIndex : _lnkIndex;
-		if (_emoji) {
+		auto custom = _customEmojiData.isEmpty()
+			? nullptr
+			: Integration::Instance().createCustomEmoji(
+				_customEmojiData,
+				_context);
+		if (custom) {
+			_t->_blocks.push_back(Block::CustomEmoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, std::move(custom)));
+			_lastSkipped = true;
+		} else if (_emoji) {
 			_t->_blocks.push_back(Block::Emoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, _emoji));
-			_emoji = nullptr;
 			_lastSkipped = true;
 		} else if (newline) {
 			_t->_blocks.push_back(Block::Newline(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
@@ -416,6 +424,8 @@ void Parser::createBlock(int32 skipBack) {
 			_t->_blocks.push_back(Block::Text(_t->_st->font, _t->_text, _t->_minResizeWidth, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
 		}
 		_blockStart += len;
+		_customEmojiData = QByteArray();
+		_emoji = nullptr;
 		blockCreated();
 	}
 }
@@ -499,7 +509,10 @@ bool Parser::checkEntities() {
 		link.data = _waitingEntity->data();
 		link.text = QString(entityBegin, entityLength);
 	};
-	if (entityType == EntityType::Bold) {
+	if (entityType == EntityType::CustomEmoji) {
+		createBlock();
+		_customEmojiData = _waitingEntity->data();
+	} else if (entityType == EntityType::Bold) {
 		flags = TextBlockFBold;
 	} else if (entityType == EntityType::Semibold) {
 		flags = TextBlockFSemibold;
@@ -519,7 +532,8 @@ bool Parser::checkEntities() {
 			flags = TextBlockFPre;
 			createBlock();
 			if (!_t->_blocks.empty()
-				&& _t->_blocks.back()->type() != TextBlockTNewline) {
+				&& _t->_blocks.back()->type() != TextBlockTNewline
+				&& _customEmojiData.isEmpty()) {
 				createNewlineBlock();
 			}
 		}
@@ -632,10 +646,11 @@ void Parser::skipBadEntities() {
 void Parser::parseCurrentChar() {
 	_ch = ((_ptr < _end) ? *_ptr : 0);
 	_emojiLookback = 0;
-	const auto isNewLine = _multiline && IsNewline(_ch);
+	const auto inCustomEmoji = !_customEmojiData.isEmpty();
+	const auto isNewLine = !inCustomEmoji && _multiline && IsNewline(_ch);
 	const auto isSpace = IsSpace(_ch);
 	const auto isDiac = IsDiac(_ch);
-	const auto isTilde = _checkTilde && (_ch == '~');
+	const auto isTilde = !inCustomEmoji && _checkTilde && (_ch == '~');
 	const auto skip = [&] {
 		if (IsBad(_ch) || _ch.isLowSurrogate()) {
 			return true;
@@ -711,6 +726,9 @@ void Parser::parseCurrentChar() {
 }
 
 void Parser::parseEmojiFromCurrent() {
+	if (!_customEmojiData.isEmpty()) {
+		return;
+	}
 	int len = 0;
 	auto e = Emoji::Find(_ptr - _emojiLookback, _end, &len);
 	if (!e) return;
@@ -878,7 +896,7 @@ void Parser::finalize(const TextParseOptions &options) {
 	}
 	_t->_links.squeeze();
 	_t->_spoilers.squeeze();
-	_t->_blocks.squeeze();
+	_t->_blocks.shrink_to_fit();
 	_t->_text.squeeze();
 }
 
@@ -1301,7 +1319,10 @@ private:
 					i = n;
 					++n;
 				}
-				if ((*i)->type() != TextBlockTEmoji && *curr >= 0x590) {
+				const auto type = (*i)->type();
+				if (type != TextBlockTEmoji
+					&& type != TextBlockTCustomEmoji
+					&& *curr >= 0x590) {
 					ignore = false;
 					break;
 				}
@@ -1490,8 +1511,13 @@ private:
 				levels[i] = si.analysis.bidiLevel;
 			}
 			if (si.analysis.flags == QScriptAnalysis::Object) {
-				if (_type == TextBlockTEmoji || _type == TextBlockTSkip) {
-					si.width = currentBlock->f_width() + (nextBlock == _endBlock && (!nextBlock || nextBlock->from() >= trimmedLineEnd) ? 0 : currentBlock->f_rpadding());
+				if (_type == TextBlockTEmoji
+					|| _type == TextBlockTCustomEmoji
+					|| _type == TextBlockTSkip) {
+					si.width = currentBlock->f_width()
+						+ (nextBlock == _endBlock && (!nextBlock || nextBlock->from() >= trimmedLineEnd)
+							? 0
+							: currentBlock->f_rpadding());
 				}
 			}
 		}
@@ -1586,7 +1612,7 @@ private:
 						}
 					}
 					return false;
-				} else if (_p && _type == TextBlockTEmoji) {
+				} else if (_p && (_type == TextBlockTEmoji || _type == TextBlockTCustomEmoji)) {
 					auto glyphX = x;
 					auto spacesWidth = (si.width - currentBlock->f_width());
 					if (rtl) {
@@ -1636,12 +1662,18 @@ private:
 						if (hasSpoiler) {
 							_p->setOpacity(opacity * (1. - spoilerOpacity));
 						}
-						Emoji::Draw(
-							*_p,
-							static_cast<const EmojiBlock*>(currentBlock)->_emoji,
-							Emoji::GetSizeNormal(),
-							(glyphX + st::emojiPadding).toInt(),
-							_y + _yDelta + emojiY);
+						const auto x = (glyphX + st::emojiPadding).toInt();
+						const auto y = _y + _yDelta + emojiY;
+						if (_type == TextBlockTEmoji) {
+							Emoji::Draw(
+								*_p,
+								static_cast<const EmojiBlock*>(currentBlock)->_emoji,
+								Emoji::GetSizeNormal(),
+								x,
+								y);
+						} else if (const auto custom = static_cast<const CustomEmojiBlock*>(currentBlock)->_custom.get()) {
+							custom->paint(*_p, x, y);
+						}
 					}
 					if (hasSpoiler) {
 						_p->setOpacity(opacity * spoilerOpacity);
@@ -2014,11 +2046,16 @@ private:
 			}
 			TextBlockType _type = currentBlock->type();
 			if (si.analysis.flags == QScriptAnalysis::Object) {
-				if (_type == TextBlockTEmoji || _type == TextBlockTSkip) {
+				if (_type == TextBlockTEmoji
+					|| _type == TextBlockTCustomEmoji
+					|| _type == TextBlockTSkip) {
 					si.width = currentBlock->f_width() + currentBlock->f_rpadding();
 				}
 			}
-			if (_type == TextBlockTEmoji || _type == TextBlockTSkip || _type == TextBlockTNewline) {
+			if (_type == TextBlockTEmoji
+				|| _type == TextBlockTCustomEmoji
+				|| _type == TextBlockTSkip
+				|| _type == TextBlockTNewline) {
 				if (_wLeft < si.width) {
 					lineText = lineText.mid(0, currentBlock->from() - _localFrom) + kQEllipsis;
 					lineLength = currentBlock->from() + kQEllipsis.size() - _lineStart;
@@ -2214,7 +2251,9 @@ private:
 				nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
 			}
 			auto _type = currentBlock->type();
-			if (_type == TextBlockTEmoji || _type == TextBlockTSkip) {
+			if (_type == TextBlockTEmoji
+				|| _type == TextBlockTCustomEmoji
+				|| _type == TextBlockTSkip) {
 				analysis->script = QChar::Script_Common;
 				analysis->flags = QScriptAnalysis::Object;
 			} else {
@@ -2294,7 +2333,8 @@ private:
 			TextBlockType _itype = (*i)->type();
 			if (eor == _parLength)
 				dir = control.basicDirection();
-			else if (_itype == TextBlockTEmoji)
+			else if (_itype == TextBlockTEmoji
+				|| _itype == TextBlockTCustomEmoji)
 				dir = QChar::DirCS;
 			else if (_itype == TextBlockTSkip)
 				dir = QChar::DirCS;
@@ -2329,7 +2369,7 @@ private:
 
 		QChar::Direction sdir;
 		TextBlockType _stype = (*_parStartBlock)->type();
-		if (_stype == TextBlockTEmoji)
+		if (_stype == TextBlockTEmoji || _stype == TextBlockTCustomEmoji)
 			sdir = QChar::DirCS;
 		else if (_stype == TextBlockTSkip)
 			sdir = QChar::DirCS;
@@ -2355,7 +2395,8 @@ private:
 			TextBlockType _itype = (*i)->type();
 			if (current == (int)_parLength)
 				dirCurrent = control.basicDirection();
-			else if (_itype == TextBlockTEmoji)
+			else if (_itype == TextBlockTEmoji
+				|| _itype == TextBlockTCustomEmoji)
 				dirCurrent = QChar::DirCS;
 			else if (_itype == TextBlockTSkip)
 				dirCurrent = QChar::DirCS;
@@ -3356,8 +3397,17 @@ uint16 String::countBlockLength(const String::TextBlocks::const_iterator &i, con
 	return countBlockEnd(i, e) - (*i)->from();
 }
 
-template <typename AppendPartCallback, typename ClickHandlerStartCallback, typename ClickHandlerFinishCallback, typename FlagsChangeCallback>
-void String::enumerateText(TextSelection selection, AppendPartCallback appendPartCallback, ClickHandlerStartCallback clickHandlerStartCallback, ClickHandlerFinishCallback clickHandlerFinishCallback, FlagsChangeCallback flagsChangeCallback) const {
+template <
+	typename AppendPartCallback,
+	typename ClickHandlerStartCallback,
+	typename ClickHandlerFinishCallback,
+	typename FlagsChangeCallback>
+void String::enumerateText(
+		TextSelection selection,
+		AppendPartCallback appendPartCallback,
+		ClickHandlerStartCallback clickHandlerStartCallback,
+		ClickHandlerFinishCallback clickHandlerFinishCallback,
+		FlagsChangeCallback flagsChangeCallback) const {
 	if (isEmpty() || selection.empty()) {
 		return;
 	}
@@ -3437,12 +3487,20 @@ void String::enumerateText(TextSelection selection, AppendPartCallback appendPar
 			break;
 		}
 
-		if ((*i)->type() == TextBlockTSkip) continue;
+		const auto blockType = (*i)->type();
+		if (blockType == TextBlockTSkip) continue;
 
 		auto rangeFrom = qMax(selection.from, blockFrom);
-		auto rangeTo = qMin(selection.to, uint16(blockFrom + countBlockLength(i, e)));
+		auto rangeTo = qMin(
+			selection.to,
+			uint16(blockFrom + countBlockLength(i, e)));
 		if (rangeTo > rangeFrom) {
-			appendPartCallback(base::StringViewMid(_text, rangeFrom, rangeTo - rangeFrom));
+			const auto customEmojiData = (blockType == TextBlockTCustomEmoji)
+				? static_cast<const CustomEmojiBlock*>(i->get())->_custom->entityData()
+				: QString();
+			appendPartCallback(
+				base::StringViewMid(_text, rangeFrom, rangeTo - rangeFrom),
+				customEmojiData);
 		}
 	}
 }
@@ -3562,11 +3620,21 @@ TextForMimeData String::toText(
 				plainUrl ? QString() : entity.data });
 		}
 	};
-	const auto appendPartCallback = [&](QStringView part) {
+	const auto appendPartCallback = [&](
+			QStringView part,
+			const QString &customEmojiData) {
 		result.rich.text += part;
 		if (composeExpanded) {
 			result.expanded += part;
 		}
+		if (composeEntities && !customEmojiData.isEmpty()) {
+			insertEntity({
+				EntityType::CustomEmoji,
+				result.rich.text.size() - part.size(),
+				part.size(),
+				customEmojiData,
+			});
+		}
 	};
 
 	enumerateText(
diff --git a/ui/text/text.h b/ui/text/text.h
index 3927652..fc36995 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -106,9 +106,7 @@ public:
 		const QString &text,
 		const TextParseOptions &options = kDefaultTextOptions,
 		int32 minResizeWidth = QFIXED_MAX);
-	String(const String &other) = default;
 	String(String &&other) = default;
-	String &operator=(const String &other) = default;
 	String &operator=(String &&other) = default;
 	~String() = default;
 
@@ -177,7 +175,7 @@ public:
 	void clear();
 
 private:
-	using TextBlocks = QVector<Block>;
+	using TextBlocks = std::vector<Block>;
 	using TextLinks = QVector<ClickHandlerPtr>;
 
 	uint16 countBlockEnd(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const;
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index a110c15..f3d2275 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -348,8 +348,8 @@ AbstractBlock::AbstractBlock(
 	uint16 flags,
 	uint16 lnkIndex,
 	uint16 spoilerIndex)
-: _from(from)
-, _flags((flags & 0b1111111111) | ((lnkIndex & 0xFFFF) << 14))
+: _flags((flags & 0b1111111111) | ((lnkIndex & 0xFFFF) << 14))
+, _from(from)
 , _spoilerIndex(spoilerIndex) {
 }
 
@@ -474,6 +474,30 @@ EmojiBlock::EmojiBlock(
 	}
 }
 
+CustomEmojiBlock::CustomEmojiBlock(
+	const style::font &font,
+	const QString &str,
+	uint16 from,
+	uint16 length,
+	uint16 flags,
+	uint16 lnkIndex,
+	uint16 spoilerIndex,
+	std::unique_ptr<CustomEmoji> custom)
+: AbstractBlock(font, str, from, length, flags, lnkIndex, spoilerIndex)
+, _custom(std::move(custom)) {
+	_flags |= ((TextBlockTCustomEmoji & 0x0F) << 10);
+	_width = int(st::emojiSize + 2 * st::emojiPadding);
+	_rpadding = 0;
+	for (auto i = length; i != 0;) {
+		auto ch = str[_from + (--i)];
+		if (ch.unicode() == QChar::Space) {
+			_rpadding += font->spacew;
+		} else {
+			break;
+		}
+	}
+}
+
 NewlineBlock::NewlineBlock(
 	const style::font &font,
 	const QString &str,
@@ -546,25 +570,6 @@ Block::Block() {
 	Unexpected("Should not be called.");
 }
 
-Block::Block(const Block &other) {
-	switch (other->type()) {
-	case TextBlockTNewline:
-		emplace<NewlineBlock>(other.unsafe<NewlineBlock>());
-		break;
-	case TextBlockTText:
-		emplace<TextBlock>(other.unsafe<TextBlock>());
-		break;
-	case TextBlockTEmoji:
-		emplace<EmojiBlock>(other.unsafe<EmojiBlock>());
-		break;
-	case TextBlockTSkip:
-		emplace<SkipBlock>(other.unsafe<SkipBlock>());
-		break;
-	default:
-		Unexpected("Bad text block type in Block(const Block&).");
-	}
-}
-
 Block::Block(Block &&other) {
 	switch (other->type()) {
 	case TextBlockTNewline:
@@ -576,6 +581,9 @@ Block::Block(Block &&other) {
 	case TextBlockTEmoji:
 		emplace<EmojiBlock>(std::move(other.unsafe<EmojiBlock>()));
 		break;
+	case TextBlockTCustomEmoji:
+		emplace<CustomEmojiBlock>(std::move(other.unsafe<CustomEmojiBlock>()));
+		break;
 	case TextBlockTSkip:
 		emplace<SkipBlock>(std::move(other.unsafe<SkipBlock>()));
 		break;
@@ -584,30 +592,6 @@ Block::Block(Block &&other) {
 	}
 }
 
-Block &Block::operator=(const Block &other) {
-	if (&other == this) {
-		return *this;
-	}
-	destroy();
-	switch (other->type()) {
-	case TextBlockTNewline:
-		emplace<NewlineBlock>(other.unsafe<NewlineBlock>());
-		break;
-	case TextBlockTText:
-		emplace<TextBlock>(other.unsafe<TextBlock>());
-		break;
-	case TextBlockTEmoji:
-		emplace<EmojiBlock>(other.unsafe<EmojiBlock>());
-		break;
-	case TextBlockTSkip:
-		emplace<SkipBlock>(other.unsafe<SkipBlock>());
-		break;
-	default:
-		Unexpected("Bad text block type in operator=(const Block&).");
-	}
-	return *this;
-}
-
 Block &Block::operator=(Block &&other) {
 	if (&other == this) {
 		return *this;
@@ -623,6 +607,9 @@ Block &Block::operator=(Block &&other) {
 	case TextBlockTEmoji:
 		emplace<EmojiBlock>(std::move(other.unsafe<EmojiBlock>()));
 		break;
+	case TextBlockTCustomEmoji:
+		emplace<CustomEmojiBlock>(std::move(other.unsafe<CustomEmojiBlock>()));
+		break;
 	case TextBlockTSkip:
 		emplace<SkipBlock>(std::move(other.unsafe<SkipBlock>()));
 		break;
@@ -694,6 +681,26 @@ Block Block::Emoji(
 		emoji);
 }
 
+Block Block::CustomEmoji(
+		const style::font &font,
+		const QString &str,
+		uint16 from,
+		uint16 length,
+		uint16 flags,
+		uint16 lnkIndex,
+		uint16 spoilerIndex,
+		std::unique_ptr<Text::CustomEmoji> custom) {
+	return New<CustomEmojiBlock>(
+		font,
+		str,
+		from,
+		length,
+		flags,
+		lnkIndex,
+		spoilerIndex,
+		std::move(custom));
+}
+
 Block Block::Skip(
 		const style::font &font,
 		const QString &str,
@@ -740,6 +747,9 @@ void Block::destroy() {
 	case TextBlockTEmoji:
 		unsafe<EmojiBlock>().~EmojiBlock();
 		break;
+	case TextBlockTCustomEmoji:
+		unsafe<CustomEmojiBlock>().~CustomEmojiBlock();
+		break;
 	case TextBlockTSkip:
 		unsafe<SkipBlock>().~SkipBlock();
 		break;
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index c02d68c..249bc91 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -18,7 +18,8 @@ enum TextBlockType {
 	TextBlockTNewline = 0x01,
 	TextBlockTText = 0x02,
 	TextBlockTEmoji = 0x03,
-	TextBlockTSkip = 0x04,
+	TextBlockTCustomEmoji = 0x04,
+	TextBlockTSkip = 0x05,
 };
 
 enum TextBlockFlags {
@@ -63,10 +64,8 @@ protected:
 		uint16 lnkIndex,
 		uint16 spoilerIndex);
 
-	uint16 _from = 0;
-
 	uint32 _flags = 0; // 2 bits empty, 16 bits lnkIndex, 4 bits type, 10 bits flags
-
+	uint16 _from = 0;
 	uint16 _spoilerIndex = 0;
 
 	QFixed _width = 0;
@@ -165,6 +164,35 @@ private:
 
 };
 
+class CustomEmoji {
+public:
+	virtual ~CustomEmoji() = default;
+	[[nodiscard]] virtual QString entityData() = 0;
+	virtual void paint(QPainter &p, int x, int y) = 0;
+
+};
+
+class CustomEmojiBlock final : public AbstractBlock {
+public:
+	CustomEmojiBlock(
+		const style::font &font,
+		const QString &str,
+		uint16 from,
+		uint16 length,
+		uint16 flags,
+		uint16 lnkIndex,
+		uint16 spoilerIndex,
+		std::unique_ptr<CustomEmoji> custom);
+
+private:
+	std::unique_ptr<CustomEmoji> _custom;
+
+	friend class String;
+	friend class Parser;
+	friend class Renderer;
+
+};
+
 class SkipBlock final : public AbstractBlock {
 public:
 	SkipBlock(
@@ -190,9 +218,7 @@ private:
 class Block final {
 public:
 	Block();
-	Block(const Block &other);
 	Block(Block &&other);
-	Block &operator=(const Block &other);
 	Block &operator=(Block &&other);
 	~Block();
 
@@ -225,6 +251,16 @@ public:
 			uint16 spoilerIndex,
 			EmojiPtr emoji);
 
+	[[nodiscard]] static Block CustomEmoji(
+		const style::font &font,
+		const QString &str,
+		uint16 from,
+		uint16 length,
+		uint16 flags,
+		uint16 lnkIndex,
+		uint16 spoilerIndex,
+		std::unique_ptr<CustomEmoji> custom);
+
 	[[nodiscard]] static Block Skip(
 			const style::font &font,
 			const QString &str,
@@ -278,6 +314,8 @@ private:
 	static_assert(alignof(NewlineBlock) <= alignof(void*));
 	static_assert(sizeof(EmojiBlock) <= sizeof(TextBlock));
 	static_assert(alignof(EmojiBlock) <= alignof(void*));
+	static_assert(sizeof(CustomEmojiBlock) <= sizeof(TextBlock));
+	static_assert(alignof(CustomEmojiBlock) <= alignof(void*));
 	static_assert(sizeof(SkipBlock) <= sizeof(TextBlock));
 	static_assert(alignof(SkipBlock) <= alignof(void*));
 
diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 7c794ec..fc406ab 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -23,6 +23,7 @@ enum class EntityType : uchar {
 	Cashtag,
 	Mention,
 	MentionName,
+	CustomEmoji,
 	BotCommand,
 	MediaTimestamp,
 	PlainLink, // Senders in chat list, attachements in chat list, etc.

From 14a7fc74af32af350d65edc253d1763a9574c289 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 Jun 2022 10:48:46 +0400
Subject: [PATCH 151/635] Correctly finish custom emoji entities.

---
 ui/text/text.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 2073ea8..bcefacd 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -215,14 +215,16 @@ private:
 			Link,
 			IndexedLink,
 			Spoiler,
+			CustomEmoji,
 		};
 
 		explicit StartedEntity(TextBlockFlags flags);
 		explicit StartedEntity(uint16 index, Type type);
 
-		std::optional<TextBlockFlags> flags() const;
-		std::optional<uint16> lnkIndex() const;
-		std::optional<uint16> spoilerIndex() const;
+		[[nodiscard]] Type type() const;
+		[[nodiscard]] std::optional<TextBlockFlags> flags() const;
+		[[nodiscard]] std::optional<uint16> lnkIndex() const;
+		[[nodiscard]] std::optional<uint16> spoilerIndex() const;
 
 	private:
 		const int _value = 0;
@@ -323,6 +325,10 @@ Parser::StartedEntity::StartedEntity(uint16 index, Type type)
 		: (_value < kStringLinkIndexShift));
 }
 
+Parser::StartedEntity::Type Parser::StartedEntity::type() const {
+	return _type;
+}
+
 std::optional<TextBlockFlags> Parser::StartedEntity::flags() const {
 	if (_value < int(kStringLinkIndexShift) && (_type == Type::Flags)) {
 		return TextBlockFlags(_value);
@@ -450,7 +456,9 @@ void Parser::finishEntities() {
 		_startedEntities.erase(_startedEntities.begin());
 
 		while (!list.empty()) {
-			if (const auto flags = list.back().flags()) {
+			if (list.back().type() == StartedEntity::Type::CustomEmoji) {
+				createBlock();
+			} else if (const auto flags = list.back().flags()) {
 				if (_flags & (*flags)) {
 					createBlock();
 					_flags &= ~(*flags);
@@ -509,9 +517,13 @@ bool Parser::checkEntities() {
 		link.data = _waitingEntity->data();
 		link.text = QString(entityBegin, entityLength);
 	};
+
+	using Type = StartedEntity::Type;
+
 	if (entityType == EntityType::CustomEmoji) {
 		createBlock();
 		_customEmojiData = _waitingEntity->data();
+		_startedEntities[entityEnd].emplace_back(0, Type::CustomEmoji);
 	} else if (entityType == EntityType::Bold) {
 		flags = TextBlockFBold;
 	} else if (entityType == EntityType::Semibold) {
@@ -568,8 +580,6 @@ bool Parser::checkEntities() {
 		pushComplexUrl();
 	}
 
-	using Type = StartedEntity::Type;
-
 	if (link.type != EntityType::Invalid) {
 		createBlock();
 

From e217611d50d5d6ff55c524f97f018f9a91319663 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 Jun 2022 20:33:02 +0400
Subject: [PATCH 152/635] Revert "Simplify Windows native event filter."

With that commit the window frame on Windows 7 is still bugged :(
---
 ui/platform/ui_platform_window.cpp |  7 ---
 ui/platform/ui_platform_window.h   |  5 --
 ui/platform/win/ui_window_win.cpp  | 79 ++++++++++++++++++++++--------
 ui/platform/win/ui_window_win.h    |  9 ++--
 ui/widgets/rp_window.cpp           | 15 ------
 ui/widgets/rp_window.h             |  8 ---
 6 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index b11831f..2ce63a2 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -70,13 +70,6 @@ rpl::producer<HitTestResult> BasicWindowHelper::systemButtonDown() const {
 	return rpl::never<HitTestResult>();
 }
 
-bool BasicWindowHelper::nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) {
-	return false;
-}
-
 void BasicWindowHelper::setTitle(const QString &title) {
 	_window->setWindowTitle(title);
 }
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index eadcbca..e34f1d7 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -8,7 +8,6 @@
 
 #include "base/flags.h"
 #include "base/object_ptr.h"
-#include "base/qt/qt_common_adapters.h"
 #include "ui/round_rect.h"
 
 namespace style {
@@ -49,10 +48,6 @@ public:
 		-> rpl::producer<HitTestResult>;
 	[[nodiscard]] virtual auto systemButtonDown() const
 		-> rpl::producer<HitTestResult>;
-	[[nodiscard]] virtual bool nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result);
 	virtual void setTitle(const QString &title);
 	virtual void setTitleStyle(const style::WindowTitle &st);
 	virtual void setNativeFrame(bool enabled);
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 9357993..95957c0 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -17,6 +17,7 @@
 #include "styles/palette.h"
 #include "styles/style_widgets.h"
 
+#include <QtCore/QAbstractNativeEventFilter>
 #include <QtGui/QWindow>
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QApplication>
@@ -128,6 +129,50 @@ void FixAeroSnap(HWND handle) {
 
 } // namespace
 
+class WindowHelper::NativeFilter final : public QAbstractNativeEventFilter {
+public:
+       void registerWindow(HWND handle, not_null<WindowHelper*> helper);
+       void unregisterWindow(HWND handle);
+
+       bool nativeEventFilter(
+               const QByteArray &eventType,
+               void *message,
+               long *result) override;
+
+private:
+       base::flat_map<HWND, not_null<WindowHelper*>> _windowByHandle;
+
+};
+
+void WindowHelper::NativeFilter::registerWindow(
+               HWND handle,
+               not_null<WindowHelper*> helper) {
+       _windowByHandle.emplace(handle, helper);
+}
+
+void WindowHelper::NativeFilter::unregisterWindow(HWND handle) {
+       _windowByHandle.remove(handle);
+}
+
+bool WindowHelper::NativeFilter::nativeEventFilter(
+               const QByteArray &eventType,
+               void *message,
+               long *result) {
+       auto filtered = false;
+       const auto msg = static_cast<MSG*>(message);
+       const auto i = _windowByHandle.find(msg->hwnd);
+       if (i != end(_windowByHandle)) {
+               base::Integration::Instance().enterFromEventLoop([&] {
+                       filtered = i->second->handleNativeEvent(
+                               msg->message,
+                               msg->wParam,
+                               msg->lParam,
+                               reinterpret_cast<LRESULT*>(result));
+               });
+       }
+       return filtered;
+}
+
 WindowHelper::WindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
 , _handle(ResolveWindowHandle(window))
@@ -141,6 +186,7 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 }
 
 WindowHelper::~WindowHelper() {
+	GetNativeFilter()->unregisterWindow(_handle);
 }
 
 void WindowHelper::initInWindow(not_null<RpWindow*> window) {
@@ -272,6 +318,7 @@ rpl::producer<HitTestResult> WindowHelper::systemButtonDown() const {
 
 void WindowHelper::init() {
 	_title->show();
+	GetNativeFilter()->registerWindow(_handle, this);
 
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
@@ -321,26 +368,6 @@ void WindowHelper::init() {
 	initialShadowUpdate();
 }
 
-bool WindowHelper::nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) {
-	const auto msg = static_cast<MSG*>(message);
-	auto lresult = LRESULT(*result);
-	const auto guard = gsl::finally([&] {
-		*result = base::NativeEventResult(lresult);
-	});
-	auto filtered = false;
-	base::Integration::Instance().enterFromEventLoop([&] {
-		filtered = handleNativeEvent(
-			msg->message,
-			msg->wParam,
-			msg->lParam,
-			&lresult);
-	});
-	return filtered;
-}
-
 bool WindowHelper::handleNativeEvent(
 		UINT msg,
 		WPARAM wParam,
@@ -762,6 +789,18 @@ void WindowHelper::fixMaximizedWindow() {
 	}
 }
 
+not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() {
+       Expects(QCoreApplication::instance() != nullptr);
+
+       static const auto GlobalFilter = [&] {
+               const auto application = QCoreApplication::instance();
+               const auto filter = Ui::CreateChild<NativeFilter>(application);
+               application->installNativeEventFilter(filter);
+               return filter;
+       }();
+       return GlobalFilter;
+}
+
 HWND GetWindowHandle(not_null<QWidget*> widget) {
 	const auto toplevel = widget->window();
 	toplevel->createWinId();
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index eada67c..d3ec58d 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -44,12 +44,10 @@ public:
 	[[nodiscard]] auto systemButtonDown() const
 		-> rpl::producer<HitTestResult> override;
 
-	[[nodiscard]] bool nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) override;
-
 private:
+	class NativeFilter;
+	friend class NativeFilter;
+
 	void init();
 	void updateMargins();
 	void updateWindowFrameColors();
@@ -72,6 +70,7 @@ private:
 	[[nodiscard]] HitTestResult systemButtonHitTest(int result) const;
 
 	[[nodiscard]] int titleHeight() const;
+	static not_null<NativeFilter*> GetNativeFilter();
 
 	const HWND _handle = nullptr;
 	const not_null<TitleWidget*> _title;
diff --git a/ui/widgets/rp_window.cpp b/ui/widgets/rp_window.cpp
index f1dc292..d1c38a6 100644
--- a/ui/widgets/rp_window.cpp
+++ b/ui/widgets/rp_window.cpp
@@ -17,8 +17,6 @@ RpWindow::RpWindow(QWidget *parent)
 
 	_helper->initInWindow(this);
 	hide();
-
-	_initialized = true;
 }
 
 RpWindow::~RpWindow() = default;
@@ -101,17 +99,4 @@ void RpWindow::setBodyTitleArea(
 	_helper->setBodyTitleArea(std::move(testMethod));
 }
 
-bool RpWindow::nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) {
-	if (_initialized && _helper->nativeEvent(
-		eventType,
-		message,
-		result)) {
-		return true;
-	}
-	return RpWidget::nativeEvent(eventType, message, result);
-}
-
 } // namespace Ui
diff --git a/ui/widgets/rp_window.h b/ui/widgets/rp_window.h
index 77311fc..04b4d99 100644
--- a/ui/widgets/rp_window.h
+++ b/ui/widgets/rp_window.h
@@ -8,7 +8,6 @@
 
 #include "ui/rp_widget.h"
 #include "base/flags.h"
-#include "base/qt/qt_common_adapters.h"
 
 namespace style {
 struct WindowTitle;
@@ -68,14 +67,7 @@ public:
 	void close();
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
-protected:
-	bool nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) override;
-
 private:
-	bool _initialized = false;
 	const std::unique_ptr<Platform::BasicWindowHelper> _helper;
 
 };

From 187110f43820a70d20b77e4063286b692d53294d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 Jun 2022 20:33:46 +0400
Subject: [PATCH 153/635] Allow unloading custom emoji data.

---
 ui/text/text.cpp     | 22 +++++++++++++++++++++-
 ui/text/text.h       |  4 ++++
 ui/text/text_block.h |  3 ++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index bcefacd..9ff22ab 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -838,7 +838,11 @@ void Parser::finalize(const TextParseOptions &options) {
 			currentIndex++;
 		}
 	};
+	_t->_hasCustomEmoji = false;
 	for (auto &block : _t->_blocks) {
+		if (block->type() == TextBlockTCustomEmoji) {
+			_t->_hasCustomEmoji = true;
+		}
 		const auto spoilerIndex = block->spoilerIndex();
 		if (spoilerIndex && (_t->_spoilers.size() < spoilerIndex)) {
 			_t->_spoilers.resize(spoilerIndex);
@@ -1682,7 +1686,7 @@ private:
 								x,
 								y);
 						} else if (const auto custom = static_cast<const CustomEmojiBlock*>(currentBlock)->_custom.get()) {
-							custom->paint(*_p, x, y);
+							custom->paint(*_p, x, y, _textPalette->spoilerActiveBg->c);
 						}
 					}
 					if (hasSpoiler) {
@@ -3515,6 +3519,22 @@ void String::enumerateText(
 	}
 }
 
+bool String::hasCustomEmoji() const {
+	return _hasCustomEmoji;
+}
+
+void String::unloadCustomEmoji() {
+	if (!_hasCustomEmoji) {
+		return;
+	}
+	for (const auto &block : _blocks) {
+		const auto raw = block.get();
+		if (raw->type() == TextBlockTCustomEmoji) {
+			static_cast<const CustomEmojiBlock*>(raw)->_custom->unload();
+		}
+	}
+}
+
 QString String::toString(TextSelection selection) const {
 	return toText(selection, false, false).rich.text;
 }
diff --git a/ui/text/text.h b/ui/text/text.h
index fc36995..8829f96 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -161,6 +161,9 @@ public:
 		return _text.size();
 	}
 
+	[[nodiscard]] bool hasCustomEmoji() const;
+	void unloadCustomEmoji();
+
 	QString toString(TextSelection selection = AllTextSelection) const;
 	TextWithEntities toTextWithEntities(
 		TextSelection selection = AllTextSelection) const;
@@ -207,6 +210,7 @@ private:
 	QFixed _minResizeWidth;
 	QFixed _maxWidth = 0;
 	int32 _minHeight = 0;
+	bool _hasCustomEmoji = false;
 
 	QString _text;
 	const style::TextStyle *_st = nullptr;
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index 249bc91..39ac2f9 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -168,7 +168,8 @@ class CustomEmoji {
 public:
 	virtual ~CustomEmoji() = default;
 	[[nodiscard]] virtual QString entityData() = 0;
-	virtual void paint(QPainter &p, int x, int y) = 0;
+	virtual void paint(QPainter &p, int x, int y, const QColor &preview) = 0;
+	virtual void unload() = 0;
 
 };
 

From f40dc661b3f5235c11829dc5e7069fe79766984b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 Jun 2022 20:33:02 +0400
Subject: [PATCH 154/635] Revert "Simplify Windows native event filter."

With that commit the window frame on Windows 7 is still bugged :(
---
 ui/platform/ui_platform_window.cpp |  7 ---
 ui/platform/ui_platform_window.h   |  5 --
 ui/platform/win/ui_window_win.cpp  | 79 ++++++++++++++++++++++--------
 ui/platform/win/ui_window_win.h    |  9 ++--
 ui/widgets/rp_window.cpp           | 15 ------
 ui/widgets/rp_window.h             |  8 ---
 6 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index b11831f..2ce63a2 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -70,13 +70,6 @@ rpl::producer<HitTestResult> BasicWindowHelper::systemButtonDown() const {
 	return rpl::never<HitTestResult>();
 }
 
-bool BasicWindowHelper::nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) {
-	return false;
-}
-
 void BasicWindowHelper::setTitle(const QString &title) {
 	_window->setWindowTitle(title);
 }
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index eadcbca..e34f1d7 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -8,7 +8,6 @@
 
 #include "base/flags.h"
 #include "base/object_ptr.h"
-#include "base/qt/qt_common_adapters.h"
 #include "ui/round_rect.h"
 
 namespace style {
@@ -49,10 +48,6 @@ public:
 		-> rpl::producer<HitTestResult>;
 	[[nodiscard]] virtual auto systemButtonDown() const
 		-> rpl::producer<HitTestResult>;
-	[[nodiscard]] virtual bool nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result);
 	virtual void setTitle(const QString &title);
 	virtual void setTitleStyle(const style::WindowTitle &st);
 	virtual void setNativeFrame(bool enabled);
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 9357993..95957c0 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -17,6 +17,7 @@
 #include "styles/palette.h"
 #include "styles/style_widgets.h"
 
+#include <QtCore/QAbstractNativeEventFilter>
 #include <QtGui/QWindow>
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QApplication>
@@ -128,6 +129,50 @@ void FixAeroSnap(HWND handle) {
 
 } // namespace
 
+class WindowHelper::NativeFilter final : public QAbstractNativeEventFilter {
+public:
+       void registerWindow(HWND handle, not_null<WindowHelper*> helper);
+       void unregisterWindow(HWND handle);
+
+       bool nativeEventFilter(
+               const QByteArray &eventType,
+               void *message,
+               long *result) override;
+
+private:
+       base::flat_map<HWND, not_null<WindowHelper*>> _windowByHandle;
+
+};
+
+void WindowHelper::NativeFilter::registerWindow(
+               HWND handle,
+               not_null<WindowHelper*> helper) {
+       _windowByHandle.emplace(handle, helper);
+}
+
+void WindowHelper::NativeFilter::unregisterWindow(HWND handle) {
+       _windowByHandle.remove(handle);
+}
+
+bool WindowHelper::NativeFilter::nativeEventFilter(
+               const QByteArray &eventType,
+               void *message,
+               long *result) {
+       auto filtered = false;
+       const auto msg = static_cast<MSG*>(message);
+       const auto i = _windowByHandle.find(msg->hwnd);
+       if (i != end(_windowByHandle)) {
+               base::Integration::Instance().enterFromEventLoop([&] {
+                       filtered = i->second->handleNativeEvent(
+                               msg->message,
+                               msg->wParam,
+                               msg->lParam,
+                               reinterpret_cast<LRESULT*>(result));
+               });
+       }
+       return filtered;
+}
+
 WindowHelper::WindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
 , _handle(ResolveWindowHandle(window))
@@ -141,6 +186,7 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 }
 
 WindowHelper::~WindowHelper() {
+	GetNativeFilter()->unregisterWindow(_handle);
 }
 
 void WindowHelper::initInWindow(not_null<RpWindow*> window) {
@@ -272,6 +318,7 @@ rpl::producer<HitTestResult> WindowHelper::systemButtonDown() const {
 
 void WindowHelper::init() {
 	_title->show();
+	GetNativeFilter()->registerWindow(_handle, this);
 
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
@@ -321,26 +368,6 @@ void WindowHelper::init() {
 	initialShadowUpdate();
 }
 
-bool WindowHelper::nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) {
-	const auto msg = static_cast<MSG*>(message);
-	auto lresult = LRESULT(*result);
-	const auto guard = gsl::finally([&] {
-		*result = base::NativeEventResult(lresult);
-	});
-	auto filtered = false;
-	base::Integration::Instance().enterFromEventLoop([&] {
-		filtered = handleNativeEvent(
-			msg->message,
-			msg->wParam,
-			msg->lParam,
-			&lresult);
-	});
-	return filtered;
-}
-
 bool WindowHelper::handleNativeEvent(
 		UINT msg,
 		WPARAM wParam,
@@ -762,6 +789,18 @@ void WindowHelper::fixMaximizedWindow() {
 	}
 }
 
+not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() {
+       Expects(QCoreApplication::instance() != nullptr);
+
+       static const auto GlobalFilter = [&] {
+               const auto application = QCoreApplication::instance();
+               const auto filter = Ui::CreateChild<NativeFilter>(application);
+               application->installNativeEventFilter(filter);
+               return filter;
+       }();
+       return GlobalFilter;
+}
+
 HWND GetWindowHandle(not_null<QWidget*> widget) {
 	const auto toplevel = widget->window();
 	toplevel->createWinId();
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index eada67c..d3ec58d 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -44,12 +44,10 @@ public:
 	[[nodiscard]] auto systemButtonDown() const
 		-> rpl::producer<HitTestResult> override;
 
-	[[nodiscard]] bool nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) override;
-
 private:
+	class NativeFilter;
+	friend class NativeFilter;
+
 	void init();
 	void updateMargins();
 	void updateWindowFrameColors();
@@ -72,6 +70,7 @@ private:
 	[[nodiscard]] HitTestResult systemButtonHitTest(int result) const;
 
 	[[nodiscard]] int titleHeight() const;
+	static not_null<NativeFilter*> GetNativeFilter();
 
 	const HWND _handle = nullptr;
 	const not_null<TitleWidget*> _title;
diff --git a/ui/widgets/rp_window.cpp b/ui/widgets/rp_window.cpp
index f1dc292..d1c38a6 100644
--- a/ui/widgets/rp_window.cpp
+++ b/ui/widgets/rp_window.cpp
@@ -17,8 +17,6 @@ RpWindow::RpWindow(QWidget *parent)
 
 	_helper->initInWindow(this);
 	hide();
-
-	_initialized = true;
 }
 
 RpWindow::~RpWindow() = default;
@@ -101,17 +99,4 @@ void RpWindow::setBodyTitleArea(
 	_helper->setBodyTitleArea(std::move(testMethod));
 }
 
-bool RpWindow::nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) {
-	if (_initialized && _helper->nativeEvent(
-		eventType,
-		message,
-		result)) {
-		return true;
-	}
-	return RpWidget::nativeEvent(eventType, message, result);
-}
-
 } // namespace Ui
diff --git a/ui/widgets/rp_window.h b/ui/widgets/rp_window.h
index 77311fc..04b4d99 100644
--- a/ui/widgets/rp_window.h
+++ b/ui/widgets/rp_window.h
@@ -8,7 +8,6 @@
 
 #include "ui/rp_widget.h"
 #include "base/flags.h"
-#include "base/qt/qt_common_adapters.h"
 
 namespace style {
 struct WindowTitle;
@@ -68,14 +67,7 @@ public:
 	void close();
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
-protected:
-	bool nativeEvent(
-		const QByteArray &eventType,
-		void *message,
-		base::NativeEventResult *result) override;
-
 private:
-	bool _initialized = false;
 	const std::unique_ptr<Platform::BasicWindowHelper> _helper;
 
 };

From 3dbf58c45fb9a184b6e82fc15b21f762c8dc1f1c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 21 May 2022 17:10:21 +0400
Subject: [PATCH 155/635] Make window resize less lagged on Windows

---
 ui/platform/win/ui_window_win.cpp | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 95957c0..72213a0 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -244,6 +244,18 @@ void WindowHelper::setNativeFrame(bool enabled) {
 	updateMargins();
 	updateWindowFrameColors();
 	fixMaximizedWindow();
+	SetWindowPos(
+		_handle,
+		0,
+		0,
+		0,
+		0,
+		0,
+		SWP_FRAMECHANGED
+			| SWP_NOMOVE
+			| SWP_NOSIZE
+			| SWP_NOZORDER
+			| SWP_NOACTIVATE);
 }
 
 void WindowHelper::initialShadowUpdate() {
@@ -403,17 +415,14 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCCALCSIZE: {
-		if (_title->isHidden()) {
+		if (_title->isHidden() || !wParam) {
 			return false;
 		}
 		WINDOWPLACEMENT wp;
 		wp.length = sizeof(WINDOWPLACEMENT);
 		if (GetWindowPlacement(_handle, &wp)
 			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
-			const auto params = (LPNCCALCSIZE_PARAMS)lParam;
-			const auto r = (wParam == TRUE)
-				? &params->rgrc[0]
-				: (LPRECT)lParam;
+			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
 			const auto hMonitor = MonitorFromPoint(
 				{ (r->left + r->right) / 2, (r->top + r->bottom) / 2 },
 				MONITOR_DEFAULTTONEAREST);
@@ -433,8 +442,10 @@ bool WindowHelper::handleNativeEvent(
 					}
 				}
 			}
+			if (result) *result = 0;
+		} else {
+			if (result) *result = WVR_REDRAW;
 		}
-		if (result) *result = 0;
 		return true;
 	}
 

From c499a437f8f48322aa5691dfb4419ec4fb1f8394 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 24 Jun 2022 20:57:27 +0400
Subject: [PATCH 156/635] Fix a crash while updating window extents

---
 ui/platform/ui_platform_window.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 2ce63a2..c60519a 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -262,10 +262,10 @@ void DefaultWindowHelper::init() {
 			Qt::WindowStates windowState) {
 		if (const auto handle = window()->windowHandle()) {
 			handle->setFlag(Qt::FramelessWindowHint, titleShown);
+			updateWindowExtents();
 		} else {
 			window()->setWindowFlag(Qt::FramelessWindowHint, titleShown);
 		}
-		updateWindowExtents();
 	}, window()->lifetime());
 
 	window()->events() | rpl::start_with_next([=](not_null<QEvent*> e) {

From db2638cf607be96ba121a3ef180e87d533abd613 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 25 Jun 2022 01:07:56 +0400
Subject: [PATCH 157/635] Fix painting of bottom left shadow corner

---
 ui/platform/ui_platform_window.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index c60519a..0a4a70f 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -315,7 +315,7 @@ void DefaultWindowHelper::updateRoundingOverlay() {
 				rect.topRight() - QPoint(radiusWithFix, 0),
 				radiusSize
 			)) || clip.intersects(QRect(
-				rect.bottomRight() - QPoint(0, radiusWithFix),
+				rect.bottomLeft() - QPoint(0, radiusWithFix),
 				radiusSize
 			)) || clip.intersects(QRect(
 				rect.bottomRight() - QPoint(radiusWithFix, radiusWithFix),

From 6ef5ec3410ef5db33cb6413a7f05cc87a2c970bd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 Jun 2022 17:11:16 +0400
Subject: [PATCH 158/635] Pass painting active/inactive state through Painter.

---
 CMakeLists.txt               |  1 +
 ui/effects/frame_generator.h | 29 +++++++++++++++++++++++++++++
 ui/painter.h                 |  9 ++++++++-
 ui/text/text.cpp             | 11 +++++++++--
 ui/text/text_block.h         | 10 +++++++++-
 5 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 ui/effects/frame_generator.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd55c80..36a2548 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ PRIVATE
     ui/effects/cross_line.h
     ui/effects/fade_animation.cpp
     ui/effects/fade_animation.h
+    ui/effects/frame_generator.h
     ui/effects/gradient.cpp
     ui/effects/gradient.h
     ui/effects/numbers_animation.cpp
diff --git a/ui/effects/frame_generator.h b/ui/effects/frame_generator.h
new file mode 100644
index 0000000..0cc300e
--- /dev/null
+++ b/ui/effects/frame_generator.h
@@ -0,0 +1,29 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include <QtGui/QImage>
+
+#include <crl/crl_time.h>
+
+namespace Ui {
+
+class FrameGenerator {
+public:
+	[[nodiscard]] virtual int count() = 0;
+
+	struct Frame {
+		QImage image;
+		crl::time duration = 0;
+	};
+	[[nodiscard]] virtual Frame renderNext(
+		QImage storage,
+		QSize size,
+		Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) = 0;
+};
+
+} // namespace Ui
diff --git a/ui/painter.h b/ui/painter.h
index 017e66e..d2b73d8 100644
--- a/ui/painter.h
+++ b/ui/painter.h
@@ -69,12 +69,19 @@ public:
 	void restoreTextPalette() {
 		_textPalette = nullptr;
 	}
-	const style::TextPalette &textPalette() const {
+	[[nodiscard]] const style::TextPalette &textPalette() const {
 		return _textPalette ? *_textPalette : st::defaultTextPalette;
 	}
+	void setInactive(bool inactive) {
+		_inactive = inactive;
+	}
+	[[nodiscard]] bool inactive() const {
+		return _inactive;
+	}
 
 private:
 	const style::TextPalette *_textPalette = nullptr;
+	bool _inactive = false;
 
 };
 
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 9ff22ab..45e33fc 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -1686,7 +1686,10 @@ private:
 								x,
 								y);
 						} else if (const auto custom = static_cast<const CustomEmojiBlock*>(currentBlock)->_custom.get()) {
-							custom->paint(*_p, x, y, _textPalette->spoilerActiveBg->c);
+							if (!_now) {
+								_now = crl::now();
+							}
+							custom->paint(*_p, x, y, _now, _textPalette->spoilerActiveBg->c, _p->inactive());
 						}
 					}
 					if (hasSpoiler) {
@@ -1920,7 +1923,10 @@ private:
 		if (!_background.startMs) {
 			return 1.;
 		}
-		const auto progress = float64(crl::now() - _background.startMs)
+		if (!_now) {
+			_now = crl::now();
+		}
+		const auto progress = float64(_now - _background.startMs)
 			/ st::fadeWrapDuration;
 		if ((progress > 1.) && _background.spoilerIndex) {
 			const auto link = _t->_spoilers.at(_background.spoilerIndex - 1);
@@ -2863,6 +2869,7 @@ private:
 	TextSelection _selection = { 0, 0 };
 	bool _fullWidthSelection = true;
 	const QChar *_str = nullptr;
+	crl::time _now = 0;
 
 	int _indexOfElidedBlock = -1; // For spoilers.
 
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index 39ac2f9..4da5ec9 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -11,6 +11,8 @@
 
 #include <private/qfixed_p.h>
 
+#include <crl/crl_time.h>
+
 namespace Ui {
 namespace Text {
 
@@ -168,7 +170,13 @@ class CustomEmoji {
 public:
 	virtual ~CustomEmoji() = default;
 	[[nodiscard]] virtual QString entityData() = 0;
-	virtual void paint(QPainter &p, int x, int y, const QColor &preview) = 0;
+	virtual void paint(
+		QPainter &p,
+		int x,
+		int y,
+		crl::time now,
+		const QColor &preview,
+		bool paused) = 0;
 	virtual void unload() = 0;
 
 };

From cb5296a6b0e14a608cb97d3cafe8971ea25e7f56 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 Jun 2022 11:51:23 +0400
Subject: [PATCH 159/635] Add ImageFrameGenerator for static custom emoji.

---
 CMakeLists.txt                 |  1 +
 ui/effects/frame_generator.cpp | 58 ++++++++++++++++++++++++++++++++++
 ui/effects/frame_generator.h   | 15 +++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 ui/effects/frame_generator.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36a2548..13b7a19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ PRIVATE
     ui/effects/cross_line.h
     ui/effects/fade_animation.cpp
     ui/effects/fade_animation.h
+    ui/effects/frame_generator.cpp
     ui/effects/frame_generator.h
     ui/effects/gradient.cpp
     ui/effects/gradient.h
diff --git a/ui/effects/frame_generator.cpp b/ui/effects/frame_generator.cpp
new file mode 100644
index 0000000..329bad0
--- /dev/null
+++ b/ui/effects/frame_generator.cpp
@@ -0,0 +1,58 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/effects/frame_generator.h"
+
+#include "ui/image/image_prepare.h"
+
+namespace Ui {
+
+ImageFrameGenerator::ImageFrameGenerator(const QByteArray &bytes)
+: _bytes(bytes) {
+}
+
+int ImageFrameGenerator::count() {
+	return 1;
+}
+
+FrameGenerator::Frame ImageFrameGenerator::renderNext(
+		QImage storage,
+		QSize size,
+		Qt::AspectRatioMode mode) {
+	storage = Images::Read({
+		.content = _bytes,
+	}).image;
+	if (storage.isNull()) {
+		return {};
+	}
+	auto scaled = storage.scaled(
+		size,
+		mode,
+		Qt::SmoothTransformation
+	).convertToFormat(QImage::Format_ARGB32_Premultiplied);
+	if (scaled.size() == size) {
+		return { .image = std::move(scaled) };
+	}
+	auto result = QImage(size, QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+
+	const auto skipx = (size.width() - scaled.width()) / 2;
+	const auto skipy = (size.height() - scaled.height()) / 2;
+	const auto fromPerLine = scaled.bytesPerLine();
+	const auto toPerLine = result.bytesPerLine();
+	const auto lineBytes = scaled.width() * 4;
+	auto from = scaled.constBits();
+	auto to = result.bits() + (skipx * 4) + (skipy * fromPerLine);
+	for (auto y = 0, height = scaled.height(); y != height; ++y) {
+		memcpy(to, from, lineBytes);
+		from += fromPerLine;
+		to += toPerLine;
+	}
+
+	return { .image = std::move(result) };
+}
+
+} // namespace Ui
diff --git a/ui/effects/frame_generator.h b/ui/effects/frame_generator.h
index 0cc300e..9aec154 100644
--- a/ui/effects/frame_generator.h
+++ b/ui/effects/frame_generator.h
@@ -26,4 +26,19 @@ public:
 		Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) = 0;
 };
 
+class ImageFrameGenerator final : public Ui::FrameGenerator {
+public:
+	explicit ImageFrameGenerator(const QByteArray &bytes);
+
+	int count() override;
+	Frame renderNext(
+		QImage storage,
+		QSize size,
+		Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) override;
+
+private:
+	QByteArray _bytes;
+
+};
+
 } // namespace Ui

From 32cf0968a14f7ef7756834f72500fc58fef50c6d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 29 Jun 2022 16:17:03 +0400
Subject: [PATCH 160/635] Use src/dst prefixes instead of from/to.

---
 ui/effects/frame_generator.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/effects/frame_generator.cpp b/ui/effects/frame_generator.cpp
index 329bad0..43a20d4 100644
--- a/ui/effects/frame_generator.cpp
+++ b/ui/effects/frame_generator.cpp
@@ -41,15 +41,15 @@ FrameGenerator::Frame ImageFrameGenerator::renderNext(
 
 	const auto skipx = (size.width() - scaled.width()) / 2;
 	const auto skipy = (size.height() - scaled.height()) / 2;
-	const auto fromPerLine = scaled.bytesPerLine();
-	const auto toPerLine = result.bytesPerLine();
+	const auto srcPerLine = scaled.bytesPerLine();
+	const auto dstPerLine = result.bytesPerLine();
 	const auto lineBytes = scaled.width() * 4;
-	auto from = scaled.constBits();
-	auto to = result.bits() + (skipx * 4) + (skipy * fromPerLine);
+	auto src = scaled.constBits();
+	auto dst = result.bits() + (skipx * 4) + (skipy * srcPerLine);
 	for (auto y = 0, height = scaled.height(); y != height; ++y) {
-		memcpy(to, from, lineBytes);
-		from += fromPerLine;
-		to += toPerLine;
+		memcpy(dst, src, lineBytes);
+		src += srcPerLine;
+		dst += dstPerLine;
 	}
 
 	return { .image = std::move(result) };

From e6b3951b403d17ac8256b0331ec73736497fca5b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 Jun 2022 13:22:03 +0400
Subject: [PATCH 161/635] Support serializing / deserializing custom emoji as
 tags.

---
 ui/text/text_entity.cpp     |  15 +++-
 ui/widgets/input_fields.cpp | 135 +++++++++++++++++++++++++++++++++---
 ui/widgets/input_fields.h   |  27 +++++++-
 3 files changed, 165 insertions(+), 12 deletions(-)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 3c95679..96fa427 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -2052,7 +2052,9 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 	const auto processState = [&](State nextState) {
 		const auto linkChanged = (nextState.link != state.link);
 		if (linkChanged) {
-			if (IsMentionLink(state.link)) {
+			if (Ui::InputField::IsCustomEmojiLink(state.link)) {
+				closeType(EntityType::CustomEmoji);
+			} else if (IsMentionLink(state.link)) {
 				closeType(EntityType::MentionName);
 			} else {
 				closeType(EntityType::CustomUrl);
@@ -2064,7 +2066,13 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 			}
 		}
 		if (linkChanged && !nextState.link.isEmpty()) {
-			if (IsMentionLink(nextState.link)) {
+			if (Ui::InputField::IsCustomEmojiLink(nextState.link)) {
+				const auto data = Ui::InputField::CustomEmojiEntityData(
+					nextState.link);
+				if (!data.isEmpty()) {
+					openType(EntityType::CustomEmoji, data);
+				}
+			} else if (IsMentionLink(nextState.link)) {
 				const auto match = qthelp::regex_match(
 					"^(\\d+\\.\\d+)(/|$)",
 					base::StringViewMid(nextState.link, kMentionTagStart.size()));
@@ -2175,6 +2183,9 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 				push(url);
 			}
 		} break;
+		case EntityType::CustomEmoji: {
+			push(Ui::InputField::CustomEmojiLink(entity.data()));
+		} break;
 		case EntityType::Bold: push(Ui::InputField::kTagBold); break;
 		//case EntityType::Semibold: // Semibold is for UI parts only.
 		//	push(Ui::InputField::kTagSemibold);
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 43a09b4..6e4cf08 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -14,8 +14,9 @@
 #include "base/random.h"
 #include "base/platform/base_platform_info.h"
 #include "emoji_suggestions_helper.h"
-#include "styles/palette.h"
+#include "base/qthelp_regex.h"
 #include "base/qt/qt_common_adapters.h"
+#include "styles/palette.h"
 
 #include <QtWidgets/QCommonStyle>
 #include <QtWidgets/QScrollBar>
@@ -34,6 +35,9 @@ constexpr auto kInstantReplaceWhatId = QTextFormat::UserProperty + 1;
 constexpr auto kInstantReplaceWithId = QTextFormat::UserProperty + 2;
 constexpr auto kReplaceTagId = QTextFormat::UserProperty + 3;
 constexpr auto kTagProperty = QTextFormat::UserProperty + 4;
+constexpr auto kCustomEmojiFormat = QTextFormat::UserObject + 1;
+constexpr auto kCustomEmojiText = QTextFormat::UserProperty + 5;
+constexpr auto kCustomEmojiLink = QTextFormat::UserProperty + 6;
 const auto kObjectReplacementCh = QChar(QChar::ObjectReplacementCharacter);
 const auto kObjectReplacement = QString::fromRawData(
 	&kObjectReplacementCh,
@@ -45,13 +49,17 @@ const auto &kTagStrikeOut = InputField::kTagStrikeOut;
 const auto &kTagCode = InputField::kTagCode;
 const auto &kTagPre = InputField::kTagPre;
 const auto &kTagSpoiler = InputField::kTagSpoiler;
-const auto kTagCheckLinkMeta = QString("^:/:/:^");
+const auto kTagCheckLinkMeta = u"^:/:/:^"_q;
 const auto kNewlineChars = QString("\r\n")
 	+ QChar(0xfdd0) // QTextBeginningOfFrame
 	+ QChar(0xfdd1) // QTextEndOfFrame
 	+ QChar(QChar::ParagraphSeparator)
 	+ QChar(QChar::LineSeparator);
 
+// We need unique tags otherwise same custom emoji would join in a single
+// QTextCharFormat with the same properties, including kCustomEmojiText.
+auto GlobalCustomEmojiCounter = 0;
+
 class InputDocument : public QTextDocument {
 public:
 	InputDocument(QObject *parent, const style::InputField &st);
@@ -105,6 +113,20 @@ bool IsNewline(QChar ch) {
 	return (link.indexOf('.') >= 0) || (link.indexOf(':') >= 0);
 }
 
+[[nodiscard]] bool IsCustomEmojiLink(QStringView link) {
+	return link.startsWith(Ui::InputField::kCustomEmojiTagStart);
+}
+
+[[nodiscard]] QString MakeUniqueCustomEmojiLink(QStringView link) {
+	if (!IsCustomEmojiLink(link)) {
+		return link.toString();
+	}
+	const auto index = link.indexOf('?');
+	return u"%1?%2"_q
+		.arg((index < 0) ? link : base::StringViewMid(link, 0, index))
+		.arg(++GlobalCustomEmojiCounter);
+}
+
 [[nodiscard]] QString CheckFullTextTag(
 		const TextWithTags &textWithTags,
 		const QString &tag) {
@@ -703,8 +725,15 @@ QTextCharFormat PrepareTagFormat(
 	auto font = st.font;
 	auto color = std::optional<style::color>();
 	auto bg = std::optional<style::color>();
+	auto replaceWhat = QString();
+	auto replaceWith = QString();
 	const auto applyOne = [&](QStringView tag) {
-		if (IsValidMarkdownLink(tag)) {
+		if (IsCustomEmojiLink(tag)) {
+			replaceWhat = tag.toString();
+			replaceWith = MakeUniqueCustomEmojiLink(tag);
+			result.setObjectType(kCustomEmojiFormat);
+			result.setProperty(kCustomEmojiLink, replaceWith);
+		} else if (IsValidMarkdownLink(tag)) {
 			color = st::defaultTextPalette.linkFg;
 		} else if (tag == kTagBold) {
 			font = font->bold();
@@ -726,7 +755,11 @@ QTextCharFormat PrepareTagFormat(
 	}
 	result.setFont(font);
 	result.setForeground(color.value_or(st.textFg));
-	result.setProperty(kTagProperty, tag);
+	result.setProperty(
+		kTagProperty,
+		(replaceWhat.isEmpty()
+			? tag
+			: std::move(tag).replace(replaceWhat, replaceWith)));
 	if (bg) {
 		result.setBackground(*bg);
 	}
@@ -772,7 +805,6 @@ int ProcessInsertedTags(
 			QTextCursor c(document);
 			c.setPosition(tagFrom);
 			c.setPosition(tagTo, QTextCursor::KeepAnchor);
-
 			c.mergeCharFormat(PrepareTagFormat(st, tagId));
 
 			applyNoTagFrom = tagTo;
@@ -824,6 +856,7 @@ struct FormattingAction {
 	enum class Type {
 		Invalid,
 		InsertEmoji,
+		InsertCustomEmoji,
 		TildeFont,
 		RemoveTag,
 		RemoveNewline,
@@ -834,6 +867,8 @@ struct FormattingAction {
 	EmojiPtr emoji = nullptr;
 	bool isTilde = false;
 	QString tildeTag;
+	QString customEmojiText;
+	QString customEmojiLink;
 	int intervalStart = 0;
 	int intervalEnd = 0;
 
@@ -850,6 +885,7 @@ const QString InputField::kTagStrikeOut = QStringLiteral("~~");
 const QString InputField::kTagCode = QStringLiteral("`");
 const QString InputField::kTagPre = QStringLiteral("```");
 const QString InputField::kTagSpoiler = QStringLiteral("||");
+const QString InputField::kCustomEmojiTagStart = u"custom-emoji://"_q;
 
 class InputField::Inner final : public QTextEdit {
 public:
@@ -904,6 +940,20 @@ void InsertEmojiAtCursor(QTextCursor cursor, EmojiPtr emoji) {
 	cursor.insertText(kObjectReplacement, format);
 }
 
+void InsertCustomEmojiAtCursor(
+		QTextCursor cursor,
+		const QString &text,
+		const QString &link) {
+	const auto currentFormat = cursor.charFormat();
+	auto format = QTextCharFormat();
+	format.setObjectType(kCustomEmojiFormat);
+	format.setProperty(kCustomEmojiText, text);
+	format.setProperty(kCustomEmojiLink, MakeUniqueCustomEmojiLink(link));
+	format.setVerticalAlignment(QTextCharFormat::AlignBottom);
+	ApplyTagFormat(format, currentFormat);
+	cursor.insertText(kObjectReplacement, format);
+}
+
 void InstantReplaces::add(const QString &what, const QString &with) {
 	auto node = &reverseMap;
 	for (auto i = what.end(), b = what.begin(); i != b;) {
@@ -1265,6 +1315,30 @@ void FlatInput::onTextChange(const QString &text) {
 	Integration::Instance().textActionsUpdated();
 }
 
+CustomEmojiObject::CustomEmojiObject(QObject *parent) : QObject(parent) {
+}
+
+QSizeF CustomEmojiObject::intrinsicSize(
+		QTextDocument *doc,
+		int posInDocument,
+		const QTextFormat &format) {
+	const auto factor = style::DevicePixelRatio() * 1.;
+	const auto size = Emoji::GetSizeNormal() / factor;
+	const auto width = size + st::emojiPadding * 2.;
+	const auto font = format.toCharFormat().font();
+	const auto height = std::max(QFontMetrics(font).height() * 1., size);
+	return { width, height };
+}
+
+void CustomEmojiObject::drawObject(
+		QPainter *painter,
+		const QRectF &rect,
+		QTextDocument *doc,
+		int posInDocument,
+		const QTextFormat &format) {
+	painter->fillRect(rect, QColor(0, 128, 0, 128));
+}
+
 InputField::InputField(
 	QWidget *parent,
 	const style::InputField &st,
@@ -1314,6 +1388,10 @@ InputField::InputField(
 		setAttribute(Qt::WA_OpaquePaintEvent);
 	}
 
+	_inner->document()->documentLayout()->registerHandler(
+		kCustomEmojiFormat,
+		new CustomEmojiObject(this));
+
 	_inner->setFont(_st.font->f);
 	_inner->setAlignment(_st.textAlign);
 	if (_mode == Mode::SingleLine) {
@@ -1940,7 +2018,7 @@ QString InputField::getTextPart(
 						return emoji->text();
 					}
 				}
-				return QString();
+				return format.property(kCustomEmojiText).toString();
 			}();
 			auto text = [&] {
 				const auto result = fragment.text();
@@ -2086,6 +2164,20 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 				auto *textStart = fragmentText.constData();
 				auto *textEnd = textStart + fragmentText.size();
 
+				if (format.objectType() == kCustomEmojiFormat) {
+					if (fragmentText == kObjectReplacement) {
+						checkedTill = fragmentEnd;
+						continue;
+					}
+					action.type = ActionType::InsertCustomEmoji;
+					action.intervalStart = fragmentPosition;
+					action.intervalEnd = fragmentPosition
+						+ fragmentText.size();
+					action.customEmojiText = fragmentText;
+					action.customEmojiLink = format.property(
+						kCustomEmojiLink).toString();
+				}
+
 				const auto with = format.property(kInstantReplaceWithId);
 				if (with.isValid()) {
 					const auto string = with.toString();
@@ -2205,8 +2297,16 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 			auto cursor = QTextCursor(document);
 			cursor.setPosition(action.intervalStart);
 			cursor.setPosition(action.intervalEnd, QTextCursor::KeepAnchor);
-			if (action.type == ActionType::InsertEmoji) {
-				InsertEmojiAtCursor(cursor, action.emoji);
+			if (action.type == ActionType::InsertEmoji
+				|| action.type == ActionType::InsertCustomEmoji) {
+				if (action.type == ActionType::InsertEmoji) {
+					InsertEmojiAtCursor(cursor, action.emoji);
+				} else {
+					InsertCustomEmojiAtCursor(
+						cursor,
+						action.customEmojiText,
+						action.customEmojiLink);
+				}
 				insertPosition = action.intervalStart + 1;
 				if (insertEnd >= action.intervalEnd) {
 					insertEnd -= action.intervalEnd
@@ -2858,7 +2958,7 @@ auto InputField::selectionEditLinkData(EditLinkSelection selection) const
 				kTagCheckLinkMeta)
 			: QString();
 	}();
-	const auto simple = EditLinkData {
+	const auto simple = EditLinkData{
 		selection.from,
 		selection.till,
 		QString()
@@ -3348,6 +3448,23 @@ bool InputField::IsValidMarkdownLink(QStringView link) {
 	return ::Ui::IsValidMarkdownLink(link);
 }
 
+bool InputField::IsCustomEmojiLink(QStringView link) {
+	return ::Ui::IsCustomEmojiLink(link);
+}
+
+QString InputField::CustomEmojiLink(QStringView entityData) {
+	return MakeUniqueCustomEmojiLink(u"%1%2"_q
+		.arg(kCustomEmojiTagStart)
+		.arg(entityData));
+}
+
+QString InputField::CustomEmojiEntityData(QStringView link) {
+	const auto match = qthelp::regex_match(
+		"^(\\d+\\.\\d+/\\d+)(\\?|$)",
+		base::StringViewMid(link, kCustomEmojiTagStart.size()));
+	return match ? match->captured(1) : QString();
+}
+
 void InputField::commitMarkdownLinkEdit(
 		EditLinkSelection selection,
 		const QString &text,
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 01fd43e..736ea03 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -15,6 +15,7 @@
 #include <QContextMenuEvent>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QTextEdit>
+#include <QtGui/QTextObjectInterface>
 #include <QtCore/QTimer>
 
 #include <rpl/variable.h>
@@ -143,6 +144,26 @@ private:
 
 };
 
+class CustomEmojiObject : public QObject, public QTextObjectInterface {
+	Q_OBJECT
+	Q_INTERFACES(QTextObjectInterface)
+
+public:
+	explicit CustomEmojiObject(QObject *parent);
+
+	QSizeF intrinsicSize(
+		QTextDocument *doc,
+		int posInDocument,
+		const QTextFormat &format) override;
+	void drawObject(
+		QPainter *painter,
+		const QRectF &rect,
+		QTextDocument *doc,
+		int posInDocument,
+		const QTextFormat &format) override;
+
+};
+
 class InputField : public RpWidget {
 	Q_OBJECT
 
@@ -173,6 +194,7 @@ public:
 	static const QString kTagCode;
 	static const QString kTagPre;
 	static const QString kTagSpoiler;
+	static const QString kCustomEmojiTagStart;
 
 	InputField(
 		QWidget *parent,
@@ -261,7 +283,10 @@ public:
 		EditLinkSelection selection,
 		const QString &text,
 		const QString &link);
-	static bool IsValidMarkdownLink(QStringView link);
+	[[nodiscard]] static bool IsValidMarkdownLink(QStringView link);
+	[[nodiscard]] static bool IsCustomEmojiLink(QStringView link);
+	[[nodiscard]] static QString CustomEmojiLink(QStringView entityData);
+	[[nodiscard]] static QString CustomEmojiEntityData(QStringView link);
 
 	const QString &getLastText() const {
 		return _lastTextWithTags.text;

From 6bd7518109850d650a174b74e5582367555390da Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Jul 2022 12:55:26 +0400
Subject: [PATCH 162/635] Fix editing text with custom emoji and formatting.

---
 ui/text/text_entity.cpp     |  55 ++++++++++---
 ui/text/text_entity.h       |  31 ++------
 ui/widgets/input_fields.cpp | 150 ++++++++++++++++++++++++++++++++----
 ui/widgets/input_fields.h   |  35 +++++++--
 4 files changed, 213 insertions(+), 58 deletions(-)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 96fa427..d5fd44a 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -1527,6 +1527,29 @@ bool CutPart(TextWithEntities &sending, TextWithEntities &left, int32 limit) {
 	return true;
 }
 
+MentionNameFields MentionNameDataToFields(QStringView data) {
+	const auto components = data.split('.');
+	if (components.size() != 2) {
+		return {};
+	}
+	const auto parts = components[1].split(':');
+	if (parts.size() != 2) {
+		return {};
+	}
+	return {
+		.selfId = parts[1].toULongLong(),
+		.userId = components[0].toULongLong(),
+		.accessHash = parts[0].toULongLong(),
+	};
+}
+
+QString MentionNameDataFromFields(const MentionNameFields &fields) {
+	return u"%1.%2:%3"_q
+		.arg(fields.userId)
+		.arg(fields.accessHash)
+		.arg(fields.selfId);
+}
+
 TextWithEntities ParseEntities(const QString &text, int32 flags) {
 	auto result = TextWithEntities{ text, EntitiesInText() };
 	ParseEntities(result, flags);
@@ -1929,7 +1952,14 @@ bool IsMentionLink(QStringView link) {
 	return link.startsWith(kMentionTagStart);
 }
 
-[[nodiscard]] bool IsSeparateTag(QStringView tag) {
+QString MentionEntityData(QStringView link) {
+	const auto match = qthelp::regex_match(
+		"^(\\d+\\.\\d+:\\d+)(/|$)",
+		base::StringViewMid(link, kMentionTagStart.size()));
+	return match ? match->captured(1) : QString();
+}
+
+bool IsSeparateTag(QStringView tag) {
 	return (tag == Ui::InputField::kTagCode)
 		|| (tag == Ui::InputField::kTagPre);
 }
@@ -1953,8 +1983,8 @@ QString JoinTag(const QList<QStringView> &list) {
 	return result;
 }
 
-QList<QStringView> SplitTags(const QString &tag) {
-	return QStringView(tag).split(kTagSeparator);
+QList<QStringView> SplitTags(QStringView tag) {
+	return tag.split(kTagSeparator);
 }
 
 QString TagWithRemoved(const QString &tag, const QString &removed) {
@@ -2073,11 +2103,9 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 					openType(EntityType::CustomEmoji, data);
 				}
 			} else if (IsMentionLink(nextState.link)) {
-				const auto match = qthelp::regex_match(
-					"^(\\d+\\.\\d+)(/|$)",
-					base::StringViewMid(nextState.link, kMentionTagStart.size()));
-				if (match) {
-					openType(EntityType::MentionName, match->captured(1));
+				const auto data = MentionEntityData(nextState.link);
+				if (!data.isEmpty()) {
+					openType(EntityType::MentionName, data);
 				}
 			} else {
 				openType(EntityType::CustomUrl, nextState.link);
@@ -2169,8 +2197,8 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 		};
 		switch (entity.type()) {
 		case EntityType::MentionName: {
-			auto match = QRegularExpression(
-				R"(^(\d+\.\d+)$)"
+			const auto match = QRegularExpression(
+				"^(\\d+\\.\\d+:\\d+)$"
 			).match(entity.data());
 			if (match.hasMatch()) {
 				push(kMentionTagStart + entity.data());
@@ -2184,7 +2212,12 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 			}
 		} break;
 		case EntityType::CustomEmoji: {
-			push(Ui::InputField::CustomEmojiLink(entity.data()));
+			const auto match = QRegularExpression(
+				"^(\\d+\\.\\d+:\\d+/\\d+)$"
+			).match(entity.data());
+			if (match.hasMatch()) {
+				push(Ui::InputField::CustomEmojiLink(entity.data()));
+			}
 		} break;
 		case EntityType::Bold: push(Ui::InputField::kTagBold); break;
 		//case EntityType::Semibold: // Semibold is for UI parts only.
diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index fc406ab..0a18f83 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -306,31 +306,13 @@ QStringList PrepareSearchWords(const QString &query, const QRegularExpression *S
 bool CutPart(TextWithEntities &sending, TextWithEntities &left, int limit);
 
 struct MentionNameFields {
-	MentionNameFields(uint64 userId = 0, uint64 accessHash = 0)
-	: userId(userId), accessHash(accessHash) {
-	}
+	uint64 selfId = 0;
 	uint64 userId = 0;
 	uint64 accessHash = 0;
 };
-
-inline MentionNameFields MentionNameDataToFields(const QString &data) {
-	auto components = data.split('.');
-	if (!components.isEmpty()) {
-		return {
-			components.at(0).toULongLong(),
-			(components.size() > 1) ? components.at(1).toULongLong() : 0
-		};
-	}
-	return MentionNameFields{};
-}
-
-inline QString MentionNameDataFromFields(const MentionNameFields &fields) {
-	auto result = QString::number(fields.userId);
-	if (fields.accessHash) {
-		result += '.' + QString::number(fields.accessHash);
-	}
-	return result;
-}
+[[nodiscard]] MentionNameFields MentionNameDataToFields(QStringView data);
+[[nodiscard]] QString MentionNameDataFromFields(
+	const MentionNameFields &fields);
 
 // New entities are added to the ones that are already in result.
 // Changes text if (flags & TextParseMarkdown).
@@ -362,12 +344,13 @@ void ApplyServerCleaning(TextWithEntities &result);
 [[nodiscard]] QString TagsMimeType();
 [[nodiscard]] QString TagsTextMimeType();
 
-inline const auto kMentionTagStart = qstr("mention://user.");
+inline const auto kMentionTagStart = qstr("mention://");
 
 [[nodiscard]] bool IsMentionLink(QStringView link);
+[[nodiscard]] QString MentionEntityData(QStringView link);
 [[nodiscard]] bool IsSeparateTag(QStringView tag);
 [[nodiscard]] QString JoinTag(const QList<QStringView> &list);
-[[nodiscard]] QList<QStringView> SplitTags(const QString &tag);
+[[nodiscard]] QList<QStringView> SplitTags(QStringView tag);
 [[nodiscard]] QString TagWithRemoved(
 	const QString &tag,
 	const QString &removed);
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 6e4cf08..4a521f4 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -38,6 +38,7 @@ constexpr auto kTagProperty = QTextFormat::UserProperty + 4;
 constexpr auto kCustomEmojiFormat = QTextFormat::UserObject + 1;
 constexpr auto kCustomEmojiText = QTextFormat::UserProperty + 5;
 constexpr auto kCustomEmojiLink = QTextFormat::UserProperty + 6;
+constexpr auto kCustomEmojiId = QTextFormat::UserProperty + 7;
 const auto kObjectReplacementCh = QChar(QChar::ObjectReplacementCharacter);
 const auto kObjectReplacement = QString::fromRawData(
 	&kObjectReplacementCh,
@@ -127,6 +128,19 @@ bool IsNewline(QChar ch) {
 		.arg(++GlobalCustomEmojiCounter);
 }
 
+[[nodiscard]] uint64 CustomEmojiIdFromLink(QStringView link) {
+	const auto skip = Ui::InputField::kCustomEmojiTagStart.size();
+	if (const auto i = link.indexOf('/', skip + 1); i > 0) {
+		const auto j = link.indexOf('?', i + 1);
+		return base::StringViewMid(
+			link,
+			i + 1,
+			(j > i) ? (j - i - 1) : -1
+		).toULongLong();
+	}
+	return 0;
+}
+
 [[nodiscard]] QString CheckFullTextTag(
 		const TextWithTags &textWithTags,
 		const QString &tag) {
@@ -733,6 +747,9 @@ QTextCharFormat PrepareTagFormat(
 			replaceWith = MakeUniqueCustomEmojiLink(tag);
 			result.setObjectType(kCustomEmojiFormat);
 			result.setProperty(kCustomEmojiLink, replaceWith);
+			result.setProperty(
+				kCustomEmojiId,
+				CustomEmojiIdFromLink(replaceWith));
 		} else if (IsValidMarkdownLink(tag)) {
 			color = st::defaultTextPalette.linkFg;
 		} else if (tag == kTagBold) {
@@ -762,10 +779,40 @@ QTextCharFormat PrepareTagFormat(
 			: std::move(tag).replace(replaceWhat, replaceWith)));
 	if (bg) {
 		result.setBackground(*bg);
+	} else {
+		result.setBackground(QBrush());
 	}
 	return result;
 }
 
+[[nodiscard]] QString TagWithoutCustomEmoji(QStringView tag) {
+	auto tags = TextUtilities::SplitTags(tag);
+	for (auto i = tags.begin(); i != tags.end();) {
+		if (IsCustomEmojiLink(*i)) {
+			i = tags.erase(i);
+		} else {
+			++i;
+		}
+	}
+	return TextUtilities::JoinTag(tags);
+}
+
+void RemoveCustomEmojiTag(
+		const style::InputField &st,
+		not_null<QTextDocument*> document,
+		const QString &existingTags,
+		int from,
+		int end) {
+	auto cursor = QTextCursor(document);
+	cursor.setPosition(from);
+	cursor.setPosition(end, QTextCursor::KeepAnchor);
+
+	auto format = PrepareTagFormat(st, TagWithoutCustomEmoji(existingTags));
+	format.setProperty(kCustomEmojiLink, QString());
+	format.setProperty(kCustomEmojiId, QString());
+	cursor.mergeCharFormat(format);
+}
+
 void ApplyTagFormat(QTextCharFormat &to, const QTextCharFormat &from) {
 	to.setProperty(kTagProperty, from.property(kTagProperty));
 	to.setProperty(kReplaceTagId, from.property(kReplaceTagId));
@@ -781,7 +828,7 @@ int ProcessInsertedTags(
 		int changedPosition,
 		int changedEnd,
 		const TextWithTags::Tags &tags,
-		InputField::TagMimeProcessor *processor) {
+		Fn<QString(QStringView)> processor) {
 	int firstTagStart = changedEnd;
 	int applyNoTagFrom = changedEnd;
 	for (const auto &tag : tags) {
@@ -789,7 +836,7 @@ int ProcessInsertedTags(
 		int tagTo = tagFrom + tag.length;
 		accumulate_max(tagFrom, changedPosition);
 		accumulate_min(tagTo, changedEnd);
-		auto tagId = processor ? processor->tagFromMimeTag(tag.id) : tag.id;
+		auto tagId = processor ? processor(tag.id) : tag.id;
 		if (tagTo > tagFrom && !tagId.isEmpty()) {
 			accumulate_min(firstTagStart, tagFrom);
 
@@ -833,7 +880,9 @@ bool WasInsertTillTheEndOfTag(
 			const auto outsideInsertion = (position >= insertionEnd);
 			if (outsideInsertion) {
 				const auto format = fragment.charFormat();
-				return (format.property(kTagProperty) != insertTagName);
+				const auto tag = format.property(kTagProperty).toString();
+				return TagWithoutCustomEmoji(tag)
+					!= TagWithoutCustomEmoji(insertTagName.toString());
 			}
 			const auto end = position + fragment.length();
 			const auto notFullFragmentInserted = (end > insertionEnd);
@@ -857,6 +906,7 @@ struct FormattingAction {
 		Invalid,
 		InsertEmoji,
 		InsertCustomEmoji,
+		RemoveCustomEmoji,
 		TildeFont,
 		RemoveTag,
 		RemoveNewline,
@@ -867,6 +917,7 @@ struct FormattingAction {
 	EmojiPtr emoji = nullptr;
 	bool isTilde = false;
 	QString tildeTag;
+	QString existingTags;
 	QString customEmojiText;
 	QString customEmojiLink;
 	int intervalStart = 0;
@@ -949,6 +1000,7 @@ void InsertCustomEmojiAtCursor(
 	format.setObjectType(kCustomEmojiFormat);
 	format.setProperty(kCustomEmojiText, text);
 	format.setProperty(kCustomEmojiLink, MakeUniqueCustomEmojiLink(link));
+	format.setProperty(kCustomEmojiId, CustomEmojiIdFromLink(link));
 	format.setVerticalAlignment(QTextCharFormat::AlignBottom);
 	ApplyTagFormat(format, currentFormat);
 	cursor.insertText(kObjectReplacement, format);
@@ -1315,9 +1367,14 @@ void FlatInput::onTextChange(const QString &text) {
 	Integration::Instance().textActionsUpdated();
 }
 
-CustomEmojiObject::CustomEmojiObject(QObject *parent) : QObject(parent) {
+CustomEmojiObject::CustomEmojiObject(Factory factory, Fn<bool()> paused)
+: _factory(std::move(factory))
+, _paused(std::move(paused))
+, _now(crl::now()) {
 }
 
+CustomEmojiObject::~CustomEmojiObject() = default;
+
 QSizeF CustomEmojiObject::intrinsicSize(
 		QTextDocument *doc,
 		int posInDocument,
@@ -1326,7 +1383,7 @@ QSizeF CustomEmojiObject::intrinsicSize(
 	const auto size = Emoji::GetSizeNormal() / factor;
 	const auto width = size + st::emojiPadding * 2.;
 	const auto font = format.toCharFormat().font();
-	const auto height = std::max(QFontMetrics(font).height() * 1., size);
+	const auto height = std::min(QFontMetrics(font).height() * 1., size);
 	return { width, height };
 }
 
@@ -1336,7 +1393,36 @@ void CustomEmojiObject::drawObject(
 		QTextDocument *doc,
 		int posInDocument,
 		const QTextFormat &format) {
-	painter->fillRect(rect, QColor(0, 128, 0, 128));
+	const auto id = format.property(kCustomEmojiId).toULongLong();
+	if (!id) {
+		return;
+	}
+	auto i = _emoji.find(id);
+	if (i == end(_emoji)) {
+		const auto link = format.property(kCustomEmojiLink).toString();
+		const auto data = InputField::CustomEmojiEntityData(link);
+		if (auto emoji = _factory(data)) {
+			i = _emoji.emplace(id, std::move(emoji)).first;
+		}
+	}
+	if (i == end(_emoji)) {
+		return;
+	}
+	i->second->paint(
+		*painter,
+		int(base::SafeRound(rect.x())) + st::emojiPadding,
+		int(base::SafeRound(rect.y())),
+		_now,
+		st::defaultTextPalette.spoilerActiveBg->c,
+		_paused());
+}
+
+void CustomEmojiObject::clear() {
+	_emoji.clear();
+}
+
+void CustomEmojiObject::setNow(crl::time now) {
+	_now = now;
 }
 
 InputField::InputField(
@@ -1388,10 +1474,6 @@ InputField::InputField(
 		setAttribute(Qt::WA_OpaquePaintEvent);
 	}
 
-	_inner->document()->documentLayout()->registerHandler(
-		kCustomEmojiFormat,
-		new CustomEmojiObject(this));
-
 	_inner->setFont(_st.font->f);
 	_inner->setAlignment(_st.textAlign);
 	if (_mode == Mode::SingleLine) {
@@ -1473,6 +1555,8 @@ bool InputField::viewportEventInner(QEvent *e) {
 		if (ev->device()->type() == base::TouchDevice::TouchScreen) {
 			handleTouchEvent(ev);
 		}
+	} else if (e->type() == QEvent::Paint && _customEmojiObject) {
+		_customEmojiObject->setNow(crl::now());
 	}
 	return _inner->QTextEdit::viewportEvent(e);
 }
@@ -1566,11 +1650,22 @@ void InputField::setMarkdownReplacesEnabled(rpl::producer<bool> enabled) {
 	}, lifetime());
 }
 
-void InputField::setTagMimeProcessor(
-		std::unique_ptr<TagMimeProcessor> &&processor) {
+void InputField::setTagMimeProcessor(Fn<QString(QStringView)> processor) {
 	_tagMimeProcessor = std::move(processor);
 }
 
+void InputField::setCustomEmojiFactory(
+		CustomEmojiFactory factory,
+		Fn<bool()> paused) {
+	_customEmojiObject = std::make_unique<CustomEmojiObject>([=](
+			QStringView data) {
+		return factory(data, [=] { _inner->update(); });
+	}, std::move(paused));
+	_inner->document()->documentLayout()->registerHandler(
+		kCustomEmojiFormat,
+		_customEmojiObject.get());
+}
+
 void InputField::setAdditionalMargin(int margin) {
 	_additionalMargin = margin;
 	QResizeEvent e(size(), size());
@@ -2105,8 +2200,8 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 	auto document = _inner->document();
 
 	// Apply inserted tags.
-	auto insertedTagsProcessor = _insertedTagsAreFromMime
-		? _tagMimeProcessor.get()
+	const auto insertedTagsProcessor = _insertedTagsAreFromMime
+		? _tagMimeProcessor
 		: nullptr;
 	const auto breakTagOnNotLetterTill = ProcessInsertedTags(
 		_st,
@@ -2176,6 +2271,7 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 					action.customEmojiText = fragmentText;
 					action.customEmojiLink = format.property(
 						kCustomEmojiLink).toString();
+					break;
 				}
 
 				const auto with = format.property(kInstantReplaceWithId);
@@ -2193,6 +2289,15 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 					}
 				}
 
+				if (format.hasProperty(kCustomEmojiLink)
+					&& !format.property(kCustomEmojiLink).toString().isEmpty()) {
+					action.type = ActionType::RemoveCustomEmoji;
+					action.existingTags = format.property(kTagProperty).toString();
+					action.intervalStart = fragmentPosition;
+					action.intervalEnd = fragmentPosition
+						+ fragmentText.size();
+					break;
+				}
 				if (!startTagFound) {
 					startTagFound = true;
 					auto tagName = format.property(kTagProperty).toString();
@@ -2319,6 +2424,13 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 					document,
 					action.intervalStart,
 					action.intervalEnd);
+			} else if (action.type == ActionType::RemoveCustomEmoji) {
+				RemoveCustomEmojiTag(
+					_st,
+					document,
+					action.existingTags,
+					action.intervalStart,
+					action.intervalEnd);
 			} else if (action.type == ActionType::TildeFont) {
 				auto format = QTextCharFormat();
 				format.setFont(action.isTilde
@@ -2476,6 +2588,11 @@ void InputField::handleContentsChanged() {
 		checkContentHeight();
 	}
 	startPlaceholderAnimation();
+	if (_lastTextWithTags.text.isEmpty()) {
+		if (const auto object = _customEmojiObject.get()) {
+			object->clear();
+		}
+	}
 	Integration::Instance().textActionsUpdated();
 }
 
@@ -2751,6 +2868,9 @@ TextWithTags InputField::getTextWithAppliedMarkdown() const {
 void InputField::clear() {
 	_inner->clear();
 	startPlaceholderAnimation();
+	if (const auto object = _customEmojiObject.get()) {
+		object->clear();
+	}
 }
 
 bool InputField::hasFocus() const {
@@ -3460,7 +3580,7 @@ QString InputField::CustomEmojiLink(QStringView entityData) {
 
 QString InputField::CustomEmojiEntityData(QStringView link) {
 	const auto match = qthelp::regex_match(
-		"^(\\d+\\.\\d+/\\d+)(\\?|$)",
+		"^(\\d+\\.\\d+:\\d+/\\d+)(\\?|$)",
 		base::StringViewMid(link, kCustomEmojiTagStart.size()));
 	return match ? match->captured(1) : QString();
 }
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 736ea03..3883b58 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -23,6 +23,10 @@
 class QTouchEvent;
 class Painter;
 
+namespace Ui::Text {
+class CustomEmoji;
+} // namespace Ui::Text
+
 namespace Ui {
 
 const auto kClearFormatSequence = QKeySequence("ctrl+shift+n");
@@ -31,6 +35,10 @@ const auto kMonospaceSequence = QKeySequence("ctrl+shift+m");
 const auto kEditLinkSequence = QKeySequence("ctrl+k");
 const auto kSpoilerSequence = QKeySequence("ctrl+shift+p");
 
+using CustomEmojiFactory = Fn<std::unique_ptr<Text::CustomEmoji>(
+	QStringView,
+	Fn<void()>)>;
+
 class PopupMenu;
 
 void InsertEmojiAtCursor(QTextCursor cursor, EmojiPtr emoji);
@@ -149,7 +157,10 @@ class CustomEmojiObject : public QObject, public QTextObjectInterface {
 	Q_INTERFACES(QTextObjectInterface)
 
 public:
-	explicit CustomEmojiObject(QObject *parent);
+	using Factory = Fn<std::unique_ptr<Text::CustomEmoji>(QStringView)>;
+
+	CustomEmojiObject(Factory factory, Fn<bool()> paused);
+	~CustomEmojiObject();
 
 	QSizeF intrinsicSize(
 		QTextDocument *doc,
@@ -162,6 +173,15 @@ public:
 		int posInDocument,
 		const QTextFormat &format) override;
 
+	void setNow(crl::time now);
+	void clear();
+
+private:
+	Factory _factory;
+	Fn<bool()> _paused;
+	base::flat_map<uint64, std::unique_ptr<Text::CustomEmoji>> _emoji;
+	crl::time _now = 0;
+
 };
 
 class InputField : public RpWidget {
@@ -245,12 +265,10 @@ public:
 
 	// If you need to make some preparations of tags before putting them to QMimeData
 	// (and then to clipboard or to drag-n-drop object), here is a strategy for that.
-	class TagMimeProcessor {
-	public:
-		virtual QString tagFromMimeTag(const QString &mimeTag) = 0;
-		virtual ~TagMimeProcessor() = default;
-	};
-	void setTagMimeProcessor(std::unique_ptr<TagMimeProcessor> &&processor);
+	void setTagMimeProcessor(Fn<QString(QStringView)> processor);
+	void setCustomEmojiFactory(
+		CustomEmojiFactory factory,
+		Fn<bool()> paused);
 
 	struct EditLinkSelection {
 		int from = 0;
@@ -528,7 +546,8 @@ private:
 	// before _documentContentsChanges fire.
 	int _emojiSurrogateAmount = 0;
 
-	std::unique_ptr<TagMimeProcessor> _tagMimeProcessor;
+	Fn<QString(QStringView)> _tagMimeProcessor;
+	std::unique_ptr<CustomEmojiObject> _customEmojiObject;
 
 	SubmitSettings _submitSettings = SubmitSettings::Enter;
 	bool _markdownEnabled = false;

From 0b829240fd3ade757aa4e957c17d84a81ef1c3ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Jul 2022 17:01:11 +0400
Subject: [PATCH 163/635] Don't insert object character without
 _customEmojiObject.

---
 ui/widgets/input_fields.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 4a521f4..2239344 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -2259,7 +2259,8 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 				auto *textStart = fragmentText.constData();
 				auto *textEnd = textStart + fragmentText.size();
 
-				if (format.objectType() == kCustomEmojiFormat) {
+				if (_customEmojiObject
+					&& format.objectType() == kCustomEmojiFormat) {
 					if (fragmentText == kObjectReplacement) {
 						checkedTill = fragmentEnd;
 						continue;

From 464c6a61711fa7b66d45829bde582d36e23f0b1a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Jul 2022 17:32:35 +0400
Subject: [PATCH 164/635] Custom emoji not pausing by default.

---
 ui/widgets/input_fields.cpp | 2 +-
 ui/widgets/input_fields.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 2239344..18fac3e 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1414,7 +1414,7 @@ void CustomEmojiObject::drawObject(
 		int(base::SafeRound(rect.y())),
 		_now,
 		st::defaultTextPalette.spoilerActiveBg->c,
-		_paused());
+		_paused && _paused());
 }
 
 void CustomEmojiObject::clear() {
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 3883b58..e2d7bd7 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -268,7 +268,7 @@ public:
 	void setTagMimeProcessor(Fn<QString(QStringView)> processor);
 	void setCustomEmojiFactory(
 		CustomEmojiFactory factory,
-		Fn<bool()> paused);
+		Fn<bool()> paused = nullptr);
 
 	struct EditLinkSelection {
 		int from = 0;

From 9cb7bb58f658d7603f9493b9d051cf8a78a2cd41 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Jul 2022 23:35:03 +0400
Subject: [PATCH 165/635] Update custom emoji entity format.

---
 ui/text/text_entity.cpp     |  2 +-
 ui/widgets/input_fields.cpp | 17 +++++++++++------
 ui/widgets/input_fields.h   |  4 ++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index d5fd44a..0dc3676 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -2213,7 +2213,7 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 		} break;
 		case EntityType::CustomEmoji: {
 			const auto match = QRegularExpression(
-				"^(\\d+\\.\\d+:\\d+/\\d+)$"
+				"^(\\d+:\\d+)$"
 			).match(entity.data());
 			if (match.hasMatch()) {
 				push(Ui::InputField::CustomEmojiLink(entity.data()));
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 18fac3e..75e2e34 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -130,13 +130,11 @@ bool IsNewline(QChar ch) {
 
 [[nodiscard]] uint64 CustomEmojiIdFromLink(QStringView link) {
 	const auto skip = Ui::InputField::kCustomEmojiTagStart.size();
-	if (const auto i = link.indexOf('/', skip + 1); i > 0) {
-		const auto j = link.indexOf('?', i + 1);
+	if (const auto i = link.indexOf(':', skip + 1); i > 0) {
 		return base::StringViewMid(
 			link,
-			i + 1,
-			(j > i) ? (j - i - 1) : -1
-		).toULongLong();
+			skip + 1,
+			i - skip - 1).toULongLong();
 	}
 	return 0;
 }
@@ -1003,6 +1001,13 @@ void InsertCustomEmojiAtCursor(
 	format.setProperty(kCustomEmojiId, CustomEmojiIdFromLink(link));
 	format.setVerticalAlignment(QTextCharFormat::AlignBottom);
 	ApplyTagFormat(format, currentFormat);
+	auto existingTag = TagWithoutCustomEmoji(
+		format.property(kTagProperty).toString());
+	auto existingTags = existingTag.isEmpty()
+		? QList<QStringView>()
+		: TextUtilities::SplitTags(existingTag);
+	existingTags.push_back(link);
+	format.setProperty(kTagProperty, TextUtilities::JoinTag(existingTags));
 	cursor.insertText(kObjectReplacement, format);
 }
 
@@ -3581,7 +3586,7 @@ QString InputField::CustomEmojiLink(QStringView entityData) {
 
 QString InputField::CustomEmojiEntityData(QStringView link) {
 	const auto match = qthelp::regex_match(
-		"^(\\d+\\.\\d+:\\d+/\\d+)(\\?|$)",
+		"^(\\d+:\\d+)(\\?|$)",
 		base::StringViewMid(link, kCustomEmojiTagStart.size()));
 	return match ? match->captured(1) : QString();
 }
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index e2d7bd7..67fffed 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -42,6 +42,10 @@ using CustomEmojiFactory = Fn<std::unique_ptr<Text::CustomEmoji>(
 class PopupMenu;
 
 void InsertEmojiAtCursor(QTextCursor cursor, EmojiPtr emoji);
+void InsertCustomEmojiAtCursor(
+	QTextCursor cursor,
+	const QString &text,
+	const QString &link);
 
 struct InstantReplaces {
 	struct Node {

From ec76a4c0bb9131ab14fe676630a1f465bfc05ee2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Jul 2022 10:09:10 +0400
Subject: [PATCH 166/635] Optimize custom emoji repaints in the InputField.

---
 ui/widgets/input_fields.cpp | 18 +++++++++++++++++-
 ui/widgets/input_fields.h   |  3 +++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 75e2e34..8a87c91 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -963,6 +963,9 @@ protected:
 	void inputMethodEvent(QInputMethodEvent *e) override {
 		return outer()->inputMethodEventInner(e);
 	}
+	void paintEvent(QPaintEvent *e) override {
+		return outer()->paintEventInner(e);
+	}
 
 	bool canInsertFromMimeData(const QMimeData *source) const override {
 		return outer()->canInsertFromMimeDataInner(source);
@@ -1664,13 +1667,26 @@ void InputField::setCustomEmojiFactory(
 		Fn<bool()> paused) {
 	_customEmojiObject = std::make_unique<CustomEmojiObject>([=](
 			QStringView data) {
-		return factory(data, [=] { _inner->update(); });
+		return factory(data, [=] { customEmojiRepaint(); });
 	}, std::move(paused));
 	_inner->document()->documentLayout()->registerHandler(
 		kCustomEmojiFormat,
 		_customEmojiObject.get());
 }
 
+void InputField::customEmojiRepaint() {
+	if (_customEmojiRepaintScheduled) {
+		return;
+	}
+	_customEmojiRepaintScheduled = true;
+	_inner->update();
+}
+
+void InputField::paintEventInner(QPaintEvent *e) {
+	_customEmojiRepaintScheduled = false;
+	_inner->QTextEdit::paintEvent(e);
+}
+
 void InputField::setAdditionalMargin(int margin) {
 	_additionalMargin = margin;
 	QResizeEvent e(size(), size());
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 67fffed..a80e24c 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -442,6 +442,7 @@ private:
 	void contextMenuEventInner(QContextMenuEvent *e, QMenu *m = nullptr);
 	void dropEventInner(QDropEvent *e);
 	void inputMethodEventInner(QInputMethodEvent *e);
+	void paintEventInner(QPaintEvent *e);
 
 	QMimeData *createMimeDataFromSelectionInner() const;
 	bool canInsertFromMimeDataInner(const QMimeData *source) const;
@@ -513,6 +514,7 @@ private:
 
 	bool revertFormatReplace();
 
+	void customEmojiRepaint();
 	void highlightMarkdown();
 
 	const style::InputField &_st;
@@ -536,6 +538,7 @@ private:
 
 	bool _forcePlaceholderHidden = false;
 	bool _reverseMarkdownReplacement = false;
+	bool _customEmojiRepaintScheduled = false;
 
 	// Tags list which we should apply while setText() call or insert from mime data.
 	TagList _insertedTags;

From 2bec77825150094d248528f40341c6aef16e810a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Jul 2022 10:41:30 +0400
Subject: [PATCH 167/635] Fix custom emoji before a newline.

---
 ui/widgets/input_fields.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 8a87c91..6e103b7 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -204,9 +204,12 @@ public:
 	TagAccumulator(TextWithTags::Tags &tags) : _tags(tags) {
 	}
 
-	bool changed() const {
+	[[nodiscard]] bool changed() const {
 		return _changed;
 	}
+	[[nodiscrd]] QString currentTag() const {
+		return _currentTagId;
+	}
 
 	void feed(const QString &randomTagId, int currentPosition) {
 		if (randomTagId == _currentTagId) {
@@ -214,7 +217,7 @@ public:
 		}
 
 		if (!_currentTagId.isEmpty()) {
-			const auto tag = TextWithTags::Tag {
+			const auto tag = TextWithTags::Tag{
 				_currentStart,
 				currentPosition - _currentStart,
 				_currentTagId
@@ -2186,6 +2189,9 @@ QString InputField::getTextPart(
 
 		block = block.next();
 		if (block != till) {
+			tagAccumulator.feed(
+				TagWithoutCustomEmoji(tagAccumulator.currentTag()),
+				result.size());
 			result.append('\n');
 			markdownTagAccumulator.feed(newline, 1, lastTag);
 		}

From d7318d849ef89873a1b4f78f23e471555061921b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Jul 2022 12:20:29 +0400
Subject: [PATCH 168/635] Make custom emoji size 12% larger.

---
 ui/emoji_config.cpp         |  4 ++--
 ui/text/text.cpp            | 14 +++++++++++++-
 ui/text/text_block.cpp      |  4 ++++
 ui/text/text_block.h        |  2 ++
 ui/widgets/input_fields.cpp | 27 ++++++++++++++++++---------
 ui/widgets/input_fields.h   |  1 +
 6 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/ui/emoji_config.cpp b/ui/emoji_config.cpp
index 6b43bcf..06f28b9 100644
--- a/ui/emoji_config.cpp
+++ b/ui/emoji_config.cpp
@@ -490,8 +490,8 @@ void Init() {
 	const auto persprite = kImagesPerRow * kImageRowsPerSprite;
 	SpritesCount = (count / persprite) + ((count % persprite) ? 1 : 0);
 
-	SizeNormal = style::ConvertScale(18, style::Scale() * style::DevicePixelRatio());
-	SizeLarge = int(style::ConvertScale(18 * 4 / 3., style::Scale() * style::DevicePixelRatio()));
+	SizeNormal = st::emojiSize * style::DevicePixelRatio();
+	SizeLarge = int(style::ConvertScale(18 * 4 / 3., style::Scale())) * style::DevicePixelRatio();
 	Universal = std::make_shared<UniversalImages>(ReadCurrentSetId());
 	CanClearUniversal = false;
 
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 45e33fc..e56ca5d 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -1689,7 +1689,17 @@ private:
 							if (!_now) {
 								_now = crl::now();
 							}
-							custom->paint(*_p, x, y, _now, _textPalette->spoilerActiveBg->c, _p->inactive());
+							if (!_customEmojiSize) {
+								_customEmojiSize = AdjustCustomEmojiSize(st::emojiSize);
+								_customEmojiSkip = (st::emojiSize - _customEmojiSize) / 2;
+							}
+							custom->paint(
+								*_p,
+								x + _customEmojiSkip,
+								y + _customEmojiSkip,
+								_now,
+								_textPalette->spoilerActiveBg->c,
+								_p->inactive());
 						}
 					}
 					if (hasSpoiler) {
@@ -2871,6 +2881,8 @@ private:
 	const QChar *_str = nullptr;
 	crl::time _now = 0;
 
+	int _customEmojiSize = 0;
+	int _customEmojiSkip = 0;
 	int _indexOfElidedBlock = -1; // For spoilers.
 
 	// current paragraph data
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index f3d2275..7c6c617 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -498,6 +498,10 @@ CustomEmojiBlock::CustomEmojiBlock(
 	}
 }
 
+int AdjustCustomEmojiSize(int emojiSize) {
+	return base::SafeRound(emojiSize * 1.12);
+}
+
 NewlineBlock::NewlineBlock(
 	const style::font &font,
 	const QString &str,
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index 4da5ec9..da10ab2 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -202,6 +202,8 @@ private:
 
 };
 
+[[nodiscard]] int AdjustCustomEmojiSize(int emojiSize);
+
 class SkipBlock final : public AbstractBlock {
 public:
 	SkipBlock(
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 6e103b7..b02a15d 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -815,7 +815,11 @@ void RemoveCustomEmojiTag(
 }
 
 void ApplyTagFormat(QTextCharFormat &to, const QTextCharFormat &from) {
-	to.setProperty(kTagProperty, from.property(kTagProperty));
+	if (from.hasProperty(kTagProperty)) {
+		to.setProperty(
+			kTagProperty,
+			TagWithoutCustomEmoji(from.property(kTagProperty).toString()));
+	}
 	to.setProperty(kReplaceTagId, from.property(kReplaceTagId));
 	to.setFont(from.font());
 	to.setForeground(from.foreground());
@@ -1000,19 +1004,19 @@ void InsertCustomEmojiAtCursor(
 		const QString &text,
 		const QString &link) {
 	const auto currentFormat = cursor.charFormat();
+	const auto unique = MakeUniqueCustomEmojiLink(link);
 	auto format = QTextCharFormat();
 	format.setObjectType(kCustomEmojiFormat);
 	format.setProperty(kCustomEmojiText, text);
-	format.setProperty(kCustomEmojiLink, MakeUniqueCustomEmojiLink(link));
+	format.setProperty(kCustomEmojiLink, unique);
 	format.setProperty(kCustomEmojiId, CustomEmojiIdFromLink(link));
 	format.setVerticalAlignment(QTextCharFormat::AlignBottom);
 	ApplyTagFormat(format, currentFormat);
-	auto existingTag = TagWithoutCustomEmoji(
-		format.property(kTagProperty).toString());
+	auto existingTag = format.property(kTagProperty).toString();
 	auto existingTags = existingTag.isEmpty()
 		? QList<QStringView>()
 		: TextUtilities::SplitTags(existingTag);
-	existingTags.push_back(link);
+	existingTags.push_back(unique);
 	format.setProperty(kTagProperty, TextUtilities::JoinTag(existingTags));
 	cursor.insertText(kObjectReplacement, format);
 }
@@ -1391,10 +1395,14 @@ QSizeF CustomEmojiObject::intrinsicSize(
 		int posInDocument,
 		const QTextFormat &format) {
 	const auto factor = style::DevicePixelRatio() * 1.;
-	const auto size = Emoji::GetSizeNormal() / factor;
+	const auto size = st::emojiSize * 1.;
 	const auto width = size + st::emojiPadding * 2.;
 	const auto font = format.toCharFormat().font();
 	const auto height = std::min(QFontMetrics(font).height() * 1., size);
+	if (!_skip) {
+		const auto emoji = Ui::Text::AdjustCustomEmojiSize(st::emojiSize);
+		_skip = (st::emojiSize - emoji) / 2;
+	}
 	return { width, height };
 }
 
@@ -1421,8 +1429,8 @@ void CustomEmojiObject::drawObject(
 	}
 	i->second->paint(
 		*painter,
-		int(base::SafeRound(rect.x())) + st::emojiPadding,
-		int(base::SafeRound(rect.y())),
+		int(base::SafeRound(rect.x())) + st::emojiPadding + _skip,
+		int(base::SafeRound(rect.y())) + _skip,
 		_now,
 		st::defaultTextPalette.spoilerActiveBg->c,
 		_paused && _paused());
@@ -1614,7 +1622,8 @@ void InputField::updatePalette() {
 		auto format = cursor.charFormat();
 		format.merge(PrepareTagFormat(
 			_st,
-			format.property(kTagProperty).toString()));
+			TagWithoutCustomEmoji(
+				format.property(kTagProperty).toString())));
 		cursor.setCharFormat(format);
 		setTextCursor(cursor);
 	}
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index a80e24c..c69defd 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -185,6 +185,7 @@ private:
 	Fn<bool()> _paused;
 	base::flat_map<uint64, std::unique_ptr<Text::CustomEmoji>> _emoji;
 	crl::time _now = 0;
+	int _skip = 0;
 
 };
 

From a7074136b4d8ba17b623cf673afc054f3aa3145b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 7 Jul 2022 08:38:53 +0400
Subject: [PATCH 169/635] Add several phrases for webview popups.

---
 ui/integration.cpp     | 16 ++++++++++++++++
 ui/integration.h       |  4 ++++
 ui/layers/layers.style |  1 +
 3 files changed, 21 insertions(+)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index d0694e7..b3d6703 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -154,8 +154,24 @@ QString Integration::phraseButtonOk() {
 	return "OK";
 }
 
+QString Integration::phraseButtonClose() {
+	return "Close";
+}
+
 QString Integration::phraseButtonCancel() {
 	return "Cancel";
 }
 
+QString Integration::phrasePanelCloseWarning() {
+	return "Warning";
+}
+
+QString Integration::phrasePanelCloseUnsaved() {
+	return "Changes that you made may not be saved.";
+}
+
+QString Integration::phrasePanelCloseAnyway() {
+	return "Close anyway";
+}
+
 } // namespace Ui
diff --git a/ui/integration.h b/ui/integration.h
index 701d8e3..55c6155 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -81,7 +81,11 @@ public:
 	[[nodiscard]] virtual QString phraseFormattingMonospace();
 	[[nodiscard]] virtual QString phraseFormattingSpoiler();
 	[[nodiscard]] virtual QString phraseButtonOk();
+	[[nodiscard]] virtual QString phraseButtonClose();
 	[[nodiscard]] virtual QString phraseButtonCancel();
+	[[nodiscard]] virtual QString phrasePanelCloseWarning();
+	[[nodiscard]] virtual QString phrasePanelCloseUnsaved();
+	[[nodiscard]] virtual QString phrasePanelCloseAnyway();
 
 };
 
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 4292a71..a07cd19 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -199,6 +199,7 @@ separatePanelBack: IconButton(separatePanelClose) {
 separatePanelDuration: 150;
 
 webviewDialogButton: defaultBoxButton;
+webviewDialogDestructiveButton: attentionBoxButton;
 webviewDialogSubmit: RoundButton(defaultActiveButton) {
 	width: -48px;
 	height: 34px;

From e65d4965257d5ab4b6bcff99b51ee50f0b690843 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Jul 2022 22:44:12 +0400
Subject: [PATCH 170/635] Fix build with Xcode.

---
 ui/effects/frame_generator.h | 1 +
 ui/text/text.cpp             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/effects/frame_generator.h b/ui/effects/frame_generator.h
index 9aec154..cf413dc 100644
--- a/ui/effects/frame_generator.h
+++ b/ui/effects/frame_generator.h
@@ -14,6 +14,7 @@ namespace Ui {
 
 class FrameGenerator {
 public:
+	virtual ~FrameGenerator() = default;
 	[[nodiscard]] virtual int count() = 0;
 
 	struct Frame {
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index e56ca5d..5d09fb7 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -3679,8 +3679,8 @@ TextForMimeData String::toText(
 		if (composeEntities && !customEmojiData.isEmpty()) {
 			insertEntity({
 				EntityType::CustomEmoji,
-				result.rich.text.size() - part.size(),
-				part.size(),
+				int(result.rich.text.size() - part.size()),
+				int(part.size()),
 				customEmojiData,
 			});
 		}

From 1d34c64da8bc234c4d5dd8ebaff7f249d897c7d7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Jul 2022 15:08:48 +0300
Subject: [PATCH 171/635] Add phrases for sharing the phone number.

---
 ui/integration.cpp | 12 ++++++++++++
 ui/integration.h   |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index b3d6703..4930e45 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -174,4 +174,16 @@ QString Integration::phrasePanelCloseAnyway() {
 	return "Close anyway";
 }
 
+QString Integration::phraseBotSharePhone() {
+	return "Do you want to share your phone number with this bot?";
+}
+
+QString Integration::phraseBotSharePhoneTitle() {
+	return "Phone number";
+}
+
+QString Integration::phraseBotSharePhoneConfirm() {
+	return "Share";
+}
+
 } // namespace Ui
diff --git a/ui/integration.h b/ui/integration.h
index 55c6155..871ce42 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -86,6 +86,9 @@ public:
 	[[nodiscard]] virtual QString phrasePanelCloseWarning();
 	[[nodiscard]] virtual QString phrasePanelCloseUnsaved();
 	[[nodiscard]] virtual QString phrasePanelCloseAnyway();
+	[[nodiscard]] virtual QString phraseBotSharePhone();
+	[[nodiscard]] virtual QString phraseBotSharePhoneTitle();
+	[[nodiscard]] virtual QString phraseBotSharePhoneConfirm();
 
 };
 

From 0daf3d4ac70e587c80abe7685e7ad7512f6f39cf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Jul 2022 20:30:09 +0300
Subject: [PATCH 172/635] Support instant-replacement with a custom emoji.

---
 ui/widgets/input_fields.cpp | 65 ++++++++++++++++++++++++++++---------
 ui/widgets/input_fields.h   |  8 ++++-
 2 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index b02a15d..2c39df5 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -35,7 +35,6 @@ constexpr auto kInstantReplaceWhatId = QTextFormat::UserProperty + 1;
 constexpr auto kInstantReplaceWithId = QTextFormat::UserProperty + 2;
 constexpr auto kReplaceTagId = QTextFormat::UserProperty + 3;
 constexpr auto kTagProperty = QTextFormat::UserProperty + 4;
-constexpr auto kCustomEmojiFormat = QTextFormat::UserObject + 1;
 constexpr auto kCustomEmojiText = QTextFormat::UserProperty + 5;
 constexpr auto kCustomEmojiLink = QTextFormat::UserProperty + 6;
 constexpr auto kCustomEmojiId = QTextFormat::UserProperty + 7;
@@ -50,6 +49,7 @@ const auto &kTagStrikeOut = InputField::kTagStrikeOut;
 const auto &kTagCode = InputField::kTagCode;
 const auto &kTagPre = InputField::kTagPre;
 const auto &kTagSpoiler = InputField::kTagSpoiler;
+const auto &kCustomEmojiFormat = InputField::kCustomEmojiFormat;
 const auto kTagCheckLinkMeta = u"^:/:/:^"_q;
 const auto kNewlineChars = QString("\r\n")
 	+ QChar(0xfdd0) // QTextBeginningOfFrame
@@ -942,6 +942,8 @@ const QString InputField::kTagCode = QStringLiteral("`");
 const QString InputField::kTagPre = QStringLiteral("```");
 const QString InputField::kTagSpoiler = QStringLiteral("||");
 const QString InputField::kCustomEmojiTagStart = u"custom-emoji://"_q;
+const int InputField::kCustomEmojiFormat
+	= QTextFormat::UserObject + 1;
 
 class InputField::Inner final : public QTextEdit {
 public:
@@ -1012,12 +1014,9 @@ void InsertCustomEmojiAtCursor(
 	format.setProperty(kCustomEmojiId, CustomEmojiIdFromLink(link));
 	format.setVerticalAlignment(QTextCharFormat::AlignBottom);
 	ApplyTagFormat(format, currentFormat);
-	auto existingTag = format.property(kTagProperty).toString();
-	auto existingTags = existingTag.isEmpty()
-		? QList<QStringView>()
-		: TextUtilities::SplitTags(existingTag);
-	existingTags.push_back(unique);
-	format.setProperty(kTagProperty, TextUtilities::JoinTag(existingTags));
+	format.setProperty(kTagProperty, TextUtilities::TagWithAdded(
+		format.property(kTagProperty).toString(),
+		unique));
 	cursor.insertText(kObjectReplacement, format);
 }
 
@@ -3352,20 +3351,34 @@ void InputField::applyInstantReplace(
 	} else if (position < length) {
 		return;
 	}
-	commitInstantReplacement(position - length, position, with, what, true);
-}
-
-void InputField::commitInstantReplacement(
-		int from,
-		int till,
-		const QString &with) {
-	commitInstantReplacement(from, till, with, std::nullopt, false);
+	commitInstantReplacement(
+		position - length,
+		position,
+		with,
+		QString(),
+		what,
+		true);
 }
 
 void InputField::commitInstantReplacement(
 		int from,
 		int till,
 		const QString &with,
+		const QString &customEmojiData) {
+	commitInstantReplacement(
+		from,
+		till,
+		with,
+		customEmojiData,
+		std::nullopt,
+		false);
+}
+
+void InputField::commitInstantReplacement(
+		int from,
+		int till,
+		const QString &with,
+		const QString &customEmojiData,
 		std::optional<QString> checkOriginal,
 		bool checkIfInMonospace) {
 	const auto original = getTextWithTagsPart(from, till).text;
@@ -3388,17 +3401,32 @@ void InputField::commitInstantReplacement(
 	cursor.setPosition(from);
 	cursor.setPosition(till, QTextCursor::KeepAnchor);
 
+	const auto link = customEmojiData.isEmpty()
+		? QString()
+		: CustomEmojiLink(customEmojiData);
+	const auto unique = link.isEmpty()
+		? QString()
+		: MakeUniqueCustomEmojiLink(link);
 	auto format = [&]() -> QTextCharFormat {
 		auto emojiLength = 0;
 		const auto emoji = Emoji::Find(with, &emojiLength);
 		if (!emoji || with.size() != emojiLength) {
 			return _defaultCharFormat;
+		} else if (!customEmojiData.isEmpty()) {
+			auto result = QTextCharFormat();
+			result.setObjectType(kCustomEmojiFormat);
+			result.setProperty(kCustomEmojiText, with);
+			result.setProperty(kCustomEmojiLink, unique);
+			result.setProperty(kCustomEmojiId, CustomEmojiIdFromLink(link));
+			result.setVerticalAlignment(QTextCharFormat::AlignBottom);
+			return result;
 		}
 		const auto use = Integration::Instance().defaultEmojiVariant(
 			emoji);
 		return PrepareEmojiFormat(use, _st.font);
 	}();
-	const auto replacement = format.isImageFormat()
+	const auto replacement = (format.isImageFormat()
+		|| format.objectType() == kCustomEmojiFormat)
 		? kObjectReplacement
 		: with;
 	format.setProperty(kInstantReplaceWhatId, original);
@@ -3407,6 +3435,11 @@ void InputField::commitInstantReplacement(
 		kInstantReplaceRandomId,
 		base::RandomValue<uint32>());
 	ApplyTagFormat(format, cursor.charFormat());
+	if (!unique.isEmpty()) {
+		format.setProperty(kTagProperty, TextUtilities::TagWithAdded(
+			format.property(kTagProperty).toString(),
+			unique));
+	}
 	cursor.insertText(replacement, format);
 }
 
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index c69defd..1da7845 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -220,6 +220,7 @@ public:
 	static const QString kTagPre;
 	static const QString kTagSpoiler;
 	static const QString kCustomEmojiTagStart;
+	static const int kCustomEmojiFormat;
 
 	InputField(
 		QWidget *parent,
@@ -301,7 +302,11 @@ public:
 	void setInstantReplacesEnabled(rpl::producer<bool> enabled);
 	void setMarkdownReplacesEnabled(rpl::producer<bool> enabled);
 	void setExtendedContextMenu(rpl::producer<ExtendedContextMenu> value);
-	void commitInstantReplacement(int from, int till, const QString &with);
+	void commitInstantReplacement(
+		int from,
+		int till,
+		const QString &with,
+		const QString &customEmojiData);
 	void commitMarkdownLinkEdit(
 		EditLinkSelection selection,
 		const QString &text,
@@ -497,6 +502,7 @@ private:
 		int from,
 		int till,
 		const QString &with,
+		const QString &customEmojiData,
 		std::optional<QString> checkOriginal,
 		bool checkIfInMonospace);
 	bool commitMarkdownReplacement(

From 6411e0583a209a4d6ac63f7f1c57af24e51af200 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Jul 2022 16:08:35 +0300
Subject: [PATCH 173/635] Update emoji to Unicode 14.

---
 emoji.txt           |  56 ++--
 emoji_old/data4.txt | 654 ++++++++++++++++++++++++++++++++++++++++++++
 ui/emoji_config.cpp |   2 +-
 3 files changed, 694 insertions(+), 18 deletions(-)
 create mode 100644 emoji_old/data4.txt

diff --git a/emoji.txt b/emoji.txt
index 6fba402..05755f1 100644
--- a/emoji.txt
+++ b/emoji.txt
@@ -1,9 +1,10 @@
-"😀","😃","😄","😁","😆","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🤭","🤫","🤥","😶","😐","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"😀","😃","😄","😁","😆","🥹","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🫣","🤭","🫢","🫡","🤫","🫠","🤥","😶","🫥","😐","🫤","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"🫶","🫶🏻","🫶🏼","🫶🏽","🫶🏾","🫶🏿",
 "🤲","🤲🏻","🤲🏼","🤲🏽","🤲🏾","🤲🏿",
 "👐","👐🏻","👐🏼","👐🏽","👐🏾","👐🏿",
 "🙌","🙌🏻","🙌🏼","🙌🏽","🙌🏾","🙌🏿",
 "👏","👏🏻","👏🏼","👏🏽","👏🏾","👏🏿",
-"🤝",
+"🤝","🤝🏻","🫱🏻‍🫲🏼","🫱🏻‍🫲🏽","🫱🏻‍🫲🏾","🫱🏻‍🫲🏿","🫱🏼‍🫲🏻","🤝🏼","🫱🏼‍🫲🏽","🫱🏼‍🫲🏾","🫱🏼‍🫲🏿","🫱🏽‍🫲🏻","🫱🏽‍🫲🏼","🤝🏽","🫱🏽‍🫲🏾","🫱🏽‍🫲🏿","🫱🏾‍🫲🏻","🫱🏾‍🫲🏼","🫱🏾‍🫲🏽","🤝🏾","🫱🏾‍🫲🏿","🫱🏿‍🫲🏻","🫱🏿‍🫲🏼","🫱🏿‍🫲🏽","🫱🏿‍🫲🏾","🤝🏿",
 "👍","👍🏻","👍🏼","👍🏽","👍🏾","👍🏿",
 "👎","👎🏻","👎🏼","👎🏽","👎🏾","👎🏿",
 "👊","👊🏻","👊🏼","👊🏽","👊🏾","👊🏿",
@@ -12,11 +13,14 @@
 "🤜","🤜🏻","🤜🏼","🤜🏽","🤜🏾","🤜🏿",
 "🤞","🤞🏻","🤞🏼","🤞🏽","🤞🏾","🤞🏿",
 "✌️","✌🏻","✌🏼","✌🏽","✌🏾","✌🏿",
+"🫰","🫰🏻","🫰🏼","🫰🏽","🫰🏾","🫰🏿",
 "🤟","🤟🏻","🤟🏼","🤟🏽","🤟🏾","🤟🏿",
 "🤘","🤘🏻","🤘🏼","🤘🏽","🤘🏾","🤘🏿",
 "👌","👌🏻","👌🏼","👌🏽","👌🏾","👌🏿",
 "🤌","🤌🏻","🤌🏼","🤌🏽","🤌🏾","🤌🏿",
 "🤏","🤏🏻","🤏🏼","🤏🏽","🤏🏾","🤏🏿",
+"🫳","🫳🏻","🫳🏼","🫳🏽","🫳🏾","🫳🏿",
+"🫴","🫴🏻","🫴🏼","🫴🏽","🫴🏾","🫴🏿",
 "👈","👈🏻","👈🏼","👈🏽","👈🏾","👈🏿",
 "👉","👉🏻","👉🏼","👉🏽","👉🏾","👉🏿",
 "👆","👆🏻","👆🏼","👆🏽","👆🏾","👆🏿",
@@ -28,14 +32,17 @@
 "🖖","🖖🏻","🖖🏼","🖖🏽","🖖🏾","🖖🏿",
 "👋","👋🏻","👋🏼","👋🏽","👋🏾","👋🏿",
 "🤙","🤙🏻","🤙🏼","🤙🏽","🤙🏾","🤙🏿",
+"🫲","🫲🏻","🫲🏼","🫲🏽","🫲🏾","🫲🏿",
+"🫱","🫱🏻","🫱🏼","🫱🏽","🫱🏾","🫱🏿",
 "💪","💪🏻","💪🏼","💪🏽","💪🏾","💪🏿",
 "🦾",
 "🖕","🖕🏻","🖕🏼","🖕🏽","🖕🏾","🖕🏿",
 "✍️","✍🏻","✍🏼","✍🏽","✍🏾","✍🏿",
 "🙏","🙏🏻","🙏🏼","🙏🏽","🙏🏾","🙏🏿",
+"🫵","🫵🏻","🫵🏼","🫵🏽","🫵🏾","🫵🏿",
 "🦶","🦶🏻","🦶🏼","🦶🏽","🦶🏾","🦶🏿",
 "🦵","🦵🏻","🦵🏼","🦵🏽","🦵🏾","🦵🏿",
-"🦿","💄","💋","👄","🦷","👅",
+"🦿","💄","💋","👄","🫦","🦷","👅",
 "👂","👂🏻","👂🏼","👂🏽","👂🏾","👂🏿",
 "🦻","🦻🏻","🦻🏼","🦻🏽","🦻🏾","🦻🏿",
 "👃","👃🏻","👃🏼","👃🏽","👃🏾","👃🏿",
@@ -140,6 +147,7 @@
 "🤵","🤵🏻","🤵🏼","🤵🏽","🤵🏾","🤵🏿",
 "🤵‍♂️","🤵🏻‍♂️","🤵🏼‍♂️","🤵🏽‍♂️","🤵🏾‍♂️","🤵🏿‍♂️",
 "👸","👸🏻","👸🏼","👸🏽","👸🏾","👸🏿",
+"🫅","🫅🏻","🫅🏼","🫅🏽","🫅🏾","🫅🏿",
 "🤴","🤴🏻","🤴🏼","🤴🏽","🤴🏾","🤴🏿",
 "🥷","🥷🏻","🥷🏼","🥷🏽","🥷🏾","🥷🏿",
 "🦸‍♀️","🦸🏻‍♀️","🦸🏼‍♀️","🦸🏽‍♀️","🦸🏾‍♀️","🦸🏿‍♀️",
@@ -157,6 +165,7 @@
 "🧝‍♀️","🧝🏻‍♀️","🧝🏼‍♀️","🧝🏽‍♀️","🧝🏾‍♀️","🧝🏿‍♀️",
 "🧝","🧝🏻","🧝🏼","🧝🏽","🧝🏾","🧝🏿",
 "🧝‍♂️","🧝🏻‍♂️","🧝🏼‍♂️","🧝🏽‍♂️","🧝🏾‍♂️","🧝🏿‍♂️",
+"🧌",
 "🧛‍♀️","🧛🏻‍♀️","🧛🏼‍♀️","🧛🏽‍♀️","🧛🏾‍♀️","🧛🏿‍♀️",
 "🧛","🧛🏻","🧛🏼","🧛🏽","🧛🏾","🧛🏿",
 "🧛‍♂️","🧛🏻‍♂️","🧛🏼‍♂️","🧛🏽‍♂️","🧛🏾‍♂️","🧛🏿‍♂️",
@@ -169,6 +178,8 @@
 "🧚‍♂️","🧚🏻‍♂️","🧚🏼‍♂️","🧚🏽‍♂️","🧚🏾‍♂️","🧚🏿‍♂️",
 "👼","👼🏻","👼🏼","👼🏽","👼🏾","👼🏿",
 "🤰","🤰🏻","🤰🏼","🤰🏽","🤰🏾","🤰🏿",
+"🫄","🫄🏻","🫄🏼","🫄🏽","🫄🏾","🫄🏿",
+"🫃","🫃🏻","🫃🏼","🫃🏽","🫃🏾","🫃🏿",
 "🤱","🤱🏻","🤱🏼","🤱🏽","🤱🏾","🤱🏿",
 "👩‍🍼","👩🏻‍🍼","👩🏼‍🍼","👩🏽‍🍼","👩🏾‍🍼","👩🏿‍🍼",
 "🧑‍🍼","🧑🏻‍🍼","🧑🏼‍🍼","🧑🏽‍🍼","🧑🏾‍🍼","🧑🏿‍🍼",
@@ -253,13 +264,13 @@
 "👨‍👩‍👦","👨‍👩‍👧","👨‍👩‍👧‍👦","👨‍👩‍👦‍👦","👨‍👩‍👧‍👧","👩‍👩‍👦","👩‍👩‍👧","👩‍👩‍👧‍👦","👩‍👩‍👦‍👦","👩‍👩‍👧‍👧","👨‍👨‍👦","👨‍👨‍👧","👨‍👨‍👧‍👦","👨‍👨‍👦‍👦","👨‍👨‍👧‍👧","👩‍👦","👩‍👧","👩‍👧‍👦","👩‍👦‍👦","👩‍👧‍👧","👨‍👦","👨‍👧","👨‍👧‍👦","👨‍👦‍👦","👨‍👧‍👧","🪢","🧶","🧵","🪡","🧥","🥼","🦺","👚","👕","👖","🩲","🩳","👔","👗","👙","🩱","👘","🥻","🩴","🥿","👠","👡","👢","👞","👟","🥾","🧦","🧤","🧣","🎩","🧢","👒","🎓","⛑","🪖","👑","💍","👝","👛","👜","💼","🎒","🧳","👓","🕶","🥽","🌂"
 
 
-"🐶","🐱","🐭","🐹","🐰","🦊","🐻","🐼","🐻‍❄️","🐨","🐯","🦁","🐮","🐷","🐽","🐸","🐵","🙈","🙉","🙊","🐒","🐔","🐧","🐦","🐤","🐣","🐥","🦆","🦅","🦉","🦇","🐺","🐗","🐴","🦄","🐝","🪱","🐛","🦋","🐌","🐞","🐜","🪰","🪲","🪳","🦟","🦗","🕷","🕸","🦂","🐢","🐍","🦎","🦖","🦕","🐙","🦑","🦐","🦞","🦀","🐡","🐠","🐟","🐬","🐳","🐋","🦈","🦭","🐊","🐅","🐆","🦓","🦍","🦧","🦣","🐘","🦛","🦏","🐪","🐫","🦒","🦘","🦬","🐃","🐂","🐄","🐎","🐖","🐏","🐑","🦙","🐐","🦌","🐕","🐩","🦮","🐕‍🦺","🐈","🐈‍⬛","🪶","🐓","🦃","🦤","🦚","🦜","🦢","🦩","🕊","🐇","🦝","🦨","🦡","🦫","🦦","🦥","🐁","🐀","🐿","🦔","🐾","🐉","🐲","🌵","🎄","🌲","🌳","🌴","🪵","🌱","🌿","☘️","🍀","🎍","🪴","🎋","🍃","🍂","🍁","🍄","🐚","🪨","🌾","💐","🌷","🌹","🥀","🌺","🌸","🌼","🌻","🌞","🌝","🌛","🌜","🌚","🌕","🌖","🌗","🌘","🌑","🌒","🌓","🌔","🌙","🌎","🌍","🌏","🪐","💫","⭐️","🌟","✨","⚡️","☄️","💥","🔥","🌪","🌈","☀️","🌤","⛅️","🌥","☁️","🌦","🌧","⛈","🌩","🌨","❄️","☃️","⛄️","🌬","💨","💧","💦","☔️","☂️","🌊","🌫"
+"🐶","🐱","🐭","🐹","🐰","🦊","🐻","🐼","🐻‍❄️","🐨","🐯","🦁","🐮","🐷","🐽","🐸","🐵","🙈","🙉","🙊","🐒","🐔","🐧","🐦","🐤","🐣","🐥","🦆","🦅","🦉","🦇","🐺","🐗","🐴","🦄","🐝","🪱","🐛","🦋","🐌","🐞","🐜","🪰","🪲","🪳","🦟","🦗","🕷","🕸","🦂","🐢","🐍","🦎","🦖","🦕","🐙","🦑","🦐","🦞","🦀","🐡","🐠","🐟","🐬","🐳","🐋","🦈","🦭","🐊","🐅","🐆","🦓","🦍","🦧","🦣","🐘","🦛","🦏","🐪","🐫","🦒","🦘","🦬","🐃","🐂","🐄","🐎","🐖","🐏","🐑","🦙","🐐","🦌","🐕","🐩","🦮","🐕‍🦺","🐈","🐈‍⬛","🪶","🐓","🦃","🦤","🦚","🦜","🦢","🦩","🕊","🐇","🦝","🦨","🦡","🦫","🦦","🦥","🐁","🐀","🐿","🦔","🐾","🐉","🐲","🌵","🎄","🌲","🌳","🌴","🪵","🌱","🌿","☘️","🍀","🎍","🪴","🎋","🍃","🍂","🍁","🪺","🪹","🍄","🐚","🪸","🪨","🌾","💐","🌷","🌹","🥀","🪷","🌺","🌸","🌼","🌻","🌞","🌝","🌛","🌜","🌚","🌕","🌖","🌗","🌘","🌑","🌒","🌓","🌔","🌙","🌎","🌍","🌏","🪐","💫","⭐️","🌟","✨","⚡️","☄️","💥","🔥","🌪","🌈","☀️","🌤","⛅️","🌥","☁️","🌦","🌧","⛈","🌩","🌨","❄️","☃️","⛄️","🌬","💨","💧","💦","🫧","☔️","☂️","🌊","🌫"
 
 
-"🍏","🍎","🍐","🍊","🍋","🍌","🍉","🍇","🍓","🫐","🍈","🍒","🍑","🥭","🍍","🥥","🥝","🍅","🍆","🥑","🥦","🥬","🥒","🌶","🫑","🌽","🥕","🫒","🧄","🧅","🥔","🍠","🥐","🥯","🍞","🥖","🥨","🧀","🥚","🍳","🧈","🥞","🧇","🥓","🥩","🍗","🍖","🦴","🌭","🍔","🍟","🍕","🫓","🥪","🥙","🧆","🌮","🌯","🫔","🥗","🥘","🫕","🥫","🍝","🍜","🍲","🍛","🍣","🍱","🥟","🦪","🍤","🍙","🍚","🍘","🍥","🥠","🥮","🍢","🍡","🍧","🍨","🍦","🥧","🧁","🍰","🎂","🍮","🍭","🍬","🍫","🍿","🍩","🍪","🌰","🥜","🍯","🥛","🍼","🫖","☕️","🍵","🧃","🥤","🧋","🍶","🍺","🍻","🥂","🍷","🥃","🍸","🍹","🧉","🍾","🧊","🥄","🍴","🍽","🥣","🥡","🥢","🧂"
+"🍏","🍎","🍐","🍊","🍋","🍌","🍉","🍇","🍓","🫐","🍈","🍒","🍑","🥭","🍍","🥥","🥝","🍅","🍆","🥑","🥦","🥬","🥒","🌶","🫑","🌽","🥕","🫒","🧄","🧅","🥔","🍠","🥐","🥯","🍞","🥖","🥨","🧀","🥚","🍳","🧈","🥞","🧇","🥓","🥩","🍗","🍖","🦴","🌭","🍔","🍟","🍕","🫓","🥪","🥙","🧆","🌮","🌯","🫔","🥗","🥘","🫕","🥫","🍝","🍜","🍲","🫙","🍛","🍣","🍱","🥟","🦪","🍤","🍙","🍚","🍘","🍥","🥠","🥮","🍢","🍡","🍧","🍨","🍦","🥧","🧁","🍰","🎂","🍮","🍭","🍬","🍫","🍿","🍩","🍪","🌰","🥜","🫘","🍯","🥛","🫗","🍼","🫖","☕️","🍵","🧃","🥤","🧋","🍶","🍺","🍻","🥂","🍷","🥃","🍸","🍹","🧉","🍾","🧊","🥄","🍴","🍽","🥣","🥡","🥢","🧂"
 
 
-"⚽️","🏀","🏈","⚾️","🥎","🎾","🏐","🏉","🥏","🎱","🪀","🏓","🏸","🏒","🏑","🥍","🏏","🪃","🥅","⛳️","🪁","🏹","🎣","🤿","🥊","🥋","🎽","🛹","🛼","🛷","⛸","🥌","🎿","⛷","🏂","🪂",
+"⚽️","🏀","🏈","⚾️","🥎","🎾","🏐","🏉","🥏","🎱","🪀","🏓","🏸","🏒","🏑","🥍","🏏","🪃","🥅","⛳️","🪁","🛝","🏹","🎣","🤿","🥊","🥋","🎽","🛹","🛼","🛷","⛸","🥌","🎿","⛷","🏂","🪂",
 "🏋️‍♀️","🏋🏻‍♀️","🏋🏼‍♀️","🏋🏽‍♀️","🏋🏾‍♀️","🏋🏿‍♀️",
 "🏋️","🏋🏻","🏋🏼","🏋🏽","🏋🏾","🏋🏿",
 "🏋️‍♂️","🏋🏻‍♂️","🏋🏼‍♂️","🏋🏽‍♂️","🏋🏾‍♂️","🏋🏿‍♂️",
@@ -309,17 +320,17 @@
 "🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🎲","♟","🎯","🎳","🎮","🎰","🧩"
 
 
-"🚗","🚕","🚙","🚌","🚎","🏎","🚓","🚑","🚒","🚐","🛻","🚚","🚛","🚜","🦯","🦽","🦼","🛴","🚲","🛵","🏍","🛺","🚨","🚔","🚍","🚘","🚖","🚡","🚠","🚟","🚃","🚋","🚞","🚝","🚄","🚅","🚈","🚂","🚆","🚇","🚊","🚉","✈️","🛫","🛬","🛩","💺","🛰","🚀","🛸","🚁","🛶","⛵️","🚤","🛥","🛳","⛴","🚢","⚓️","🪝","⛽️","🚧","🚦","🚥","🚏","🗺","🗿","🗽","🗼","🏰","🏯","🏟","🎡","🎢","🎠","⛲️","⛱","🏖","🏝","🏜","🌋","⛰","🏔","🗻","🏕","⛺️","🛖","🏠","🏡","🏘","🏚","🏗","🏭","🏢","🏬","🏣","🏤","🏥","🏦","🏨","🏪","🏫","🏩","💒","🏛","⛪️","🕌","🕍","🛕","🕋","⛩","🛤","🛣","🗾","🎑","🏞","🌅","🌄","🌠","🎇","🎆","🌇","🌆","🏙","🌃","🌌","🌉","🌁"
+"🚗","🚕","🚙","🚌","🚎","🏎","🚓","🚑","🚒","🚐","🛻","🚚","🚛","🚜","🦯","🦽","🦼","🩼","🛴","🚲","🛵","🏍","🛺","🛞","🚨","🚔","🚍","🚘","🚖","🚡","🚠","🚟","🚃","🚋","🚞","🚝","🚄","🚅","🚈","🚂","🚆","🚇","🚊","🚉","✈️","🛫","🛬","🛩","💺","🛰","🚀","🛸","🚁","🛶","⛵️","🚤","🛥","🛳","⛴","🚢","🛟","⚓️","🪝","⛽️","🚧","🚦","🚥","🚏","🗺","🗿","🗽","🗼","🏰","🏯","🏟","🎡","🎢","🎠","⛲️","⛱","🏖","🏝","🏜","🌋","⛰","🏔","🗻","🏕","⛺️","🛖","🏠","🏡","🏘","🏚","🏗","🏭","🏢","🏬","🏣","🏤","🏥","🏦","🏨","🏪","🏫","🏩","💒","🏛","⛪️","🕌","🕍","🛕","🕋","⛩","🛤","🛣","🗾","🎑","🏞","🌅","🌄","🌠","🎇","🎆","🌇","🌆","🏙","🌃","🌌","🌉","🌁"
 
 
 
-"⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","💈","⚗️","🔭","🔬","🕳","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
+"⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🪫","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","🪪","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","🪬","💈","⚗️","🔭","🔬","🕳","🩻","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
 "🛀","🛀🏻","🛀🏼","🛀🏽","🛀🏾","🛀🏿",
-"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
+"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🪩","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
 
 
 
-"❤️","🧡","💛","💚","💙","💜","🖤","🤍","🤎","💔","❤️‍🔥","❤️‍🩹","❣️","💕","💞","💓","💗","💖","💘","💝","💟","☮️","✝️","☪️","🕉","☸️","✡️","🔯","🕎","☯️","☦️","🛐","⛎","♈️","♉️","♊️","♋️","♌️","♍️","♎️","♏️","♐️","♑️","♒️","♓️","🆔","⚛️","🉑","☢️","☣️","📴","📳","🈶","🈚️","🈸","🈺","🈷️","✴️","🆚","💮","🉐","㊙️","㊗️","🈴","🈵","🈹","🈲","🅰️","🅱️","🆎","🆑","🅾️","🆘","❌","⭕️","🛑","⛔️","📛","🚫","💯","💢","♨️","🚷","🚯","🚳","🚱","🔞","📵","🚭","❗️","❕","❓","❔","‼️","⁉️","🔅","🔆","〽️","⚠️","🚸","🔱","⚜️","🔰","♻️","✅","🈯️","💹","❇️","✳️","❎","🌐","💠","Ⓜ️","🌀","💤","🏧","🚾","♿️","🅿️","🛗","🈳","🈂️","🛂","🛃","🛄","🛅","🚹","🚺","🚼","⚧","🚻","🚮","🎦","📶","🈁","🔣","ℹ️","🔤","🔡","🔠","🆖","🆗","🆙","🆒","🆕","🆓","0️⃣","1️⃣","2️⃣","3️⃣","4️⃣","5️⃣","6️⃣","7️⃣","8️⃣","9️⃣","🔟","🔢","#️⃣","*️⃣","⏏️","▶️","⏸","⏯","⏹","⏺","⏭","⏮","⏩","⏪","⏫","⏬","◀️","🔼","🔽","➡️","⬅️","⬆️","⬇️","↗️","↘️","↙️","↖️","↕️","↔️","↪️","↩️","⤴️","⤵️","🔀","🔁","🔂","🔄","🔃","🎵","🎶","➕","➖","➗","✖️","♾","💲","💱","™️","©️","®️","👁‍🗨","🔚","🔙","🔛","🔝","🔜","〰️","➰","➿","✔️","☑️","🔘","🔴","🟠","🟡","🟢","🔵","🟣","⚫️","⚪️","🟤","🔺","🔻","🔸","🔹","🔶","🔷","🔳","🔲","▪️","▫️","◾️","◽️","◼️","◻️","🟥","🟧","🟨","🟩","🟦","🟪","⬛️","⬜️","🟫","🔈","🔇","🔉","🔊","🔔","🔕","📣","📢","💬","💭","🗯","♠️","♣️","♥️","♦️","🃏","🎴","🀄️","🕐","🕑","🕒","🕓","🕔","🕕","🕖","🕗","🕘","🕙","🕚","🕛","🕜","🕝","🕞","🕟","🕠","🕡","🕢","🕣","🕤","🕥","🕦","🕧"
+"❤️","🧡","💛","💚","💙","💜","🖤","🤍","🤎","💔","❤️‍🔥","❤️‍🩹","❣️","💕","💞","💓","💗","💖","💘","💝","💟","☮️","✝️","☪️","🕉","☸️","✡️","🔯","🕎","☯️","☦️","🛐","⛎","♈️","♉️","♊️","♋️","♌️","♍️","♎️","♏️","♐️","♑️","♒️","♓️","🆔","⚛️","🉑","☢️","☣️","📴","📳","🈶","🈚️","🈸","🈺","🈷️","✴️","🆚","💮","🉐","㊙️","㊗️","🈴","🈵","🈹","🈲","🅰️","🅱️","🆎","🆑","🅾️","🆘","❌","⭕️","🛑","⛔️","📛","🚫","💯","💢","♨️","🚷","🚯","🚳","🚱","🔞","📵","🚭","❗️","❕","❓","❔","‼️","⁉️","🔅","🔆","〽️","⚠️","🚸","🔱","⚜️","🔰","♻️","✅","🈯️","💹","❇️","✳️","❎","🌐","💠","Ⓜ️","🌀","💤","🏧","🚾","♿️","🅿️","🛗","🈳","🈂️","🛂","🛃","🛄","🛅","🚹","🚺","🚼","⚧","🚻","🚮","🎦","📶","🈁","🔣","ℹ️","🔤","🔡","🔠","🆖","🆗","🆙","🆒","🆕","🆓","0️⃣","1️⃣","2️⃣","3️⃣","4️⃣","5️⃣","6️⃣","7️⃣","8️⃣","9️⃣","🔟","🔢","#️⃣","*️⃣","⏏️","▶️","⏸","⏯","⏹","⏺","⏭","⏮","⏩","⏪","⏫","⏬","◀️","🔼","🔽","➡️","⬅️","⬆️","⬇️","↗️","↘️","↙️","↖️","↕️","↔️","↪️","↩️","⤴️","⤵️","🔀","🔁","🔂","🔄","🔃","🎵","🎶","➕","➖","➗", "✖️", "🟰", "♾", "💲","💱","™️","©️","®️","👁‍🗨","🔚","🔙","🔛","🔝","🔜","〰️","➰","➿","✔️","☑️","🔘","🔴","🟠","🟡","🟢","🔵","🟣","⚫️","⚪️","🟤","🔺","🔻","🔸","🔹","🔶","🔷","🔳","🔲","▪️","▫️","◾️","◽️","◼️","◻️","🟥","🟧","🟨","🟩","🟦","🟪","⬛️","⬜️","🟫","🔈","🔇","🔉","🔊","🔔","🔕","📣","📢","💬","💭","🗯","♠️","♣️","♥️","♦️","🃏","🎴","🀄️","🕐","🕑","🕒","🕓","🕔","🕕","🕖","🕗","🕘","🕙","🕚","🕛","🕜","🕝","🕞","🕟","🕠","🕡","🕢","🕣","🕤","🕥","🕦","🕧"
 
 
 "🏳️","🏴","🏴‍☠️","🏁","🚩","🏳️‍🌈","🏳️‍⚧️","🇺🇳","🇦🇫","🇦🇽","🇦🇱","🇩🇿","🇦🇸","🇦🇩","🇦🇴","🇦🇮","🇦🇶","🇦🇬","🇦🇷","🇦🇲","🇦🇼","🇦🇺","🇦🇹","🇦🇿","🇧🇸","🇧🇭","🇧🇩","🇧🇧","🇧🇾","🇧🇪","🇧🇿","🇧🇯","🇧🇲","🇧🇹","🇧🇴","🇧🇦","🇧🇼","🇧🇷","🇻🇬","🇧🇳","🇧🇬","🇧🇫","🇧🇮","🇰🇭","🇨🇲","🇨🇦","🇮🇨","🇨🇻","🇧🇶","🇰🇾","🇨🇫","🇹🇩","🇮🇴","🇨🇱","🇨🇳","🇨🇽","🇨🇨","🇨🇴","🇰🇲","🇨🇬","🇨🇩","🇨🇰","🇨🇷","🇨🇮","🇭🇷","🇨🇺","🇨🇼","🇨🇾","🇨🇿","🇩🇰","🇩🇯","🇩🇲","🇩🇴","🇪🇨","🇪🇬","🇸🇻","🇬🇶","🇪🇷","🇪🇪","🇸🇿","🇪🇹","🇪🇺","🇫🇰","🇫🇴","🇫🇯","🇫🇮","🇫🇷","🇬🇫","🇵🇫","🇹🇫","🇬🇦","🇬🇲","🇬🇪","🇩🇪","🇬🇭","🇬🇮","🇬🇷","🇬🇱","🇬🇩","🇬🇵","🇬🇺","🇬🇹","🇬🇬","🇬🇳","🇬🇼","🇬🇾","🇭🇹","🇭🇳","🇭🇰","🇭🇺","🇮🇸","🇮🇳","🇮🇩","🇮🇷","🇮🇶","🇮🇪","🇮🇲","🇮🇱","🇮🇹","🇯🇲","🇯🇵","🎌","🇯🇪","🇯🇴","🇰🇿","🇰🇪","🇰🇮","🇽🇰","🇰🇼","🇰🇬","🇱🇦","🇱🇻","🇱🇧","🇱🇸","🇱🇷","🇱🇾","🇱🇮","🇱🇹","🇱🇺","🇲🇴","🇲🇬","🇲🇼","🇲🇾","🇲🇻","🇲🇱","🇲🇹","🇲🇭","🇲🇶","🇲🇷","🇲🇺","🇾🇹","🇲🇽","🇫🇲","🇲🇩","🇲🇨","🇲🇳","🇲🇪","🇲🇸","🇲🇦","🇲🇿","🇲🇲","🇳🇦","🇳🇷","🇳🇵","🇳🇱","🇳🇨","🇳🇿","🇳🇮","🇳🇪","🇳🇬","🇳🇺","🇳🇫","🇰🇵","🇲🇰","🇲🇵","🇳🇴","🇴🇲","🇵🇰","🇵🇼","🇵🇸","🇵🇦","🇵🇬","🇵🇾","🇵🇪","🇵🇭","🇵🇳","🇵🇱","🇵🇹","🇵🇷","🇶🇦","🇷🇪","🇷🇴","🇷🇺","🇷🇼","🇼🇸","🇸🇲","🇸🇹","🇸🇦","🇸🇳","🇷🇸","🇸🇨","🇸🇱","🇸🇬","🇸🇽","🇸🇰","🇸🇮","🇬🇸","🇸🇧","🇸🇴","🇿🇦","🇰🇷","🇸🇸","🇪🇸","🇱🇰","🇧🇱","🇸🇭","🇰🇳","🇱🇨","🇵🇲","🇻🇨","🇸🇩","🇸🇷","🇸🇪","🇨🇭","🇸🇾","🇹🇼","🇹🇯","🇹🇿","🇹🇭","🇹🇱","🇹🇬","🇹🇰","🇹🇴","🇹🇹","🇹🇳","🇹🇷","🇹🇲","🇹🇨","🇹🇻","🇺🇬","🇺🇦","🇦🇪","🇬🇧","🏴󠁧󠁢󠁥󠁮󠁧󠁿","🏴󠁧󠁢󠁳󠁣󠁴󠁿","🏴󠁧󠁢󠁷󠁬󠁳󠁿","🇺🇸","🇺🇾","🇻🇮","🇺🇿","🇻🇺","🇻🇦","🇻🇪","🇻🇳","🇼🇫","🇪🇭","🇾🇪","🇿🇲","🇿🇼"
@@ -329,7 +340,8 @@
 
 =========================================
 
-"😀","😃","😄","😁","😆","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🤭","🤫","🤥","😶","😐","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"😀","😃","😄","😁","😆","🥹","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🫣","🤭","🫢","🫡","🤫","🫠","🤥","😶","🫥","😐","🫤","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"🫶",
 "🤲",
 "👐",
 "🙌",
@@ -343,11 +355,14 @@
 "🤜",
 "🤞",
 "✌️",
+"🫰",
 "🤟",
 "🤘",
 "👌",
 "🤌",
 "🤏",
+"🫳",
+"🫴",
 "👈",
 "👉",
 "👆",
@@ -359,14 +374,17 @@
 "🖖",
 "👋",
 "🤙",
+"🫲",
+"🫱",
 "💪",
 "🦾",
 "🖕",
 "✍️",
 "🙏",
+"🫵",
 "🦶",
 "🦵",
-"🦿","💄","💋","👄","🦷","👅",
+"🦿","💄","💋","👄","🫦","🦷","👅",
 "👂",
 "🦻",
 "👃",
@@ -471,6 +489,7 @@
 "🤵",
 "🤵‍♂️",
 "👸",
+"🫅",
 "🤴",
 "🥷",
 "🦸‍♀️",
@@ -488,6 +507,7 @@
 "🧝‍♀️",
 "🧝",
 "🧝‍♂️",
+"🧌",
 "🧛‍♀️",
 "🧛",
 "🧛‍♂️",
@@ -500,6 +520,8 @@
 "🧚‍♂️",
 "👼",
 "🤰",
+"🫄",
+"🫃",
 "🤱",
 "👩‍🍼",
 "🧑‍🍼",
@@ -636,19 +658,19 @@
 
 
 
-"⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","💈","⚗️","🔭","🔬","🕳","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
+"⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🪫","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","🪪","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","🪬","💈","⚗️","🔭","🔬","🕳","🩻","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
 "🛀",
-"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
+"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🪩","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
 
 
 
 =========================================
-"🤲","👐","🙌","👏","👍","👎","👊","✊","🤛","🤜","🤞","✌️","🤟","🤘","👌","🤌","🤏","👈","👉","👆","👇","☝️","✋","🤚","🖐","🖖","👋","🤙","💪","🖕","✍️","🙏","🦶","🦵","👂","🦻","👃","👶","👧","🧒","👦","👩","🧑","👨","👩‍🦱","🧑‍🦱","👨‍🦱","👩‍🦰","🧑‍🦰","👨‍🦰","👱‍♀️","👱","👱‍♂️","👩‍🦳","🧑‍🦳","👨‍🦳","👩‍🦲","🧑‍🦲","👨‍🦲","🧔‍♀️","🧔","🧔‍♂️","👵","🧓","👴","👲","👳‍♀️","👳","👳‍♂️","🧕","👮‍♀️","👮","👮‍♂️","👷‍♀️","👷","👷‍♂️","💂‍♀️","💂","💂‍♂️","🕵️‍♀️","🕵️","🕵️‍♂️","👩‍⚕️","🧑‍⚕️","👨‍⚕️","👩‍🌾","🧑‍🌾","👨‍🌾","👩‍🍳","🧑‍🍳","👨‍🍳","👩‍🎓","🧑‍🎓","👨‍🎓","👩‍🎤","🧑‍🎤","👨‍🎤","👩‍🏫","🧑‍🏫","👨‍🏫","👩‍🏭","🧑‍🏭","👨‍🏭","👩‍💻","🧑‍💻","👨‍💻","👩‍💼","🧑‍💼","👨‍💼","👩‍🔧","🧑‍🔧","👨‍🔧","👩‍🔬","🧑‍🔬","👨‍🔬","👩‍🎨","🧑‍🎨","👨‍🎨","👩‍🚒","🧑‍🚒","👨‍🚒","👩‍✈️","🧑‍✈️","👨‍✈️","👩‍🚀","🧑‍🚀","👨‍🚀","👩‍⚖️","🧑‍⚖️","👨‍⚖️","👰‍♀️","👰","👰‍♂️","🤵‍♀️","🤵","🤵‍♂️","👸","🤴","🥷","🦸‍♀️","🦸","🦸‍♂️","🦹‍♀️","🦹","🦹‍♂️","🤶","🧑‍🎄","🎅","🧙‍♀️","🧙","🧙‍♂️","🧝‍♀️","🧝","🧝‍♂️","🧛‍♀️","🧛","🧛‍♂️","🧜‍♀️","🧜","🧜‍♂️","🧚‍♀️","🧚","🧚‍♂️","👼","🤰","🤱","👩‍🍼","🧑‍🍼","👨‍🍼","🙇‍♀️","🙇","🙇‍♂️","💁‍♀️","💁","💁‍♂️","🙅‍♀️","🙅","🙅‍♂️","🙆‍♀️","🙆","🙆‍♂️","🙋‍♀️","🙋","🙋‍♂️","🧏‍♀️","🧏","🧏‍♂️","🤦‍♀️","🤦","🤦‍♂️","🤷‍♀️","🤷","🤷‍♂️","🙎‍♀️","🙎","🙎‍♂️","🙍‍♀️","🙍","🙍‍♂️","💇‍♀️","💇","💇‍♂️","💆‍♀️","💆","💆‍♂️","🧖‍♀️","🧖","🧖‍♂️","💅","🤳","💃","🕺","🕴","👩‍🦽","🧑‍🦽","👨‍🦽","👩‍🦼","🧑‍🦼","👨‍🦼","🚶‍♀️","🚶","🚶‍♂️","👩‍🦯","🧑‍🦯","👨‍🦯","🧎‍♀️","🧎","🧎‍♂️","🏃‍♀️","🏃","🏃‍♂️","🧍‍♀️","🧍","🧍‍♂️","🏋️‍♀️","🏋️","🏋️‍♂️","🤸‍♀️","🤸","🤸‍♂️","⛹️‍♀️","⛹️","⛹️‍♂️","🤾‍♀️","🤾","🤾‍♂️","🏌️‍♀️","🏌️","🏌️‍♂️","🏇","🧘‍♀️","🧘","🧘‍♂️","🏄‍♀️","🏄","🏄‍♂️","🏊‍♀️","🏊","🏊‍♂️","🤽‍♀️","🤽","🤽‍♂️","🚣‍♀️","🚣","🚣‍♂️","🧗‍♀️","🧗","🧗‍♂️","🚵‍♀️","🚵","🚵‍♂️","🚴‍♀️","🚴","🚴‍♂️","🤹‍♀️","🤹","🤹‍♂️","🛀"
+"🫶","🤲","👐","🙌","👏","👍","👎","👊","✊","🤛","🤜","🤞","✌️","🫰","🤟","🤘","👌","🤌","🤏","🫳","🫴","👈","👉","👆","👇","☝️","✋","🤚","🖐","🖖","👋","🤙","🫲","🫱","💪","🖕","✍️","🙏","🫵","🦶","🦵","👂","🦻","👃","👶","👧","🧒","👦","👩","🧑","👨","👩‍🦱","🧑‍🦱","👨‍🦱","👩‍🦰","🧑‍🦰","👨‍🦰","👱‍♀️","👱","👱‍♂️","👩‍🦳","🧑‍🦳","👨‍🦳","👩‍🦲","🧑‍🦲","👨‍🦲","🧔‍♀️","🧔","🧔‍♂️","👵","🧓","👴","👲","👳‍♀️","👳","👳‍♂️","🧕","👮‍♀️","👮","👮‍♂️","👷‍♀️","👷","👷‍♂️","💂‍♀️","💂","💂‍♂️","🕵️‍♀️","🕵️","🕵️‍♂️","👩‍⚕️","🧑‍⚕️","👨‍⚕️","👩‍🌾","🧑‍🌾","👨‍🌾","👩‍🍳","🧑‍🍳","👨‍🍳","👩‍🎓","🧑‍🎓","👨‍🎓","👩‍🎤","🧑‍🎤","👨‍🎤","👩‍🏫","🧑‍🏫","👨‍🏫","👩‍🏭","🧑‍🏭","👨‍🏭","👩‍💻","🧑‍💻","👨‍💻","👩‍💼","🧑‍💼","👨‍💼","👩‍🔧","🧑‍🔧","👨‍🔧","👩‍🔬","🧑‍🔬","👨‍🔬","👩‍🎨","🧑‍🎨","👨‍🎨","👩‍🚒","🧑‍🚒","👨‍🚒","👩‍✈️","🧑‍✈️","👨‍✈️","👩‍🚀","🧑‍🚀","👨‍🚀","👩‍⚖️","🧑‍⚖️","👨‍⚖️","👰‍♀️","👰","👰‍♂️","🤵‍♀️","🤵","🤵‍♂️","👸","🫅","🤴","🥷","🦸‍♀️","🦸","🦸‍♂️","🦹‍♀️","🦹","🦹‍♂️","🤶","🧑‍🎄","🎅","🧙‍♀️","🧙","🧙‍♂️","🧝‍♀️","🧝","🧝‍♂️","🧛‍♀️","🧛","🧛‍♂️","🧜‍♀️","🧜","🧜‍♂️","🧚‍♀️","🧚","🧚‍♂️","👼","🤰","🫄","🫃","🤱","👩‍🍼","🧑‍🍼","👨‍🍼","🙇‍♀️","🙇","🙇‍♂️","💁‍♀️","💁","💁‍♂️","🙅‍♀️","🙅","🙅‍♂️","🙆‍♀️","🙆","🙆‍♂️","🙋‍♀️","🙋","🙋‍♂️","🧏‍♀️","🧏","🧏‍♂️","🤦‍♀️","🤦","🤦‍♂️","🤷‍♀️","🤷","🤷‍♂️","🙎‍♀️","🙎","🙎‍♂️","🙍‍♀️","🙍","🙍‍♂️","💇‍♀️","💇","💇‍♂️","💆‍♀️","💆","💆‍♂️","🧖‍♀️","🧖","🧖‍♂️","💅","🤳","💃","🕺","🕴","👩‍🦽","🧑‍🦽","👨‍🦽","👩‍🦼","🧑‍🦼","👨‍🦼","🚶‍♀️","🚶","🚶‍♂️","👩‍🦯","🧑‍🦯","👨‍🦯","🧎‍♀️","🧎","🧎‍♂️","🏃‍♀️","🏃","🏃‍♂️","🧍‍♀️","🧍","🧍‍♂️","🏋️‍♀️","🏋️","🏋️‍♂️","🤸‍♀️","🤸","🤸‍♂️","⛹️‍♀️","⛹️","⛹️‍♂️","🤾‍♀️","🤾","🤾‍♂️","🏌️‍♀️","🏌️","🏌️‍♂️","🏇","🧘‍♀️","🧘","🧘‍♂️","🏄‍♀️","🏄","🏄‍♂️","🏊‍♀️","🏊","🏊‍♂️","🤽‍♀️","🤽","🤽‍♂️","🚣‍♀️","🚣","🚣‍♂️","🧗‍♀️","🧗","🧗‍♂️","🚵‍♀️","🚵","🚵‍♂️","🚴‍♀️","🚴","🚴‍♂️","🤹‍♀️","🤹","🤹‍♂️","🛀"
 
 
-"👫","👭","👬","👩‍❤️‍👨","👩‍❤️‍👩","💑","👨‍❤️‍👨","👩‍❤️‍💋‍👨","👩‍❤️‍💋‍👩","💏","👨‍❤️‍💋‍👨"
+"🤝","👫","👭","👬","👩‍❤️‍👨","👩‍❤️‍👩","💑","👨‍❤️‍👨","👩‍❤️‍💋‍👨","👩‍❤️‍💋‍👩","💏","👨‍❤️‍💋‍👨"
 
 =========================================
 
 
-"🗨", "👪"
+"🗨", "👪"
\ No newline at end of file
diff --git a/emoji_old/data4.txt b/emoji_old/data4.txt
new file mode 100644
index 0000000..6fba402
--- /dev/null
+++ b/emoji_old/data4.txt
@@ -0,0 +1,654 @@
+"😀","😃","😄","😁","😆","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🤭","🤫","🤥","😶","😐","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"🤲","🤲🏻","🤲🏼","🤲🏽","🤲🏾","🤲🏿",
+"👐","👐🏻","👐🏼","👐🏽","👐🏾","👐🏿",
+"🙌","🙌🏻","🙌🏼","🙌🏽","🙌🏾","🙌🏿",
+"👏","👏🏻","👏🏼","👏🏽","👏🏾","👏🏿",
+"🤝",
+"👍","👍🏻","👍🏼","👍🏽","👍🏾","👍🏿",
+"👎","👎🏻","👎🏼","👎🏽","👎🏾","👎🏿",
+"👊","👊🏻","👊🏼","👊🏽","👊🏾","👊🏿",
+"✊","✊🏻","✊🏼","✊🏽","✊🏾","✊🏿",
+"🤛","🤛🏻","🤛🏼","🤛🏽","🤛🏾","🤛🏿",
+"🤜","🤜🏻","🤜🏼","🤜🏽","🤜🏾","🤜🏿",
+"🤞","🤞🏻","🤞🏼","🤞🏽","🤞🏾","🤞🏿",
+"✌️","✌🏻","✌🏼","✌🏽","✌🏾","✌🏿",
+"🤟","🤟🏻","🤟🏼","🤟🏽","🤟🏾","🤟🏿",
+"🤘","🤘🏻","🤘🏼","🤘🏽","🤘🏾","🤘🏿",
+"👌","👌🏻","👌🏼","👌🏽","👌🏾","👌🏿",
+"🤌","🤌🏻","🤌🏼","🤌🏽","🤌🏾","🤌🏿",
+"🤏","🤏🏻","🤏🏼","🤏🏽","🤏🏾","🤏🏿",
+"👈","👈🏻","👈🏼","👈🏽","👈🏾","👈🏿",
+"👉","👉🏻","👉🏼","👉🏽","👉🏾","👉🏿",
+"👆","👆🏻","👆🏼","👆🏽","👆🏾","👆🏿",
+"👇","👇🏻","👇🏼","👇🏽","👇🏾","👇🏿",
+"☝️","☝🏻","☝🏼","☝🏽","☝🏾","☝🏿",
+"✋","✋🏻","✋🏼","✋🏽","✋🏾","✋🏿",
+"🤚","🤚🏻","🤚🏼","🤚🏽","🤚🏾","🤚🏿",
+"🖐","🖐🏻","🖐🏼","🖐🏽","🖐🏾","🖐🏿",
+"🖖","🖖🏻","🖖🏼","🖖🏽","🖖🏾","🖖🏿",
+"👋","👋🏻","👋🏼","👋🏽","👋🏾","👋🏿",
+"🤙","🤙🏻","🤙🏼","🤙🏽","🤙🏾","🤙🏿",
+"💪","💪🏻","💪🏼","💪🏽","💪🏾","💪🏿",
+"🦾",
+"🖕","🖕🏻","🖕🏼","🖕🏽","🖕🏾","🖕🏿",
+"✍️","✍🏻","✍🏼","✍🏽","✍🏾","✍🏿",
+"🙏","🙏🏻","🙏🏼","🙏🏽","🙏🏾","🙏🏿",
+"🦶","🦶🏻","🦶🏼","🦶🏽","🦶🏾","🦶🏿",
+"🦵","🦵🏻","🦵🏼","🦵🏽","🦵🏾","🦵🏿",
+"🦿","💄","💋","👄","🦷","👅",
+"👂","👂🏻","👂🏼","👂🏽","👂🏾","👂🏿",
+"🦻","🦻🏻","🦻🏼","🦻🏽","🦻🏾","🦻🏿",
+"👃","👃🏻","👃🏼","👃🏽","👃🏾","👃🏿",
+"👣","👁","👀","🫀","🫁","🧠","🗣","👤","👥","🫂",
+"👶","👶🏻","👶🏼","👶🏽","👶🏾","👶🏿",
+"👧","👧🏻","👧🏼","👧🏽","👧🏾","👧🏿",
+"🧒","🧒🏻","🧒🏼","🧒🏽","🧒🏾","🧒🏿",
+"👦","👦🏻","👦🏼","👦🏽","👦🏾","👦🏿",
+"👩","👩🏻","👩🏼","👩🏽","👩🏾","👩🏿",
+"🧑","🧑🏻","🧑🏼","🧑🏽","🧑🏾","🧑🏿",
+"👨","👨🏻","👨🏼","👨🏽","👨🏾","👨🏿",
+"👩‍🦱","👩🏻‍🦱","👩🏼‍🦱","👩🏽‍🦱","👩🏾‍🦱","👩🏿‍🦱",
+"🧑‍🦱","🧑🏻‍🦱","🧑🏼‍🦱","🧑🏽‍🦱","🧑🏾‍🦱","🧑🏿‍🦱",
+"👨‍🦱","👨🏻‍🦱","👨🏼‍🦱","👨🏽‍🦱","👨🏾‍🦱","👨🏿‍🦱",
+"👩‍🦰","👩🏻‍🦰","👩🏼‍🦰","👩🏽‍🦰","👩🏾‍🦰","👩🏿‍🦰",
+"🧑‍🦰","🧑🏻‍🦰","🧑🏼‍🦰","🧑🏽‍🦰","🧑🏾‍🦰","🧑🏿‍🦰",
+"👨‍🦰","👨🏻‍🦰","👨🏼‍🦰","👨🏽‍🦰","👨🏾‍🦰","👨🏿‍🦰",
+"👱‍♀️","👱🏻‍♀️","👱🏼‍♀️","👱🏽‍♀️","👱🏾‍♀️","👱🏿‍♀️",
+"👱","👱🏻","👱🏼","👱🏽","👱🏾","👱🏿",
+"👱‍♂️","👱🏻‍♂️","👱🏼‍♂️","👱🏽‍♂️","👱🏾‍♂️","👱🏿‍♂️",
+"👩‍🦳","👩🏻‍🦳","👩🏼‍🦳","👩🏽‍🦳","👩🏾‍🦳","👩🏿‍🦳",
+"🧑‍🦳","🧑🏻‍🦳","🧑🏼‍🦳","🧑🏽‍🦳","🧑🏾‍🦳","🧑🏿‍🦳",
+"👨‍🦳","👨🏻‍🦳","👨🏼‍🦳","👨🏽‍🦳","👨🏾‍🦳","👨🏿‍🦳",
+"👩‍🦲","👩🏻‍🦲","👩🏼‍🦲","👩🏽‍🦲","👩🏾‍🦲","👩🏿‍🦲",
+"🧑‍🦲","🧑🏻‍🦲","🧑🏼‍🦲","🧑🏽‍🦲","🧑🏾‍🦲","🧑🏿‍🦲",
+"👨‍🦲","👨🏻‍🦲","👨🏼‍🦲","👨🏽‍🦲","👨🏾‍🦲","👨🏿‍🦲",
+"🧔‍♀️","🧔🏻‍♀️","🧔🏼‍♀️","🧔🏽‍♀️","🧔🏾‍♀️","🧔🏿‍♀️",
+"🧔","🧔🏻","🧔🏼","🧔🏽","🧔🏾","🧔🏿",
+"🧔‍♂️","🧔🏻‍♂️","🧔🏼‍♂️","🧔🏽‍♂️","🧔🏾‍♂️","🧔🏿‍♂️",
+"👵","👵🏻","👵🏼","👵🏽","👵🏾","👵🏿",
+"🧓","🧓🏻","🧓🏼","🧓🏽","🧓🏾","🧓🏿",
+"👴","👴🏻","👴🏼","👴🏽","👴🏾","👴🏿",
+"👲","👲🏻","👲🏼","👲🏽","👲🏾","👲🏿",
+"👳‍♀️","👳🏻‍♀️","👳🏼‍♀️","👳🏽‍♀️","👳🏾‍♀️","👳🏿‍♀️",
+"👳","👳🏻","👳🏼","👳🏽","👳🏾","👳🏿",
+"👳‍♂️","👳🏻‍♂️","👳🏼‍♂️","👳🏽‍♂️","👳🏾‍♂️","👳🏿‍♂️",
+"🧕","🧕🏻","🧕🏼","🧕🏽","🧕🏾","🧕🏿",
+"👮‍♀️","👮🏻‍♀️","👮🏼‍♀️","👮🏽‍♀️","👮🏾‍♀️","👮🏿‍♀️",
+"👮","👮🏻","👮🏼","👮🏽","👮🏾","👮🏿",
+"👮‍♂️","👮🏻‍♂️","👮🏼‍♂️","👮🏽‍♂️","👮🏾‍♂️","👮🏿‍♂️",
+"👷‍♀️","👷🏻‍♀️","👷🏼‍♀️","👷🏽‍♀️","👷🏾‍♀️","👷🏿‍♀️",
+"👷","👷🏻","👷🏼","👷🏽","👷🏾","👷🏿",
+"👷‍♂️","👷🏻‍♂️","👷🏼‍♂️","👷🏽‍♂️","👷🏾‍♂️","👷🏿‍♂️",
+"💂‍♀️","💂🏻‍♀️","💂🏼‍♀️","💂🏽‍♀️","💂🏾‍♀️","💂🏿‍♀️",
+"💂","💂🏻","💂🏼","💂🏽","💂🏾","💂🏿",
+"💂‍♂️","💂🏻‍♂️","💂🏼‍♂️","💂🏽‍♂️","💂🏾‍♂️","💂🏿‍♂️",
+"🕵️‍♀️","🕵🏻‍♀️","🕵🏼‍♀️","🕵🏽‍♀️","🕵🏾‍♀️","🕵🏿‍♀️",
+"🕵️","🕵🏻","🕵🏼","🕵🏽","🕵🏾","🕵🏿",
+"🕵️‍♂️","🕵🏻‍♂️","🕵🏼‍♂️","🕵🏽‍♂️","🕵🏾‍♂️","🕵🏿‍♂️",
+"👩‍⚕️","👩🏻‍⚕️","👩🏼‍⚕️","👩🏽‍⚕️","👩🏾‍⚕️","👩🏿‍⚕️",
+"🧑‍⚕️","🧑🏻‍⚕️","🧑🏼‍⚕️","🧑🏽‍⚕️","🧑🏾‍⚕️","🧑🏿‍⚕️",
+"👨‍⚕️","👨🏻‍⚕️","👨🏼‍⚕️","👨🏽‍⚕️","👨🏾‍⚕️","👨🏿‍⚕️",
+"👩‍🌾","👩🏻‍🌾","👩🏼‍🌾","👩🏽‍🌾","👩🏾‍🌾","👩🏿‍🌾",
+"🧑‍🌾","🧑🏻‍🌾","🧑🏼‍🌾","🧑🏽‍🌾","🧑🏾‍🌾","🧑🏿‍🌾",
+"👨‍🌾","👨🏻‍🌾","👨🏼‍🌾","👨🏽‍🌾","👨🏾‍🌾","👨🏿‍🌾",
+"👩‍🍳","👩🏻‍🍳","👩🏼‍🍳","👩🏽‍🍳","👩🏾‍🍳","👩🏿‍🍳",
+"🧑‍🍳","🧑🏻‍🍳","🧑🏼‍🍳","🧑🏽‍🍳","🧑🏾‍🍳","🧑🏿‍🍳",
+"👨‍🍳","👨🏻‍🍳","👨🏼‍🍳","👨🏽‍🍳","👨🏾‍🍳","👨🏿‍🍳",
+"👩‍🎓","👩🏻‍🎓","👩🏼‍🎓","👩🏽‍🎓","👩🏾‍🎓","👩🏿‍🎓",
+"🧑‍🎓","🧑🏻‍🎓","🧑🏼‍🎓","🧑🏽‍🎓","🧑🏾‍🎓","🧑🏿‍🎓",
+"👨‍🎓","👨🏻‍🎓","👨🏼‍🎓","👨🏽‍🎓","👨🏾‍🎓","👨🏿‍🎓",
+"👩‍🎤","👩🏻‍🎤","👩🏼‍🎤","👩🏽‍🎤","👩🏾‍🎤","👩🏿‍🎤",
+"🧑‍🎤","🧑🏻‍🎤","🧑🏼‍🎤","🧑🏽‍🎤","🧑🏾‍🎤","🧑🏿‍🎤",
+"👨‍🎤","👨🏻‍🎤","👨🏼‍🎤","👨🏽‍🎤","👨🏾‍🎤","👨🏿‍🎤",
+"👩‍🏫","👩🏻‍🏫","👩🏼‍🏫","👩🏽‍🏫","👩🏾‍🏫","👩🏿‍🏫",
+"🧑‍🏫","🧑🏻‍🏫","🧑🏼‍🏫","🧑🏽‍🏫","🧑🏾‍🏫","🧑🏿‍🏫",
+"👨‍🏫","👨🏻‍🏫","👨🏼‍🏫","👨🏽‍🏫","👨🏾‍🏫","👨🏿‍🏫",
+"👩‍🏭","👩🏻‍🏭","👩🏼‍🏭","👩🏽‍🏭","👩🏾‍🏭","👩🏿‍🏭",
+"🧑‍🏭","🧑🏻‍🏭","🧑🏼‍🏭","🧑🏽‍🏭","🧑🏾‍🏭","🧑🏿‍🏭",
+"👨‍🏭","👨🏻‍🏭","👨🏼‍🏭","👨🏽‍🏭","👨🏾‍🏭","👨🏿‍🏭",
+"👩‍💻","👩🏻‍💻","👩🏼‍💻","👩🏽‍💻","👩🏾‍💻","👩🏿‍💻",
+"🧑‍💻","🧑🏻‍💻","🧑🏼‍💻","🧑🏽‍💻","🧑🏾‍💻","🧑🏿‍💻",
+"👨‍💻","👨🏻‍💻","👨🏼‍💻","👨🏽‍💻","👨🏾‍💻","👨🏿‍💻",
+"👩‍💼","👩🏻‍💼","👩🏼‍💼","👩🏽‍💼","👩🏾‍💼","👩🏿‍💼",
+"🧑‍💼","🧑🏻‍💼","🧑🏼‍💼","🧑🏽‍💼","🧑🏾‍💼","🧑🏿‍💼",
+"👨‍💼","👨🏻‍💼","👨🏼‍💼","👨🏽‍💼","👨🏾‍💼","👨🏿‍💼",
+"👩‍🔧","👩🏻‍🔧","👩🏼‍🔧","👩🏽‍🔧","👩🏾‍🔧","👩🏿‍🔧",
+"🧑‍🔧","🧑🏻‍🔧","🧑🏼‍🔧","🧑🏽‍🔧","🧑🏾‍🔧","🧑🏿‍🔧",
+"👨‍🔧","👨🏻‍🔧","👨🏼‍🔧","👨🏽‍🔧","👨🏾‍🔧","👨🏿‍🔧",
+"👩‍🔬","👩🏻‍🔬","👩🏼‍🔬","👩🏽‍🔬","👩🏾‍🔬","👩🏿‍🔬",
+"🧑‍🔬","🧑🏻‍🔬","🧑🏼‍🔬","🧑🏽‍🔬","🧑🏾‍🔬","🧑🏿‍🔬",
+"👨‍🔬","👨🏻‍🔬","👨🏼‍🔬","👨🏽‍🔬","👨🏾‍🔬","👨🏿‍🔬",
+"👩‍🎨","👩🏻‍🎨","👩🏼‍🎨","👩🏽‍🎨","👩🏾‍🎨","👩🏿‍🎨",
+"🧑‍🎨","🧑🏻‍🎨","🧑🏼‍🎨","🧑🏽‍🎨","🧑🏾‍🎨","🧑🏿‍🎨",
+"👨‍🎨","👨🏻‍🎨","👨🏼‍🎨","👨🏽‍🎨","👨🏾‍🎨","👨🏿‍🎨",
+"👩‍🚒","👩🏻‍🚒","👩🏼‍🚒","👩🏽‍🚒","👩🏾‍🚒","👩🏿‍🚒",
+"🧑‍🚒","🧑🏻‍🚒","🧑🏼‍🚒","🧑🏽‍🚒","🧑🏾‍🚒","🧑🏿‍🚒",
+"👨‍🚒","👨🏻‍🚒","👨🏼‍🚒","👨🏽‍🚒","👨🏾‍🚒","👨🏿‍🚒",
+"👩‍✈️","👩🏻‍✈️","👩🏼‍✈️","👩🏽‍✈️","👩🏾‍✈️","👩🏿‍✈️",
+"🧑‍✈️","🧑🏻‍✈️","🧑🏼‍✈️","🧑🏽‍✈️","🧑🏾‍✈️","🧑🏿‍✈️",
+"👨‍✈️","👨🏻‍✈️","👨🏼‍✈️","👨🏽‍✈️","👨🏾‍✈️","👨🏿‍✈️",
+"👩‍🚀","👩🏻‍🚀","👩🏼‍🚀","👩🏽‍🚀","👩🏾‍🚀","👩🏿‍🚀",
+"🧑‍🚀","🧑🏻‍🚀","🧑🏼‍🚀","🧑🏽‍🚀","🧑🏾‍🚀","🧑🏿‍🚀",
+"👨‍🚀","👨🏻‍🚀","👨🏼‍🚀","👨🏽‍🚀","👨🏾‍🚀","👨🏿‍🚀",
+"👩‍⚖️","👩🏻‍⚖️","👩🏼‍⚖️","👩🏽‍⚖️","👩🏾‍⚖️","👩🏿‍⚖️",
+"🧑‍⚖️","🧑🏻‍⚖️","🧑🏼‍⚖️","🧑🏽‍⚖️","🧑🏾‍⚖️","🧑🏿‍⚖️",
+"👨‍⚖️","👨🏻‍⚖️","👨🏼‍⚖️","👨🏽‍⚖️","👨🏾‍⚖️","👨🏿‍⚖️",
+"👰‍♀️","👰🏻‍♀️","👰🏼‍♀️","👰🏽‍♀️","👰🏾‍♀️","👰🏿‍♀️",
+"👰","👰🏻","👰🏼","👰🏽","👰🏾","👰🏿",
+"👰‍♂️","👰🏻‍♂️","👰🏼‍♂️","👰🏽‍♂️","👰🏾‍♂️","👰🏿‍♂️",
+"🤵‍♀️","🤵🏻‍♀️","🤵🏼‍♀️","🤵🏽‍♀️","🤵🏾‍♀️","🤵🏿‍♀️",
+"🤵","🤵🏻","🤵🏼","🤵🏽","🤵🏾","🤵🏿",
+"🤵‍♂️","🤵🏻‍♂️","🤵🏼‍♂️","🤵🏽‍♂️","🤵🏾‍♂️","🤵🏿‍♂️",
+"👸","👸🏻","👸🏼","👸🏽","👸🏾","👸🏿",
+"🤴","🤴🏻","🤴🏼","🤴🏽","🤴🏾","🤴🏿",
+"🥷","🥷🏻","🥷🏼","🥷🏽","🥷🏾","🥷🏿",
+"🦸‍♀️","🦸🏻‍♀️","🦸🏼‍♀️","🦸🏽‍♀️","🦸🏾‍♀️","🦸🏿‍♀️",
+"🦸","🦸🏻","🦸🏼","🦸🏽","🦸🏾","🦸🏿",
+"🦸‍♂️","🦸🏻‍♂️","🦸🏼‍♂️","🦸🏽‍♂️","🦸🏾‍♂️","🦸🏿‍♂️",
+"🦹‍♀️","🦹🏻‍♀️","🦹🏼‍♀️","🦹🏽‍♀️","🦹🏾‍♀️","🦹🏿‍♀️",
+"🦹","🦹🏻","🦹🏼","🦹🏽","🦹🏾","🦹🏿",
+"🦹‍♂️","🦹🏻‍♂️","🦹🏼‍♂️","🦹🏽‍♂️","🦹🏾‍♂️","🦹🏿‍♂️",
+"🤶","🤶🏻","🤶🏼","🤶🏽","🤶🏾","🤶🏿",
+"🧑‍🎄","🧑🏻‍🎄","🧑🏼‍🎄","🧑🏽‍🎄","🧑🏾‍🎄","🧑🏿‍🎄",
+"🎅","🎅🏻","🎅🏼","🎅🏽","🎅🏾","🎅🏿",
+"🧙‍♀️","🧙🏻‍♀️","🧙🏼‍♀️","🧙🏽‍♀️","🧙🏾‍♀️","🧙🏿‍♀️",
+"🧙","🧙🏻","🧙🏼","🧙🏽","🧙🏾","🧙🏿",
+"🧙‍♂️","🧙🏻‍♂️","🧙🏼‍♂️","🧙🏽‍♂️","🧙🏾‍♂️","🧙🏿‍♂️",
+"🧝‍♀️","🧝🏻‍♀️","🧝🏼‍♀️","🧝🏽‍♀️","🧝🏾‍♀️","🧝🏿‍♀️",
+"🧝","🧝🏻","🧝🏼","🧝🏽","🧝🏾","🧝🏿",
+"🧝‍♂️","🧝🏻‍♂️","🧝🏼‍♂️","🧝🏽‍♂️","🧝🏾‍♂️","🧝🏿‍♂️",
+"🧛‍♀️","🧛🏻‍♀️","🧛🏼‍♀️","🧛🏽‍♀️","🧛🏾‍♀️","🧛🏿‍♀️",
+"🧛","🧛🏻","🧛🏼","🧛🏽","🧛🏾","🧛🏿",
+"🧛‍♂️","🧛🏻‍♂️","🧛🏼‍♂️","🧛🏽‍♂️","🧛🏾‍♂️","🧛🏿‍♂️",
+"🧟‍♀️","🧟","🧟‍♂️","🧞‍♀️","🧞","🧞‍♂️",
+"🧜‍♀️","🧜🏻‍♀️","🧜🏼‍♀️","🧜🏽‍♀️","🧜🏾‍♀️","🧜🏿‍♀️",
+"🧜","🧜🏻","🧜🏼","🧜🏽","🧜🏾","🧜🏿",
+"🧜‍♂️","🧜🏻‍♂️","🧜🏼‍♂️","🧜🏽‍♂️","🧜🏾‍♂️","🧜🏿‍♂️",
+"🧚‍♀️","🧚🏻‍♀️","🧚🏼‍♀️","🧚🏽‍♀️","🧚🏾‍♀️","🧚🏿‍♀️",
+"🧚","🧚🏻","🧚🏼","🧚🏽","🧚🏾","🧚🏿",
+"🧚‍♂️","🧚🏻‍♂️","🧚🏼‍♂️","🧚🏽‍♂️","🧚🏾‍♂️","🧚🏿‍♂️",
+"👼","👼🏻","👼🏼","👼🏽","👼🏾","👼🏿",
+"🤰","🤰🏻","🤰🏼","🤰🏽","🤰🏾","🤰🏿",
+"🤱","🤱🏻","🤱🏼","🤱🏽","🤱🏾","🤱🏿",
+"👩‍🍼","👩🏻‍🍼","👩🏼‍🍼","👩🏽‍🍼","👩🏾‍🍼","👩🏿‍🍼",
+"🧑‍🍼","🧑🏻‍🍼","🧑🏼‍🍼","🧑🏽‍🍼","🧑🏾‍🍼","🧑🏿‍🍼",
+"👨‍🍼","👨🏻‍🍼","👨🏼‍🍼","👨🏽‍🍼","👨🏾‍🍼","👨🏿‍🍼",
+"🙇‍♀️","🙇🏻‍♀️","🙇🏼‍♀️","🙇🏽‍♀️","🙇🏾‍♀️","🙇🏿‍♀️",
+"🙇","🙇🏻","🙇🏼","🙇🏽","🙇🏾","🙇🏿",
+"🙇‍♂️","🙇🏻‍♂️","🙇🏼‍♂️","🙇🏽‍♂️","🙇🏾‍♂️","🙇🏿‍♂️",
+"💁‍♀️","💁🏻‍♀️","💁🏼‍♀️","💁🏽‍♀️","💁🏾‍♀️","💁🏿‍♀️",
+"💁","💁🏻","💁🏼","💁🏽","💁🏾","💁🏿",
+"💁‍♂️","💁🏻‍♂️","💁🏼‍♂️","💁🏽‍♂️","💁🏾‍♂️","💁🏿‍♂️",
+"🙅‍♀️","🙅🏻‍♀️","🙅🏼‍♀️","🙅🏽‍♀️","🙅🏾‍♀️","🙅🏿‍♀️",
+"🙅","🙅🏻","🙅🏼","🙅🏽","🙅🏾","🙅🏿",
+"🙅‍♂️","🙅🏻‍♂️","🙅🏼‍♂️","🙅🏽‍♂️","🙅🏾‍♂️","🙅🏿‍♂️",
+"🙆‍♀️","🙆🏻‍♀️","🙆🏼‍♀️","🙆🏽‍♀️","🙆🏾‍♀️","🙆🏿‍♀️",
+"🙆","🙆🏻","🙆🏼","🙆🏽","🙆🏾","🙆🏿",
+"🙆‍♂️","🙆🏻‍♂️","🙆🏼‍♂️","🙆🏽‍♂️","🙆🏾‍♂️","🙆🏿‍♂️",
+"🙋‍♀️","🙋🏻‍♀️","🙋🏼‍♀️","🙋🏽‍♀️","🙋🏾‍♀️","🙋🏿‍♀️",
+"🙋","🙋🏻","🙋🏼","🙋🏽","🙋🏾","🙋🏿",
+"🙋‍♂️","🙋🏻‍♂️","🙋🏼‍♂️","🙋🏽‍♂️","🙋🏾‍♂️","🙋🏿‍♂️",
+"🧏‍♀️","🧏🏻‍♀️","🧏🏼‍♀️","🧏🏽‍♀️","🧏🏾‍♀️","🧏🏿‍♀️",
+"🧏","🧏🏻","🧏🏼","🧏🏽","🧏🏾","🧏🏿",
+"🧏‍♂️","🧏🏻‍♂️","🧏🏼‍♂️","🧏🏽‍♂️","🧏🏾‍♂️","🧏🏿‍♂️",
+"🤦‍♀️","🤦🏻‍♀️","🤦🏼‍♀️","🤦🏽‍♀️","🤦🏾‍♀️","🤦🏿‍♀️",
+"🤦","🤦🏻","🤦🏼","🤦🏽","🤦🏾","🤦🏿",
+"🤦‍♂️","🤦🏻‍♂️","🤦🏼‍♂️","🤦🏽‍♂️","🤦🏾‍♂️","🤦🏿‍♂️",
+"🤷‍♀️","🤷🏻‍♀️","🤷🏼‍♀️","🤷🏽‍♀️","🤷🏾‍♀️","🤷🏿‍♀️",
+"🤷","🤷🏻","🤷🏼","🤷🏽","🤷🏾","🤷🏿",
+"🤷‍♂️","🤷🏻‍♂️","🤷🏼‍♂️","🤷🏽‍♂️","🤷🏾‍♂️","🤷🏿‍♂️",
+"🙎‍♀️","🙎🏻‍♀️","🙎🏼‍♀️","🙎🏽‍♀️","🙎🏾‍♀️","🙎🏿‍♀️",
+"🙎","🙎🏻","🙎🏼","🙎🏽","🙎🏾","🙎🏿",
+"🙎‍♂️","🙎🏻‍♂️","🙎🏼‍♂️","🙎🏽‍♂️","🙎🏾‍♂️","🙎🏿‍♂️",
+"🙍‍♀️","🙍🏻‍♀️","🙍🏼‍♀️","🙍🏽‍♀️","🙍🏾‍♀️","🙍🏿‍♀️",
+"🙍","🙍🏻","🙍🏼","🙍🏽","🙍🏾","🙍🏿",
+"🙍‍♂️","🙍🏻‍♂️","🙍🏼‍♂️","🙍🏽‍♂️","🙍🏾‍♂️","🙍🏿‍♂️",
+"💇‍♀️","💇🏻‍♀️","💇🏼‍♀️","💇🏽‍♀️","💇🏾‍♀️","💇🏿‍♀️",
+"💇","💇🏻","💇🏼","💇🏽","💇🏾","💇🏿",
+"💇‍♂️","💇🏻‍♂️","💇🏼‍♂️","💇🏽‍♂️","💇🏾‍♂️","💇🏿‍♂️",
+"💆‍♀️","💆🏻‍♀️","💆🏼‍♀️","💆🏽‍♀️","💆🏾‍♀️","💆🏿‍♀️",
+"💆","💆🏻","💆🏼","💆🏽","💆🏾","💆🏿",
+"💆‍♂️","💆🏻‍♂️","💆🏼‍♂️","💆🏽‍♂️","💆🏾‍♂️","💆🏿‍♂️",
+"🧖‍♀️","🧖🏻‍♀️","🧖🏼‍♀️","🧖🏽‍♀️","🧖🏾‍♀️","🧖🏿‍♀️",
+"🧖","🧖🏻","🧖🏼","🧖🏽","🧖🏾","🧖🏿",
+"🧖‍♂️","🧖🏻‍♂️","🧖🏼‍♂️","🧖🏽‍♂️","🧖🏾‍♂️","🧖🏿‍♂️",
+"💅","💅🏻","💅🏼","💅🏽","💅🏾","💅🏿",
+"🤳","🤳🏻","🤳🏼","🤳🏽","🤳🏾","🤳🏿",
+"💃","💃🏻","💃🏼","💃🏽","💃🏾","💃🏿",
+"🕺","🕺🏻","🕺🏼","🕺🏽","🕺🏾","🕺🏿",
+"👯‍♀️","👯","👯‍♂️",
+"🕴","🕴🏻","🕴🏼","🕴🏽","🕴🏾","🕴🏿",
+"👩‍🦽","👩🏻‍🦽","👩🏼‍🦽","👩🏽‍🦽","👩🏾‍🦽","👩🏿‍🦽",
+"🧑‍🦽","🧑🏻‍🦽","🧑🏼‍🦽","🧑🏽‍🦽","🧑🏾‍🦽","🧑🏿‍🦽",
+"👨‍🦽","👨🏻‍🦽","👨🏼‍🦽","👨🏽‍🦽","👨🏾‍🦽","👨🏿‍🦽",
+"👩‍🦼","👩🏻‍🦼","👩🏼‍🦼","👩🏽‍🦼","👩🏾‍🦼","👩🏿‍🦼",
+"🧑‍🦼","🧑🏻‍🦼","🧑🏼‍🦼","🧑🏽‍🦼","🧑🏾‍🦼","🧑🏿‍🦼",
+"👨‍🦼","👨🏻‍🦼","👨🏼‍🦼","👨🏽‍🦼","👨🏾‍🦼","👨🏿‍🦼",
+"🚶‍♀️","🚶🏻‍♀️","🚶🏼‍♀️","🚶🏽‍♀️","🚶🏾‍♀️","🚶🏿‍♀️",
+"🚶","🚶🏻","🚶🏼","🚶🏽","🚶🏾","🚶🏿",
+"🚶‍♂️","🚶🏻‍♂️","🚶🏼‍♂️","🚶🏽‍♂️","🚶🏾‍♂️","🚶🏿‍♂️",
+"👩‍🦯","👩🏻‍🦯","👩🏼‍🦯","👩🏽‍🦯","👩🏾‍🦯","👩🏿‍🦯",
+"🧑‍🦯","🧑🏻‍🦯","🧑🏼‍🦯","🧑🏽‍🦯","🧑🏾‍🦯","🧑🏿‍🦯",
+"👨‍🦯","👨🏻‍🦯","👨🏼‍🦯","👨🏽‍🦯","👨🏾‍🦯","👨🏿‍🦯",
+"🧎‍♀️","🧎🏻‍♀️","🧎🏼‍♀️","🧎🏽‍♀️","🧎🏾‍♀️","🧎🏿‍♀️",
+"🧎","🧎🏻","🧎🏼","🧎🏽","🧎🏾","🧎🏿",
+"🧎‍♂️","🧎🏻‍♂️","🧎🏼‍♂️","🧎🏽‍♂️","🧎🏾‍♂️","🧎🏿‍♂️",
+"🏃‍♀️","🏃🏻‍♀️","🏃🏼‍♀️","🏃🏽‍♀️","🏃🏾‍♀️","🏃🏿‍♀️",
+"🏃","🏃🏻","🏃🏼","🏃🏽","🏃🏾","🏃🏿",
+"🏃‍♂️","🏃🏻‍♂️","🏃🏼‍♂️","🏃🏽‍♂️","🏃🏾‍♂️","🏃🏿‍♂️",
+"🧍‍♀️","🧍🏻‍♀️","🧍🏼‍♀️","🧍🏽‍♀️","🧍🏾‍♀️","🧍🏿‍♀️",
+"🧍","🧍🏻","🧍🏼","🧍🏽","🧍🏾","🧍🏿",
+"🧍‍♂️","🧍🏻‍♂️","🧍🏼‍♂️","🧍🏽‍♂️","🧍🏾‍♂️","🧍🏿‍♂️",
+"👫","👫🏻","👩🏻‍🤝‍👨🏼","👩🏻‍🤝‍👨🏽","👩🏻‍🤝‍👨🏾","👩🏻‍🤝‍👨🏿","👩🏼‍🤝‍👨🏻","👫🏼","👩🏼‍🤝‍👨🏽","👩🏼‍🤝‍👨🏾","👩🏼‍🤝‍👨🏿","👩🏽‍🤝‍👨🏻","👩🏽‍🤝‍👨🏼","👫🏽","👩🏽‍🤝‍👨🏾","👩🏽‍🤝‍👨🏿","👩🏾‍🤝‍👨🏻","👩🏾‍🤝‍👨🏼","👩🏾‍🤝‍👨🏽","👫🏾","👩🏾‍🤝‍👨🏿","👩🏿‍🤝‍👨🏻","👩🏿‍🤝‍👨🏼","👩🏿‍🤝‍👨🏽","👩🏿‍🤝‍👨🏾","👫🏿",
+"👭","👭🏻","👩🏻‍🤝‍👩🏼","👩🏻‍🤝‍👩🏽","👩🏻‍🤝‍👩🏾","👩🏻‍🤝‍👩🏿","👩🏼‍🤝‍👩🏻","👭🏼","👩🏼‍🤝‍👩🏽","👩🏼‍🤝‍👩🏾","👩🏼‍🤝‍👩🏿","👩🏽‍🤝‍👩🏻","👩🏽‍🤝‍👩🏼","👭🏽","👩🏽‍🤝‍👩🏾","👩🏽‍🤝‍👩🏿","👩🏾‍🤝‍👩🏻","👩🏾‍🤝‍👩🏼","👩🏾‍🤝‍👩🏽","👭🏾","👩🏾‍🤝‍👩🏿","👩🏿‍🤝‍👩🏻","👩🏿‍🤝‍👩🏼","👩🏿‍🤝‍👩🏽","👩🏿‍🤝‍👩🏾","👭🏿",
+"👬","👬🏻","👨🏻‍🤝‍👨🏼","👨🏻‍🤝‍👨🏽","👨🏻‍🤝‍👨🏾","👨🏻‍🤝‍👨🏿","👨🏼‍🤝‍👨🏻","👬🏼","👨🏼‍🤝‍👨🏽","👨🏼‍🤝‍👨🏾","👨🏼‍🤝‍👨🏿","👨🏽‍🤝‍👨🏻","👨🏽‍🤝‍👨🏼","👬🏽","👨🏽‍🤝‍👨🏾","👨🏽‍🤝‍👨🏿","👨🏾‍🤝‍👨🏻","👨🏾‍🤝‍👨🏼","👨🏾‍🤝‍👨🏽","👬🏾","👨🏾‍🤝‍👨🏿","👨🏿‍🤝‍👨🏻","👨🏿‍🤝‍👨🏼","👨🏿‍🤝‍👨🏽","👨🏿‍🤝‍👨🏾","👬🏿",
+"👩‍❤️‍👨","👩🏻‍❤️‍👨🏻","👩🏻‍❤️‍👨🏼","👩🏻‍❤️‍👨🏽","👩🏻‍❤️‍👨🏾","👩🏻‍❤️‍👨🏿","👩🏼‍❤️‍👨🏻","👩🏼‍❤️‍👨🏼","👩🏼‍❤️‍👨🏽","👩🏼‍❤️‍👨🏾","👩🏼‍❤️‍👨🏿","👩🏽‍❤️‍👨🏻","👩🏽‍❤️‍👨🏼","👩🏽‍❤️‍👨🏽","👩🏽‍❤️‍👨🏾","👩🏽‍❤️‍👨🏿","👩🏾‍❤️‍👨🏻","👩🏾‍❤️‍👨🏼","👩🏾‍❤️‍👨🏽","👩🏾‍❤️‍👨🏾","👩🏾‍❤️‍👨🏿","👩🏿‍❤️‍👨🏻","👩🏿‍❤️‍👨🏼","👩🏿‍❤️‍👨🏽","👩🏿‍❤️‍👨🏾","👩🏿‍❤️‍👨🏿",
+"👩‍❤️‍👩","👩🏻‍❤️‍👩🏻","👩🏻‍❤️‍👩🏼","👩🏻‍❤️‍👩🏽","👩🏻‍❤️‍👩🏾","👩🏻‍❤️‍👩🏿","👩🏼‍❤️‍👩🏻","👩🏼‍❤️‍👩🏼","👩🏼‍❤️‍👩🏽","👩🏼‍❤️‍👩🏾","👩🏼‍❤️‍👩🏿","👩🏽‍❤️‍👩🏻","👩🏽‍❤️‍👩🏼","👩🏽‍❤️‍👩🏽","👩🏽‍❤️‍👩🏾","👩🏽‍❤️‍👩🏿","👩🏾‍❤️‍👩🏻","👩🏾‍❤️‍👩🏼","👩🏾‍❤️‍👩🏽","👩🏾‍❤️‍👩🏾","👩🏾‍❤️‍👩🏿","👩🏿‍❤️‍👩🏻","👩🏿‍❤️‍👩🏼","👩🏿‍❤️‍👩🏽","👩🏿‍❤️‍👩🏾","👩🏿‍❤️‍👩🏿",
+"💑","🧑🏻‍❤️‍🧑🏻","🧑🏻‍❤️‍🧑🏼","🧑🏻‍❤️‍🧑🏽","🧑🏻‍❤️‍🧑🏾","🧑🏻‍❤️‍🧑🏿","🧑🏼‍❤️‍🧑🏻","🧑🏼‍❤️‍🧑🏼","🧑🏼‍❤️‍🧑🏽","🧑🏼‍❤️‍🧑🏾","🧑🏼‍❤️‍🧑🏿","🧑🏽‍❤️‍🧑🏻","🧑🏽‍❤️‍🧑🏼","🧑🏽‍❤️‍🧑🏽","🧑🏽‍❤️‍🧑🏾","🧑🏽‍❤️‍🧑🏿","🧑🏾‍❤️‍🧑🏻","🧑🏾‍❤️‍🧑🏼","🧑🏾‍❤️‍🧑🏽","🧑🏾‍❤️‍🧑🏾","🧑🏾‍❤️‍🧑🏿","🧑🏿‍❤️‍🧑🏻","🧑🏿‍❤️‍🧑🏼","🧑🏿‍❤️‍🧑🏽","🧑🏿‍❤️‍🧑🏾","🧑🏿‍❤️‍🧑🏿",
+"👨‍❤️‍👨","👨🏻‍❤️‍👨🏻","👨🏻‍❤️‍👨🏼","👨🏻‍❤️‍👨🏽","👨🏻‍❤️‍👨🏾","👨🏻‍❤️‍👨🏿","👨🏼‍❤️‍👨🏻","👨🏼‍❤️‍👨🏼","👨🏼‍❤️‍👨🏽","👨🏼‍❤️‍👨🏾","👨🏼‍❤️‍👨🏿","👨🏽‍❤️‍👨🏻","👨🏽‍❤️‍👨🏼","👨🏽‍❤️‍👨🏽","👨🏽‍❤️‍👨🏾","👨🏽‍❤️‍👨🏿","👨🏾‍❤️‍👨🏻","👨🏾‍❤️‍👨🏼","👨🏾‍❤️‍👨🏽","👨🏾‍❤️‍👨🏾","👨🏾‍❤️‍👨🏿","👨🏿‍❤️‍👨🏻","👨🏿‍❤️‍👨🏼","👨🏿‍❤️‍👨🏽","👨🏿‍❤️‍👨🏾","👨🏿‍❤️‍👨🏿",
+"👩‍❤️‍💋‍👨","👩🏻‍❤️‍💋‍👨🏻","👩🏻‍❤️‍💋‍👨🏼","👩🏻‍❤️‍💋‍👨🏽","👩🏻‍❤️‍💋‍👨🏾","👩🏻‍❤️‍💋‍👨🏿","👩🏼‍❤️‍💋‍👨🏻","👩🏼‍❤️‍💋‍👨🏼","👩🏼‍❤️‍💋‍👨🏽","👩🏼‍❤️‍💋‍👨🏾","👩🏼‍❤️‍💋‍👨🏿","👩🏽‍❤️‍💋‍👨🏻","👩🏽‍❤️‍💋‍👨🏼","👩🏽‍❤️‍💋‍👨🏽","👩🏽‍❤️‍💋‍👨🏾","👩🏽‍❤️‍💋‍👨🏿","👩🏾‍❤️‍💋‍👨🏻","👩🏾‍❤️‍💋‍👨🏼","👩🏾‍❤️‍💋‍👨🏽","👩🏾‍❤️‍💋‍👨🏾","👩🏾‍❤️‍💋‍👨🏿","👩🏿‍❤️‍💋‍👨🏻","👩🏿‍❤️‍💋‍👨🏼","👩🏿‍❤️‍💋‍👨🏽","👩🏿‍❤️‍💋‍👨🏾","👩🏿‍❤️‍💋‍👨🏿",
+"👩‍❤️‍💋‍👩","👩🏻‍❤️‍💋‍👩🏻","👩🏻‍❤️‍💋‍👩🏼","👩🏻‍❤️‍💋‍👩🏽","👩🏻‍❤️‍💋‍👩🏾","👩🏻‍❤️‍💋‍👩🏿","👩🏼‍❤️‍💋‍👩🏻","👩🏼‍❤️‍💋‍👩🏼","👩🏼‍❤️‍💋‍👩🏽","👩🏼‍❤️‍💋‍👩🏾","👩🏼‍❤️‍💋‍👩🏿","👩🏽‍❤️‍💋‍👩🏻","👩🏽‍❤️‍💋‍👩🏼","👩🏽‍❤️‍💋‍👩🏽","👩🏽‍❤️‍💋‍👩🏾","👩🏽‍❤️‍💋‍👩🏿","👩🏾‍❤️‍💋‍👩🏻","👩🏾‍❤️‍💋‍👩🏼","👩🏾‍❤️‍💋‍👩🏽","👩🏾‍❤️‍💋‍👩🏾","👩🏾‍❤️‍💋‍👩🏿","👩🏿‍❤️‍💋‍👩🏻","👩🏿‍❤️‍💋‍👩🏼","👩🏿‍❤️‍💋‍👩🏽","👩🏿‍❤️‍💋‍👩🏾","👩🏿‍❤️‍💋‍👩🏿",
+"💏","🧑🏻‍❤️‍💋‍🧑🏻","🧑🏻‍❤️‍💋‍🧑🏼","🧑🏻‍❤️‍💋‍🧑🏽","🧑🏻‍❤️‍💋‍🧑🏾","🧑🏻‍❤️‍💋‍🧑🏿","🧑🏼‍❤️‍💋‍🧑🏻","🧑🏼‍❤️‍💋‍🧑🏼","🧑🏼‍❤️‍💋‍🧑🏽","🧑🏼‍❤️‍💋‍🧑🏾","🧑🏼‍❤️‍💋‍🧑🏿","🧑🏽‍❤️‍💋‍🧑🏻","🧑🏽‍❤️‍💋‍🧑🏼","🧑🏽‍❤️‍💋‍🧑🏽","🧑🏽‍❤️‍💋‍🧑🏾","🧑🏽‍❤️‍💋‍🧑🏿","🧑🏾‍❤️‍💋‍🧑🏻","🧑🏾‍❤️‍💋‍🧑🏼","🧑🏾‍❤️‍💋‍🧑🏽","🧑🏾‍❤️‍💋‍🧑🏾","🧑🏾‍❤️‍💋‍🧑🏿","🧑🏿‍❤️‍💋‍🧑🏻","🧑🏿‍❤️‍💋‍🧑🏼","🧑🏿‍❤️‍💋‍🧑🏽","🧑🏿‍❤️‍💋‍🧑🏾","🧑🏿‍❤️‍💋‍🧑🏿",
+"👨‍❤️‍💋‍👨","👨🏻‍❤️‍💋‍👨🏻","👨🏻‍❤️‍💋‍👨🏼","👨🏻‍❤️‍💋‍👨🏽","👨🏻‍❤️‍💋‍👨🏾","👨🏻‍❤️‍💋‍👨🏿","👨🏼‍❤️‍💋‍👨🏻","👨🏼‍❤️‍💋‍👨🏼","👨🏼‍❤️‍💋‍👨🏽","👨🏼‍❤️‍💋‍👨🏾","👨🏼‍❤️‍💋‍👨🏿","👨🏽‍❤️‍💋‍👨🏻","👨🏽‍❤️‍💋‍👨🏼","👨🏽‍❤️‍💋‍👨🏽","👨🏽‍❤️‍💋‍👨🏾","👨🏽‍❤️‍💋‍👨🏿","👨🏾‍❤️‍💋‍👨🏻","👨🏾‍❤️‍💋‍👨🏼","👨🏾‍❤️‍💋‍👨🏽","👨🏾‍❤️‍💋‍👨🏾","👨🏾‍❤️‍💋‍👨🏿","👨🏿‍❤️‍💋‍👨🏻","👨🏿‍❤️‍💋‍👨🏼","👨🏿‍❤️‍💋‍👨🏽","👨🏿‍❤️‍💋‍👨🏾","👨🏿‍❤️‍💋‍👨🏿",
+"👨‍👩‍👦","👨‍👩‍👧","👨‍👩‍👧‍👦","👨‍👩‍👦‍👦","👨‍👩‍👧‍👧","👩‍👩‍👦","👩‍👩‍👧","👩‍👩‍👧‍👦","👩‍👩‍👦‍👦","👩‍👩‍👧‍👧","👨‍👨‍👦","👨‍👨‍👧","👨‍👨‍👧‍👦","👨‍👨‍👦‍👦","👨‍👨‍👧‍👧","👩‍👦","👩‍👧","👩‍👧‍👦","👩‍👦‍👦","👩‍👧‍👧","👨‍👦","👨‍👧","👨‍👧‍👦","👨‍👦‍👦","👨‍👧‍👧","🪢","🧶","🧵","🪡","🧥","🥼","🦺","👚","👕","👖","🩲","🩳","👔","👗","👙","🩱","👘","🥻","🩴","🥿","👠","👡","👢","👞","👟","🥾","🧦","🧤","🧣","🎩","🧢","👒","🎓","⛑","🪖","👑","💍","👝","👛","👜","💼","🎒","🧳","👓","🕶","🥽","🌂"
+
+
+"🐶","🐱","🐭","🐹","🐰","🦊","🐻","🐼","🐻‍❄️","🐨","🐯","🦁","🐮","🐷","🐽","🐸","🐵","🙈","🙉","🙊","🐒","🐔","🐧","🐦","🐤","🐣","🐥","🦆","🦅","🦉","🦇","🐺","🐗","🐴","🦄","🐝","🪱","🐛","🦋","🐌","🐞","🐜","🪰","🪲","🪳","🦟","🦗","🕷","🕸","🦂","🐢","🐍","🦎","🦖","🦕","🐙","🦑","🦐","🦞","🦀","🐡","🐠","🐟","🐬","🐳","🐋","🦈","🦭","🐊","🐅","🐆","🦓","🦍","🦧","🦣","🐘","🦛","🦏","🐪","🐫","🦒","🦘","🦬","🐃","🐂","🐄","🐎","🐖","🐏","🐑","🦙","🐐","🦌","🐕","🐩","🦮","🐕‍🦺","🐈","🐈‍⬛","🪶","🐓","🦃","🦤","🦚","🦜","🦢","🦩","🕊","🐇","🦝","🦨","🦡","🦫","🦦","🦥","🐁","🐀","🐿","🦔","🐾","🐉","🐲","🌵","🎄","🌲","🌳","🌴","🪵","🌱","🌿","☘️","🍀","🎍","🪴","🎋","🍃","🍂","🍁","🍄","🐚","🪨","🌾","💐","🌷","🌹","🥀","🌺","🌸","🌼","🌻","🌞","🌝","🌛","🌜","🌚","🌕","🌖","🌗","🌘","🌑","🌒","🌓","🌔","🌙","🌎","🌍","🌏","🪐","💫","⭐️","🌟","✨","⚡️","☄️","💥","🔥","🌪","🌈","☀️","🌤","⛅️","🌥","☁️","🌦","🌧","⛈","🌩","🌨","❄️","☃️","⛄️","🌬","💨","💧","💦","☔️","☂️","🌊","🌫"
+
+
+"🍏","🍎","🍐","🍊","🍋","🍌","🍉","🍇","🍓","🫐","🍈","🍒","🍑","🥭","🍍","🥥","🥝","🍅","🍆","🥑","🥦","🥬","🥒","🌶","🫑","🌽","🥕","🫒","🧄","🧅","🥔","🍠","🥐","🥯","🍞","🥖","🥨","🧀","🥚","🍳","🧈","🥞","🧇","🥓","🥩","🍗","🍖","🦴","🌭","🍔","🍟","🍕","🫓","🥪","🥙","🧆","🌮","🌯","🫔","🥗","🥘","🫕","🥫","🍝","🍜","🍲","🍛","🍣","🍱","🥟","🦪","🍤","🍙","🍚","🍘","🍥","🥠","🥮","🍢","🍡","🍧","🍨","🍦","🥧","🧁","🍰","🎂","🍮","🍭","🍬","🍫","🍿","🍩","🍪","🌰","🥜","🍯","🥛","🍼","🫖","☕️","🍵","🧃","🥤","🧋","🍶","🍺","🍻","🥂","🍷","🥃","🍸","🍹","🧉","🍾","🧊","🥄","🍴","🍽","🥣","🥡","🥢","🧂"
+
+
+"⚽️","🏀","🏈","⚾️","🥎","🎾","🏐","🏉","🥏","🎱","🪀","🏓","🏸","🏒","🏑","🥍","🏏","🪃","🥅","⛳️","🪁","🏹","🎣","🤿","🥊","🥋","🎽","🛹","🛼","🛷","⛸","🥌","🎿","⛷","🏂","🪂",
+"🏋️‍♀️","🏋🏻‍♀️","🏋🏼‍♀️","🏋🏽‍♀️","🏋🏾‍♀️","🏋🏿‍♀️",
+"🏋️","🏋🏻","🏋🏼","🏋🏽","🏋🏾","🏋🏿",
+"🏋️‍♂️","🏋🏻‍♂️","🏋🏼‍♂️","🏋🏽‍♂️","🏋🏾‍♂️","🏋🏿‍♂️",
+"🤼‍♀️","🤼","🤼‍♂️",
+"🤸‍♀️","🤸🏻‍♀️","🤸🏼‍♀️","🤸🏽‍♀️","🤸🏾‍♀️","🤸🏿‍♀️",
+"🤸","🤸🏻","🤸🏼","🤸🏽","🤸🏾","🤸🏿",
+"🤸‍♂️","🤸🏻‍♂️","🤸🏼‍♂️","🤸🏽‍♂️","🤸🏾‍♂️","🤸🏿‍♂️",
+"⛹️‍♀️","⛹🏻‍♀️","⛹🏼‍♀️","⛹🏽‍♀️","⛹🏾‍♀️","⛹🏿‍♀️",
+"⛹️","⛹🏻","⛹🏼","⛹🏽","⛹🏾","⛹🏿",
+"⛹️‍♂️","⛹🏻‍♂️","⛹🏼‍♂️","⛹🏽‍♂️","⛹🏾‍♂️","⛹🏿‍♂️",
+"🤺",
+"🤾‍♀️","🤾🏻‍♀️","🤾🏼‍♀️","🤾🏽‍♀️","🤾🏾‍♀️","🤾🏿‍♀️",
+"🤾","🤾🏻","🤾🏼","🤾🏽","🤾🏾","🤾🏿",
+"🤾‍♂️","🤾🏻‍♂️","🤾🏼‍♂️","🤾🏽‍♂️","🤾🏾‍♂️","🤾🏿‍♂️",
+"🏌️‍♀️","🏌🏻‍♀️","🏌🏼‍♀️","🏌🏽‍♀️","🏌🏾‍♀️","🏌🏿‍♀️",
+"🏌️","🏌🏻","🏌🏼","🏌🏽","🏌🏾","🏌🏿",
+"🏌️‍♂️","🏌🏻‍♂️","🏌🏼‍♂️","🏌🏽‍♂️","🏌🏾‍♂️","🏌🏿‍♂️",
+"🏇","🏇🏻","🏇🏼","🏇🏽","🏇🏾","🏇🏿",
+"🧘‍♀️","🧘🏻‍♀️","🧘🏼‍♀️","🧘🏽‍♀️","🧘🏾‍♀️","🧘🏿‍♀️",
+"🧘","🧘🏻","🧘🏼","🧘🏽","🧘🏾","🧘🏿",
+"🧘‍♂️","🧘🏻‍♂️","🧘🏼‍♂️","🧘🏽‍♂️","🧘🏾‍♂️","🧘🏿‍♂️",
+"🏄‍♀️","🏄🏻‍♀️","🏄🏼‍♀️","🏄🏽‍♀️","🏄🏾‍♀️","🏄🏿‍♀️",
+"🏄","🏄🏻","🏄🏼","🏄🏽","🏄🏾","🏄🏿",
+"🏄‍♂️","🏄🏻‍♂️","🏄🏼‍♂️","🏄🏽‍♂️","🏄🏾‍♂️","🏄🏿‍♂️",
+"🏊‍♀️","🏊🏻‍♀️","🏊🏼‍♀️","🏊🏽‍♀️","🏊🏾‍♀️","🏊🏿‍♀️",
+"🏊","🏊🏻","🏊🏼","🏊🏽","🏊🏾","🏊🏿",
+"🏊‍♂️","🏊🏻‍♂️","🏊🏼‍♂️","🏊🏽‍♂️","🏊🏾‍♂️","🏊🏿‍♂️",
+"🤽‍♀️","🤽🏻‍♀️","🤽🏼‍♀️","🤽🏽‍♀️","🤽🏾‍♀️","🤽🏿‍♀️",
+"🤽","🤽🏻","🤽🏼","🤽🏽","🤽🏾","🤽🏿",
+"🤽‍♂️","🤽🏻‍♂️","🤽🏼‍♂️","🤽🏽‍♂️","🤽🏾‍♂️","🤽🏿‍♂️",
+"🚣‍♀️","🚣🏻‍♀️","🚣🏼‍♀️","🚣🏽‍♀️","🚣🏾‍♀️","🚣🏿‍♀️",
+"🚣","🚣🏻","🚣🏼","🚣🏽","🚣🏾","🚣🏿",
+"🚣‍♂️","🚣🏻‍♂️","🚣🏼‍♂️","🚣🏽‍♂️","🚣🏾‍♂️","🚣🏿‍♂️",
+"🧗‍♀️","🧗🏻‍♀️","🧗🏼‍♀️","🧗🏽‍♀️","🧗🏾‍♀️","🧗🏿‍♀️",
+"🧗","🧗🏻","🧗🏼","🧗🏽","🧗🏾","🧗🏿",
+"🧗‍♂️","🧗🏻‍♂️","🧗🏼‍♂️","🧗🏽‍♂️","🧗🏾‍♂️","🧗🏿‍♂️",
+"🚵‍♀️","🚵🏻‍♀️","🚵🏼‍♀️","🚵🏽‍♀️","🚵🏾‍♀️","🚵🏿‍♀️",
+"🚵","🚵🏻","🚵🏼","🚵🏽","🚵🏾","🚵🏿",
+"🚵‍♂️","🚵🏻‍♂️","🚵🏼‍♂️","🚵🏽‍♂️","🚵🏾‍♂️","🚵🏿‍♂️",
+"🚴‍♀️","🚴🏻‍♀️","🚴🏼‍♀️","🚴🏽‍♀️","🚴🏾‍♀️","🚴🏿‍♀️",
+"🚴","🚴🏻","🚴🏼","🚴🏽","🚴🏾","🚴🏿",
+"🚴‍♂️","🚴🏻‍♂️","🚴🏼‍♂️","🚴🏽‍♂️","🚴🏾‍♂️","🚴🏿‍♂️",
+"🏆","🥇","🥈","🥉","🏅","🎖","🏵","🎗","🎫","🎟","🎪",
+"🤹‍♀️","🤹🏻‍♀️","🤹🏼‍♀️","🤹🏽‍♀️","🤹🏾‍♀️","🤹🏿‍♀️",
+"🤹","🤹🏻","🤹🏼","🤹🏽","🤹🏾","🤹🏿",
+"🤹‍♂️","🤹🏻‍♂️","🤹🏼‍♂️","🤹🏽‍♂️","🤹🏾‍♂️","🤹🏿‍♂️",
+"🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🎲","♟","🎯","🎳","🎮","🎰","🧩"
+
+
+"🚗","🚕","🚙","🚌","🚎","🏎","🚓","🚑","🚒","🚐","🛻","🚚","🚛","🚜","🦯","🦽","🦼","🛴","🚲","🛵","🏍","🛺","🚨","🚔","🚍","🚘","🚖","🚡","🚠","🚟","🚃","🚋","🚞","🚝","🚄","🚅","🚈","🚂","🚆","🚇","🚊","🚉","✈️","🛫","🛬","🛩","💺","🛰","🚀","🛸","🚁","🛶","⛵️","🚤","🛥","🛳","⛴","🚢","⚓️","🪝","⛽️","🚧","🚦","🚥","🚏","🗺","🗿","🗽","🗼","🏰","🏯","🏟","🎡","🎢","🎠","⛲️","⛱","🏖","🏝","🏜","🌋","⛰","🏔","🗻","🏕","⛺️","🛖","🏠","🏡","🏘","🏚","🏗","🏭","🏢","🏬","🏣","🏤","🏥","🏦","🏨","🏪","🏫","🏩","💒","🏛","⛪️","🕌","🕍","🛕","🕋","⛩","🛤","🛣","🗾","🎑","🏞","🌅","🌄","🌠","🎇","🎆","🌇","🌆","🏙","🌃","🌌","🌉","🌁"
+
+
+
+"⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","💈","⚗️","🔭","🔬","🕳","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
+"🛀","🛀🏻","🛀🏼","🛀🏽","🛀🏾","🛀🏿",
+"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
+
+
+
+"❤️","🧡","💛","💚","💙","💜","🖤","🤍","🤎","💔","❤️‍🔥","❤️‍🩹","❣️","💕","💞","💓","💗","💖","💘","💝","💟","☮️","✝️","☪️","🕉","☸️","✡️","🔯","🕎","☯️","☦️","🛐","⛎","♈️","♉️","♊️","♋️","♌️","♍️","♎️","♏️","♐️","♑️","♒️","♓️","🆔","⚛️","🉑","☢️","☣️","📴","📳","🈶","🈚️","🈸","🈺","🈷️","✴️","🆚","💮","🉐","㊙️","㊗️","🈴","🈵","🈹","🈲","🅰️","🅱️","🆎","🆑","🅾️","🆘","❌","⭕️","🛑","⛔️","📛","🚫","💯","💢","♨️","🚷","🚯","🚳","🚱","🔞","📵","🚭","❗️","❕","❓","❔","‼️","⁉️","🔅","🔆","〽️","⚠️","🚸","🔱","⚜️","🔰","♻️","✅","🈯️","💹","❇️","✳️","❎","🌐","💠","Ⓜ️","🌀","💤","🏧","🚾","♿️","🅿️","🛗","🈳","🈂️","🛂","🛃","🛄","🛅","🚹","🚺","🚼","⚧","🚻","🚮","🎦","📶","🈁","🔣","ℹ️","🔤","🔡","🔠","🆖","🆗","🆙","🆒","🆕","🆓","0️⃣","1️⃣","2️⃣","3️⃣","4️⃣","5️⃣","6️⃣","7️⃣","8️⃣","9️⃣","🔟","🔢","#️⃣","*️⃣","⏏️","▶️","⏸","⏯","⏹","⏺","⏭","⏮","⏩","⏪","⏫","⏬","◀️","🔼","🔽","➡️","⬅️","⬆️","⬇️","↗️","↘️","↙️","↖️","↕️","↔️","↪️","↩️","⤴️","⤵️","🔀","🔁","🔂","🔄","🔃","🎵","🎶","➕","➖","➗","✖️","♾","💲","💱","™️","©️","®️","👁‍🗨","🔚","🔙","🔛","🔝","🔜","〰️","➰","➿","✔️","☑️","🔘","🔴","🟠","🟡","🟢","🔵","🟣","⚫️","⚪️","🟤","🔺","🔻","🔸","🔹","🔶","🔷","🔳","🔲","▪️","▫️","◾️","◽️","◼️","◻️","🟥","🟧","🟨","🟩","🟦","🟪","⬛️","⬜️","🟫","🔈","🔇","🔉","🔊","🔔","🔕","📣","📢","💬","💭","🗯","♠️","♣️","♥️","♦️","🃏","🎴","🀄️","🕐","🕑","🕒","🕓","🕔","🕕","🕖","🕗","🕘","🕙","🕚","🕛","🕜","🕝","🕞","🕟","🕠","🕡","🕢","🕣","🕤","🕥","🕦","🕧"
+
+
+"🏳️","🏴","🏴‍☠️","🏁","🚩","🏳️‍🌈","🏳️‍⚧️","🇺🇳","🇦🇫","🇦🇽","🇦🇱","🇩🇿","🇦🇸","🇦🇩","🇦🇴","🇦🇮","🇦🇶","🇦🇬","🇦🇷","🇦🇲","🇦🇼","🇦🇺","🇦🇹","🇦🇿","🇧🇸","🇧🇭","🇧🇩","🇧🇧","🇧🇾","🇧🇪","🇧🇿","🇧🇯","🇧🇲","🇧🇹","🇧🇴","🇧🇦","🇧🇼","🇧🇷","🇻🇬","🇧🇳","🇧🇬","🇧🇫","🇧🇮","🇰🇭","🇨🇲","🇨🇦","🇮🇨","🇨🇻","🇧🇶","🇰🇾","🇨🇫","🇹🇩","🇮🇴","🇨🇱","🇨🇳","🇨🇽","🇨🇨","🇨🇴","🇰🇲","🇨🇬","🇨🇩","🇨🇰","🇨🇷","🇨🇮","🇭🇷","🇨🇺","🇨🇼","🇨🇾","🇨🇿","🇩🇰","🇩🇯","🇩🇲","🇩🇴","🇪🇨","🇪🇬","🇸🇻","🇬🇶","🇪🇷","🇪🇪","🇸🇿","🇪🇹","🇪🇺","🇫🇰","🇫🇴","🇫🇯","🇫🇮","🇫🇷","🇬🇫","🇵🇫","🇹🇫","🇬🇦","🇬🇲","🇬🇪","🇩🇪","🇬🇭","🇬🇮","🇬🇷","🇬🇱","🇬🇩","🇬🇵","🇬🇺","🇬🇹","🇬🇬","🇬🇳","🇬🇼","🇬🇾","🇭🇹","🇭🇳","🇭🇰","🇭🇺","🇮🇸","🇮🇳","🇮🇩","🇮🇷","🇮🇶","🇮🇪","🇮🇲","🇮🇱","🇮🇹","🇯🇲","🇯🇵","🎌","🇯🇪","🇯🇴","🇰🇿","🇰🇪","🇰🇮","🇽🇰","🇰🇼","🇰🇬","🇱🇦","🇱🇻","🇱🇧","🇱🇸","🇱🇷","🇱🇾","🇱🇮","🇱🇹","🇱🇺","🇲🇴","🇲🇬","🇲🇼","🇲🇾","🇲🇻","🇲🇱","🇲🇹","🇲🇭","🇲🇶","🇲🇷","🇲🇺","🇾🇹","🇲🇽","🇫🇲","🇲🇩","🇲🇨","🇲🇳","🇲🇪","🇲🇸","🇲🇦","🇲🇿","🇲🇲","🇳🇦","🇳🇷","🇳🇵","🇳🇱","🇳🇨","🇳🇿","🇳🇮","🇳🇪","🇳🇬","🇳🇺","🇳🇫","🇰🇵","🇲🇰","🇲🇵","🇳🇴","🇴🇲","🇵🇰","🇵🇼","🇵🇸","🇵🇦","🇵🇬","🇵🇾","🇵🇪","🇵🇭","🇵🇳","🇵🇱","🇵🇹","🇵🇷","🇶🇦","🇷🇪","🇷🇴","🇷🇺","🇷🇼","🇼🇸","🇸🇲","🇸🇹","🇸🇦","🇸🇳","🇷🇸","🇸🇨","🇸🇱","🇸🇬","🇸🇽","🇸🇰","🇸🇮","🇬🇸","🇸🇧","🇸🇴","🇿🇦","🇰🇷","🇸🇸","🇪🇸","🇱🇰","🇧🇱","🇸🇭","🇰🇳","🇱🇨","🇵🇲","🇻🇨","🇸🇩","🇸🇷","🇸🇪","🇨🇭","🇸🇾","🇹🇼","🇹🇯","🇹🇿","🇹🇭","🇹🇱","🇹🇬","🇹🇰","🇹🇴","🇹🇹","🇹🇳","🇹🇷","🇹🇲","🇹🇨","🇹🇻","🇺🇬","🇺🇦","🇦🇪","🇬🇧","🏴󠁧󠁢󠁥󠁮󠁧󠁿","🏴󠁧󠁢󠁳󠁣󠁴󠁿","🏴󠁧󠁢󠁷󠁬󠁳󠁿","🇺🇸","🇺🇾","🇻🇮","🇺🇿","🇻🇺","🇻🇦","🇻🇪","🇻🇳","🇼🇫","🇪🇭","🇾🇪","🇿🇲","🇿🇼"
+
+
+
+
+=========================================
+
+"😀","😃","😄","😁","😆","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🤭","🤫","🤥","😶","😐","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"🤲",
+"👐",
+"🙌",
+"👏",
+"🤝",
+"👍",
+"👎",
+"👊",
+"✊",
+"🤛",
+"🤜",
+"🤞",
+"✌️",
+"🤟",
+"🤘",
+"👌",
+"🤌",
+"🤏",
+"👈",
+"👉",
+"👆",
+"👇",
+"☝️",
+"✋",
+"🤚",
+"🖐",
+"🖖",
+"👋",
+"🤙",
+"💪",
+"🦾",
+"🖕",
+"✍️",
+"🙏",
+"🦶",
+"🦵",
+"🦿","💄","💋","👄","🦷","👅",
+"👂",
+"🦻",
+"👃",
+"👣","👁","👀","🫀","🫁","🧠","🗣","👤","👥","🫂",
+"👶",
+"👧",
+"🧒",
+"👦",
+"👩",
+"🧑",
+"👨",
+"👩‍🦱",
+"🧑‍🦱",
+"👨‍🦱",
+"👩‍🦰",
+"🧑‍🦰",
+"👨‍🦰",
+"👱‍♀️",
+"👱",
+"👱‍♂️",
+"👩‍🦳",
+"🧑‍🦳",
+"👨‍🦳",
+"👩‍🦲",
+"🧑‍🦲",
+"👨‍🦲",
+"🧔‍♀️",
+"🧔",
+"🧔‍♂️",
+"👵",
+"🧓",
+"👴",
+"👲",
+"👳‍♀️",
+"👳",
+"👳‍♂️",
+"🧕",
+"👮‍♀️",
+"👮",
+"👮‍♂️",
+"👷‍♀️",
+"👷",
+"👷‍♂️",
+"💂‍♀️",
+"💂",
+"💂‍♂️",
+"🕵️‍♀️",
+"🕵️",
+"🕵️‍♂️",
+"👩‍⚕️",
+"🧑‍⚕️",
+"👨‍⚕️",
+"👩‍🌾",
+"🧑‍🌾",
+"👨‍🌾",
+"👩‍🍳",
+"🧑‍🍳",
+"👨‍🍳",
+"👩‍🎓",
+"🧑‍🎓",
+"👨‍🎓",
+"👩‍🎤",
+"🧑‍🎤",
+"👨‍🎤",
+"👩‍🏫",
+"🧑‍🏫",
+"👨‍🏫",
+"👩‍🏭",
+"🧑‍🏭",
+"👨‍🏭",
+"👩‍💻",
+"🧑‍💻",
+"👨‍💻",
+"👩‍💼",
+"🧑‍💼",
+"👨‍💼",
+"👩‍🔧",
+"🧑‍🔧",
+"👨‍🔧",
+"👩‍🔬",
+"🧑‍🔬",
+"👨‍🔬",
+"👩‍🎨",
+"🧑‍🎨",
+"👨‍🎨",
+"👩‍🚒",
+"🧑‍🚒",
+"👨‍🚒",
+"👩‍✈️",
+"🧑‍✈️",
+"👨‍✈️",
+"👩‍🚀",
+"🧑‍🚀",
+"👨‍🚀",
+"👩‍⚖️",
+"🧑‍⚖️",
+"👨‍⚖️",
+"👰‍♀️",
+"👰",
+"👰‍♂️",
+"🤵‍♀️",
+"🤵",
+"🤵‍♂️",
+"👸",
+"🤴",
+"🥷",
+"🦸‍♀️",
+"🦸",
+"🦸‍♂️",
+"🦹‍♀️",
+"🦹",
+"🦹‍♂️",
+"🤶",
+"🧑‍🎄",
+"🎅",
+"🧙‍♀️",
+"🧙",
+"🧙‍♂️",
+"🧝‍♀️",
+"🧝",
+"🧝‍♂️",
+"🧛‍♀️",
+"🧛",
+"🧛‍♂️",
+"🧟‍♀️","🧟","🧟‍♂️","🧞‍♀️","🧞","🧞‍♂️",
+"🧜‍♀️",
+"🧜",
+"🧜‍♂️",
+"🧚‍♀️",
+"🧚",
+"🧚‍♂️",
+"👼",
+"🤰",
+"🤱",
+"👩‍🍼",
+"🧑‍🍼",
+"👨‍🍼",
+"🙇‍♀️",
+"🙇",
+"🙇‍♂️",
+"💁‍♀️",
+"💁",
+"💁‍♂️",
+"🙅‍♀️",
+"🙅",
+"🙅‍♂️",
+"🙆‍♀️",
+"🙆",
+"🙆‍♂️",
+"🙋‍♀️",
+"🙋",
+"🙋‍♂️",
+"🧏‍♀️",
+"🧏",
+"🧏‍♂️",
+"🤦‍♀️",
+"🤦",
+"🤦‍♂️",
+"🤷‍♀️",
+"🤷",
+"🤷‍♂️",
+"🙎‍♀️",
+"🙎",
+"🙎‍♂️",
+"🙍‍♀️",
+"🙍",
+"🙍‍♂️",
+"💇‍♀️",
+"💇",
+"💇‍♂️",
+"💆‍♀️",
+"💆",
+"💆‍♂️",
+"🧖‍♀️",
+"🧖",
+"🧖‍♂️",
+"💅",
+"🤳",
+"💃",
+"🕺",
+"👯‍♀️","👯","👯‍♂️",
+"🕴",
+"👩‍🦽",
+"🧑‍🦽",
+"👨‍🦽",
+"👩‍🦼",
+"🧑‍🦼",
+"👨‍🦼",
+"🚶‍♀️",
+"🚶",
+"🚶‍♂️",
+"👩‍🦯",
+"🧑‍🦯",
+"👨‍🦯",
+"🧎‍♀️",
+"🧎",
+"🧎‍♂️",
+"🏃‍♀️",
+"🏃",
+"🏃‍♂️",
+"🧍‍♀️",
+"🧍",
+"🧍‍♂️",
+"👫",
+"👭",
+"👬",
+"👩‍❤️‍👨",
+"👩‍❤️‍👩",
+"💑",
+"👨‍❤️‍👨",
+"👩‍❤️‍💋‍👨",
+"👩‍❤️‍💋‍👩",
+"💏",
+"👨‍❤️‍💋‍👨",
+"👨‍👩‍👦","👨‍👩‍👧","👨‍👩‍👧‍👦","👨‍👩‍👦‍👦","👨‍👩‍👧‍👧","👩‍👩‍👦","👩‍👩‍👧","👩‍👩‍👧‍👦","👩‍👩‍👦‍👦","👩‍👩‍👧‍👧","👨‍👨‍👦","👨‍👨‍👧","👨‍👨‍👧‍👦","👨‍👨‍👦‍👦","👨‍👨‍👧‍👧","👩‍👦","👩‍👧","👩‍👧‍👦","👩‍👦‍👦","👩‍👧‍👧","👨‍👦","👨‍👧","👨‍👧‍👦","👨‍👦‍👦","👨‍👧‍👧","🪢","🧶","🧵","🪡","🧥","🥼","🦺","👚","👕","👖","🩲","🩳","👔","👗","👙","🩱","👘","🥻","🩴","🥿","👠","👡","👢","👞","👟","🥾","🧦","🧤","🧣","🎩","🧢","👒","🎓","⛑","🪖","👑","💍","👝","👛","👜","💼","🎒","🧳","👓","🕶","🥽","🌂"
+
+
+"⚽️","🏀","🏈","⚾️","🥎","🎾","🏐","🏉","🥏","🎱","🪀","🏓","🏸","🏒","🏑","🥍","🏏","🪃","🥅","⛳️","🪁","🏹","🎣","🤿","🥊","🥋","🎽","🛹","🛼","🛷","⛸","🥌","🎿","⛷","🏂","🪂",
+"🏋️‍♀️",
+"🏋️",
+"🏋️‍♂️",
+"🤼‍♀️","🤼","🤼‍♂️",
+"🤸‍♀️",
+"🤸",
+"🤸‍♂️",
+"⛹️‍♀️",
+"⛹️",
+"⛹️‍♂️",
+"🤺",
+"🤾‍♀️",
+"🤾",
+"🤾‍♂️",
+"🏌️‍♀️",
+"🏌️",
+"🏌️‍♂️",
+"🏇",
+"🧘‍♀️",
+"🧘",
+"🧘‍♂️",
+"🏄‍♀️",
+"🏄",
+"🏄‍♂️",
+"🏊‍♀️",
+"🏊",
+"🏊‍♂️",
+"🤽‍♀️",
+"🤽",
+"🤽‍♂️",
+"🚣‍♀️",
+"🚣",
+"🚣‍♂️",
+"🧗‍♀️",
+"🧗",
+"🧗‍♂️",
+"🚵‍♀️",
+"🚵",
+"🚵‍♂️",
+"🚴‍♀️",
+"🚴",
+"🚴‍♂️",
+"🏆","🥇","🥈","🥉","🏅","🎖","🏵","🎗","🎫","🎟","🎪",
+"🤹‍♀️",
+"🤹",
+"🤹‍♂️",
+"🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🎲","♟","🎯","🎳","🎮","🎰","🧩"
+
+
+
+
+"⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","💈","⚗️","🔭","🔬","🕳","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
+"🛀",
+"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
+
+
+
+=========================================
+"🤲","👐","🙌","👏","👍","👎","👊","✊","🤛","🤜","🤞","✌️","🤟","🤘","👌","🤌","🤏","👈","👉","👆","👇","☝️","✋","🤚","🖐","🖖","👋","🤙","💪","🖕","✍️","🙏","🦶","🦵","👂","🦻","👃","👶","👧","🧒","👦","👩","🧑","👨","👩‍🦱","🧑‍🦱","👨‍🦱","👩‍🦰","🧑‍🦰","👨‍🦰","👱‍♀️","👱","👱‍♂️","👩‍🦳","🧑‍🦳","👨‍🦳","👩‍🦲","🧑‍🦲","👨‍🦲","🧔‍♀️","🧔","🧔‍♂️","👵","🧓","👴","👲","👳‍♀️","👳","👳‍♂️","🧕","👮‍♀️","👮","👮‍♂️","👷‍♀️","👷","👷‍♂️","💂‍♀️","💂","💂‍♂️","🕵️‍♀️","🕵️","🕵️‍♂️","👩‍⚕️","🧑‍⚕️","👨‍⚕️","👩‍🌾","🧑‍🌾","👨‍🌾","👩‍🍳","🧑‍🍳","👨‍🍳","👩‍🎓","🧑‍🎓","👨‍🎓","👩‍🎤","🧑‍🎤","👨‍🎤","👩‍🏫","🧑‍🏫","👨‍🏫","👩‍🏭","🧑‍🏭","👨‍🏭","👩‍💻","🧑‍💻","👨‍💻","👩‍💼","🧑‍💼","👨‍💼","👩‍🔧","🧑‍🔧","👨‍🔧","👩‍🔬","🧑‍🔬","👨‍🔬","👩‍🎨","🧑‍🎨","👨‍🎨","👩‍🚒","🧑‍🚒","👨‍🚒","👩‍✈️","🧑‍✈️","👨‍✈️","👩‍🚀","🧑‍🚀","👨‍🚀","👩‍⚖️","🧑‍⚖️","👨‍⚖️","👰‍♀️","👰","👰‍♂️","🤵‍♀️","🤵","🤵‍♂️","👸","🤴","🥷","🦸‍♀️","🦸","🦸‍♂️","🦹‍♀️","🦹","🦹‍♂️","🤶","🧑‍🎄","🎅","🧙‍♀️","🧙","🧙‍♂️","🧝‍♀️","🧝","🧝‍♂️","🧛‍♀️","🧛","🧛‍♂️","🧜‍♀️","🧜","🧜‍♂️","🧚‍♀️","🧚","🧚‍♂️","👼","🤰","🤱","👩‍🍼","🧑‍🍼","👨‍🍼","🙇‍♀️","🙇","🙇‍♂️","💁‍♀️","💁","💁‍♂️","🙅‍♀️","🙅","🙅‍♂️","🙆‍♀️","🙆","🙆‍♂️","🙋‍♀️","🙋","🙋‍♂️","🧏‍♀️","🧏","🧏‍♂️","🤦‍♀️","🤦","🤦‍♂️","🤷‍♀️","🤷","🤷‍♂️","🙎‍♀️","🙎","🙎‍♂️","🙍‍♀️","🙍","🙍‍♂️","💇‍♀️","💇","💇‍♂️","💆‍♀️","💆","💆‍♂️","🧖‍♀️","🧖","🧖‍♂️","💅","🤳","💃","🕺","🕴","👩‍🦽","🧑‍🦽","👨‍🦽","👩‍🦼","🧑‍🦼","👨‍🦼","🚶‍♀️","🚶","🚶‍♂️","👩‍🦯","🧑‍🦯","👨‍🦯","🧎‍♀️","🧎","🧎‍♂️","🏃‍♀️","🏃","🏃‍♂️","🧍‍♀️","🧍","🧍‍♂️","🏋️‍♀️","🏋️","🏋️‍♂️","🤸‍♀️","🤸","🤸‍♂️","⛹️‍♀️","⛹️","⛹️‍♂️","🤾‍♀️","🤾","🤾‍♂️","🏌️‍♀️","🏌️","🏌️‍♂️","🏇","🧘‍♀️","🧘","🧘‍♂️","🏄‍♀️","🏄","🏄‍♂️","🏊‍♀️","🏊","🏊‍♂️","🤽‍♀️","🤽","🤽‍♂️","🚣‍♀️","🚣","🚣‍♂️","🧗‍♀️","🧗","🧗‍♂️","🚵‍♀️","🚵","🚵‍♂️","🚴‍♀️","🚴","🚴‍♂️","🤹‍♀️","🤹","🤹‍♂️","🛀"
+
+
+"👫","👭","👬","👩‍❤️‍👨","👩‍❤️‍👩","💑","👨‍❤️‍👨","👩‍❤️‍💋‍👨","👩‍❤️‍💋‍👩","💏","👨‍❤️‍💋‍👨"
+
+=========================================
+
+
+"🗨", "👪"
diff --git a/ui/emoji_config.cpp b/ui/emoji_config.cpp
index 06f28b9..189f10f 100644
--- a/ui/emoji_config.cpp
+++ b/ui/emoji_config.cpp
@@ -31,7 +31,7 @@ constexpr auto kUniversalSize = 72;
 constexpr auto kImagesPerRow = 32;
 constexpr auto kImageRowsPerSprite = 16;
 
-constexpr auto kSetVersion = uint32(3);
+constexpr auto kSetVersion = uint32(4);
 constexpr auto kCacheVersion = uint32(7);
 constexpr auto kMaxId = uint32(1 << 8);
 

From e91cfd55c243cfd2fa0d04f58616ee4f0a0ccb11 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Jul 2022 12:54:09 +0400
Subject: [PATCH 174/635] Fix missing include for Qt 6.4

---
 ui/effects/animations.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/effects/animations.h b/ui/effects/animations.h
index bdc3a45..a918cfc 100644
--- a/ui/effects/animations.h
+++ b/ui/effects/animations.h
@@ -10,6 +10,7 @@
 
 #include <crl/crl_time.h>
 #include <rpl/lifetime.h>
+#include <QtCore/QObject>
 
 namespace Ui {
 namespace Animations {

From ba7e3667d6c3bac46cf20c1b9c7a90801947cd41 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 14 Jul 2022 12:54:15 +0400
Subject: [PATCH 175/635] Adapt for Qt 6.4 device pixel ratio changes

QWidget::devicePixelRatioF represents backing store ratio and it's no more equal to native surface ratio
---
 ui/platform/linux/ui_utility_linux.cpp  | 11 +++++++----
 ui/platform/win/ui_utility_win.cpp      |  7 ++++---
 ui/platform/win/ui_window_title_win.cpp |  3 ++-
 ui/platform/win/ui_window_win.cpp       |  6 ++++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 9414c55..5066c0b 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -21,6 +21,7 @@
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 #include <QtCore/QPoint>
+#include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
 
 namespace Ui {
@@ -236,9 +237,9 @@ std::optional<bool> XCBIsOverlapped(
 
 	const auto mappedRect = QRect(
 		rect.topLeft()
-			* widget->devicePixelRatioF()
+			* widget->windowHandle()->devicePixelRatio()
 			+ windowGeometry.topLeft(),
-		rect.size() * widget->devicePixelRatioF());
+		rect.size() * widget->windowHandle()->devicePixelRatio());
 
 	const auto cookie = xcb_query_tree(connection, *root);
 	const auto reply = base::Platform::XCB::MakeReplyPointer(
@@ -304,7 +305,9 @@ void SetXCBFrameExtents(not_null<QWidget*> widget, const QMargins &extents) {
 		return;
 	}
 
-	const auto nativeExtents = extents * widget->devicePixelRatioF();
+	const auto nativeExtents = extents
+		* widget->windowHandle()->devicePixelRatio();
+
 	const auto extentsVector = std::vector<uint>{
 		uint(nativeExtents.left()),
 		uint(nativeExtents.right()),
@@ -368,7 +371,7 @@ void ShowXCBWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 	}
 
 	const auto globalPos = point
-		* widget->devicePixelRatioF()
+		* widget->windowHandle()->devicePixelRatio()
 		+ windowGeometry.topLeft();
 
 	xcb_client_message_event_t xev;
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index b63a936..6d3154d 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -9,6 +9,7 @@
 #include "base/platform/win/base_windows_h.h"
 
 #include <QtWidgets/QApplication>
+#include <QtGui/QWindow>
 
 #include <wrl/client.h>
 #include <Shobjidl.h>
@@ -75,7 +76,7 @@ std::optional<bool> IsOverlapped(
 	const auto nativeRect = [&] {
 		const auto topLeft = [&] {
 			const auto qpoints = rect.topLeft()
-				* widget->devicePixelRatioF();
+				* widget->windowHandle()->devicePixelRatio();
 			POINT result{
 				qpoints.x(),
 				qpoints.y(),
@@ -85,7 +86,7 @@ std::optional<bool> IsOverlapped(
 		}();
 		const auto bottomRight = [&] {
 			const auto qpoints = rect.bottomRight()
-				* widget->devicePixelRatioF();
+				* widget->windowHandle()->devicePixelRatio();
 			POINT result{
 				qpoints.x(),
 				qpoints.y(),
@@ -122,7 +123,7 @@ std::optional<bool> IsOverlapped(
 
 void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 	const auto handle = HWND(widget->winId());
-	const auto mapped = point * widget->devicePixelRatioF();
+	const auto mapped = point * widget->windowHandle()->devicePixelRatio();
 	POINT p{ mapped.x(), mapped.y() };
 	ClientToScreen(handle, &p);
 	SendMessage(
diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index 4defa64..fdb8b89 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -205,7 +205,8 @@ void TitleWidget::refreshAdditionalPaddings(
 			return -1;
 		}
 		const auto pixels = (factor + 50) / 100;
-		return int(base::SafeRound(pixels / window()->devicePixelRatioF()));
+		return int(base::SafeRound(
+			pixels / window()->windowHandle()->devicePixelRatio()));
 	}();
 	if (padding < 0) {
 		return;
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 72213a0..995c8d5 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -455,7 +455,8 @@ bool WindowHelper::handleNativeEvent(
 		}
 		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 		ScreenToClient(_handle, &p);
-		const auto mapped = QPoint(p.x, p.y) / window()->devicePixelRatioF();
+		const auto mapped = QPoint(p.x, p.y)
+			/ window()->windowHandle()->devicePixelRatio();
 		ShowWindowMenu(window(), mapped);
 		if (result) *result = 0;
 	} return true;
@@ -547,7 +548,8 @@ bool WindowHelper::handleNativeEvent(
 
 		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 		ScreenToClient(_handle, &p);
-		const auto mapped = QPoint(p.x, p.y) / window()->devicePixelRatioF();
+		const auto mapped = QPoint(p.x, p.y)
+			/ window()->windowHandle()->devicePixelRatio();
 		*result = [&] {
 			if (!window()->rect().contains(mapped)) {
 				return HTTRANSPARENT;

From 48a34dc7469292ba2b63084d85209d353dc97ab9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 18 Jul 2022 22:25:53 +0400
Subject: [PATCH 176/635] Get rid of QSurface::supportsOpenGL check

It checks for surface type to be compatible with OpenGL, but there's no guarantee raster surface would return true here and once it's converted to an OpenGL surface, there's no need to check as it's known to support OpenGL.

This is the case with all QWidgets in Qt 6.4.
---
 ui/gl/gl_detection.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp
index 7c7ea3f..91af67f 100644
--- a/ui/gl/gl_detection.cpp
+++ b/ui/gl/gl_detection.cpp
@@ -79,10 +79,6 @@ Capabilities CheckCapabilities(QWidget *widget) {
 			LOG(("OpenGL: Could not create window for widget."));
 			return {};
 		}
-		if (!widget->window()->windowHandle()->supportsOpenGL()) {
-			LOG_ONCE(("OpenGL: Not supported for window."));
-			return {};
-		}
 		format = widget->window()->windowHandle()->format();
 		format.setAlphaBufferSize(8);
 		widget->window()->windowHandle()->setFormat(format);

From 2f21e92bbe5c2f6350b22f70d2dc4b0fdda832a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Jul 2022 22:32:02 +0300
Subject: [PATCH 177/635] Fix build with GCC.

---
 ui/widgets/input_fields.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 2c39df5..f1dcfdf 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -207,7 +207,7 @@ public:
 	[[nodiscard]] bool changed() const {
 		return _changed;
 	}
-	[[nodiscrd]] QString currentTag() const {
+	[[nodiscard]] QString currentTag() const {
 		return _currentTagId;
 	}
 
@@ -1393,7 +1393,6 @@ QSizeF CustomEmojiObject::intrinsicSize(
 		QTextDocument *doc,
 		int posInDocument,
 		const QTextFormat &format) {
-	const auto factor = style::DevicePixelRatio() * 1.;
 	const auto size = st::emojiSize * 1.;
 	const auto width = size + st::emojiPadding * 2.;
 	const auto font = format.toCharFormat().font();

From c5b32c53efbc1481f3942d28ef7e4f5eaca5df1f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Jul 2022 22:37:09 +0300
Subject: [PATCH 178/635] Respect kSetVersion in default set cache key.

---
 ui/emoji_config.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ui/emoji_config.cpp b/ui/emoji_config.cpp
index 189f10f..88ae330 100644
--- a/ui/emoji_config.cpp
+++ b/ui/emoji_config.cpp
@@ -124,12 +124,9 @@ uint32 ComputeVersion(int id) {
 	static_assert(kCacheVersion > 0 && kCacheVersion < (1 << 16));
 	static_assert(kSetVersion > 0 && kSetVersion < (1 << 8));
 
-	auto result = uint32(kCacheVersion);
-	if (!id) {
-		return result;
-	}
-	result |= (uint32(id) << 24) | (uint32(kSetVersion) << 16);
-	return result;
+	return uint32(kCacheVersion)
+		| (uint32(kSetVersion) << 16)
+		| (uint32(id) << 24);
 }
 
 int ReadCurrentSetId() {

From a5d7b23a638e6c2d9bffa97bf40d5d7559a926c8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Jul 2022 17:54:15 +0300
Subject: [PATCH 179/635] Support custom emoji in IsolatedEmoji.

---
 ui/text/text.cpp              | 15 ++++++-----
 ui/text/text.h                | 51 +++++++++++++++++------------------
 ui/text/text_isolated_emoji.h | 17 +++++++-----
 3 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 5d09fb7..70e870d 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -22,8 +22,7 @@
 #include <private/qharfbuzz_p.h>
 #endif // Qt < 6.0.0
 
-namespace Ui {
-namespace Text {
+namespace Ui::Text {
 namespace {
 
 constexpr auto kStringLinkIndexShift = uint16(0x8000);
@@ -169,8 +168,7 @@ void InitTextItemWithScriptItem(QTextItemInt &ti, const QScriptItem &si) {
 }
 
 } // namespace
-} // namespace Text
-} // namespace Ui
+} // namespace Ui::Text
 
 const TextParseOptions kDefaultTextOptions = {
 	TextParseLinks | TextParseMultiline, // flags
@@ -3723,17 +3721,20 @@ IsolatedEmoji String::toIsolatedEmoji() const {
 		|| _blocks.back()->type() != TextBlockTSkip) ? 0 : 1;
 	if ((_blocks.size() > kIsolatedEmojiLimit + skip)
 		|| !_spoilers.empty()) {
-		return IsolatedEmoji();
+		return {};
 	}
 	auto index = 0;
 	for (const auto &block : _blocks) {
 		const auto type = block->type();
 		if (block->lnkIndex()) {
-			return IsolatedEmoji();
+			return {};
 		} else if (type == TextBlockTEmoji) {
 			result.items[index++] = block.unsafe<EmojiBlock>()._emoji;
+		} else if (type == TextBlockTCustomEmoji) {
+			result.items[index++]
+				= block.unsafe<CustomEmojiBlock>()._custom->entityData();
 		} else if (type != TextBlockTSkip) {
-			return IsolatedEmoji();
+			return {};
 		}
 	}
 	return result;
diff --git a/ui/text/text.h b/ui/text/text.h
index 8829f96..83c2273 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -60,8 +60,7 @@ inline bool operator!=(TextSelection a, TextSelection b) {
 
 static constexpr TextSelection AllTextSelection = { 0, 0xFFFF };
 
-namespace Ui {
-namespace Text {
+namespace Ui::Text {
 
 struct IsolatedEmoji;
 
@@ -110,31 +109,31 @@ public:
 	String &operator=(String &&other) = default;
 	~String() = default;
 
-	int countWidth(int width, bool breakEverywhere = false) const;
-	int countHeight(int width, bool breakEverywhere = false) const;
+	[[nodiscard]] int countWidth(int width, bool breakEverywhere = false) const;
+	[[nodiscard]] int countHeight(int width, bool breakEverywhere = false) const;
 	void countLineWidths(int width, QVector<int> *lineWidths, bool breakEverywhere = false) const;
 	void setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options = kDefaultTextOptions);
 	void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options = kMarkupTextOptions, const std::any &context = {});
 
 	void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk);
-	bool hasLinks() const;
+	[[nodiscard]] bool hasLinks() const;
 	void setSpoiler(
 		uint16 lnkIndex,
 		const std::shared_ptr<SpoilerClickHandler> &lnk);
 	void setSpoilerShown(uint16 lnkIndex, bool shown);
-	int spoilersCount() const;
+	[[nodiscard]] int spoilersCount() const;
 
-	bool hasSkipBlock() const;
+	[[nodiscard]] bool hasSkipBlock() const;
 	bool updateSkipBlock(int width, int height);
 	bool removeSkipBlock();
 
-	int maxWidth() const {
+	[[nodiscard]] int maxWidth() const {
 		return _maxWidth.ceil().toInt();
 	}
-	int minHeight() const {
+	[[nodiscard]] int minHeight() const {
 		return _minHeight;
 	}
-	int countMaxMonospaceWidth() const;
+	[[nodiscard]] int countMaxMonospaceWidth() const;
 
 	void draw(Painter &p, int32 left, int32 top, int32 width, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, TextSelection selection = { 0, 0 }, bool fullWidthSelection = true) const;
 	void drawElided(Painter &p, int32 left, int32 top, int32 width, int32 lines = 1, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, int32 removeFromEnd = 0, bool breakEverywhere = false, TextSelection selection = { 0, 0 }) const;
@@ -143,35 +142,36 @@ public:
 	void drawRight(Painter &p, int32 right, int32 top, int32 width, int32 outerw, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, TextSelection selection = { 0, 0 }) const;
 	void drawRightElided(Painter &p, int32 right, int32 top, int32 width, int32 outerw, int32 lines = 1, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, int32 removeFromEnd = 0, bool breakEverywhere = false, TextSelection selection = { 0, 0 }) const;
 
-	StateResult getState(QPoint point, int width, StateRequest request = StateRequest()) const;
-	StateResult getStateLeft(QPoint point, int width, int outerw, StateRequest request = StateRequest()) const;
-	StateResult getStateElided(QPoint point, int width, StateRequestElided request = StateRequestElided()) const;
-	StateResult getStateElidedLeft(QPoint point, int width, int outerw, StateRequestElided request = StateRequestElided()) const;
+	[[nodiscard]] StateResult getState(QPoint point, int width, StateRequest request = StateRequest()) const;
+	[[nodiscard]] StateResult getStateLeft(QPoint point, int width, int outerw, StateRequest request = StateRequest()) const;
+	[[nodiscard]] StateResult getStateElided(QPoint point, int width, StateRequestElided request = StateRequestElided()) const;
+	[[nodiscard]] StateResult getStateElidedLeft(QPoint point, int width, int outerw, StateRequestElided request = StateRequestElided()) const;
 
 	[[nodiscard]] TextSelection adjustSelection(TextSelection selection, TextSelectType selectType) const;
-	bool isFullSelection(TextSelection selection) const {
+	[[nodiscard]] bool isFullSelection(TextSelection selection) const {
 		return (selection.from == 0) && (selection.to >= _text.size());
 	}
 
-	bool isEmpty() const;
-	bool isNull() const {
+	[[nodiscard]] bool isEmpty() const;
+	[[nodiscard]] bool isNull() const {
 		return !_st;
 	}
-	int length() const {
+	[[nodiscard]] int length() const {
 		return _text.size();
 	}
 
 	[[nodiscard]] bool hasCustomEmoji() const;
 	void unloadCustomEmoji();
 
-	QString toString(TextSelection selection = AllTextSelection) const;
-	TextWithEntities toTextWithEntities(
+	[[nodiscard]] QString toString(
 		TextSelection selection = AllTextSelection) const;
-	TextForMimeData toTextForMimeData(
+	[[nodiscard]] TextWithEntities toTextWithEntities(
 		TextSelection selection = AllTextSelection) const;
-	IsolatedEmoji toIsolatedEmoji() const;
+	[[nodiscard]] TextForMimeData toTextForMimeData(
+		TextSelection selection = AllTextSelection) const;
+	[[nodiscard]] IsolatedEmoji toIsolatedEmoji() const;
 
-	const style::TextStyle *style() const {
+	[[nodiscard]] const style::TextStyle *style() const {
 		return _st;
 	}
 
@@ -200,7 +200,7 @@ private:
 	// it is also called from move constructor / assignment operator
 	void clearFields();
 
-	ClickHandlerPtr spoilerLink(uint16 spoilerIndex) const;
+	[[nodiscard]] ClickHandlerPtr spoilerLink(uint16 spoilerIndex) const;
 
 	TextForMimeData toText(
 		TextSelection selection,
@@ -241,8 +241,7 @@ private:
 [[nodiscard]] bool IsReplacedBySpace(QChar ch);
 [[nodiscard]] bool IsTrimmed(QChar ch);
 
-} // namespace Text
-} // namespace Ui
+} // namespace Ui::Text
 
 inline TextSelection snapSelection(int from, int to) {
 	return { static_cast<uint16>(std::clamp(from, 0, 0xFFFF)), static_cast<uint16>(std::clamp(to, 0, 0xFFFF)) };
diff --git a/ui/text/text_isolated_emoji.h b/ui/text/text_isolated_emoji.h
index ac772bb..c3b5ce7 100644
--- a/ui/text/text_isolated_emoji.h
+++ b/ui/text/text_isolated_emoji.h
@@ -6,17 +6,19 @@
 //
 #pragma once
 
-namespace Ui {
-namespace Text {
+#include "base/variant.h"
+
+namespace Ui::Text {
 
 inline constexpr auto kIsolatedEmojiLimit = 3;
 
 struct IsolatedEmoji {
-	using Items = std::array<EmojiPtr, kIsolatedEmojiLimit>;
-	Items items = { { nullptr } };
+	using Item = std::variant<v::null_t, EmojiPtr, QString>;
+	using Items = std::array<Item, kIsolatedEmojiLimit>;
+	Items items = {};
 
 	[[nodiscard]] bool empty() const {
-		return items[0] == nullptr;
+		return v::is_null(items[0]);
 	}
 	[[nodiscard]] explicit operator bool() const {
 		return !empty();
@@ -41,5 +43,6 @@ struct IsolatedEmoji {
 	}
 };
 
-} // namespace Text
-} // namespace Ui
+constexpr auto t = sizeof(IsolatedEmoji);
+
+} // namespace Ui::Text

From d8b94feb9dacaa80e6559c3ebd625b323f59662d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Jul 2022 18:47:07 +0300
Subject: [PATCH 180/635] Disable attach bot share phone phrases for now.

---
 ui/integration.cpp | 2 ++
 ui/integration.h   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index 4930e45..ee44160 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -174,6 +174,7 @@ QString Integration::phrasePanelCloseAnyway() {
 	return "Close anyway";
 }
 
+#if 0 // disabled for now
 QString Integration::phraseBotSharePhone() {
 	return "Do you want to share your phone number with this bot?";
 }
@@ -185,5 +186,6 @@ QString Integration::phraseBotSharePhoneTitle() {
 QString Integration::phraseBotSharePhoneConfirm() {
 	return "Share";
 }
+#endif
 
 } // namespace Ui
diff --git a/ui/integration.h b/ui/integration.h
index 871ce42..6eb7d06 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -86,9 +86,11 @@ public:
 	[[nodiscard]] virtual QString phrasePanelCloseWarning();
 	[[nodiscard]] virtual QString phrasePanelCloseUnsaved();
 	[[nodiscard]] virtual QString phrasePanelCloseAnyway();
+#if 0 // disabled for now
 	[[nodiscard]] virtual QString phraseBotSharePhone();
 	[[nodiscard]] virtual QString phraseBotSharePhoneTitle();
 	[[nodiscard]] virtual QString phraseBotSharePhoneConfirm();
+#endif
 
 };
 

From 14f5a828fc90932fba7447234f3ff018984ed054 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Jul 2022 13:19:39 +0300
Subject: [PATCH 181/635] Add emoji subcategory icon color.

---
 ui/colors.palette | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/colors.palette b/ui/colors.palette
index e5ad475..c586c18 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -245,6 +245,7 @@ emojiPanHeaderFg: windowSubTextFg; // emoji panel section header text
 emojiPanHeaderBg: #fffffff2 | emojiPanBg; // emoji panel section header background
 emojiIconFg: #999999; // emoji category icon
 emojiIconFgActive: windowBgActive; // active emoji category icon
+emojiSubIconFgActive: #666666 | windowBoldFg; // active emoji subcategory icon
 stickerPanDeleteBg: #000000ff; // delete X button background for custom sent stickers in stickers panel (legacy)
 stickerPanDeleteFg: windowFgActive; // delete X button icon for custom sent stickers in stickers panel (legacy)
 stickerPreviewBg: #ffffffb0; // sticker and GIF preview background (when you press and hold on a sticker)

From 4ff70e7dff9377db10b7c04c0c96d4d7e0e10da3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Jul 2022 18:31:20 +0300
Subject: [PATCH 182/635] Fix popup menu with variable item height.

---
 ui/widgets/menu/menu.cpp | 56 +++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/ui/widgets/menu/menu.cpp b/ui/widgets/menu/menu.cpp
index 23c6bd0..471d021 100644
--- a/ui/widgets/menu/menu.cpp
+++ b/ui/widgets/menu/menu.cpp
@@ -148,29 +148,44 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
 	const auto raw = widget.get();
 	_actionWidgets.push_back(std::move(widget));
 
-	rpl::combine(
-		raw->minWidthValue(),
-		raw->heightValue()
-	) | rpl::start_with_next([=] {
-		const auto newWidth = _forceWidth
+	const auto recountWidth = [=] {
+		return _forceWidth
 			? _forceWidth
 			: std::clamp(
-				_actionWidgets.empty()
-				? 0
-				: (*ranges::max_element(
-					_actionWidgets,
-					std::less<>(),
-					&ItemBase::minWidth))->minWidth(),
+				(_actionWidgets.empty()
+					? 0
+					: (*ranges::max_element(
+						_actionWidgets,
+						std::less<>(),
+						&ItemBase::minWidth))->minWidth()),
 				_st.widthMin,
 				_st.widthMax);
-		const auto newHeight = ranges::accumulate(
-			_actionWidgets,
-			0,
-			ranges::plus(),
-			&ItemBase::height);
-		resizeFromInner(newWidth, newHeight);
+	};
+	const auto recountHeight = [=] {
+		auto result = 0;
+		for (const auto &widget : _actionWidgets) {
+			if (widget->y() != result) {
+				widget->move(0, result);
+			}
+			result += widget->height();
+		}
+		return result;
+	};
+
+	raw->minWidthValue(
+	) | rpl::skip(1) | rpl::filter([=] {
+		return !_forceWidth;
+	}) | rpl::start_with_next([=] {
+		resizeFromInner(recountWidth(), height());
 	}, raw->lifetime());
 
+	raw->heightValue(
+	) | rpl::skip(1) | rpl::start_with_next([=] {
+		resizeFromInner(width(), recountHeight());
+	}, raw->lifetime());
+
+	resizeFromInner(recountWidth(), recountHeight());
+
 	updateSelected(QCursor::pos());
 
 	return action;
@@ -204,11 +219,10 @@ bool Menu::empty() const {
 }
 
 void Menu::resizeFromInner(int w, int h) {
-	if ((w == width()) && (h == height())) {
-		return;
+	if (const auto s = QSize(w, h); s != size()) {
+		resize(s);
+		_resizesFromInner.fire({});
 	}
-	resize(w, h);
-	_resizesFromInner.fire({});
 }
 
 rpl::producer<> Menu::resizesFromInner() const {

From 9b0f4df00715f4dfaac81e17148ca37df26fb301 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 27 Jul 2022 13:48:32 +0300
Subject: [PATCH 183/635] Allow different style for child PopupMenu.

---
 ui/widgets/menu/menu_add_action_callback_factory.cpp | 2 +-
 ui/widgets/popup_menu.cpp                            | 6 ++++--
 ui/widgets/popup_menu.h                              | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/menu/menu_add_action_callback_factory.cpp b/ui/widgets/menu/menu_add_action_callback_factory.cpp
index 443fa45..2d1c73e 100644
--- a/ui/widgets/menu/menu_add_action_callback_factory.cpp
+++ b/ui/widgets/menu/menu_add_action_callback_factory.cpp
@@ -24,7 +24,7 @@ MenuCallback CreateAddActionCallback(
 				a.icon);
 			// Dummy menu.
 			action->setMenu(Ui::CreateChild<QMenu>(menu->menu().get()));
-			a.fillSubmenu(menu->ensureSubmenu(action));
+			a.fillSubmenu(menu->ensureSubmenu(action, menu->st()));
 			return action;
 		} else if (a.isSeparator) {
 			return menu->addSeparator();
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index c783372..75cd2c0 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -259,7 +259,9 @@ void PopupMenu::init() {
 	setAttribute(Qt::WA_TranslucentBackground, true);
 }
 
-not_null<PopupMenu*> PopupMenu::ensureSubmenu(not_null<QAction*> action) {
+not_null<PopupMenu*> PopupMenu::ensureSubmenu(
+		not_null<QAction*> action,
+		const style::PopupMenu &st) {
 	const auto &list = actions();
 	const auto i = ranges::find(list, action);
 	Assert(i != end(list));
@@ -270,7 +272,7 @@ not_null<PopupMenu*> PopupMenu::ensureSubmenu(not_null<QAction*> action) {
 	}
 	const auto result = _submenus.emplace(
 		action,
-		base::make_unique_q<PopupMenu>(parentWidget(), st())
+		base::make_unique_q<PopupMenu>(parentWidget(), st)
 	).first->second.get();
 	result->deleteOnHide(false);
 	return result;
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 1cfe9e7..2be0d27 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -49,7 +49,8 @@ public:
 
 	[[nodiscard]] const std::vector<not_null<QAction*>> &actions() const;
 	[[nodiscard]] not_null<PopupMenu*> ensureSubmenu(
-		not_null<QAction*> action);
+		not_null<QAction*> action,
+		const style::PopupMenu &st);
 	void removeSubmenu(not_null<QAction*> action);
 	void checkSubmenuShow();
 	bool empty() const;

From 4768e7ee03aa22f64f73dc13016d5bd94a047496 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 28 Jul 2022 17:13:43 +0300
Subject: [PATCH 184/635] Allow requesting originalUrl() from UrlClickHandler.

---
 ui/basic_click_handlers.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/basic_click_handlers.h b/ui/basic_click_handlers.h
index ac8c7e3..89d5773 100644
--- a/ui/basic_click_handlers.h
+++ b/ui/basic_click_handlers.h
@@ -39,6 +39,10 @@ class UrlClickHandler : public TextClickHandler {
 public:
 	UrlClickHandler(const QString &url, bool fullDisplayed = true);
 
+	[[nodiscard]] QString originalUrl() const {
+		return _originalUrl;
+	}
+
 	QString copyToClipboardContextItemText() const override;
 
 	QString dragText() const override {
@@ -64,9 +68,6 @@ public:
 	[[nodiscard]] static QString ShowEncoded(const QString &url);
 
 protected:
-	[[nodiscard]] QString originalUrl() const {
-		return _originalUrl;
-	}
 	QString url() const override {
 		return EncodeForOpening(_originalUrl);
 	}

From a7117df837db39e8d2e4590dd6b0434415f79264 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 2 Aug 2022 19:18:41 +0400
Subject: [PATCH 185/635] Use glib to open URLs on Linux

Just like in lib_base&tdesktop
---
 ui/basic_click_handlers.cpp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ui/basic_click_handlers.cpp b/ui/basic_click_handlers.cpp
index 71d3da7..33624ea 100644
--- a/ui/basic_click_handlers.cpp
+++ b/ui/basic_click_handlers.cpp
@@ -12,11 +12,19 @@
 #include "base/qthelp_url.h"
 #include "base/qt/qt_string_view.h"
 
+#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#include "base/platform/linux/base_linux_app_launch_context.h"
+#endif // Q_OS_UNIX && !Q_OS_MAC && !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+
 #include <QtCore/QUrl>
 #include <QtCore/QRegularExpression>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QGuiApplication>
 
+#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#include <giomm.h>
+#endif // Q_OS_UNIX && !Q_OS_MAC && !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+
 QString TextClickHandler::readable() const {
 	const auto result = url();
 	return !result.startsWith(qstr("internal:"))
@@ -80,6 +88,25 @@ void UrlClickHandler::Open(QString url, QVariant context) {
 		if (IsEmail(url)) {
 			url = "mailto: " + url;
 		}
+#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+		// Desktop entry spec implementation,
+		// prefer it over QDesktopServices::openUrl since it just calls
+		// the xdg-open shell script that is known to be bugged:
+		// various shell-specific bugs with spaces in paths,
+		// logic bugs violating the spec and etc, etc.
+		// Not to mention xdg-open can and will use DE-specific executables
+		// that allows various ill people to develop extensions
+		// to the standard and differ the behavior across apps.
+		// https://specifications.freedesktop.org/desktop-entry-spec/latest/
+		try {
+			if (Gio::AppInfo::launch_default_for_uri(
+				url.toStdString(),
+				base::Platform::AppLaunchContext())) {
+				return;
+			}
+		} catch (...) {
+		}
+#endif // Q_OS_UNIX && !Q_OS_MAC && !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 		QDesktopServices::openUrl(url);
 	}
 }

From f27d756bcd7508250a3f7ff73bf6053308c18cd6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 3 Aug 2022 20:07:43 +0300
Subject: [PATCH 186/635] Support getting OnlyCustomEmoji from
 Ui::Text::String.

---
 ui/text/text.cpp              | 71 +++++++++++++++++++++++++++++++++--
 ui/text/text.h                | 16 ++++++--
 ui/text/text_isolated_emoji.h | 15 +++++++-
 3 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 70e870d..ab84086 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -836,10 +836,28 @@ void Parser::finalize(const TextParseOptions &options) {
 			currentIndex++;
 		}
 	};
+	auto isolatedEmojiCount = 0;
 	_t->_hasCustomEmoji = false;
+	_t->_isIsolatedEmoji = true;
+	_t->_isOnlyCustomEmoji = true;
 	for (auto &block : _t->_blocks) {
 		if (block->type() == TextBlockTCustomEmoji) {
 			_t->_hasCustomEmoji = true;
+		} else if (block->type() != TextBlockTNewline
+			&& block->type() != TextBlockTSkip) {
+			_t->_isOnlyCustomEmoji = false;
+		} else if (block->lnkIndex()) {
+			_t->_isOnlyCustomEmoji = _t->_isIsolatedEmoji = false;
+		}
+		if (_t->_isIsolatedEmoji) {
+			if (block->type() == TextBlockTCustomEmoji
+				|| block->type() == TextBlockTEmoji) {
+				if (++isolatedEmojiCount > kIsolatedEmojiLimit) {
+					_t->_isIsolatedEmoji = false;
+				}
+			} else if (block->type() != TextBlockTSkip) {
+				_t->_isIsolatedEmoji = false;
+			}
 		}
 		const auto spoilerIndex = block->spoilerIndex();
 		if (spoilerIndex && (_t->_spoilers.size() < spoilerIndex)) {
@@ -906,6 +924,12 @@ void Parser::finalize(const TextParseOptions &options) {
 		}
 		lastHandlerIndex.lnk = realIndex;
 	}
+	if (!_t->_hasCustomEmoji || !_t->_spoilers.empty()) {
+		_t->_isOnlyCustomEmoji = false;
+	}
+	if (_t->_blocks.empty() || !_t->_spoilers.empty()) {
+		_t->_isIsolatedEmoji = false;
+	}
 	_t->_links.squeeze();
 	_t->_spoilers.squeeze();
 	_t->_blocks.shrink_to_fit();
@@ -2916,11 +2940,20 @@ private:
 
 };
 
-String::String(int32 minResizeWidth) : _minResizeWidth(minResizeWidth) {
+String::String(int32 minResizeWidth)
+: _minResizeWidth(minResizeWidth)
+, _hasCustomEmoji(false)
+, _isOnlyCustomEmoji(false) {
 }
 
-String::String(const style::TextStyle &st, const QString &text, const TextParseOptions &options, int32 minResizeWidth)
-: _minResizeWidth(minResizeWidth) {
+String::String(
+	const style::TextStyle &st,
+	const QString &text,
+	const TextParseOptions &options,
+	int32 minResizeWidth)
+: _minResizeWidth(minResizeWidth)
+, _hasCustomEmoji(false)
+, _isOnlyCustomEmoji(false) {
 	setText(st, text, options);
 }
 
@@ -3552,6 +3585,31 @@ void String::unloadCustomEmoji() {
 	}
 }
 
+bool String::isOnlyCustomEmoji() const {
+	return _isOnlyCustomEmoji;
+}
+
+OnlyCustomEmoji String::toOnlyCustomEmoji() const {
+	if (!_isOnlyCustomEmoji) {
+		return {};
+	}
+	auto result = OnlyCustomEmoji();
+	auto spaces = 0;
+	result.lines.emplace_back();
+	for (const auto &block : _blocks) {
+		const auto raw = block.get();
+		if (raw->type() == TextBlockTCustomEmoji) {
+			const auto custom = static_cast<const CustomEmojiBlock*>(raw);
+			result.lines.back().push_back({
+				.entityData = custom->_custom->entityData(),
+			});
+		} else if (raw->type() == TextBlockTNewline) {
+			result.lines.emplace_back();
+		}
+	}
+	return result;
+}
+
 QString String::toString(TextSelection selection) const {
 	return toText(selection, false, false).rich.text;
 }
@@ -3715,7 +3773,14 @@ TextForMimeData String::toText(
 	return result;
 }
 
+bool String::isIsolatedEmoji() const {
+	return _isIsolatedEmoji;
+}
+
 IsolatedEmoji String::toIsolatedEmoji() const {
+	if (!_isIsolatedEmoji) {
+		return {};
+	}
 	auto result = IsolatedEmoji();
 	const auto skip = (_blocks.empty()
 		|| _blocks.back()->type() != TextBlockTSkip) ? 0 : 1;
diff --git a/ui/text/text.h b/ui/text/text.h
index 83c2273..6f810ad 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -63,6 +63,7 @@ static constexpr TextSelection AllTextSelection = { 0, 0xFFFF };
 namespace Ui::Text {
 
 struct IsolatedEmoji;
+struct OnlyCustomEmoji;
 
 struct StateRequest {
 	enum class Flag {
@@ -160,17 +161,22 @@ public:
 		return _text.size();
 	}
 
-	[[nodiscard]] bool hasCustomEmoji() const;
-	void unloadCustomEmoji();
-
 	[[nodiscard]] QString toString(
 		TextSelection selection = AllTextSelection) const;
 	[[nodiscard]] TextWithEntities toTextWithEntities(
 		TextSelection selection = AllTextSelection) const;
 	[[nodiscard]] TextForMimeData toTextForMimeData(
 		TextSelection selection = AllTextSelection) const;
+
+	[[nodiscard]] bool hasCustomEmoji() const;
+	void unloadCustomEmoji();
+
+	[[nodiscard]] bool isIsolatedEmoji() const;
 	[[nodiscard]] IsolatedEmoji toIsolatedEmoji() const;
 
+	[[nodiscard]] bool isOnlyCustomEmoji() const;
+	[[nodiscard]] OnlyCustomEmoji toOnlyCustomEmoji() const;
+
 	[[nodiscard]] const style::TextStyle *style() const {
 		return _st;
 	}
@@ -210,7 +216,9 @@ private:
 	QFixed _minResizeWidth;
 	QFixed _maxWidth = 0;
 	int32 _minHeight = 0;
-	bool _hasCustomEmoji = false;
+	bool _hasCustomEmoji : 1;
+	bool _isIsolatedEmoji : 1;
+	bool _isOnlyCustomEmoji : 1;
 
 	QString _text;
 	const style::TextStyle *_st = nullptr;
diff --git a/ui/text/text_isolated_emoji.h b/ui/text/text_isolated_emoji.h
index c3b5ce7..d73ef66 100644
--- a/ui/text/text_isolated_emoji.h
+++ b/ui/text/text_isolated_emoji.h
@@ -43,6 +43,19 @@ struct IsolatedEmoji {
 	}
 };
 
-constexpr auto t = sizeof(IsolatedEmoji);
+struct OnlyCustomEmoji {
+	struct Item {
+		QString entityData;
+		int spacesBefore = 0;
+	};
+	std::vector<std::vector<Item>> lines;
+
+	[[nodiscard]] bool empty() const {
+		return lines.empty();
+	}
+	[[nodiscard]] explicit operator bool() const {
+		return !empty();
+	}
+};
 
 } // namespace Ui::Text

From f15218d36e91af79b69bfcb3aabadb531fd4de33 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 3 Aug 2022 20:38:22 +0400
Subject: [PATCH 187/635] Make QWidgetPrivate accessible

---
 ui/rp_widget.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ui/rp_widget.h b/ui/rp_widget.h
index f1260b9..33143da 100644
--- a/ui/rp_widget.h
+++ b/ui/rp_widget.h
@@ -258,6 +258,8 @@ class RpWidgetWrap {
 public:
 	virtual QWidget *rpWidget() = 0;
 	virtual const QWidget *rpWidget() const = 0;
+	virtual QObjectData *rpPrivate() = 0;
+	virtual const QObjectData *rpPrivate() const = 0;
 
 	rpl::producer<not_null<QEvent*>> events() const;
 	rpl::producer<QRect> geometryValue() const;
@@ -336,6 +338,12 @@ public:
 	const QWidget *rpWidget() const final override {
 		return this;
 	}
+	QObjectData *rpPrivate() final override {
+		return qGetPtrHelper(this->d_ptr);
+	}
+	const QObjectData *rpPrivate() const final override {
+		return qGetPtrHelper(this->d_ptr);
+	}
 	void setVisible(bool visible) final override {
 		auto wasVisible = !this->isHidden();
 		setVisibleHook(visible);

From 303947c78c27d8322dd1b9a6796a2eb13c0ba78a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 4 Aug 2022 06:39:43 +0400
Subject: [PATCH 188/635] Allow buffer size overrides on Wayland EGL

---
 .../linux/ui_linux_wayland_integration.cpp    | 84 ++++++++++++++++++-
 ui/platform/linux/wayland-egl.json            |  3 +
 2 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 ui/platform/linux/wayland-egl.json

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 32666b3..bcbfa53 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -12,9 +12,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "waylandshells/xdg_shell.h"
 #include "qwayland-xdg-shell.h"
 
+#include <QtCore/QtPlugin>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <qpa/qplatformnativeinterface.h>
+#include <wayland-client.h>
 
 // private QtWaylandClient headers are using keywords :(
 #ifdef QT_NO_KEYWORDS
@@ -22,15 +24,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #define slots Q_SLOTS
 #endif // QT_NO_KEYWORDS
 
+#ifndef QT_STATICPLUGIN
+#define QT_STATICPLUGIN
+#endif // !QT_STATICPLUGIN
+
 #include <private/qwaylanddisplay_p.h>
 #include <private/qwaylandwindow_p.h>
 #include <private/qwaylandinputdevice_p.h>
-
-#include <wayland-client.h>
+#include <private/qwaylandclientbufferintegrationplugin_p.h>
+#include <private/qwaylandeglclientbufferintegration_p.h>
+#include <private/qwaylandeglwindow_p.h>
+#include <private/qwidgetwindow_p.h>
+#include <private/qwidget_p.h>
 
 Q_DECLARE_METATYPE(QMargins);
 
-using QtWaylandClient::QWaylandWindow;
+Q_IMPORT_PLUGIN(DesktopAppWaylandEglClientBufferPlugin)
+
+using namespace QtWaylandClient;
 
 namespace Ui {
 namespace Platform {
@@ -48,6 +59,64 @@ struct WlCallbackDeleter {
 	}
 };
 
+class DesktopAppWaylandEglWindow : public QWaylandEglWindow {
+public:
+	using QWaylandEglWindow::QWaylandEglWindow;
+
+	void ensureSize() override {
+		_settingGeometry = false;
+		QWaylandEglWindow::ensureSize();
+	}
+
+	QRect geometry() const override {
+		if (!_settingGeometry) {
+			if (const auto widgetWindow = qobject_cast<const QWidgetWindow*>(
+				window())) {
+				return widgetWindow->widget()->geometry();
+			}
+		}
+		return QWaylandEglWindow::geometry();
+	}
+
+	void setGeometry(const QRect &rect) override {
+		_settingGeometry = true;
+		QWaylandEglWindow::setGeometry(rect);
+	}
+
+private:
+	bool _settingGeometry = false;
+};
+
+class DesktopAppWaylandEglClientBufferIntegration
+	: public QWaylandEglClientBufferIntegration {
+public:
+	void initialize(QWaylandDisplay *display) override {
+		m_display = display;
+		QWaylandEglClientBufferIntegration::initialize(display);
+	}
+
+	QWaylandWindow *createEglWindow(QWindow *window) override {
+		return new DesktopAppWaylandEglWindow(window, m_display);
+	}
+
+private:
+	QWaylandDisplay *m_display = nullptr;
+};
+
+class DesktopAppWaylandEglClientBufferPlugin
+	: public QWaylandClientBufferIntegrationPlugin {
+	Q_OBJECT
+	Q_PLUGIN_METADATA(
+		IID QWaylandClientBufferIntegrationFactoryInterface_iid
+		FILE "wayland-egl.json")
+public:
+	QWaylandClientBufferIntegration *create(
+			const QString&,
+			const QStringList&) override {
+		return new DesktopAppWaylandEglClientBufferIntegration();
+	}
+};
+
 } // namespace
 
 struct WaylandIntegration::Private {
@@ -212,8 +281,15 @@ void WaylandIntegration::showWindowMenu(
 		return;
 	}
 
-	xdg_toplevel_show_window_menu(toplevel, seat, *serial, point.x(), point.y());
+	xdg_toplevel_show_window_menu(
+		toplevel,
+		seat,
+		*serial,
+		point.x(),
+		point.y());
 }
 
 } // namespace Platform
 } // namespace Ui
+
+#include "ui/platform/linux/ui_linux_wayland_integration.moc"
diff --git a/ui/platform/linux/wayland-egl.json b/ui/platform/linux/wayland-egl.json
new file mode 100644
index 0000000..fd3a978
--- /dev/null
+++ b/ui/platform/linux/wayland-egl.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "desktop-app-wayland-egl" ]
+}

From dcb4a33eeffc549c8ac52a39a1b7a220076ab649 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Aug 2022 18:25:45 +0300
Subject: [PATCH 189/635] Allow changing SeparatePanel title height.

---
 ui/layers/layers.style        |  1 +
 ui/widgets/separate_panel.cpp | 15 ++++++++++++---
 ui/widgets/separate_panel.h   |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index a07cd19..018ef3e 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -160,6 +160,7 @@ boxDividerHeight: 10px;
 
 separatePanelBorderCacheSize: 60px;
 separatePanelTitleHeight: 62px;
+separatePanelNoTitleHeight: 32px;
 separatePanelClose: IconButton(boxTitleClose) {
 	width: 60px;
 	height: 60px;
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index f302edf..4176ba3 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -93,7 +93,8 @@ SeparatePanel::SeparatePanel(QWidget *parent)
 : RpWidget(parent)
 , _close(this, st::separatePanelClose)
 , _back(this, object_ptr<Ui::IconButton>(this, st::separatePanelBack))
-, _body(this) {
+, _body(this)
+, _titleHeight(st::separatePanelTitleHeight) {
 	setMouseTracking(true);
 	setWindowIcon(QGuiApplication::windowIcon());
 	initControls();
@@ -107,6 +108,11 @@ void SeparatePanel::setTitle(rpl::producer<QString> title) {
 	updateTitleGeometry(width());
 }
 
+void SeparatePanel::setTitleHeight(int height) {
+	_titleHeight = height;
+	updateControlsGeometry();
+}
+
 void SeparatePanel::initControls() {
 	widthValue(
 	) | rpl::start_with_next([=](int width) {
@@ -127,6 +133,9 @@ void SeparatePanel::initControls() {
 	}, _back->lifetime());
 	_back->hide(anim::type::instant);
 	_titleLeft.stop();
+
+	_back->raise();
+	_close->raise();
 }
 
 void SeparatePanel::updateTitleGeometry(int newWidth) {
@@ -552,7 +561,7 @@ void SeparatePanel::resizeEvent(QResizeEvent *e) {
 }
 
 void SeparatePanel::updateControlsGeometry() {
-	const auto top = _padding.top() + st::separatePanelTitleHeight;
+	const auto top = _padding.top() + _titleHeight;
 	_body->setGeometry(
 		_padding.left(),
 		top,
@@ -716,7 +725,7 @@ void SeparatePanel::mousePressEvent(QMouseEvent *e) {
 		_padding.left(),
 		_padding.top(),
 		width() - _padding.left() - _padding.right(),
-		st::separatePanelTitleHeight);
+		_titleHeight);
 	if (e->button() == Qt::LeftButton) {
 		if (dragArea.contains(e->pos())) {
 			const auto dragViaSystem = [&] {
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 029dc8f..311c02f 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -34,6 +34,7 @@ public:
 	explicit SeparatePanel(QWidget *parent = nullptr);
 
 	void setTitle(rpl::producer<QString> title);
+	void setTitleHeight(int height);
 	void setInnerSize(QSize size);
 	[[nodiscard]] QRect innerGeometry() const;
 
@@ -105,6 +106,7 @@ private:
 	rpl::event_stream<> _userCloseRequests;
 	rpl::event_stream<> _closeEvents;
 
+	int _titleHeight = 0;
 	bool _hideOnDeactivate = false;
 	bool _useTransparency = true;
 	style::margins _padding;

From 9b5c58f92f129925b48449bba20bb6e9678d2e58 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Aug 2022 19:27:45 +0300
Subject: [PATCH 190/635] Allow SeparatePanel not to join all spaces.

---
 ui/widgets/separate_panel.cpp | 12 +++++++-----
 ui/widgets/separate_panel.h   |  9 +++++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 4176ba3..063bb42 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -89,8 +89,8 @@ PanelShow::operator bool() const {
 
 } // namespace
 
-SeparatePanel::SeparatePanel(QWidget *parent)
-: RpWidget(parent)
+SeparatePanel::SeparatePanel(SeparatePanelArgs &&args)
+: RpWidget(args.parent)
 , _close(this, st::separatePanelClose)
 , _back(this, object_ptr<Ui::IconButton>(this, st::separatePanelBack))
 , _body(this)
@@ -98,7 +98,7 @@ SeparatePanel::SeparatePanel(QWidget *parent)
 	setMouseTracking(true);
 	setWindowIcon(QGuiApplication::windowIcon());
 	initControls();
-	initLayout();
+	initLayout(args);
 }
 
 void SeparatePanel::setTitle(rpl::producer<QString> title) {
@@ -280,7 +280,7 @@ bool SeparatePanel::eventHook(QEvent *e) {
 	return RpWidget::eventHook(e);
 }
 
-void SeparatePanel::initLayout() {
+void SeparatePanel::initLayout(const SeparatePanelArgs &args) {
 	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint)
 		| Qt::WindowStaysOnTopHint
 		| Qt::NoDropShadowWindowHint
@@ -296,7 +296,9 @@ void SeparatePanel::initLayout() {
 		Ui::ForceFullRepaint(this);
 	}, lifetime());
 
-	Ui::Platform::InitOnTopPanel(this);
+	if (args.onAllSpaces) {
+		Ui::Platform::InitOnTopPanel(this);
+	}
 }
 
 void SeparatePanel::createBorderImage() {
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 311c02f..63cfbdd 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -29,9 +29,14 @@ class FlatLabel;
 template <typename Widget>
 class FadeWrapScaled;
 
+struct SeparatePanelArgs {
+	QWidget *parent = nullptr;
+	bool onAllSpaces = false;
+};
+
 class SeparatePanel final : public RpWidget {
 public:
-	explicit SeparatePanel(QWidget *parent = nullptr);
+	explicit SeparatePanel(SeparatePanelArgs &&args = {});
 
 	void setTitle(rpl::producer<QString> title);
 	void setTitleHeight(int height);
@@ -73,7 +78,7 @@ protected:
 
 private:
 	void initControls();
-	void initLayout();
+	void initLayout(const SeparatePanelArgs &args);
 	void initGeometry(QSize size);
 	void updateGeometry(QSize size);
 	void showControls();

From bda46510f5f598ebaa72b07e4104bd1b5b3bb6e0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Aug 2022 10:12:33 +0300
Subject: [PATCH 191/635] Fix build with GCC.

---
 ui/text/text.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index ab84086..bc2fc0b 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -3594,7 +3594,6 @@ OnlyCustomEmoji String::toOnlyCustomEmoji() const {
 		return {};
 	}
 	auto result = OnlyCustomEmoji();
-	auto spaces = 0;
 	result.lines.emplace_back();
 	for (const auto &block : _blocks) {
 		const auto raw = block.get();

From 4689c896e201cc2863d629eac58306a0b561a71c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 5 Aug 2022 14:45:42 +0400
Subject: [PATCH 192/635] Fix packaged build

---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index bcbfa53..1de34fd 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -12,6 +12,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "waylandshells/xdg_shell.h"
 #include "qwayland-xdg-shell.h"
 
+// must be before QtPlugin include
+#ifndef QT_STATICPLUGIN
+#define QT_STATICPLUGIN
+#endif // !QT_STATICPLUGIN
+
 #include <QtCore/QtPlugin>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
@@ -24,10 +29,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #define slots Q_SLOTS
 #endif // QT_NO_KEYWORDS
 
-#ifndef QT_STATICPLUGIN
-#define QT_STATICPLUGIN
-#endif // !QT_STATICPLUGIN
-
 #include <private/qwaylanddisplay_p.h>
 #include <private/qwaylandwindow_p.h>
 #include <private/qwaylandinputdevice_p.h>
@@ -70,8 +71,9 @@ public:
 
 	QRect geometry() const override {
 		if (!_settingGeometry) {
-			if (const auto widgetWindow = qobject_cast<const QWidgetWindow*>(
-				window())) {
+			if (window()->inherits("QWidgetWindow")) {
+				const auto widgetWindow = static_cast<QWidgetWindow*>(
+					window());
 				return widgetWindow->widget()->geometry();
 			}
 		}

From f5cdf4bdb81253cbaef13dfd913154a941165d3f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 8 Aug 2022 04:10:04 +0400
Subject: [PATCH 193/635] Provide menu shadow size to the system

---
 ui/widgets/popup_menu.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 75cd2c0..dd6d3bf 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -302,6 +302,13 @@ void PopupMenu::handleCompositingUpdate() {
 	_padding = _useTransparency
 		? _st.shadow.extend
 		: style::margins(line, line, line, line);
+	if (windowHandle()) {
+		if (_useTransparency) {
+			Platform::SetWindowExtents(this, _padding);
+		} else {
+			Platform::UnsetWindowExtents(this);
+		}
+	}
 	_scroll->moveToLeft(_padding.left(), _padding.top());
 	handleMenuResize();
 	updateRoundingOverlay();

From b75b69d59d0299fc37d35f81e67a918afe3b5ae2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 5 Aug 2022 08:10:14 +0300
Subject: [PATCH 194/635] Reduced boxLabel::minWidth to be less than width of
 box with padding.

---
 ui/layers/layers.style | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 018ef3e..a1e1f53 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -137,7 +137,8 @@ defaultBox: Box {
 layerBox: Box(defaultBox) {
 }
 boxLabel: FlatLabel(defaultFlatLabel) {
-	minWidth: 274px;
+	// Keep minWidth <= boxWidth - boxPadding.left - boxPadding.right.
+	minWidth: 256px;
 	align: align(topleft);
 	style: boxLabelStyle;
 }

From c6727e673d6aadeb1ec85aed6cf630bc756a6dd9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Aug 2022 09:39:59 +0300
Subject: [PATCH 195/635] Revert "Fix packaged build"

This reverts commit 4689c896e201cc2863d629eac58306a0b561a71c.
---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 1de34fd..bcbfa53 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -12,11 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "waylandshells/xdg_shell.h"
 #include "qwayland-xdg-shell.h"
 
-// must be before QtPlugin include
-#ifndef QT_STATICPLUGIN
-#define QT_STATICPLUGIN
-#endif // !QT_STATICPLUGIN
-
 #include <QtCore/QtPlugin>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
@@ -29,6 +24,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #define slots Q_SLOTS
 #endif // QT_NO_KEYWORDS
 
+#ifndef QT_STATICPLUGIN
+#define QT_STATICPLUGIN
+#endif // !QT_STATICPLUGIN
+
 #include <private/qwaylanddisplay_p.h>
 #include <private/qwaylandwindow_p.h>
 #include <private/qwaylandinputdevice_p.h>
@@ -71,9 +70,8 @@ public:
 
 	QRect geometry() const override {
 		if (!_settingGeometry) {
-			if (window()->inherits("QWidgetWindow")) {
-				const auto widgetWindow = static_cast<QWidgetWindow*>(
-					window());
+			if (const auto widgetWindow = qobject_cast<const QWidgetWindow*>(
+				window())) {
 				return widgetWindow->widget()->geometry();
 			}
 		}

From 48ce68751ab1d3473e7b9846b7fa845161768478 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Aug 2022 09:40:17 +0300
Subject: [PATCH 196/635] Revert "Make QWidgetPrivate accessible"

This reverts commit f15218d36e91af79b69bfcb3aabadb531fd4de33.
---
 ui/rp_widget.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ui/rp_widget.h b/ui/rp_widget.h
index 33143da..f1260b9 100644
--- a/ui/rp_widget.h
+++ b/ui/rp_widget.h
@@ -258,8 +258,6 @@ class RpWidgetWrap {
 public:
 	virtual QWidget *rpWidget() = 0;
 	virtual const QWidget *rpWidget() const = 0;
-	virtual QObjectData *rpPrivate() = 0;
-	virtual const QObjectData *rpPrivate() const = 0;
 
 	rpl::producer<not_null<QEvent*>> events() const;
 	rpl::producer<QRect> geometryValue() const;
@@ -338,12 +336,6 @@ public:
 	const QWidget *rpWidget() const final override {
 		return this;
 	}
-	QObjectData *rpPrivate() final override {
-		return qGetPtrHelper(this->d_ptr);
-	}
-	const QObjectData *rpPrivate() const final override {
-		return qGetPtrHelper(this->d_ptr);
-	}
 	void setVisible(bool visible) final override {
 		auto wasVisible = !this->isHidden();
 		setVisibleHook(visible);

From 16708fd4f42c38ff43ddd2a82a638bd5b7cd2be8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 8 Aug 2022 09:40:29 +0300
Subject: [PATCH 197/635] Revert "Allow buffer size overrides on Wayland EGL"

This reverts commit 303947c78c27d8322dd1b9a6796a2eb13c0ba78a.
---
 .../linux/ui_linux_wayland_integration.cpp    | 84 +------------------
 ui/platform/linux/wayland-egl.json            |  3 -
 2 files changed, 4 insertions(+), 83 deletions(-)
 delete mode 100644 ui/platform/linux/wayland-egl.json

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index bcbfa53..32666b3 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -12,11 +12,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "waylandshells/xdg_shell.h"
 #include "qwayland-xdg-shell.h"
 
-#include <QtCore/QtPlugin>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <qpa/qplatformnativeinterface.h>
-#include <wayland-client.h>
 
 // private QtWaylandClient headers are using keywords :(
 #ifdef QT_NO_KEYWORDS
@@ -24,24 +22,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #define slots Q_SLOTS
 #endif // QT_NO_KEYWORDS
 
-#ifndef QT_STATICPLUGIN
-#define QT_STATICPLUGIN
-#endif // !QT_STATICPLUGIN
-
 #include <private/qwaylanddisplay_p.h>
 #include <private/qwaylandwindow_p.h>
 #include <private/qwaylandinputdevice_p.h>
-#include <private/qwaylandclientbufferintegrationplugin_p.h>
-#include <private/qwaylandeglclientbufferintegration_p.h>
-#include <private/qwaylandeglwindow_p.h>
-#include <private/qwidgetwindow_p.h>
-#include <private/qwidget_p.h>
+
+#include <wayland-client.h>
 
 Q_DECLARE_METATYPE(QMargins);
 
-Q_IMPORT_PLUGIN(DesktopAppWaylandEglClientBufferPlugin)
-
-using namespace QtWaylandClient;
+using QtWaylandClient::QWaylandWindow;
 
 namespace Ui {
 namespace Platform {
@@ -59,64 +48,6 @@ struct WlCallbackDeleter {
 	}
 };
 
-class DesktopAppWaylandEglWindow : public QWaylandEglWindow {
-public:
-	using QWaylandEglWindow::QWaylandEglWindow;
-
-	void ensureSize() override {
-		_settingGeometry = false;
-		QWaylandEglWindow::ensureSize();
-	}
-
-	QRect geometry() const override {
-		if (!_settingGeometry) {
-			if (const auto widgetWindow = qobject_cast<const QWidgetWindow*>(
-				window())) {
-				return widgetWindow->widget()->geometry();
-			}
-		}
-		return QWaylandEglWindow::geometry();
-	}
-
-	void setGeometry(const QRect &rect) override {
-		_settingGeometry = true;
-		QWaylandEglWindow::setGeometry(rect);
-	}
-
-private:
-	bool _settingGeometry = false;
-};
-
-class DesktopAppWaylandEglClientBufferIntegration
-	: public QWaylandEglClientBufferIntegration {
-public:
-	void initialize(QWaylandDisplay *display) override {
-		m_display = display;
-		QWaylandEglClientBufferIntegration::initialize(display);
-	}
-
-	QWaylandWindow *createEglWindow(QWindow *window) override {
-		return new DesktopAppWaylandEglWindow(window, m_display);
-	}
-
-private:
-	QWaylandDisplay *m_display = nullptr;
-};
-
-class DesktopAppWaylandEglClientBufferPlugin
-	: public QWaylandClientBufferIntegrationPlugin {
-	Q_OBJECT
-	Q_PLUGIN_METADATA(
-		IID QWaylandClientBufferIntegrationFactoryInterface_iid
-		FILE "wayland-egl.json")
-public:
-	QWaylandClientBufferIntegration *create(
-			const QString&,
-			const QStringList&) override {
-		return new DesktopAppWaylandEglClientBufferIntegration();
-	}
-};
-
 } // namespace
 
 struct WaylandIntegration::Private {
@@ -281,15 +212,8 @@ void WaylandIntegration::showWindowMenu(
 		return;
 	}
 
-	xdg_toplevel_show_window_menu(
-		toplevel,
-		seat,
-		*serial,
-		point.x(),
-		point.y());
+	xdg_toplevel_show_window_menu(toplevel, seat, *serial, point.x(), point.y());
 }
 
 } // namespace Platform
 } // namespace Ui
-
-#include "ui/platform/linux/ui_linux_wayland_integration.moc"
diff --git a/ui/platform/linux/wayland-egl.json b/ui/platform/linux/wayland-egl.json
deleted file mode 100644
index fd3a978..0000000
--- a/ui/platform/linux/wayland-egl.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "Keys": [ "desktop-app-wayland-egl" ]
-}

From 637ff6be4b2481fffa78087a24cb9bd5380e046a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 9 Aug 2022 02:36:15 +0400
Subject: [PATCH 198/635] Use version-less Qt targets and functions whenever
 possible

---
 CMakeLists.txt | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13b7a19..9dbebcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,14 +279,10 @@ if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
 elseif(LINUX)
     remove_target_sources(lib_ui ${src_loc} ui/platform/linux/ui_linux_wayland_integration_dummy.cpp)
 
-    if (DESKTOP_APP_QT6)
-        qt6_generate_wayland_protocol_client_sources(lib_ui
-        FILES
-            ${third_party_loc}/wayland-protocols/stable/xdg-shell/xdg-shell.xml
-        )
-    else()
-        message(FATAL_ERROR "This piece of cmake code is not ported to Qt 5")
-    endif()
+    qt_generate_wayland_protocol_client_sources(lib_ui
+    FILES
+        ${third_party_loc}/wayland-protocols/stable/xdg-shell/xdg-shell.xml
+    )
 
     target_link_libraries(lib_ui
     PUBLIC

From 6732aa70e94202f0d7f135e45a89ba65e6c5c287 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 9 Aug 2022 02:46:53 +0400
Subject: [PATCH 199/635] Fix endless hiding state without compositing

---
 ui/widgets/popup_menu.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index dd6d3bf..a8374e1 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -631,12 +631,12 @@ void PopupMenu::hideAnimated() {
 void PopupMenu::hideFast() {
 	if (isHidden()) return;
 
-	_hiding = false;
 	_a_opacity.stop();
 	hideFinished();
 }
 
 void PopupMenu::hideFinished() {
+	_hiding = false;
 	_a_show.stop();
 	_cache = QPixmap();
 	if (!isHidden()) {
@@ -723,7 +723,6 @@ void PopupMenu::opacityAnimationCallback() {
 	update();
 	if (!_a_opacity.animating()) {
 		if (_hiding) {
-			_hiding = false;
 			hideFinished();
 		} else {
 			showChildren();

From 180b0bc51796dcbe5d9371280e49fda24dfaf0fd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 14 Aug 2022 07:02:06 +0400
Subject: [PATCH 200/635] Apply window extents early to avoid window size
 changes

---
 ui/platform/ui_platform_window.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 0a4a70f..55bcf0e 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -192,12 +192,13 @@ DefaultWindowHelper::DefaultWindowHelper(not_null<RpWidget*> window)
 }
 
 void DefaultWindowHelper::init() {
-	_title->show();
-
 	if (WindowExtentsSupported()) {
 		window()->setAttribute(Qt::WA_TranslucentBackground);
 	}
 
+	window()->createWinId();
+	_title->show();
+
 	rpl::combine(
 		window()->widthValue(),
 		_windowState.value(),
@@ -260,12 +261,8 @@ void DefaultWindowHelper::init() {
 			bool shown,
 			bool titleShown,
 			Qt::WindowStates windowState) {
-		if (const auto handle = window()->windowHandle()) {
-			handle->setFlag(Qt::FramelessWindowHint, titleShown);
-			updateWindowExtents();
-		} else {
-			window()->setWindowFlag(Qt::FramelessWindowHint, titleShown);
-		}
+		window()->windowHandle()->setFlag(Qt::FramelessWindowHint, titleShown);
+		updateWindowExtents();
 	}, window()->lifetime());
 
 	window()->events() | rpl::start_with_next([=](not_null<QEvent*> e) {

From fbd82ff92b6e7e1d1f5bb61308d59b60b066f073 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Aug 2022 13:12:41 +0300
Subject: [PATCH 201/635] Simplify CustomEmojiId.

---
 ui/widgets/input_fields.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index f1dcfdf..52756c4 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -130,13 +130,12 @@ bool IsNewline(QChar ch) {
 
 [[nodiscard]] uint64 CustomEmojiIdFromLink(QStringView link) {
 	const auto skip = Ui::InputField::kCustomEmojiTagStart.size();
-	if (const auto i = link.indexOf(':', skip + 1); i > 0) {
-		return base::StringViewMid(
-			link,
-			skip + 1,
-			i - skip - 1).toULongLong();
-	}
-	return 0;
+	const auto index = link.indexOf('?', skip + 1);
+	return base::StringViewMid(
+		link,
+		skip,
+		(index <= skip) ? -1 : (index - skip - 1)
+	).toULongLong();
 }
 
 [[nodiscard]] QString CheckFullTextTag(
@@ -3649,7 +3648,7 @@ QString InputField::CustomEmojiLink(QStringView entityData) {
 
 QString InputField::CustomEmojiEntityData(QStringView link) {
 	const auto match = qthelp::regex_match(
-		"^(\\d+:\\d+)(\\?|$)",
+		"^(\\d+)(\\?|$)",
 		base::StringViewMid(link, kCustomEmojiTagStart.size()));
 	return match ? match->captured(1) : QString();
 }

From 9604836ed943299278395b51d21fe04459272d1a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Aug 2022 15:13:28 +0300
Subject: [PATCH 202/635] Fix custom emoji copy from TextWithEntities to
 clipboard.

---
 ui/text/text_entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 0dc3676..c4878de 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -2213,7 +2213,7 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 		} break;
 		case EntityType::CustomEmoji: {
 			const auto match = QRegularExpression(
-				"^(\\d+:\\d+)$"
+				"^(\\d+)$"
 			).match(entity.data());
 			if (match.hasMatch()) {
 				push(Ui::InputField::CustomEmojiLink(entity.data()));

From 2f5d5e0e79bf52ab04047bc93a4b624d6d33d46a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 15 Aug 2022 18:40:24 +0300
Subject: [PATCH 203/635] Don't allow custom emoji pseudo-links in EditLink.

---
 ui/widgets/input_fields.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 52756c4..09128f5 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -3633,7 +3633,7 @@ void InputField::finishMarkdownTagChange(
 }
 
 bool InputField::IsValidMarkdownLink(QStringView link) {
-	return ::Ui::IsValidMarkdownLink(link);
+	return ::Ui::IsValidMarkdownLink(link) && !::Ui::IsCustomEmojiLink(link);
 }
 
 bool InputField::IsCustomEmojiLink(QStringView link) {

From 6ce4bedc2896d5fa26afd10b4fb2d353d15e5058 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 15 Aug 2022 21:34:14 +0300
Subject: [PATCH 204/635] Removed unused Ui::Text::Parser::createSkipBlock
 method.

---
 ui/text/text.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index bc2fc0b..20fa292 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -240,7 +240,7 @@ private:
 	void trimSourceRange();
 	void blockCreated();
 	void createBlock(int32 skipBack = 0);
-	void createSkipBlock(int32 w, int32 h);
+	// void createSkipBlock(int32 w, int32 h);
 	void createNewlineBlock();
 
 	// Returns true if at least one entity was parsed in the current position.
@@ -434,12 +434,13 @@ void Parser::createBlock(int32 skipBack) {
 	}
 }
 
-void Parser::createSkipBlock(int32 w, int32 h) {
-	createBlock();
-	_t->_text.push_back('_');
-	_t->_blocks.push_back(Block::Skip(_t->_st->font, _t->_text, _blockStart++, w, h, _monoIndex ? _monoIndex : _lnkIndex, _spoilerIndex));
-	blockCreated();
-}
+// Unused.
+// void Parser::createSkipBlock(int32 w, int32 h) {
+// 	createBlock();
+// 	_t->_text.push_back('_');
+// 	_t->_blocks.push_back(Block::Skip(_t->_st->font, _t->_text, _blockStart++, w, h, _monoIndex ? _monoIndex : _lnkIndex, _spoilerIndex));
+// 	blockCreated();
+// }
 
 void Parser::createNewlineBlock() {
 	createBlock();

From 1cc74a41c4d1c3fe9824e4bf47c23e3bcd1759e6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 16 Aug 2022 18:50:45 +0300
Subject: [PATCH 205/635] Moved out spoiler data from Ui::Text::String to
 separate structure.

---
 CMakeLists.txt              |  1 +
 ui/text/text.cpp            | 77 ++++++++++++++++++++++---------------
 ui/text/text.h              |  8 +---
 ui/text/text_spoiler_data.h | 22 +++++++++++
 4 files changed, 70 insertions(+), 38 deletions(-)
 create mode 100644 ui/text/text_spoiler_data.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dbebcb..5268434 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,6 +154,7 @@ PRIVATE
     ui/text/text_entity.cpp
     ui/text/text_entity.h
     ui/text/text_isolated_emoji.h
+    ui/text/text_spoiler_data.h
     ui/text/text_utilities.cpp
     ui/text/text_utilities.h
     ui/text/text_variant.cpp
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 20fa292..1877de5 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -9,6 +9,7 @@
 #include "ui/basic_click_handlers.h"
 #include "ui/text/text_block.h"
 #include "ui/text/text_isolated_emoji.h"
+#include "ui/text/text_spoiler_data.h"
 #include "ui/emoji_config.h"
 #include "ui/integration.h"
 #include "ui/round_rect.h"
@@ -861,12 +862,17 @@ void Parser::finalize(const TextParseOptions &options) {
 			}
 		}
 		const auto spoilerIndex = block->spoilerIndex();
-		if (spoilerIndex && (_t->_spoilers.size() < spoilerIndex)) {
-			_t->_spoilers.resize(spoilerIndex);
-			const auto handler = (options.flags & TextParseLinks)
-				? std::make_shared<SpoilerClickHandler>()
-				: nullptr;
-			_t->setSpoiler(spoilerIndex, std::move(handler));
+		if (spoilerIndex) {
+			if (!_t->_spoiler) {
+				_t->_spoiler = std::make_shared<SpoilerData>();
+			}
+			if (_t->_spoiler->links.size() < spoilerIndex) {
+				_t->_spoiler->links.resize(spoilerIndex);
+				const auto handler = (options.flags & TextParseLinks)
+					? std::make_shared<SpoilerClickHandler>()
+					: nullptr;
+				_t->setSpoiler(spoilerIndex, std::move(handler));
+			}
 		}
 		const auto shiftedIndex = block->lnkIndex();
 		auto useCustomIndex = false;
@@ -925,14 +931,16 @@ void Parser::finalize(const TextParseOptions &options) {
 		}
 		lastHandlerIndex.lnk = realIndex;
 	}
-	if (!_t->_hasCustomEmoji || !_t->_spoilers.empty()) {
+	if (!_t->_hasCustomEmoji || _t->_spoiler) {
 		_t->_isOnlyCustomEmoji = false;
 	}
-	if (_t->_blocks.empty() || !_t->_spoilers.empty()) {
+	if (_t->_blocks.empty() || _t->_spoiler) {
 		_t->_isIsolatedEmoji = false;
 	}
 	_t->_links.squeeze();
-	_t->_spoilers.squeeze();
+	if (_t->_spoiler) {
+		_t->_spoiler->links.squeeze();
+	}
 	_t->_blocks.shrink_to_fit();
 	_t->_text.squeeze();
 }
@@ -1961,8 +1969,9 @@ private:
 		}
 		const auto progress = float64(_now - _background.startMs)
 			/ st::fadeWrapDuration;
-		if ((progress > 1.) && _background.spoilerIndex) {
-			const auto link = _t->_spoilers.at(_background.spoilerIndex - 1);
+		if ((progress > 1.) && _background.spoilerIndex && _t->_spoiler) {
+			const auto link = _t->_spoiler->links.at(
+				_background.spoilerIndex - 1);
 			if (link) {
 				link->setStartMs(0);
 			}
@@ -1979,6 +1988,9 @@ private:
 		if (!_background.color) {
 			return;
 		}
+		if (!_t->_spoiler) {
+			return;
+		}
 		const auto elideOffset = (_indexOfElidedBlock == currentBlockIndex)
 			? (_elideRemoveFromEnd + _f->elidew)
 			: 0;
@@ -2011,8 +2023,8 @@ private:
 		const auto hasRight = (parts & RectPart::Right) != 0;
 
 		const auto &cache = _background.inFront
-			? _t->_spoilerCache
-			: _t->_spoilerShownCache;
+			? _t->_spoiler->spoilerCache
+			: _t->_spoiler->spoilerShownCache;
 		const auto cornerWidth = cache.corners[0].width()
 			/ style::DevicePixelRatio();
 		const auto useWidth = ((x + width).toInt() - x.toInt()) - elideOffset;
@@ -2833,9 +2845,9 @@ private:
 		if (_p) {
 			const auto isMono = IsMono(block->flags());
 			_background = {};
-			if (block->spoilerIndex()) {
+			if (block->spoilerIndex() && _t->_spoiler) {
 				const auto handler
-					= _t->_spoilers.at(block->spoilerIndex() - 1);
+					= _t->_spoiler->links.at(block->spoilerIndex() - 1);
 				const auto inBack = (handler && handler->shown());
 				_background.inFront = !inBack;
 				_background.color = inBack
@@ -2844,14 +2856,15 @@ private:
 				_background.startMs = handler ? handler->startMs() : 0;
 				_background.spoilerIndex = block->spoilerIndex();
 
+				Assert(_t->_spoiler != nullptr);
 				const auto &cache = _background.inFront
-					? _t->_spoilerCache
-					: _t->_spoilerShownCache;
+					? _t->_spoiler->spoilerCache
+					: _t->_spoiler->spoilerShownCache;
 				if (cache.color != (*_background.color)->c) {
 					auto mutableText = const_cast<String*>(_t);
 					auto &mutableCache = _background.inFront
-						? mutableText->_spoilerCache
-						: mutableText->_spoilerShownCache;
+						? mutableText->_spoiler->spoilerCache
+						: mutableText->_spoiler->spoilerShownCache;
 					mutableCache.corners = Images::PrepareCorners(
 						ImageRoundRadius::Small,
 						*_background.color);
@@ -3134,19 +3147,20 @@ void String::setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk) {
 void String::setSpoiler(
 		uint16 lnkIndex,
 		const std::shared_ptr<SpoilerClickHandler> &lnk) {
-	if (!lnkIndex || lnkIndex > _spoilers.size()) {
+	if (!lnkIndex || !_spoiler || lnkIndex > _spoiler->links.size()) {
 		return;
 	}
-	_spoilers[lnkIndex - 1] = lnk;
+	_spoiler->links[lnkIndex - 1] = lnk;
 }
 
 void String::setSpoilerShown(uint16 lnkIndex, bool shown) {
 	if (!lnkIndex
-		|| (lnkIndex > _spoilers.size())
-		|| !_spoilers[lnkIndex - 1]) {
+		|| !_spoiler
+		|| (lnkIndex > _spoiler->links.size())
+		|| !_spoiler->links[lnkIndex - 1]) {
 		return;
 	}
-	_spoilers[lnkIndex - 1]->setShown(shown);
+	_spoiler->links[lnkIndex - 1]->setShown(shown);
 }
 
 bool String::hasLinks() const {
@@ -3154,7 +3168,7 @@ bool String::hasLinks() const {
 }
 
 int String::spoilersCount() const {
-	return _spoilers.size();
+	return !_spoiler ? 0 : int(_spoiler->links.size());
 }
 
 bool String::hasSkipBlock() const {
@@ -3528,9 +3542,9 @@ void String::enumerateText(
 				if (rangeTo > rangeFrom) { // handle click handler
 					const auto r = base::StringViewMid(_text, rangeFrom, rangeTo - rangeFrom);
 					// Ignore links that are partially copied.
-					const auto handler = (spoilerFrom != rangeFrom || blockFrom != rangeTo)
+					const auto handler = (spoilerFrom != rangeFrom || blockFrom != rangeTo || !_spoiler)
 						? nullptr
-						: _spoilers.at(spoilerIndex - 1);
+						: _spoiler->links.at(spoilerIndex - 1);
 					const auto type = EntityType::Spoiler;
 					clickHandlerFinishCallback(r, handler, type);
 				}
@@ -3784,8 +3798,7 @@ IsolatedEmoji String::toIsolatedEmoji() const {
 	auto result = IsolatedEmoji();
 	const auto skip = (_blocks.empty()
 		|| _blocks.back()->type() != TextBlockTSkip) ? 0 : 1;
-	if ((_blocks.size() > kIsolatedEmojiLimit + skip)
-		|| !_spoilers.empty()) {
+	if ((_blocks.size() > kIsolatedEmojiLimit + skip) || _spoiler) {
 		return {};
 	}
 	auto index = 0;
@@ -3813,14 +3826,14 @@ void String::clear() {
 void String::clearFields() {
 	_blocks.clear();
 	_links.clear();
-	_spoilers.clear();
+	_spoiler = nullptr;
 	_maxWidth = _minHeight = 0;
 	_startDir = Qt::LayoutDirectionAuto;
 }
 
 ClickHandlerPtr String::spoilerLink(uint16 spoilerIndex) const {
-	if (spoilerIndex) {
-		const auto &handler = _spoilers.at(spoilerIndex - 1);
+	if (spoilerIndex && _spoiler) {
+		const auto &handler = _spoiler->links.at(spoilerIndex - 1);
 		return (handler && !handler->shown()) ? handler : nullptr;
 	}
 	return nullptr;
diff --git a/ui/text/text.h b/ui/text/text.h
index 6f810ad..2b3e86d 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -64,6 +64,7 @@ namespace Ui::Text {
 
 struct IsolatedEmoji;
 struct OnlyCustomEmoji;
+struct SpoilerData;
 
 struct StateRequest {
 	enum class Flag {
@@ -226,14 +227,9 @@ private:
 	TextBlocks _blocks;
 	TextLinks _links;
 
-	QVector<std::shared_ptr<SpoilerClickHandler>> _spoilers;
-
 	Qt::LayoutDirection _startDir = Qt::LayoutDirectionAuto;
 
-	struct {
-		std::array<QImage, 4> corners;
-		QColor color;
-	} _spoilerCache, _spoilerShownCache;
+	std::shared_ptr<SpoilerData> _spoiler;
 
 	friend class Parser;
 	friend class Renderer;
diff --git a/ui/text/text_spoiler_data.h b/ui/text/text_spoiler_data.h
new file mode 100644
index 0000000..fd68360
--- /dev/null
+++ b/ui/text/text_spoiler_data.h
@@ -0,0 +1,22 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+class SpoilerClickHandler;
+
+namespace Ui::Text {
+
+struct SpoilerData {
+	struct {
+		std::array<QImage, 4> corners;
+		QColor color;
+	} spoilerCache, spoilerShownCache;
+
+	QVector<std::shared_ptr<SpoilerClickHandler>> links;
+};
+
+} // namespace Ui::Text

From a76cdf7edffb6e9cbef515a0e599c3c14a8a5b53 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 Aug 2022 21:03:06 +0300
Subject: [PATCH 206/635] Allow arbitrary paddings around PopupMenu.

---
 ui/platform/linux/ui_utility_linux.cpp |   2 +-
 ui/platform/mac/ui_utility_mac.h       |   2 +-
 ui/platform/ui_platform_utility.h      |   2 +-
 ui/platform/ui_platform_window.cpp     |   3 +-
 ui/platform/win/ui_utility_win.h       |   2 +-
 ui/widgets/dropdown_menu.cpp           |   5 +-
 ui/widgets/dropdown_menu.h             |   3 +-
 ui/widgets/menu/menu.cpp               |   9 +-
 ui/widgets/menu/menu.h                 |  13 +-
 ui/widgets/menu/menu_separator.cpp     |   8 +-
 ui/widgets/menu/menu_separator.h       |   7 +-
 ui/widgets/popup_menu.cpp              | 183 ++++++++++++++++++-------
 ui/widgets/popup_menu.h                |  26 +++-
 ui/widgets/separate_panel.cpp          |   2 +-
 ui/widgets/tooltip.cpp                 |   2 +-
 ui/widgets/widgets.style               |  19 ++-
 16 files changed, 209 insertions(+), 79 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 5066c0b..87cfaf9 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -438,7 +438,7 @@ bool IsApplicationActive() {
 	return QApplication::activeWindow() != nullptr;
 }
 
-bool TranslucentWindowsSupported(QPoint globalPosition) {
+bool TranslucentWindowsSupported() {
 	if (::Platform::IsWayland()) {
 		return true;
 	}
diff --git a/ui/platform/mac/ui_utility_mac.h b/ui/platform/mac/ui_utility_mac.h
index b2d4926..57abb69 100644
--- a/ui/platform/mac/ui_utility_mac.h
+++ b/ui/platform/mac/ui_utility_mac.h
@@ -13,7 +13,7 @@
 namespace Ui {
 namespace Platform {
 
-inline bool TranslucentWindowsSupported(QPoint globalPosition) {
+inline bool TranslucentWindowsSupported() {
 	return true;
 }
 
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 50e5bb3..0bc0fd4 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -17,7 +17,7 @@ namespace Platform {
 
 [[nodiscard]] bool IsApplicationActive();
 
-[[nodiscard]] bool TranslucentWindowsSupported(QPoint globalPosition);
+[[nodiscard]] bool TranslucentWindowsSupported();
 
 void InitOnTopPanel(not_null<QWidget*> panel);
 void DeInitOnTopPanel(not_null<QWidget*> panel);
diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 55bcf0e..30903bb 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -339,8 +339,7 @@ QMargins DefaultWindowHelper::frameMargins() {
 }
 
 bool DefaultWindowHelper::hasShadow() const {
-	const auto center = window()->geometry().center();
-	return WindowExtentsSupported() && TranslucentWindowsSupported(center);
+	return WindowExtentsSupported() && TranslucentWindowsSupported();
 }
 
 QMargins DefaultWindowHelper::resizeArea() const {
diff --git a/ui/platform/win/ui_utility_win.h b/ui/platform/win/ui_utility_win.h
index c69eaa6..391acf2 100644
--- a/ui/platform/win/ui_utility_win.h
+++ b/ui/platform/win/ui_utility_win.h
@@ -16,7 +16,7 @@ class QPaintEvent;
 namespace Ui {
 namespace Platform {
 
-inline bool TranslucentWindowsSupported(QPoint globalPosition) {
+inline bool TranslucentWindowsSupported() {
 	return true;
 }
 
diff --git a/ui/widgets/dropdown_menu.cpp b/ui/widgets/dropdown_menu.cpp
index d70ddb8..070c43f 100644
--- a/ui/widgets/dropdown_menu.cpp
+++ b/ui/widgets/dropdown_menu.cpp
@@ -62,8 +62,9 @@ not_null<QAction*> DropdownMenu::addAction(const QString &text, Fn<void()> callb
 	return _menu->addAction(text, std::move(callback), icon, iconOver);
 }
 
-not_null<QAction*> DropdownMenu::addSeparator() {
-	return _menu->addSeparator();
+not_null<QAction*> DropdownMenu::addSeparator(
+		const style::MenuSeparator *st) {
+	return _menu->addSeparator(st);
 }
 
 void DropdownMenu::clearActions() {
diff --git a/ui/widgets/dropdown_menu.h b/ui/widgets/dropdown_menu.h
index bedc871..a4e9694 100644
--- a/ui/widgets/dropdown_menu.h
+++ b/ui/widgets/dropdown_menu.h
@@ -18,7 +18,8 @@ public:
 
 	not_null<QAction*> addAction(base::unique_qptr<Menu::ItemBase> widget);
 	not_null<QAction*> addAction(const QString &text, Fn<void()> callback, const style::icon *icon = nullptr, const style::icon *iconOver = nullptr);
-	not_null<QAction*> addSeparator();
+	not_null<QAction*> addSeparator(
+		const style::MenuSeparator *st = nullptr);
 	void clearActions();
 
 	void setHiddenCallback(Fn<void()> callback) {
diff --git a/ui/widgets/menu/menu.cpp b/ui/widgets/menu/menu.cpp
index 471d021..40308c6 100644
--- a/ui/widgets/menu/menu.cpp
+++ b/ui/widgets/menu/menu.cpp
@@ -10,6 +10,7 @@
 #include "ui/widgets/menu/menu_item_base.h"
 #include "ui/widgets/menu/menu_separator.h"
 #include "ui/widgets/scroll_area.h"
+#include "styles/style_widgets.h"
 
 #include <QtGui/QtEvents>
 
@@ -191,10 +192,14 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
 	return action;
 }
 
-not_null<QAction*> Menu::addSeparator() {
+not_null<QAction*> Menu::addSeparator(const style::MenuSeparator *st) {
 	const auto separator = new QAction(this);
 	separator->setSeparator(true);
-	auto item = base::make_unique_q<Separator>(this, _st, separator);
+	auto item = base::make_unique_q<Separator>(
+		this,
+		_st,
+		st ? *st : _st.separator,
+		separator);
 	return addAction(std::move(item));
 }
 
diff --git a/ui/widgets/menu/menu.h b/ui/widgets/menu/menu.h
index 3aa0b05..288ec38 100644
--- a/ui/widgets/menu/menu.h
+++ b/ui/widgets/menu/menu.h
@@ -9,7 +9,6 @@
 #include "base/unique_qptr.h"
 #include "ui/rp_widget.h"
 #include "ui/widgets/menu/menu_common.h"
-#include "styles/style_widgets.h"
 
 #include <QtWidgets/QMenu>
 
@@ -17,6 +16,15 @@ namespace Ui {
 struct ScrollToRequest;
 } // namespace Ui
 
+namespace style {
+struct Menu;
+struct MenuSeparator;
+} // namespace style
+
+namespace st {
+extern const style::Menu &defaultMenu;
+} // namespace st
+
 namespace Ui::Menu {
 
 class ItemBase;
@@ -43,7 +51,8 @@ public:
 		std::unique_ptr<QMenu> submenu,
 		const style::icon *icon = nullptr,
 		const style::icon *iconOver = nullptr);
-	not_null<QAction*> addSeparator();
+	not_null<QAction*> addSeparator(
+		const style::MenuSeparator *st = nullptr);
 	void clearActions();
 	void finishAnimating();
 
diff --git a/ui/widgets/menu/menu_separator.cpp b/ui/widgets/menu/menu_separator.cpp
index a2460b7..f6d37ae 100644
--- a/ui/widgets/menu/menu_separator.cpp
+++ b/ui/widgets/menu/menu_separator.cpp
@@ -7,17 +7,19 @@
 #include "ui/widgets/menu/menu_separator.h"
 
 #include "ui/painter.h"
+#include "styles/style_widgets.h"
 
 namespace Ui::Menu {
 
 Separator::Separator(
 	not_null<RpWidget*> parent,
 	const style::Menu &st,
+	const style::MenuSeparator &separator,
 	not_null<QAction*> action)
 : ItemBase(parent, st)
-, _lineWidth(st.separatorWidth)
-, _padding(st.separatorPadding)
-, _fg(st.separatorFg)
+, _lineWidth(separator.width)
+, _padding(separator.padding)
+, _fg(separator.fg)
 , _bg(st.itemBg)
 , _height(_padding.top() + _lineWidth + _padding.bottom())
 , _action(action) {
diff --git a/ui/widgets/menu/menu_separator.h b/ui/widgets/menu/menu_separator.h
index 1ff5f6f..9928d7f 100644
--- a/ui/widgets/menu/menu_separator.h
+++ b/ui/widgets/menu/menu_separator.h
@@ -7,10 +7,14 @@
 #pragma once
 
 #include "ui/widgets/menu/menu_item_base.h"
-#include "styles/style_widgets.h"
 
 class Painter;
 
+namespace style {
+struct Menu;
+struct MenuSeparator;
+} // namespace style
+
 namespace Ui::Menu {
 
 class Separator : public ItemBase {
@@ -18,6 +22,7 @@ public:
 	Separator(
 		not_null<RpWidget*> parent,
 		const style::Menu &st,
+		const style::MenuSeparator &separator,
 		not_null<QAction*> action);
 
 	not_null<QAction*> action() const override;
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index a8374e1..bb0a253 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -248,8 +248,6 @@ void PopupMenu::init() {
 	_menu->setMousePressDelegate([this](QPoint globalPosition) { handleMousePress(globalPosition); });
 	_menu->setMouseReleaseDelegate([this](QPoint globalPosition) { handleMouseRelease(globalPosition); });
 
-	handleCompositingUpdate();
-
 	setWindowFlags(Qt::WindowFlags(Qt::FramelessWindowHint) | Qt::BypassWindowManagerHint | Qt::Popup | Qt::NoDropShadowWindowHint);
 	setMouseTracking(true);
 
@@ -297,16 +295,26 @@ void PopupMenu::checkSubmenuShow() {
 	}
 }
 
-void PopupMenu::handleCompositingUpdate() {
+void PopupMenu::validateCompositingSupport() {
 	const auto line = st::lineWidth;
-	_padding = _useTransparency
-		? _st.shadow.extend
-		: style::margins(line, line, line, line);
+	_useTransparency = Platform::TranslucentWindowsSupported();
+	if (!_useTransparency) {
+		_padding = QMargins(line, line, line, line);
+		_extents = QMargins();
+	} else {
+		const auto &additional = _additionalMenuPadding;
+		_padding = QMargins(
+			std::max(_st.shadow.extend.left(), additional.left()),
+			std::max(_st.shadow.extend.top(), additional.top()),
+			std::max(_st.shadow.extend.right(), additional.right()),
+			std::max(_st.shadow.extend.bottom(), additional.bottom()));
+		_extents = _padding - (additional - _additionalMenuExtents);
+	}
 	if (windowHandle()) {
-		if (_useTransparency) {
-			Platform::SetWindowExtents(this, _padding);
-		} else {
+		if (_extents.isNull()) {
 			Platform::UnsetWindowExtents(this);
+		} else {
+			Platform::SetWindowExtents(this, _extents);
 		}
 	}
 	_scroll->moveToLeft(_padding.left(), _padding.top());
@@ -395,8 +403,8 @@ not_null<QAction*> PopupMenu::addAction(
 	return action;
 }
 
-not_null<QAction*> PopupMenu::addSeparator() {
-	return _menu->addSeparator();
+not_null<QAction*> PopupMenu::addSeparator(const style::MenuSeparator *st) {
+	return _menu->addSeparator(st);
 }
 
 void PopupMenu::clearActions() {
@@ -404,6 +412,10 @@ void PopupMenu::clearActions() {
 	return _menu->clearActions();
 }
 
+void PopupMenu::setForceWidth(int forceWidth) {
+	_menu->setForceWidth(forceWidth);
+}
+
 const std::vector<not_null<QAction*>> &PopupMenu::actions() const {
 	return _menu->actions();
 }
@@ -488,10 +500,14 @@ void PopupMenu::popupSubmenu(
 		currentSubmenu->hideMenu(true);
 	}
 	if (submenu) {
-		QPoint p(_inner.x() + (style::RightToLeft() ? _padding.right() : _inner.width() - _padding.left()), _inner.y() + actionTop);
+		QPoint p(_inner.x() + (style::RightToLeft() ? _padding.right() : (_inner.width() - _padding.left())), _inner.y() + actionTop);
 		_activeSubmenu = submenu;
-		_activeSubmenu->showMenu(geometry().topLeft() + p, this, source);
-		_menu->setChildShownAction(action);
+		if (_activeSubmenu->prepareGeometryFor(geometry().topLeft() + p, this)) {
+			_activeSubmenu->showPrepared(source);
+			_menu->setChildShownAction(action);
+		} else {
+			_activeSubmenu = nullptr;
+		}
 	}
 }
 
@@ -616,6 +632,22 @@ void PopupMenu::setForcedVerticalOrigin(VerticalOrigin origin) {
 	_forcedVerticalOrigin = origin;
 }
 
+void PopupMenu::setAdditionalMenuPadding(
+		QMargins padding,
+		QMargins extents) {
+	Expects(padding.left() >= extents.left()
+		&& padding.right() >= extents.right()
+		&& padding.top() >= extents.top()
+		&& padding.bottom() >= extents.bottom());
+
+	if (_additionalMenuPadding != padding
+		|| _additionalMenuExtents != extents) {
+		_additionalMenuPadding = padding;
+		_additionalMenuExtents = extents;
+		_roundingOverlay = nullptr;
+	}
+}
+
 void PopupMenu::showAnimated(PanelAnimation::Origin origin) {
 	setOrigin(origin);
 	showStarted();
@@ -759,23 +791,54 @@ void PopupMenu::deleteOnHide(bool del) {
 }
 
 void PopupMenu::popup(const QPoint &p) {
-	showMenu(p, nullptr, TriggeredSource::Mouse);
+	if (prepareGeometryFor(p)) {
+		popupPrepared();
+		return;
+	}
+	_hiding = false;
+	_a_opacity.stop();
+	_a_show.stop();
+	_cache = QPixmap();
+	hide();
+	if (_deleteOnHide) {
+		deleteLater();
+	}
 }
 
-void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource source) {
+void PopupMenu::popupPrepared() {
+	showPrepared(TriggeredSource::Mouse);
+}
+
+PanelAnimation::Origin PopupMenu::preparedOrigin() const {
+	return _origin;
+}
+
+QMargins PopupMenu::preparedPadding() const {
+	return _padding;
+}
+
+QMargins PopupMenu::preparedExtents() const {
+	return _extents;
+}
+
+bool PopupMenu::useTransparency() const {
+	return _useTransparency;
+}
+
+bool PopupMenu::prepareGeometryFor(const QPoint &p) {
+	return prepareGeometryFor(p, nullptr);
+}
+
+bool PopupMenu::prepareGeometryFor(const QPoint &p, PopupMenu *parent) {
 	const auto usingScreenGeometry = !::Platform::IsWayland();
-	const auto screen = usingScreenGeometry ? QGuiApplication::screenAt(p) : nullptr;
+	const auto screen = usingScreenGeometry
+		? QGuiApplication::screenAt(p)
+		: nullptr;
 	if ((usingScreenGeometry && !screen)
-		|| (!parent && ::Platform::IsMac() && !Platform::IsApplicationActive())) {
-		_hiding = false;
-		_a_opacity.stop();
-		_a_show.stop();
-		_cache = QPixmap();
-		hide();
-		if (_deleteOnHide) {
-			deleteLater();
-		}
-		return;
+		|| (!parent
+			&& ::Platform::IsMac()
+			&& !Platform::IsApplicationActive())) {
+		return false;
 	}
 	_parent = parent;
 
@@ -785,6 +848,7 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 	} else if (screen) {
 		windowHandle()->setScreen(screen);
 	}
+	validateCompositingSupport();
 
 	using Origin = PanelAnimation::Origin;
 	auto origin = Origin::TopLeft;
@@ -792,7 +856,7 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 		&& (*_forcedOrigin == Origin::TopLeft
 			|| *_forcedOrigin == Origin::BottomLeft);
 	const auto forceTop = (_forcedVerticalOrigin
-			&& (*_forcedVerticalOrigin == VerticalOrigin::Top))
+		&& (*_forcedVerticalOrigin == VerticalOrigin::Top))
 		|| (_forcedOrigin
 			&& (*_forcedOrigin == Origin::TopLeft
 				|| *_forcedOrigin == Origin::TopRight));
@@ -800,55 +864,74 @@ void PopupMenu::showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource sou
 		&& (*_forcedOrigin == Origin::TopRight
 			|| *_forcedOrigin == Origin::BottomRight);
 	const auto forceBottom = (_forcedVerticalOrigin
-			&& (*_forcedVerticalOrigin == VerticalOrigin::Bottom))
+		&& (*_forcedVerticalOrigin == VerticalOrigin::Bottom))
 		|| (_forcedOrigin
 			&& (*_forcedOrigin == Origin::BottomLeft
 				|| *_forcedOrigin == Origin::BottomRight));
-	auto w = p - QPoint(0, _padding.top());
+	auto w = p - QPoint(
+		std::max(
+			_additionalMenuPadding.left() - _st.shadow.extend.left(),
+			0),
+		_padding.top());
 	auto r = screen ? screen->availableGeometry() : QRect();
-	_useTransparency = Platform::TranslucentWindowsSupported(p);
-	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
-	handleCompositingUpdate();
 	if (style::RightToLeft()) {
-		const auto badLeft = !r.isNull() && w.x() - width() < r.x() - _padding.left();
+		const auto badLeft = !r.isNull() && w.x() - width() < r.x() - _extents.left();
 		if (forceRight || (badLeft && !forceLeft)) {
-			if (_parent && (r.isNull() || w.x() + _parent->width() - _padding.left() - _padding.right() + width() - _padding.right() <= r.x() + r.width())) {
-				w.setX(w.x() + _parent->width() - _padding.left() - _padding.right());
+			if (_parent && (r.isNull() || w.x() + _parent->width() - _extents.left() - _extents.right() + width() - _extents.right() <= r.x() + r.width())) {
+				w.setX(w.x() + _parent->width() - _extents.left() - _extents.right());
 			} else {
-				w.setX(r.x() - _padding.left());
+				w.setX(r.x() - _extents.left());
 			}
 		} else {
 			w.setX(w.x() - width());
 		}
 	} else {
-		const auto badLeft = !r.isNull() && w.x() + width() - _padding.right() > r.x() + r.width();
+		const auto badLeft = !r.isNull() && w.x() + width() - _extents.right() > r.x() + r.width();
 		if (forceRight || (badLeft && !forceLeft)) {
-			if (_parent && (r.isNull() || w.x() - _parent->width() + _padding.left() + _padding.right() - width() + _padding.right() >= r.x() - _padding.left())) {
-				w.setX(w.x() + _padding.left() + _padding.right() - _parent->width() - width() + _padding.left() + _padding.right());
+			if (_parent && (r.isNull() || w.x() - _parent->width() + _extents.left() + _extents.right() - width() + _extents.right() >= r.x() - _extents.left())) {
+				w.setX(w.x() + _extents.left() + _extents.right() - _parent->width() - width() + _extents.left() + _extents.right());
 			} else {
-				w.setX(p.x() - width() + _padding.right());
+				w.setX(p.x() - width() + std::max(
+					_additionalMenuPadding.right() - _st.shadow.extend.right(),
+					0));
 			}
 			origin = PanelAnimation::Origin::TopRight;
 		}
 	}
-	const auto badTop = !r.isNull() && w.y() + height() - _padding.bottom() > r.y() + r.height();
+	const auto badTop = !r.isNull() && w.y() + height() - _extents.bottom() > r.y() + r.height();
 	if (forceBottom || (badTop && !forceTop)) {
 		if (_parent) {
-			w.setY(r.y() + r.height() - height() + _padding.bottom());
+			w.setY(r.y() + r.height() - height() + _extents.bottom());
 		} else {
-			w.setY(p.y() - height() + _padding.bottom());
-			origin = (origin == PanelAnimation::Origin::TopRight) ? PanelAnimation::Origin::BottomRight : PanelAnimation::Origin::BottomLeft;
+			w.setY(p.y() - height() + _extents.bottom());
+			origin = (origin == PanelAnimation::Origin::TopRight)
+				? PanelAnimation::Origin::BottomRight
+				: PanelAnimation::Origin::BottomLeft;
 		}
 	}
-	if (!r.isNull() && w.x() < r.x()) {
-		w.setX(r.x());
-	}
-	if (!r.isNull() && w.y() < r.y()) {
-		w.setY(r.y());
+	if (!r.isNull()) {
+		if (w.x() + width() - _extents.right() > r.x() + r.width()) {
+			w.setX(r.x() + r.width() + _extents.right() - width());
+		}
+		if (w.x() + _extents.left() < r.x()) {
+			w.setX(r.x() - _extents.left());
+		}
+		if (w.y() + height() - _extents.bottom() > r.y() + r.height()) {
+			w.setY(r.y() + r.height() + _extents.bottom() - height());
+		}
+		if (w.y() + _extents.top() < r.y()) {
+			w.setY(r.y() - _extents.top());
+		}
 	}
 	move(w);
 
 	setOrigin(origin);
+	return true;
+}
+
+void PopupMenu::showPrepared(TriggeredSource source) {
+	Expects(windowHandle() != nullptr);
+
 	_menu->setShowSource(source);
 
 	startShowAnimation();
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 2be0d27..9a9754c 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -15,6 +15,10 @@
 #include "base/object_ptr.h"
 #include "base/unique_qptr.h"
 
+namespace style {
+struct MenuSeparator;
+} // namespace style
+
 namespace Ui {
 
 class ScrollArea;
@@ -44,7 +48,8 @@ public:
 		std::unique_ptr<PopupMenu> submenu,
 		const style::icon *icon = nullptr,
 		const style::icon *iconOver = nullptr);
-	not_null<QAction*> addSeparator();
+	not_null<QAction*> addSeparator(
+		const style::MenuSeparator *st = nullptr);
 	void clearActions();
 
 	[[nodiscard]] const std::vector<not_null<QAction*>> &actions() const;
@@ -57,9 +62,18 @@ public:
 
 	void deleteOnHide(bool del);
 	void popup(const QPoint &p);
+	bool prepareGeometryFor(const QPoint &p);
+	void popupPrepared();
 	void hideMenu(bool fast = false);
+	void setForceWidth(int forceWidth);
 	void setForcedOrigin(PanelAnimation::Origin origin);
 	void setForcedVerticalOrigin(VerticalOrigin origin);
+	void setAdditionalMenuPadding(QMargins padding, QMargins extents);
+
+	[[nodiscard]] PanelAnimation::Origin preparedOrigin() const;
+	[[nodiscard]] QMargins preparedPadding() const;
+	[[nodiscard]] QMargins preparedExtents() const;
+	[[nodiscard]] bool useTransparency() const;
 
 	void setDestroyedCallback(Fn<void()> callback) {
 		_destroyedCallback = std::move(callback);
@@ -104,7 +118,7 @@ private:
 	void showStarted();
 
 	using TriggeredSource = Menu::TriggeredSource;
-	void handleCompositingUpdate();
+	void validateCompositingSupport();
 	void handleMenuResize();
 	void handleActivated(const Menu::CallbackData &data);
 	void handleTriggered(const Menu::CallbackData &data);
@@ -129,7 +143,8 @@ private:
 		not_null<PopupMenu*> submenu,
 		int actionTop,
 		TriggeredSource source);
-	void showMenu(const QPoint &p, PopupMenu *parent, TriggeredSource source);
+	bool prepareGeometryFor(const QPoint &p, PopupMenu *parent);
+	void showPrepared(TriggeredSource source);
 	void updateRoundingOverlay();
 
 	const style::PopupMenu &_st;
@@ -146,7 +161,10 @@ private:
 	PopupMenu *_parent = nullptr;
 
 	QRect _inner;
-	style::margins _padding;
+	QMargins _padding;
+	QMargins _extents;
+	QMargins _additionalMenuPadding;
+	QMargins _additionalMenuExtents;
 
 	QPointer<PopupMenu> _activeSubmenu;
 
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 063bb42..443faff 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -526,7 +526,7 @@ void SeparatePanel::initGeometry(QSize size) {
 	if (center.y() - size.height() / 2 < available.y()) {
 		center.setY(available.y() + size.height() / 2);
 	}
-	_useTransparency = Ui::Platform::TranslucentWindowsSupported(center);
+	_useTransparency = Ui::Platform::TranslucentWindowsSupported();
 	_padding = _useTransparency
 		? st::callShadow.extend
 		: style::margins(
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index 839fc81..135e30a 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -90,7 +90,7 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *
 	_st = st;
 	_text = Text::String(_st->textStyle, text, kPlainTextOptions, _st->widthMax);
 
-	_useTransparency = Platform::TranslucentWindowsSupported(_point);
+	_useTransparency = Platform::TranslucentWindowsSupported();
 	setAttribute(Qt::WA_OpaquePaintEvent, !_useTransparency);
 
 	int32 addw = 2 * st::lineWidth + _st->textPadding.left() + _st->textPadding.right();
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 230f529..1744f14 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -212,6 +212,12 @@ PanelAnimation {
 	shadow: Shadow;
 }
 
+MenuSeparator {
+	padding: margins;
+	width: pixels;
+	fg: color;
+}
+
 Menu {
 	skip: pixels;
 
@@ -230,9 +236,7 @@ Menu {
 	itemToggleOver: Toggle;
 	itemToggleShift: pixels;
 
-	separatorPadding: margins;
-	separatorWidth: pixels;
-	separatorFg: color;
+	separator: MenuSeparator;
 
 	arrow: icon;
 
@@ -846,6 +850,11 @@ defaultMenuToggle: Toggle(defaultToggle) {
 defaultMenuToggleOver: Toggle(defaultToggle) {
 	untoggledFg: menuIconFgOver;
 }
+defaultMenuSeparator: MenuSeparator {
+	padding: margins(0px, 5px, 0px, 5px);
+	width: 1px;
+	fg: menuSeparatorFg;
+}
 defaultMenu: Menu {
 	skip: 0px;
 
@@ -864,9 +873,7 @@ defaultMenu: Menu {
 	itemToggleOver: defaultMenuToggleOver;
 	itemToggleShift: 0px;
 
-	separatorPadding: margins(0px, 5px, 0px, 5px);
-	separatorWidth: 1px;
-	separatorFg: menuSeparatorFg;
+	separator: defaultMenuSeparator;
 
 	arrow: defaultMenuArrow;
 

From a096628b4cd2a1406751ba5898ab1a888daeb1e4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 Aug 2022 10:22:55 +0300
Subject: [PATCH 207/635] Report PopupMenu appearing state.

---
 ui/widgets/popup_menu.cpp | 37 +++++++++++++++++++++++++++++++++++--
 ui/widgets/popup_menu.h   | 10 +++++++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index bb0a253..db6d0b7 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -428,10 +428,23 @@ void PopupMenu::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
 
 	if (_a_show.animating()) {
-		if (auto opacity = _a_opacity.value(_hiding ? 0. : 1.)) {
-			_showAnimation->paintFrame(p, 0, 0, width(), _a_show.value(1.), opacity);
+		const auto opacity = _a_opacity.value(_hiding ? 0. : 1.);
+		const auto progress = _a_show.value(1.);
+		if (opacity) {
+			_showAnimation->paintFrame(p, 0, 0, width(), progress, opacity);
 		}
+		_showStateChanges.fire({
+			.opacity = opacity,
+			.progress = progress,
+			.appearing = true,
+		});
 	} else if (_a_opacity.animating()) {
+		if (_showAnimation) {
+			_showAnimation.reset();
+			_showStateChanges.fire({
+				.toggling = true,
+			});
+		}
 		p.setOpacity(_a_opacity.value(0.));
 		p.drawPixmap(0, 0, _cache);
 	} else if (_hiding || isHidden()) {
@@ -439,6 +452,7 @@ void PopupMenu::paintEvent(QPaintEvent *e) {
 	} else if (_showAnimation) {
 		_showAnimation->paintFrame(p, 0, 0, width(), 1., 1.);
 		_showAnimation.reset();
+		_showStateChanges.fire({});
 		PostponeCall(this, [=] { showChildren(); });
 	} else {
 		paintBg(p);
@@ -681,10 +695,20 @@ void PopupMenu::prepareCache() {
 
 	auto showAnimation = base::take(_a_show);
 	auto showAnimationData = base::take(_showAnimation);
+	if (showAnimation.animating()) {
+		_showStateChanges.fire({});
+	}
 	showChildren();
 	_cache = GrabWidget(this);
 	_showAnimation = base::take(showAnimationData);
 	_a_show = base::take(showAnimation);
+	if (_a_show.animating()) {
+		_showStateChanges.fire({
+			.opacity = _a_opacity.value(1.),
+			.progress = _a_show.value(1.),
+			.appearing = true,
+		});
+	}
 }
 
 void PopupMenu::startOpacityAnimation(bool hiding) {
@@ -749,6 +773,11 @@ void PopupMenu::startShowAnimation() {
 	}
 	hideChildren();
 	_a_show.start([this] { showAnimationCallback(); }, 0., 1., _st.showDuration);
+	_showStateChanges.fire({
+		.opacity = _a_opacity.value(1.),
+		.progress = _a_show.value(1.),
+		.appearing = true,
+	});
 }
 
 void PopupMenu::opacityAnimationCallback() {
@@ -825,6 +854,10 @@ bool PopupMenu::useTransparency() const {
 	return _useTransparency;
 }
 
+rpl::producer<PopupMenu::ShowState> PopupMenu::showStateValue() const {
+	return _showStateChanges.events();
+}
+
 bool PopupMenu::prepareGeometryFor(const QPoint &p) {
 	return prepareGeometryFor(p, nullptr);
 }
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 9a9754c..3a0488d 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -32,6 +32,7 @@ public:
 
 	PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu);
 	PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu);
+	~PopupMenu();
 
 	[[nodiscard]] const style::PopupMenu &st() const {
 		return _st;
@@ -86,7 +87,13 @@ public:
 		return _menu;
 	}
 
-	~PopupMenu();
+	struct ShowState {
+		float64 opacity = 1.;
+		float64 progress = 1.;
+		bool appearing = false;
+		bool toggling = false;
+	};
+	[[nodiscard]] rpl::producer<ShowState> showStateValue() const;
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
@@ -173,6 +180,7 @@ private:
 	std::optional<PanelAnimation::Origin> _forcedOrigin;
 	std::unique_ptr<PanelAnimation> _showAnimation;
 	Animations::Simple _a_show;
+	rpl::event_stream<ShowState> _showStateChanges;
 
 	bool _useTransparency = true;
 	bool _hiding = false;

From eed9293c80eefd7b6d5398b4a65bf7822a1364fc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 Aug 2022 17:30:42 +0300
Subject: [PATCH 208/635] Add general RoundAreaWithShadow helper.

---
 CMakeLists.txt                        |   2 +
 ui/effects/panel_animation.cpp        |  62 +++-
 ui/effects/panel_animation.h          |  18 +-
 ui/effects/round_area_with_shadow.cpp | 388 ++++++++++++++++++++++++++
 ui/effects/round_area_with_shadow.h   |  87 ++++++
 ui/widgets/popup_menu.cpp             |  33 ++-
 ui/widgets/popup_menu.h               |   6 +-
 7 files changed, 569 insertions(+), 27 deletions(-)
 create mode 100644 ui/effects/round_area_with_shadow.cpp
 create mode 100644 ui/effects/round_area_with_shadow.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5268434..5c473c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,8 @@ PRIVATE
     ui/effects/radial_animation.h
     ui/effects/ripple_animation.cpp
     ui/effects/ripple_animation.h
+    ui/effects/round_area_with_shadow.cpp
+    ui/effects/round_area_with_shadow.h
     ui/effects/show_animation.cpp
     ui/effects/show_animation.h
     ui/effects/slide_animation.cpp
diff --git a/ui/effects/panel_animation.cpp b/ui/effects/panel_animation.cpp
index 9109599..1162214 100644
--- a/ui/effects/panel_animation.cpp
+++ b/ui/effects/panel_animation.cpp
@@ -361,30 +361,64 @@ void PanelAnimation::start() {
 	checkCorner(_bottomRight);
 }
 
-void PanelAnimation::paintFrame(QPainter &p, int x, int y, int outerWidth, float64 dt, float64 opacity) {
+auto PanelAnimation::computeState(float64 dt, float64 opacity) const
+-> PaintState {
+	auto &transition = anim::easeOutCirc;
+	if (dt < _alphaDuration) {
+		opacity *= transition(1., dt / _alphaDuration);
+	}
+	const auto widthProgress = (_startWidth < 0 || dt >= _widthDuration)
+		? 1.
+		: transition(1., dt / _widthDuration);
+	const auto heightProgress = (_startHeight < 0 || dt >= _heightDuration)
+		? 1.
+		: transition(1., dt / _heightDuration);
+	auto frameWidth = (widthProgress < 1.)
+		? anim::interpolate(_startWidth, _finalInnerWidth, widthProgress)
+		: _finalInnerWidth;
+	auto frameHeight = (heightProgress < 1.)
+		? anim::interpolate(_startHeight, _finalInnerHeight, heightProgress)
+		: _finalInnerHeight;
+	if (auto decrease = (frameWidth % style::DevicePixelRatio())) {
+		frameWidth -= decrease;
+	}
+	if (auto decrease = (frameHeight % style::DevicePixelRatio())) {
+		frameHeight -= decrease;
+	}
+	return {
+		.opacity = opacity,
+		.widthProgress = widthProgress,
+		.heightProgress = heightProgress,
+		.fade = transition(1., dt),
+		.width = frameWidth,
+		.height = frameHeight,
+	};
+}
+
+auto PanelAnimation::paintFrame(
+	QPainter &p,
+	int x,
+	int y,
+	int outerWidth,
+	float64 dt,
+	float64 opacity)
+-> PaintState {
 	Assert(started());
 	Assert(dt >= 0.);
 
 	const auto pixelRatio = style::DevicePixelRatio();
 
-	auto &transition = anim::easeOutCirc;
-	if (dt < _alphaDuration) opacity *= transition(1., dt / _alphaDuration);
+	const auto state = computeState(dt, opacity);
+	opacity = state.opacity;
 	_frameAlpha = anim::interpolate(1, 256, opacity);
-
-	auto frameWidth = (_startWidth < 0 || dt >= _widthDuration) ? _finalInnerWidth : anim::interpolate(_startWidth, _finalInnerWidth, transition(1., dt / _widthDuration));
-	auto frameHeight = (_startHeight < 0 || dt >= _heightDuration) ? _finalInnerHeight : anim::interpolate(_startHeight, _finalInnerHeight, transition(1., dt / _heightDuration));
-	if (auto decrease = (frameWidth % pixelRatio)) {
-		frameWidth -= decrease;
-	}
-	if (auto decrease = (frameHeight % pixelRatio)) {
-		frameHeight -= decrease;
-	}
+	const auto frameWidth = state.width;
+	const auto frameHeight = state.height;
 	auto frameLeft = (_origin == Origin::TopLeft || _origin == Origin::BottomLeft) ? _finalInnerLeft : (_finalInnerRight - frameWidth);
 	auto frameTop = (_origin == Origin::TopLeft || _origin == Origin::TopRight) ? _finalInnerTop : (_finalInnerBottom - frameHeight);
 	auto frameRight = frameLeft + frameWidth;
 	auto frameBottom = frameTop + frameHeight;
 
-	auto fadeTop = (_fadeHeight > 0) ? std::clamp(anim::interpolate(_startFadeTop, _finalInnerHeight, transition(1., dt)), 0, frameHeight) : frameHeight;
+	auto fadeTop = (_fadeHeight > 0) ? std::clamp(anim::interpolate(_startFadeTop, _finalInnerHeight, state.fade), 0, frameHeight) : frameHeight;
 	if (auto decrease = (fadeTop % pixelRatio)) {
 		fadeTop -= decrease;
 	}
@@ -503,6 +537,8 @@ void PanelAnimation::paintFrame(QPainter &p, int x, int y, int outerWidth, float
 	//}
 
 	p.drawImage(style::rtlpoint(x + (outerLeft / pixelRatio), y + (outerTop / pixelRatio), outerWidth), _frame, QRect(outerLeft, outerTop, outerRight - outerLeft, outerBottom - outerTop));
+
+	return state;
 }
 
 } // namespace Ui
diff --git a/ui/effects/panel_animation.h b/ui/effects/panel_animation.h
index 0f6844d..e114eb9 100644
--- a/ui/effects/panel_animation.h
+++ b/ui/effects/panel_animation.h
@@ -79,11 +79,27 @@ public:
 	PanelAnimation(const style::PanelAnimation &st, Origin origin) : _st(st), _origin(origin) {
 	}
 
+	struct PaintState {
+		float64 opacity = 0.;
+		float64 widthProgress = 0.;
+		float64 heightProgress = 0.;
+		float64 fade = 0.;
+		int width = 0;
+		int height = 0;
+	};
+
 	void setFinalImage(QImage &&finalImage, QRect inner);
 	void setSkipShadow(bool skipShadow);
 
 	void start();
-	void paintFrame(QPainter &p, int x, int y, int outerWidth, float64 dt, float64 opacity);
+	[[nodiscard]] PaintState computeState(float64 dt, float64 opacity) const;
+	PaintState paintFrame(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		float64 dt,
+		float64 opacity);
 
 private:
 	void setStartWidth();
diff --git a/ui/effects/round_area_with_shadow.cpp b/ui/effects/round_area_with_shadow.cpp
new file mode 100644
index 0000000..320993c
--- /dev/null
+++ b/ui/effects/round_area_with_shadow.cpp
@@ -0,0 +1,388 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/effects/round_area_with_shadow.h"
+
+#include "ui/style/style_core.h"
+#include "ui/image/image_prepare.h"
+#include "ui/painter.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kBgCacheIndex = 0;
+constexpr auto kShadowCacheIndex = 0;
+constexpr auto kOverlayMaskCacheIndex = 0;
+constexpr auto kOverlayShadowCacheIndex = 1;
+constexpr auto kOverlayCacheColumsCount = 2;
+constexpr auto kDivider = 4;
+
+} // namespace
+
+[[nodiscard]] QImage RoundAreaWithShadow::PrepareImage(QSize size) {
+	const auto ratio = style::DevicePixelRatio();
+	auto result = QImage(
+		size * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	return result;
+}
+
+[[nodiscard]] QImage RoundAreaWithShadow::PrepareFramesCache(
+		QSize frame,
+		int columns) {
+	static_assert(!(kFramesCount % kDivider));
+
+	return PrepareImage(QSize(
+		frame.width() * kDivider * columns,
+		frame.height() * kFramesCount / kDivider));
+}
+
+[[nodiscard]] QRect RoundAreaWithShadow::FrameCacheRect(
+		int frameIndex,
+		int column,
+		QSize frame) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto origin = QPoint(
+		frame.width() * (kDivider * column + (frameIndex % kDivider)),
+		frame.height() * (frameIndex / kDivider));
+	return QRect(ratio * origin, ratio * frame);
+}
+
+RoundAreaWithShadow::RoundAreaWithShadow(
+	QSize inner,
+	QMargins shadow,
+	int twiceRadiusMax)
+: _inner({}, inner)
+, _outer(_inner.marginsAdded(shadow).size())
+, _overlay(QRect(
+	0,
+	0,
+	std::max(inner.width(), twiceRadiusMax),
+	std::max(inner.height(), twiceRadiusMax)).marginsAdded(shadow).size())
+, _cacheBg(PrepareFramesCache(_outer))
+, _shadowParts(PrepareFramesCache(_outer))
+, _overlayCacheParts(PrepareFramesCache(_overlay, kOverlayCacheColumsCount))
+, _overlayMaskScaled(PrepareImage(_overlay))
+, _overlayShadowScaled(PrepareImage(_overlay))
+, _shadowBuffer(PrepareImage(_outer)) {
+	_inner.translate(QRect({}, _outer).center() - _inner.center());
+}
+
+ImageSubrect RoundAreaWithShadow::validateOverlayMask(
+		int frameIndex,
+		QSize innerSize,
+		float64 radius,
+		int twiceRadius,
+		float64 scale) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto cached = (scale == 1.);
+	const auto full = cached
+		? FrameCacheRect(frameIndex, kOverlayMaskCacheIndex, _overlay)
+		: QRect(QPoint(), _overlay * ratio);
+
+	const auto minWidth = twiceRadius + _outer.width() - _inner.width();
+	const auto minHeight = twiceRadius + _outer.height() - _inner.height();
+	const auto maskSize = QSize(
+		std::max(_outer.width(), minWidth),
+		std::max(_outer.height(), minHeight));
+
+	const auto result = ImageSubrect{
+		cached ? &_overlayCacheParts : &_overlayMaskScaled,
+		QRect(full.topLeft(), maskSize * ratio),
+	};
+	if (cached && _validOverlayMask[frameIndex]) {
+		return result;
+	}
+
+	auto p = QPainter(result.image.get());
+	const auto position = full.topLeft() / ratio;
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	p.fillRect(QRect(position, maskSize), Qt::transparent);
+
+	auto hq = PainterHighQualityEnabler(p);
+	const auto inner = QRect(position + _inner.topLeft(), innerSize);
+	p.setPen(Qt::NoPen);
+	p.setBrush(Qt::white);
+	if (scale != 1.) {
+		const auto center = inner.center();
+		p.save();
+		p.translate(center);
+		p.scale(scale, scale);
+		p.translate(-center);
+	}
+	p.drawRoundedRect(inner, radius, radius);
+	if (scale != 1.) {
+		p.restore();
+	}
+
+	if (cached) {
+		_validOverlayMask[frameIndex] = true;
+	}
+	return result;
+}
+
+ImageSubrect RoundAreaWithShadow::validateOverlayShadow(
+		int frameIndex,
+		QSize innerSize,
+		float64 radius,
+		int twiceRadius,
+		float64 scale,
+		const ImageSubrect &mask) {
+	const auto ratio = style::DevicePixelRatio();
+	const auto cached = (scale == 1.);
+	const auto full = cached
+		? FrameCacheRect(frameIndex, kOverlayShadowCacheIndex, _overlay)
+		: QRect(QPoint(), _overlay * ratio);
+
+	const auto minWidth = twiceRadius + _outer.width() - _inner.width();
+	const auto minHeight = twiceRadius + _outer.height() - _inner.height();
+	const auto maskSize = QSize(
+		std::max(_outer.width(), minWidth),
+		std::max(_outer.height(), minHeight));
+
+	const auto result = ImageSubrect{
+		cached ? &_overlayCacheParts : &_overlayShadowScaled,
+		QRect(full.topLeft(), maskSize * ratio),
+	};
+	if (cached && _validOverlayShadow[frameIndex]) {
+		return result;
+	}
+
+	const auto position = full.topLeft() / ratio;
+
+	_overlayShadowScaled.fill(Qt::transparent);
+	const auto inner = QRect(_inner.topLeft(), innerSize);
+	const auto add = style::ConvertScale(2.5);
+	const auto shift = style::ConvertScale(0.5);
+	const auto extended = QRectF(inner).marginsAdded({ add, add, add, add });
+	{
+		auto p = QPainter(&_overlayShadowScaled);
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(_shadow);
+		if (scale != 1.) {
+			const auto center = inner.center();
+			p.translate(center);
+			p.scale(scale, scale);
+			p.translate(-center);
+		}
+		p.drawRoundedRect(extended.translated(0, shift), radius, radius);
+		p.end();
+	}
+
+	_overlayShadowScaled = Images::Blur(std::move(_overlayShadowScaled));
+
+	auto q = Painter(result.image);
+	if (result.image != &_overlayShadowScaled) {
+		q.setCompositionMode(QPainter::CompositionMode_Source);
+		q.drawImage(
+			QRect(position, maskSize),
+			_overlayShadowScaled,
+			QRect(QPoint(), maskSize * ratio));
+	}
+	q.setCompositionMode(QPainter::CompositionMode_DestinationOut);
+	q.drawImage(QRect(position, maskSize), *mask.image, mask.rect);
+
+	if (cached) {
+		_validOverlayShadow[frameIndex] = true;
+	}
+	return result;
+}
+
+void RoundAreaWithShadow::overlayExpandedBorder(
+		QPainter &p,
+		QSize size,
+		float64 expandRatio,
+		float64 radius,
+		float64 scale) {
+	const auto progress = expandRatio;
+	const auto frame = int(base::SafeRound(progress * (kFramesCount - 1)));
+	const auto twiceRadius = int(base::SafeRound(radius * 2));
+	const auto innerSize = QSize(
+		std::max(_inner.width(), twiceRadius),
+		std::max(_inner.height(), twiceRadius));
+
+	const auto overlayMask = validateOverlayMask(
+		frame,
+		innerSize,
+		radius,
+		twiceRadius,
+		scale);
+	const auto overlayShadow = validateOverlayShadow(
+		frame,
+		innerSize,
+		radius,
+		twiceRadius,
+		scale,
+		overlayMask);
+
+	p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+	FillWithImage(p, QRect(QPoint(), size), overlayMask);
+	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+	FillWithImage(p, QRect(QPoint(), size), overlayShadow);
+}
+
+void RoundAreaWithShadow::FillWithImage(
+		QPainter &p,
+		QRect geometry,
+		const ImageSubrect &pattern) {
+	const auto factor = style::DevicePixelRatio();
+	const auto &image = *pattern.image;
+	const auto source = pattern.rect;
+	const auto sourceWidth = (source.width() / factor);
+	const auto sourceHeight = (source.height() / factor);
+	if (geometry.width() == sourceWidth) {
+		const auto part = (sourceHeight / 2) - 1;
+		const auto fill = geometry.height() - 2 * part;
+		const auto half = part * factor;
+		const auto top = source.height() - half;
+		p.drawImage(
+			geometry.topLeft(),
+			image,
+			QRect(source.x(), source.y(), source.width(), half));
+		if (fill > 0) {
+			p.drawImage(
+				QRect(
+					geometry.topLeft() + QPoint(0, part),
+					QSize(sourceWidth, fill)),
+				image,
+				QRect(
+					source.x(),
+					source.y() + half,
+					source.width(),
+					top - half));
+		}
+		p.drawImage(
+			geometry.topLeft() + QPoint(0, part + fill),
+			image,
+			QRect(source.x(), source.y() + top, source.width(), half));
+	} else if (geometry.height() == sourceHeight) {
+		const auto part = (sourceWidth / 2) - 1;
+		const auto fill = geometry.width() - 2 * part;
+		const auto half = part * factor;
+		const auto left = source.width() - half;
+		p.drawImage(
+			geometry.topLeft(),
+			image,
+			QRect(source.x(), source.y(), half, source.height()));
+		if (fill > 0) {
+			p.drawImage(
+				QRect(
+					geometry.topLeft() + QPoint(part, 0),
+					QSize(fill, sourceHeight)),
+				image,
+				QRect(
+					source.x() + half,
+					source.y(),
+					left - half,
+					source.height()));
+		}
+		p.drawImage(
+			geometry.topLeft() + QPoint(part + fill, 0),
+			image,
+			QRect(source.x() + left, source.y(), half, source.height()));
+	} else {
+		Unexpected("Values in RoundAreaWithShadow::fillWithImage.");
+	}
+}
+
+void RoundAreaWithShadow::setShadowColor(const QColor &shadow) {
+	if (_shadow == shadow) {
+		return;
+	}
+	_shadow = shadow;
+	ranges::fill(_validBg, false);
+	ranges::fill(_validShadow, false);
+	ranges::fill(_validOverlayShadow, false);
+}
+
+QRect RoundAreaWithShadow::validateShadow(
+		int frameIndex,
+		float64 scale,
+		float64 radius) {
+	const auto rect = FrameCacheRect(frameIndex, kShadowCacheIndex, _outer);
+	if (_validShadow[frameIndex]) {
+		return rect;
+	}
+
+	_shadowBuffer.fill(Qt::transparent);
+	auto p = QPainter(&_shadowBuffer);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto center = _inner.center();
+	const auto add = style::ConvertScale(2.5);
+	const auto shift = style::ConvertScale(0.5);
+	const auto big = QRectF(_inner).marginsAdded({ add, add, add, add });
+	p.setPen(Qt::NoPen);
+	p.setBrush(_shadow);
+	if (scale != 1.) {
+		p.translate(center);
+		p.scale(scale, scale);
+		p.translate(-center);
+	}
+	p.drawRoundedRect(big.translated(0, shift), radius, radius);
+	p.end();
+	_shadowBuffer = Images::Blur(std::move(_shadowBuffer));
+
+	auto q = QPainter(&_shadowParts);
+	q.setCompositionMode(QPainter::CompositionMode_Source);
+	q.drawImage(rect.topLeft() / style::DevicePixelRatio(), _shadowBuffer);
+
+	_validShadow[frameIndex] = true;
+	return rect;
+}
+
+void RoundAreaWithShadow::setBackgroundColor(const QColor &background) {
+	if (_background == background) {
+		return;
+	}
+	_background = background;
+	ranges::fill(_validBg, false);
+}
+
+ImageSubrect RoundAreaWithShadow::validateFrame(
+		int frameIndex,
+		float64 scale) {
+	const auto result = ImageSubrect{
+		&_cacheBg,
+		FrameCacheRect(frameIndex, kBgCacheIndex, _outer)
+	};
+	if (_validBg[frameIndex]) {
+		return result;
+	}
+
+	const auto position = result.rect.topLeft() / style::DevicePixelRatio();
+	const auto inner = _inner.translated(position);
+	const auto radius = inner.height() / 2.;
+
+	const auto shadowSource = validateShadow(frameIndex, scale, radius);
+
+	auto p = QPainter(&_cacheBg);
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	p.drawImage(position, _shadowParts, shadowSource);
+	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(_background);
+	if (scale != 1.) {
+		const auto center = inner.center();
+		p.save();
+		p.translate(center);
+		p.scale(scale, scale);
+		p.translate(-center);
+	}
+	p.drawRoundedRect(inner, radius, radius);
+	if (scale != 1.) {
+		p.restore();
+	}
+
+	_validBg[frameIndex] = true;
+	return result;
+}
+
+} // namespace Ui
diff --git a/ui/effects/round_area_with_shadow.h b/ui/effects/round_area_with_shadow.h
new file mode 100644
index 0000000..3fe4e1d
--- /dev/null
+++ b/ui/effects/round_area_with_shadow.h
@@ -0,0 +1,87 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+namespace Ui {
+
+struct ImageSubrect {
+	not_null<QImage*> image;
+	QRect rect;
+};
+
+class RoundAreaWithShadow final {
+public:
+	static constexpr auto kFramesCount = 32;
+
+	[[nodiscard]] static QImage PrepareImage(QSize size);
+	[[nodiscard]] static QImage PrepareFramesCache(
+		QSize frame,
+		int columns = 1);
+	[[nodiscard]] static QRect FrameCacheRect(
+		int frameIndex,
+		int column,
+		QSize frame);
+
+	static void FillWithImage(
+		QPainter &p,
+		QRect geometry,
+		const ImageSubrect &pattern);
+
+	RoundAreaWithShadow(QSize inner, QMargins shadow, int twiceRadiusMax);
+
+	void setBackgroundColor(const QColor &background);
+	void setShadowColor(const QColor &shadow);
+
+	[[nodiscard]] ImageSubrect validateFrame(int frameIndex, float64 scale);
+	[[nodiscard]] ImageSubrect validateOverlayMask(
+		int frameIndex,
+		QSize innerSize,
+		float64 radius,
+		int twiceRadius,
+		float64 scale);
+	[[nodiscard]] ImageSubrect validateOverlayShadow(
+		int frameIndex,
+		QSize innerSize,
+		float64 radius,
+		int twiceRadius,
+		float64 scale,
+		const ImageSubrect &mask);
+
+	void overlayExpandedBorder(
+		QPainter &p,
+		QSize size,
+		float64 expandRatio,
+		float64 radius,
+		float64 scale);
+
+private:
+	[[nodiscard]] QRect validateShadow(
+		int frameIndex,
+		float64 scale,
+		float64 radius);
+
+	QRect _inner;
+	QSize _outer;
+	QSize _overlay;
+
+	std::array<bool, kFramesCount> _validBg = { { false } };
+	std::array<bool, kFramesCount> _validShadow = { { false } };
+	std::array<bool, kFramesCount> _validOverlayMask = { { false } };
+	std::array<bool, kFramesCount> _validOverlayShadow = { { false } };
+	QColor _background;
+	QColor _gradient;
+	QColor _shadow;
+	QImage _cacheBg;
+	QImage _shadowParts;
+	QImage _overlayCacheParts;
+	QImage _overlayMaskScaled;
+	QImage _overlayShadowScaled;
+	QImage _shadowBuffer;
+
+};
+
+} // namespace Ui
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index db6d0b7..9f979b4 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -430,12 +430,15 @@ void PopupMenu::paintEvent(QPaintEvent *e) {
 	if (_a_show.animating()) {
 		const auto opacity = _a_opacity.value(_hiding ? 0. : 1.);
 		const auto progress = _a_show.value(1.);
-		if (opacity) {
-			_showAnimation->paintFrame(p, 0, 0, width(), progress, opacity);
-		}
+		const auto state = (opacity > 0.)
+			? _showAnimation->paintFrame(p, 0, 0, width(), progress, opacity)
+			: PanelAnimation::PaintState();
 		_showStateChanges.fire({
-			.opacity = opacity,
-			.progress = progress,
+			.opacity = state.opacity,
+			.widthProgress = state.widthProgress,
+			.heightProgress = state.heightProgress,
+			.appearingWidth = state.width,
+			.appearingHeight = state.height,
 			.appearing = true,
 		});
 	} else if (_a_opacity.animating()) {
@@ -703,11 +706,7 @@ void PopupMenu::prepareCache() {
 	_showAnimation = base::take(showAnimationData);
 	_a_show = base::take(showAnimation);
 	if (_a_show.animating()) {
-		_showStateChanges.fire({
-			.opacity = _a_opacity.value(1.),
-			.progress = _a_show.value(1.),
-			.appearing = true,
-		});
+		fireCurrentShowState();
 	}
 }
 
@@ -773,9 +772,19 @@ void PopupMenu::startShowAnimation() {
 	}
 	hideChildren();
 	_a_show.start([this] { showAnimationCallback(); }, 0., 1., _st.showDuration);
+	fireCurrentShowState();
+}
+
+void PopupMenu::fireCurrentShowState() {
+	const auto state = _showAnimation->computeState(
+		_a_show.value(1.),
+		_a_opacity.value(1.));
 	_showStateChanges.fire({
-		.opacity = _a_opacity.value(1.),
-		.progress = _a_show.value(1.),
+		.opacity = state.opacity,
+		.widthProgress = state.widthProgress,
+		.heightProgress = state.heightProgress,
+		.appearingWidth = state.width,
+		.appearingHeight = state.height,
 		.appearing = true,
 	});
 }
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 3a0488d..53c1029 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -89,7 +89,10 @@ public:
 
 	struct ShowState {
 		float64 opacity = 1.;
-		float64 progress = 1.;
+		float64 widthProgress = 1.;
+		float64 heightProgress = 1.;
+		int appearingWidth = 0;
+		int appearingHeight = 0;
 		bool appearing = false;
 		bool toggling = false;
 	};
@@ -123,6 +126,7 @@ private:
 
 	void hideFinished();
 	void showStarted();
+	void fireCurrentShowState();
 
 	using TriggeredSource = Menu::TriggeredSource;
 	void validateCompositingSupport();

From a1ec2c9ade2b050bd307ecf669a2ae5019d70df4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 Aug 2022 20:49:06 +0300
Subject: [PATCH 209/635] Allow arbitrary filling with 9-patch.

---
 ui/effects/round_area_with_shadow.cpp | 87 +++++++++++++++++++++++++--
 ui/effects/round_area_with_shadow.h   |  8 ++-
 2 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/ui/effects/round_area_with_shadow.cpp b/ui/effects/round_area_with_shadow.cpp
index 320993c..0c056c5 100644
--- a/ui/effects/round_area_with_shadow.cpp
+++ b/ui/effects/round_area_with_shadow.cpp
@@ -227,7 +227,7 @@ void RoundAreaWithShadow::overlayExpandedBorder(
 	FillWithImage(p, QRect(QPoint(), size), overlayShadow);
 }
 
-void RoundAreaWithShadow::FillWithImage(
+QRect RoundAreaWithShadow::FillWithImage(
 		QPainter &p,
 		QRect geometry,
 		const ImageSubrect &pattern) {
@@ -261,6 +261,7 @@ void RoundAreaWithShadow::FillWithImage(
 			geometry.topLeft() + QPoint(0, part + fill),
 			image,
 			QRect(source.x(), source.y() + top, source.width(), half));
+		return QRect();
 	} else if (geometry.height() == sourceHeight) {
 		const auto part = (sourceWidth / 2) - 1;
 		const auto fill = geometry.width() - 2 * part;
@@ -286,6 +287,85 @@ void RoundAreaWithShadow::FillWithImage(
 			geometry.topLeft() + QPoint(part + fill, 0),
 			image,
 			QRect(source.x() + left, source.y(), half, source.height()));
+		return QRect();
+	} else if (geometry.width() > sourceWidth
+		&& geometry.height() > sourceHeight) {
+		const auto xpart = (sourceWidth / 2) - 1;
+		const auto xfill = geometry.width() - 2 * xpart;
+		const auto xhalf = xpart * factor;
+		const auto left = source.width() - xhalf;
+		const auto ypart = (sourceHeight / 2) - 1;
+		const auto yfill = geometry.height() - 2 * ypart;
+		const auto yhalf = ypart * factor;
+		const auto top = source.height() - yhalf;
+		p.drawImage(
+			geometry.topLeft(),
+			image,
+			QRect(source.x(), source.y(), xhalf, yhalf));
+		if (xfill > 0) {
+			p.drawImage(
+				QRect(
+					geometry.topLeft() + QPoint(xpart, 0),
+					QSize(xfill, ypart)),
+				image,
+				QRect(
+					source.x() + xhalf,
+					source.y(),
+					left - xhalf,
+					yhalf));
+		}
+		p.drawImage(
+			geometry.topLeft() + QPoint(xpart + xfill, 0),
+			image,
+			QRect(source.x() + left, source.y(), xhalf, yhalf));
+
+		if (yfill > 0) {
+			p.drawImage(
+				QRect(
+					geometry.topLeft() + QPoint(0, ypart),
+					QSize(xpart, yfill)),
+				image,
+				QRect(
+					source.x(),
+					source.y() + yhalf,
+					xhalf,
+					top - yhalf));
+			p.drawImage(
+				QRect(
+					geometry.topLeft() + QPoint(xpart + xfill, ypart),
+					QSize(xpart, yfill)),
+				image,
+				QRect(
+					source.x() + left,
+					source.y() + yhalf,
+					xhalf,
+					top - yhalf));
+		}
+
+		p.drawImage(
+			geometry.topLeft() + QPoint(0, ypart + yfill),
+			image,
+			QRect(source.x(), source.y() + top, xhalf, yhalf));
+		if (xfill > 0) {
+			p.drawImage(
+				QRect(
+					geometry.topLeft() + QPoint(xpart, ypart + yfill),
+					QSize(xfill, ypart)),
+				image,
+				QRect(
+					source.x() + xhalf,
+					source.y() + top,
+					left - xhalf,
+					yhalf));
+		}
+		p.drawImage(
+			geometry.topLeft() + QPoint(xpart + xfill, ypart + yfill),
+			image,
+			QRect(source.x() + left, source.y() + top, xhalf, yhalf));
+
+		return QRect(
+			geometry.topLeft() + QPoint(xpart, ypart),
+			QSize(xfill, yfill));
 	} else {
 		Unexpected("Values in RoundAreaWithShadow::fillWithImage.");
 	}
@@ -346,7 +426,8 @@ void RoundAreaWithShadow::setBackgroundColor(const QColor &background) {
 
 ImageSubrect RoundAreaWithShadow::validateFrame(
 		int frameIndex,
-		float64 scale) {
+		float64 scale,
+		float64 radius) {
 	const auto result = ImageSubrect{
 		&_cacheBg,
 		FrameCacheRect(frameIndex, kBgCacheIndex, _outer)
@@ -357,8 +438,6 @@ ImageSubrect RoundAreaWithShadow::validateFrame(
 
 	const auto position = result.rect.topLeft() / style::DevicePixelRatio();
 	const auto inner = _inner.translated(position);
-	const auto radius = inner.height() / 2.;
-
 	const auto shadowSource = validateShadow(frameIndex, scale, radius);
 
 	auto p = QPainter(&_cacheBg);
diff --git a/ui/effects/round_area_with_shadow.h b/ui/effects/round_area_with_shadow.h
index 3fe4e1d..417f6d4 100644
--- a/ui/effects/round_area_with_shadow.h
+++ b/ui/effects/round_area_with_shadow.h
@@ -26,7 +26,8 @@ public:
 		int column,
 		QSize frame);
 
-	static void FillWithImage(
+	// Returns center area which could be just filled with a solid color.
+	static QRect FillWithImage(
 		QPainter &p,
 		QRect geometry,
 		const ImageSubrect &pattern);
@@ -36,7 +37,10 @@ public:
 	void setBackgroundColor(const QColor &background);
 	void setShadowColor(const QColor &shadow);
 
-	[[nodiscard]] ImageSubrect validateFrame(int frameIndex, float64 scale);
+	[[nodiscard]] ImageSubrect validateFrame(
+		int frameIndex,
+		float64 scale,
+		float64 radius);
 	[[nodiscard]] ImageSubrect validateOverlayMask(
 		int frameIndex,
 		QSize innerSize,

From 8162619cb17456f31d1be378a7ed72dc928e0831 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 22 Aug 2022 19:40:49 +0300
Subject: [PATCH 210/635] Move some fade graphics to child project.

---
 ui/basic.style | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index 57d56d0..9b36b57 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -285,14 +285,6 @@ historyReplyCancelIconOver: icon {{ "box_button_close", historyReplyCancelFgOver
 boxTitleCloseIcon: icon {{ "box_button_close", boxTitleCloseFg }};
 boxTitleCloseIconOver: icon {{ "box_button_close", boxTitleCloseFgOver }};
 
-notifyFadeRight: icon {{ "fade_horizontal", notificationBg }};
-
-stickerIconLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
-stickerIconRight: icon {{ "fade_horizontal", emojiPanCategories }};
-
-emojiSuggestionsFadeLeft: icon {{ "fade_horizontal-flip_horizontal", boxBg }};
-emojiSuggestionsFadeRight: icon {{ "fade_horizontal", boxBg }};
-
 transparentPlaceholderSize: 4px;
 
 // floating badge colors

From 01c4ba869a07eabc9eea2b633542a53e9ff6ff4c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Aug 2022 17:46:56 +0300
Subject: [PATCH 211/635] Allow requesting low-quality scaling of custom emoji.

---
 ui/text/text.cpp            | 13 ++++++-------
 ui/text/text_block.h        | 21 ++++++++++++++-------
 ui/widgets/input_fields.cpp | 15 ++++++++-------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 1877de5..7a2af6c 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -1724,13 +1724,12 @@ private:
 								_customEmojiSize = AdjustCustomEmojiSize(st::emojiSize);
 								_customEmojiSkip = (st::emojiSize - _customEmojiSize) / 2;
 							}
-							custom->paint(
-								*_p,
-								x + _customEmojiSkip,
-								y + _customEmojiSkip,
-								_now,
-								_textPalette->spoilerActiveBg->c,
-								_p->inactive());
+							custom->paint(*_p, {
+								.preview = _textPalette->spoilerActiveBg->c,
+								.now = _now,
+								.position = { x + _customEmojiSkip, y + _customEmojiSkip },
+								.paused = _p->inactive(),
+							});
 						}
 					}
 					if (hasSpoiler) {
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index da10ab2..c55e59e 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -166,17 +166,24 @@ private:
 
 };
 
+struct CustomEmojiPaintContext {
+	QColor preview;
+	QSize size; // Required only when scaled = true, for path scaling.
+	crl::time now = 0;
+	float64 scale = 0.;
+	QPoint position;
+	bool paused = false;
+	bool scaled = false;
+};
+
 class CustomEmoji {
 public:
 	virtual ~CustomEmoji() = default;
+
 	[[nodiscard]] virtual QString entityData() = 0;
-	virtual void paint(
-		QPainter &p,
-		int x,
-		int y,
-		crl::time now,
-		const QColor &preview,
-		bool paused) = 0;
+
+	using Context = CustomEmojiPaintContext;
+	virtual void paint(QPainter &p, const Context &context) = 0;
 	virtual void unload() = 0;
 
 };
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 09128f5..490a025 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1424,13 +1424,14 @@ void CustomEmojiObject::drawObject(
 	if (i == end(_emoji)) {
 		return;
 	}
-	i->second->paint(
-		*painter,
-		int(base::SafeRound(rect.x())) + st::emojiPadding + _skip,
-		int(base::SafeRound(rect.y())) + _skip,
-		_now,
-		st::defaultTextPalette.spoilerActiveBg->c,
-		_paused && _paused());
+	i->second->paint(*painter, {
+		.preview = st::defaultTextPalette.spoilerActiveBg->c,
+		.now = _now,
+		.position = QPoint(
+			int(base::SafeRound(rect.x())) + st::emojiPadding + _skip,
+			int(base::SafeRound(rect.y())) + _skip),
+		.paused = _paused && _paused(),
+	});
 }
 
 void CustomEmojiObject::clear() {

From fc2c55367099ca7bdeacd0d52ff6007f00a6ba72 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 23 Aug 2022 20:35:25 +0300
Subject: [PATCH 212/635] Allow querying ready state of custom emoji.

---
 ui/text/text_block.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index c55e59e..a974c42 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -185,6 +185,7 @@ public:
 	using Context = CustomEmojiPaintContext;
 	virtual void paint(QPainter &p, const Context &context) = 0;
 	virtual void unload() = 0;
+	[[nodiscard]] virtual bool ready() = 0;
 
 };
 

From 29ce965e6183d0e4884eab17edfb769cd39c0dfb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 25 Aug 2022 20:39:15 +0300
Subject: [PATCH 213/635] Added ability to pass context with marked text to
 Ui::FlatLabel.

---
 ui/widgets/labels.cpp | 10 ++++++++--
 ui/widgets/labels.h   |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 08d696e..65bd7e5 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -269,8 +269,14 @@ void FlatLabel::setText(const QString &text) {
 	textUpdated();
 }
 
-void FlatLabel::setMarkedText(const TextWithEntities &textWithEntities) {
-	_text.setMarkedText(_st.style, textWithEntities, _labelMarkedOptions);
+void FlatLabel::setMarkedText(
+		const TextWithEntities &textWithEntities,
+		const std::any &context) {
+	_text.setMarkedText(
+		_st.style,
+		textWithEntities,
+		_labelMarkedOptions,
+		context);
 	textUpdated();
 }
 
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index 294101e..656e6b2 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -122,7 +122,9 @@ public:
 	void setTextColorOverride(std::optional<QColor> color);
 
 	void setText(const QString &text);
-	void setMarkedText(const TextWithEntities &textWithEntities);
+	void setMarkedText(
+		const TextWithEntities &textWithEntities,
+		const std::any &context = {});
 	void setSelectable(bool selectable);
 	void setDoubleClickSelectsParagraph(bool doubleClickSelectsParagraph);
 	void setContextCopyText(const QString &copyText);

From f876d15eedbce39a445b020b92f45d137952ed2a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 26 Aug 2022 23:51:49 +0400
Subject: [PATCH 214/635] Add some helper wrappers for custom emoji.

---
 CMakeLists.txt                        |  2 +
 ui/effects/round_area_with_shadow.cpp |  6 ++-
 ui/effects/round_area_with_shadow.h   |  3 +-
 ui/text/text_block.cpp                |  4 --
 ui/text/text_block.h                  | 26 +--------
 ui/text/text_custom_emoji.cpp         | 62 +++++++++++++++++++++
 ui/text/text_custom_emoji.h           | 78 +++++++++++++++++++++++++++
 ui/widgets/input_fields.h             |  6 +--
 8 files changed, 152 insertions(+), 35 deletions(-)
 create mode 100644 ui/text/text_custom_emoji.cpp
 create mode 100644 ui/text/text_custom_emoji.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c473c1..0488eeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,8 @@ PRIVATE
     ui/text/text.h
     ui/text/text_block.cpp
     ui/text/text_block.h
+    ui/text/text_custom_emoji.cpp
+    ui/text/text_custom_emoji.h
     ui/text/text_entity.cpp
     ui/text/text_entity.h
     ui/text/text_isolated_emoji.h
diff --git a/ui/effects/round_area_with_shadow.cpp b/ui/effects/round_area_with_shadow.cpp
index 0c056c5..f1bf71a 100644
--- a/ui/effects/round_area_with_shadow.cpp
+++ b/ui/effects/round_area_with_shadow.cpp
@@ -103,6 +103,7 @@ ImageSubrect RoundAreaWithShadow::validateOverlayMask(
 	p.setCompositionMode(QPainter::CompositionMode_Source);
 	p.fillRect(QRect(position, maskSize), Qt::transparent);
 
+	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
 	auto hq = PainterHighQualityEnabler(p);
 	const auto inner = QRect(position + _inner.topLeft(), innerSize);
 	p.setPen(Qt::NoPen);
@@ -198,10 +199,13 @@ void RoundAreaWithShadow::overlayExpandedBorder(
 		QPainter &p,
 		QSize size,
 		float64 expandRatio,
-		float64 radius,
+		float64 radiusFrom,
+		float64 radiusTill,
 		float64 scale) {
 	const auto progress = expandRatio;
 	const auto frame = int(base::SafeRound(progress * (kFramesCount - 1)));
+	const auto cacheRatio = frame / float64(kFramesCount - 1);
+	const auto radius = radiusFrom + (radiusTill - radiusFrom) * cacheRatio;
 	const auto twiceRadius = int(base::SafeRound(radius * 2));
 	const auto innerSize = QSize(
 		std::max(_inner.width(), twiceRadius),
diff --git a/ui/effects/round_area_with_shadow.h b/ui/effects/round_area_with_shadow.h
index 417f6d4..0edd5be 100644
--- a/ui/effects/round_area_with_shadow.h
+++ b/ui/effects/round_area_with_shadow.h
@@ -59,7 +59,8 @@ public:
 		QPainter &p,
 		QSize size,
 		float64 expandRatio,
-		float64 radius,
+		float64 radiusFrom,
+		float64 radiusTill,
 		float64 scale);
 
 private:
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index 7c6c617..f3d2275 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -498,10 +498,6 @@ CustomEmojiBlock::CustomEmojiBlock(
 	}
 }
 
-int AdjustCustomEmojiSize(int emojiSize) {
-	return base::SafeRound(emojiSize * 1.12);
-}
-
 NewlineBlock::NewlineBlock(
 	const style::font &font,
 	const QString &str,
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index a974c42..0580146 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "ui/text/text_custom_emoji.h"
 #include "ui/style/style_core.h"
 #include "ui/emoji_config.h"
 
@@ -166,29 +167,6 @@ private:
 
 };
 
-struct CustomEmojiPaintContext {
-	QColor preview;
-	QSize size; // Required only when scaled = true, for path scaling.
-	crl::time now = 0;
-	float64 scale = 0.;
-	QPoint position;
-	bool paused = false;
-	bool scaled = false;
-};
-
-class CustomEmoji {
-public:
-	virtual ~CustomEmoji() = default;
-
-	[[nodiscard]] virtual QString entityData() = 0;
-
-	using Context = CustomEmojiPaintContext;
-	virtual void paint(QPainter &p, const Context &context) = 0;
-	virtual void unload() = 0;
-	[[nodiscard]] virtual bool ready() = 0;
-
-};
-
 class CustomEmojiBlock final : public AbstractBlock {
 public:
 	CustomEmojiBlock(
@@ -210,8 +188,6 @@ private:
 
 };
 
-[[nodiscard]] int AdjustCustomEmojiSize(int emojiSize);
-
 class SkipBlock final : public AbstractBlock {
 public:
 	SkipBlock(
diff --git a/ui/text/text_custom_emoji.cpp b/ui/text/text_custom_emoji.cpp
new file mode 100644
index 0000000..0157951
--- /dev/null
+++ b/ui/text/text_custom_emoji.cpp
@@ -0,0 +1,62 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/text/text_custom_emoji.h"
+
+namespace Ui::Text {
+
+int AdjustCustomEmojiSize(int emojiSize) {
+	return base::SafeRound(emojiSize * 1.12);
+}
+
+ShiftedEmoji::ShiftedEmoji(
+	std::unique_ptr<Ui::Text::CustomEmoji> wrapped,
+	QPoint shift)
+: _wrapped(std::move(wrapped))
+, _shift(shift) {
+}
+
+QString ShiftedEmoji::entityData() {
+	return _wrapped->entityData();
+}
+
+void ShiftedEmoji::paint(QPainter &p, const Context &context) {
+	auto copy = context;
+	copy.position += _shift;
+	_wrapped->paint(p, copy);
+}
+
+void ShiftedEmoji::unload() {
+	_wrapped->unload();
+}
+
+bool ShiftedEmoji::ready() {
+	return _wrapped->ready();
+}
+
+FirstFrameEmoji::FirstFrameEmoji(std::unique_ptr<CustomEmoji> wrapped)
+: _wrapped(std::move(wrapped)) {
+}
+
+QString FirstFrameEmoji::entityData() {
+	return _wrapped->entityData();
+}
+
+void FirstFrameEmoji::paint(QPainter &p, const Context &context) {
+	auto copy = context;
+	copy.firstFrameOnly = true;
+	_wrapped->paint(p, copy);
+}
+
+void FirstFrameEmoji::unload() {
+	_wrapped->unload();
+}
+
+bool FirstFrameEmoji::ready() {
+	return _wrapped->ready();
+}
+
+} // namespace Ui::Text
diff --git a/ui/text/text_custom_emoji.h b/ui/text/text_custom_emoji.h
new file mode 100644
index 0000000..53d134b
--- /dev/null
+++ b/ui/text/text_custom_emoji.h
@@ -0,0 +1,78 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include <QtGui/QColor>
+#include <QtCore/QSize>
+#include <QtCore/QPoint>
+
+#include <crl/crl_time.h>
+
+class QPainter;
+
+namespace Ui::Text {
+
+[[nodiscard]] int AdjustCustomEmojiSize(int emojiSize);
+
+struct CustomEmojiPaintContext {
+	QColor preview;
+	QSize size; // Required only when scaled = true, for path scaling.
+	crl::time now = 0;
+	float64 scale = 0.;
+	QPoint position;
+	bool firstFrameOnly = false;
+	bool paused = false;
+	bool scaled = false;
+};
+
+class CustomEmoji {
+public:
+	virtual ~CustomEmoji() = default;
+
+	[[nodiscard]] virtual QString entityData() = 0;
+
+	using Context = CustomEmojiPaintContext;
+	virtual void paint(QPainter &p, const Context &context) = 0;
+	virtual void unload() = 0;
+	[[nodiscard]] virtual bool ready() = 0;
+
+};
+
+using CustomEmojiFactory = Fn<std::unique_ptr<CustomEmoji>(
+	QStringView,
+	Fn<void()>)>;
+
+class ShiftedEmoji final : public CustomEmoji {
+public:
+	ShiftedEmoji(std::unique_ptr<CustomEmoji> wrapped, QPoint shift);
+
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+
+private:
+	const std::unique_ptr<Ui::Text::CustomEmoji> _wrapped;
+	const QPoint _shift;
+
+};
+
+class FirstFrameEmoji final : public CustomEmoji {
+public:
+	explicit FirstFrameEmoji(std::unique_ptr<CustomEmoji> wrapped);
+
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+
+private:
+	const std::unique_ptr<Ui::Text::CustomEmoji> _wrapped;
+
+};
+
+} // namespace Ui::Text
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 1da7845..cfd3440 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -10,6 +10,7 @@
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 #include "ui/text/text_entity.h"
+#include "ui/text/text_custom_emoji.h"
 #include "styles/style_widgets.h"
 
 #include <QContextMenuEvent>
@@ -35,10 +36,6 @@ const auto kMonospaceSequence = QKeySequence("ctrl+shift+m");
 const auto kEditLinkSequence = QKeySequence("ctrl+k");
 const auto kSpoilerSequence = QKeySequence("ctrl+shift+p");
 
-using CustomEmojiFactory = Fn<std::unique_ptr<Text::CustomEmoji>(
-	QStringView,
-	Fn<void()>)>;
-
 class PopupMenu;
 
 void InsertEmojiAtCursor(QTextCursor cursor, EmojiPtr emoji);
@@ -199,6 +196,7 @@ public:
 		MultiLine,
 	};
 	using TagList = TextWithTags::Tags;
+	using CustomEmojiFactory = Text::CustomEmojiFactory;
 
 	struct MarkdownTag {
 		// With each emoji being QChar::ObjectReplacementCharacter.

From 3287bf45c607e980268090ae27dfe4fb69d037e4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 29 Aug 2022 16:32:57 +0400
Subject: [PATCH 215/635] Add FrameGenerator-based CustomEmoji and
 AnimatedIcon.

---
 CMakeLists.txt                    |   5 +
 ui/animated_icon.cpp              | 369 ++++++++++++++
 ui/animated_icon.h                |  90 ++++
 ui/effects/frame_generator.cpp    |  33 +-
 ui/effects/frame_generator.h      |  26 +-
 ui/text/custom_emoji_instance.cpp | 775 ++++++++++++++++++++++++++++++
 ui/text/custom_emoji_instance.h   | 273 +++++++++++
 7 files changed, 1564 insertions(+), 7 deletions(-)
 create mode 100644 ui/animated_icon.cpp
 create mode 100644 ui/animated_icon.h
 create mode 100644 ui/text/custom_emoji_instance.cpp
 create mode 100644 ui/text/custom_emoji_instance.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0488eeb..8352b47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,8 @@ PRIVATE
     ui/style/style_core_types.h
     ui/style/style_palette_colorizer.cpp
     ui/style/style_palette_colorizer.h
+    ui/text/custom_emoji_instance.cpp
+    ui/text/custom_emoji_instance.h
     ui/text/text.cpp
     ui/text/text.h
     ui/text/text_block.cpp
@@ -236,6 +238,8 @@ PRIVATE
     ui/wrap/wrap.h
     ui/abstract_button.cpp
     ui/abstract_button.h
+    ui/animated_icon.cpp
+    ui/animated_icon.h
     ui/basic_click_handlers.cpp
     ui/basic_click_handlers.h
     ui/cached_special_layer_shadow_corners.cpp
@@ -308,4 +312,5 @@ PUBLIC
 PRIVATE
     desktop-app::external_zlib
     desktop-app::external_jpeg
+    desktop-app::external_lz4
 )
diff --git a/ui/animated_icon.cpp b/ui/animated_icon.cpp
new file mode 100644
index 0000000..189a562
--- /dev/null
+++ b/ui/animated_icon.cpp
@@ -0,0 +1,369 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/animated_icon.h"
+
+#include "ui/image/image_prepare.h"
+#include "ui/style/style_core.h"
+#include "ui/effects/frame_generator.h"
+
+#include <QtGui/QPainter>
+#include <crl/crl_async.h>
+#include <crl/crl_semaphore.h>
+#include <crl/crl_on_main.h>
+
+namespace Ui {
+namespace {
+
+constexpr auto kDefaultDuration = crl::time(800);
+
+} // namespace
+
+struct AnimatedIcon::Frame {
+	FrameGenerator::Frame generated;
+	QImage resizedImage;
+	int index = 0;
+};
+
+class AnimatedIcon::Impl final : public std::enable_shared_from_this<Impl> {
+public:
+	explicit Impl(base::weak_ptr<AnimatedIcon> weak);
+
+	void prepareFromAsync(
+		FnMut<std::unique_ptr<FrameGenerator>()> factory,
+		QSize sizeOverride);
+	void waitTillPrepared() const;
+
+	[[nodiscard]] bool valid() const;
+	[[nodiscard]] QSize size() const;
+	[[nodiscard]] int framesCount() const;
+	[[nodiscard]] Frame &frame();
+	[[nodiscard]] const Frame &frame() const;
+
+	[[nodiscard]] crl::time animationDuration() const;
+	void moveToFrame(int frame, QSize updatedDesiredSize);
+
+private:
+	enum class PreloadState {
+		None,
+		Preloading,
+		Ready,
+	};
+
+	// Called from crl::async.
+	void renderPreloadFrame();
+
+	std::unique_ptr<FrameGenerator> _generator;
+	Frame _current;
+	QSize _desiredSize;
+	std::atomic<PreloadState> _preloadState = PreloadState::None;
+
+	Frame _preloaded; // Changed on main or async depending on _preloadState.
+	QSize _preloadImageSize;
+
+	base::weak_ptr<AnimatedIcon> _weak;
+	int _framesCount = 0;
+	mutable crl::semaphore _semaphore;
+	mutable bool _ready = false;
+
+};
+
+AnimatedIcon::Impl::Impl(base::weak_ptr<AnimatedIcon> weak)
+: _weak(weak) {
+}
+
+void AnimatedIcon::Impl::prepareFromAsync(
+		FnMut<std::unique_ptr<FrameGenerator>()> factory,
+		QSize sizeOverride) {
+	const auto guard = gsl::finally([&] { _semaphore.release(); });
+	if (!_weak) {
+		return;
+	}
+	auto generator = factory ? factory() : nullptr;
+	if (!generator || !_weak) {
+		return;
+	}
+	_framesCount = generator->count();
+	_current.generated = generator->renderNext(QImage(), sizeOverride);
+	if (_current.generated.image.isNull()) {
+		return;
+	}
+	_generator = std::move(generator);
+	_desiredSize = sizeOverride.isEmpty()
+		? style::ConvertScale(_current.generated.image.size())
+		: sizeOverride;
+}
+
+void AnimatedIcon::Impl::waitTillPrepared() const {
+	if (!_ready) {
+		_semaphore.acquire();
+		_ready = true;
+	}
+}
+
+bool AnimatedIcon::Impl::valid() const {
+	waitTillPrepared();
+	return (_generator != nullptr);
+}
+
+QSize AnimatedIcon::Impl::size() const {
+	waitTillPrepared();
+	return _desiredSize;
+}
+
+int AnimatedIcon::Impl::framesCount() const {
+	waitTillPrepared();
+	return _framesCount;
+}
+
+AnimatedIcon::Frame &AnimatedIcon::Impl::frame() {
+	waitTillPrepared();
+	return _current;
+}
+
+const AnimatedIcon::Frame &AnimatedIcon::Impl::frame() const {
+	waitTillPrepared();
+	return _current;
+}
+
+crl::time AnimatedIcon::Impl::animationDuration() const {
+	waitTillPrepared();
+	const auto rate = _generator ? _generator->rate() : 0.;
+	const auto frames = _generator ? _generator->count() : 0;
+	return (frames && rate >= 1.)
+		? crl::time(base::SafeRound(frames / rate * 1000.))
+		: 0;
+}
+
+void AnimatedIcon::Impl::moveToFrame(int frame, QSize updatedDesiredSize) {
+	waitTillPrepared();
+	const auto state = _preloadState.load();
+	const auto shown = _current.index;
+	if (!updatedDesiredSize.isEmpty()) {
+		_desiredSize = updatedDesiredSize;
+	}
+	const auto desiredImageSize = _desiredSize * style::DevicePixelRatio();
+	if (!_generator
+		|| state == PreloadState::Preloading
+		|| (shown == frame
+			&& (_current.generated.image.size() == desiredImageSize))) {
+		return;
+	} else if (state == PreloadState::Ready) {
+		if (_preloaded.index == frame
+			&& (shown != frame
+				|| _preloaded.generated.image.size() == desiredImageSize)) {
+			std::swap(_current, _preloaded);
+			if (_current.generated.image.size() == desiredImageSize) {
+				return;
+			}
+		} else if ((shown < _preloaded.index && _preloaded.index < frame)
+			|| (shown > _preloaded.index && _preloaded.index > frame)) {
+			std::swap(_current, _preloaded);
+		}
+	}
+	_preloadImageSize = desiredImageSize;
+	_preloaded.index = frame;
+	_preloadState = PreloadState::Preloading;
+	crl::async([guard = shared_from_this()] {
+		guard->renderPreloadFrame();
+	});
+}
+
+void AnimatedIcon::Impl::renderPreloadFrame() {
+	if (!_weak) {
+		return;
+	}
+	if (_preloaded.index == 0) {
+		_generator->jumpToStart();
+	}
+	_preloaded.generated = (_preloaded.index && _preloaded.index == _current.index)
+		? _generator->renderCurrent(
+			std::move(_preloaded.generated.image),
+			_preloadImageSize)
+		: _generator->renderNext(
+			std::move(_preloaded.generated.image),
+			_preloadImageSize);
+	_preloaded.resizedImage = QImage();
+	_preloadState = PreloadState::Ready;
+	crl::on_main(_weak, [=] {
+		_weak->frameJumpFinished();
+	});
+}
+
+AnimatedIcon::AnimatedIcon(AnimatedIconDescriptor &&descriptor)
+: _impl(std::make_shared<Impl>(base::make_weak(this))) {
+	crl::async([
+		impl = _impl,
+		factory = std::move(descriptor.generator),
+		sizeOverride = descriptor.sizeOverride
+	]() mutable {
+		impl->prepareFromAsync(std::move(factory), sizeOverride);
+	});
+}
+
+void AnimatedIcon::wait() const {
+	_impl->waitTillPrepared();
+}
+
+bool AnimatedIcon::valid() const {
+	return _impl->valid();
+}
+
+int AnimatedIcon::frameIndex() const {
+	return _impl->frame().index;
+}
+
+int AnimatedIcon::framesCount() const {
+	return _impl->framesCount();
+}
+
+QImage AnimatedIcon::frame() const {
+	return frame(QSize(), nullptr).image;
+}
+
+AnimatedIcon::ResizedFrame AnimatedIcon::frame(
+		QSize desiredSize,
+		Fn<void()> updateWithPerfect) const {
+	auto &frame = _impl->frame();
+	preloadNextFrame(crl::now(), &frame, desiredSize);
+	const auto desired = size() * style::DevicePixelRatio();
+	if (frame.generated.image.isNull()) {
+		return { frame.generated.image };
+	} else if (frame.generated.image.size() == desired) {
+		return { frame.generated.image };
+	} else if (frame.resizedImage.size() != desired) {
+		frame.resizedImage = frame.generated.image.scaled(
+			desired,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+	}
+	if (updateWithPerfect) {
+		_repaint = std::move(updateWithPerfect);
+	}
+	return { frame.resizedImage, true };
+}
+
+int AnimatedIcon::width() const {
+	return size().width();
+}
+
+int AnimatedIcon::height() const {
+	return size().height();
+}
+
+QSize AnimatedIcon::size() const {
+	return _impl->size();
+}
+
+void AnimatedIcon::paint(QPainter &p, int x, int y) {
+	auto &frame = _impl->frame();
+	preloadNextFrame(crl::now(), &frame);
+	if (frame.generated.image.isNull()) {
+		return;
+	}
+	const auto rect = QRect{ QPoint(x, y), size() };
+	p.drawImage(rect, frame.generated.image);
+}
+
+void AnimatedIcon::paintInCenter(QPainter &p, QRect rect) {
+	const auto my = size();
+	paint(
+		p,
+		rect.x() + (rect.width() - my.width()) / 2,
+		rect.y() + (rect.height() - my.height()) / 2);
+}
+
+void AnimatedIcon::animate(Fn<void()> update) {
+	if (framesCount() != 1 && !anim::Disabled()) {
+		jumpToStart(std::move(update));
+		_animationDuration = _impl->animationDuration();
+		_animationCurrentStart = _animationStarted = crl::now();
+		continueAnimation(_animationCurrentStart);
+	}
+}
+
+void AnimatedIcon::continueAnimation(crl::time now) {
+	const auto callback = [=](float64 value) {
+		if (anim::Disabled()) {
+			return;
+		}
+		const auto elapsed = int(value);
+		const auto now = _animationStartTime + elapsed;
+		if (!_animationDuration && elapsed > kDefaultDuration / 2) {
+			auto animation = std::move(_animation);
+			continueAnimation(now);
+		}
+		preloadNextFrame(now);
+		if (_repaint) _repaint();
+	};
+	const auto duration = _animationDuration
+		? _animationDuration
+		: kDefaultDuration;
+	_animationStartTime = now;
+	_animation.start(callback, 0., 1. * duration, duration);
+}
+
+void AnimatedIcon::jumpToStart(Fn<void()> update) {
+	_repaint = std::move(update);
+	_animation.stop();
+	_animationCurrentIndex = 0;
+	_impl->moveToFrame(0, QSize());
+}
+
+void AnimatedIcon::frameJumpFinished() {
+	if (_repaint && !animating()) {
+		_repaint();
+		_repaint = nullptr;
+	}
+}
+
+int AnimatedIcon::wantedFrameIndex(
+		crl::time now,
+		const Frame *resolvedCurrent) const {
+	const auto frame = resolvedCurrent ? resolvedCurrent : &_impl->frame();
+	if (frame->index == _animationCurrentIndex + 1) {
+		++_animationCurrentIndex;
+		_animationCurrentStart = _animationNextStart;
+	}
+	if (!_animation.animating()) {
+		return _animationCurrentIndex;
+	}
+	if (frame->index == _animationCurrentIndex) {
+		const auto duration = frame->generated.duration;
+		const auto next = _animationCurrentStart + duration;
+		if (frame->generated.last) {
+			_animation.stop();
+			return _animationCurrentIndex;
+		} else if (now < next) {
+			return _animationCurrentIndex;
+		}
+		_animationNextStart = next;
+		return _animationCurrentIndex + 1;
+	}
+	Assert(!_animationCurrentIndex);
+	return 0;
+}
+
+void AnimatedIcon::preloadNextFrame(
+		crl::time now,
+		const Frame *resolvedCurrent,
+		QSize updatedDesiredSize) const {
+	_impl->moveToFrame(
+		wantedFrameIndex(now, resolvedCurrent),
+		updatedDesiredSize);
+}
+
+bool AnimatedIcon::animating() const {
+	return _animation.animating();
+}
+
+std::unique_ptr<AnimatedIcon> MakeAnimatedIcon(
+		AnimatedIconDescriptor &&descriptor) {
+	return std::make_unique<AnimatedIcon>(std::move(descriptor));
+}
+
+} // namespace Lottie
diff --git a/ui/animated_icon.h b/ui/animated_icon.h
new file mode 100644
index 0000000..80755f9
--- /dev/null
+++ b/ui/animated_icon.h
@@ -0,0 +1,90 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/style/style_core_types.h"
+#include "ui/effects/animations.h"
+#include "base/weak_ptr.h"
+
+#include <crl/crl_time.h>
+#include <QtCore/QByteArray>
+#include <optional>
+
+namespace Ui {
+
+class FrameGenerator;
+
+struct AnimatedIconDescriptor {
+	FnMut<std::unique_ptr<FrameGenerator>()> generator;
+	QSize sizeOverride;
+};
+
+class AnimatedIcon final : public base::has_weak_ptr {
+public:
+	explicit AnimatedIcon(AnimatedIconDescriptor &&descriptor);
+	AnimatedIcon(const AnimatedIcon &other) = delete;
+	AnimatedIcon &operator=(const AnimatedIcon &other) = delete;
+	AnimatedIcon(AnimatedIcon &&other) = delete; // _animation captures this.
+	AnimatedIcon &operator=(AnimatedIcon &&other) = delete;
+
+	[[nodiscard]] bool valid() const;
+	[[nodiscard]] int frameIndex() const;
+	[[nodiscard]] int framesCount() const;
+	[[nodiscard]] QImage frame() const;
+	[[nodiscard]] int width() const;
+	[[nodiscard]] int height() const;
+	[[nodiscard]] QSize size() const;
+
+	struct ResizedFrame {
+		QImage image;
+		bool scaled = false;
+	};
+	[[nodiscard]] ResizedFrame frame(
+		QSize desiredSize,
+		Fn<void()> updateWithPerfect) const;
+
+	void animate(Fn<void()> update);
+	void jumpToStart(Fn<void()> update);
+
+	void paint(QPainter &p, int x, int y);
+	void paintInCenter(QPainter &p, QRect rect);
+
+	[[nodiscard]] bool animating() const;
+
+private:
+	struct Frame;
+	class Impl;
+	friend class Impl;
+
+	void wait() const;
+	[[nodiscard]] int wantedFrameIndex(
+		crl::time now,
+		const Frame *resolvedCurrent = nullptr) const;
+	void preloadNextFrame(
+		crl::time now,
+		const Frame *resolvedCurrent = nullptr,
+		QSize updatedDesiredSize = QSize()) const;
+	void frameJumpFinished();
+	void continueAnimation(crl::time now);
+
+	std::shared_ptr<Impl> _impl;
+	crl::time _animationStartTime = 0;
+	crl::time _animationStarted = 0;
+	mutable Animations::Simple _animation;
+	mutable Fn<void()> _repaint;
+	mutable crl::time _animationDuration = 0;
+	mutable crl::time _animationCurrentStart = 0;
+	mutable crl::time _animationNextStart = 0;
+	mutable int _animationCurrentIndex = 0;
+
+};
+
+[[nodiscard]] std::unique_ptr<AnimatedIcon> MakeAnimatedIcon(
+	AnimatedIconDescriptor &&descriptor);
+
+} // namespace Ui
diff --git a/ui/effects/frame_generator.cpp b/ui/effects/frame_generator.cpp
index 43a20d4..a50b443 100644
--- a/ui/effects/frame_generator.cpp
+++ b/ui/effects/frame_generator.cpp
@@ -14,21 +14,39 @@ ImageFrameGenerator::ImageFrameGenerator(const QByteArray &bytes)
 : _bytes(bytes) {
 }
 
+ImageFrameGenerator::ImageFrameGenerator(const QImage &image)
+: _image(image) {
+}
+
 int ImageFrameGenerator::count() {
 	return 1;
 }
 
+double ImageFrameGenerator::rate() {
+	return 1.;
+}
+
 FrameGenerator::Frame ImageFrameGenerator::renderNext(
 		QImage storage,
 		QSize size,
 		Qt::AspectRatioMode mode) {
-	storage = Images::Read({
-		.content = _bytes,
-	}).image;
-	if (storage.isNull()) {
+	return renderCurrent(std::move(storage), size, mode);
+}
+
+FrameGenerator::Frame ImageFrameGenerator::renderCurrent(
+		QImage storage,
+		QSize size,
+		Qt::AspectRatioMode mode) {
+	if (_image.isNull() && !_bytes.isEmpty()) {
+		_image = Images::Read({
+			.content = _bytes,
+		}).image;
+		_bytes = QByteArray();
+	}
+	if (_image.isNull()) {
 		return {};
 	}
-	auto scaled = storage.scaled(
+	auto scaled = _image.scaled(
 		size,
 		mode,
 		Qt::SmoothTransformation
@@ -52,7 +70,10 @@ FrameGenerator::Frame ImageFrameGenerator::renderNext(
 		dst += dstPerLine;
 	}
 
-	return { .image = std::move(result) };
+	return { .image = std::move(result), .last = true };
+}
+
+void ImageFrameGenerator::jumpToStart() {
 }
 
 } // namespace Ui
diff --git a/ui/effects/frame_generator.h b/ui/effects/frame_generator.h
index cf413dc..7c6a45f 100644
--- a/ui/effects/frame_generator.h
+++ b/ui/effects/frame_generator.h
@@ -15,31 +15,55 @@ namespace Ui {
 class FrameGenerator {
 public:
 	virtual ~FrameGenerator() = default;
+
+	// 0 means unknown.
 	[[nodiscard]] virtual int count() = 0;
 
+	// 0. means unknown.
+	[[nodiscard]] virtual double rate() = 0;
+
 	struct Frame {
-		QImage image;
 		crl::time duration = 0;
+		QImage image;
+		bool last = false;
 	};
 	[[nodiscard]] virtual Frame renderNext(
 		QImage storage,
 		QSize size,
 		Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) = 0;
+	[[nodiscard]] virtual Frame renderCurrent(
+		QImage storage,
+		QSize size,
+		Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) = 0;
+
+	virtual void jumpToStart() = 0;
+
 };
 
 class ImageFrameGenerator final : public Ui::FrameGenerator {
 public:
 	explicit ImageFrameGenerator(const QByteArray &bytes);
+	explicit ImageFrameGenerator(const QImage &image);
 
 	int count() override;
+	double rate() override;
 	Frame renderNext(
 		QImage storage,
 		QSize size,
 		Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) override;
+	Frame renderCurrent(
+		QImage storage,
+		QSize size,
+		Qt::AspectRatioMode mode = Qt::IgnoreAspectRatio) override;
+	void jumpToStart() override;
 
 private:
 	QByteArray _bytes;
+	QImage _image;
 
 };
 
+[[nodiscard]] bool GoodStorageForFrame(const QImage &storage, QSize size);
+[[nodiscard]] QImage CreateFrameStorage(QSize size);
+
 } // namespace Ui
diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
new file mode 100644
index 0000000..928691a
--- /dev/null
+++ b/ui/text/custom_emoji_instance.cpp
@@ -0,0 +1,775 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/text/custom_emoji_instance.h"
+
+#include "ui/effects/animation_value.h"
+#include "ui/effects/frame_generator.h"
+#include "ui/ui_utility.h"
+#include "ui/painter.h"
+
+#include <crl/crl_async.h>
+#include <lz4.h>
+
+class QPainter;
+
+namespace Ui::CustomEmoji {
+namespace {
+
+constexpr auto kMaxSize = 128;
+constexpr auto kMaxFrames = 180;
+constexpr auto kCacheVersion = 1;
+constexpr auto kPreloadFrames = 3;
+
+struct CacheHeader {
+	int version = 0;
+	int size = 0;
+	int frames = 0;
+	int length = 0;
+};
+
+void PaintScaledImage(
+		QPainter &p,
+		const QRect &target,
+		const Cache::Frame &frame,
+		const Context &context) {
+	if (context.scaled) {
+		const auto sx = anim::interpolate(
+			target.width() / 2,
+			0,
+			context.scale);
+		const auto sy = (target.height() == target.width())
+			? sx
+			: anim::interpolate(target.height() / 2, 0, context.scale);
+		const auto scaled = target.marginsRemoved({ sx, sy, sx, sy });
+		if (frame.source.isNull()) {
+			p.drawImage(scaled, *frame.image);
+		} else {
+			p.drawImage(scaled, *frame.image, frame.source);
+		}
+	} else if (frame.source.isNull()) {
+		p.drawImage(target, *frame.image);
+	} else {
+		p.drawImage(target, *frame.image, frame.source);
+	}
+}
+
+} // namespace
+
+Preview::Preview(QPainterPath path, float64 scale)
+: _data(ScaledPath{ std::move(path), scale }) {
+}
+
+Preview::Preview(QImage image, bool exact)
+: _data(Image{ .data = std::move(image), .exact = exact }) {
+}
+
+void Preview::paint(QPainter &p, const Context &context) {
+	if (const auto path = std::get_if<ScaledPath>(&_data)) {
+		paintPath(p, context, *path);
+	} else if (const auto image = std::get_if<Image>(&_data)) {
+		const auto &data = image->data;
+		const auto factor = style::DevicePixelRatio();
+		const auto rect = QRect(context.position, data.size() / factor);
+		PaintScaledImage(p, rect, { .image = &data }, context);
+	}
+}
+
+bool Preview::isImage() const {
+	return v::is<Image>(_data);
+}
+
+bool Preview::isExactImage() const {
+	if (const auto image = std::get_if<Image>(&_data)) {
+		return image->exact;
+	}
+	return false;
+}
+
+QImage Preview::image() const {
+	if (const auto image = std::get_if<Image>(&_data)) {
+		return image->data;
+	}
+	return QImage();
+}
+
+void Preview::paintPath(
+		QPainter &p,
+		const Context &context,
+		const ScaledPath &path) {
+	auto hq = PainterHighQualityEnabler(p);
+	p.setBrush(context.preview);
+	p.setPen(Qt::NoPen);
+	const auto scale = path.scale;
+	const auto required = (scale != 1.) || context.scaled;
+	if (required) {
+		p.save();
+	}
+	p.translate(context.position);
+	if (required) {
+		p.scale(scale, scale);
+		const auto center = QPoint(
+			context.size.width() / 2,
+			context.size.height() / 2);
+		if (context.scaled) {
+			p.translate(center);
+			p.scale(context.scale, context.scale);
+			p.translate(-center);
+		}
+	}
+	p.drawPath(path.path);
+	if (required) {
+		p.restore();
+	} else {
+		p.translate(-context.position);
+	}
+}
+
+Cache::Cache(int size) : _size(size) {
+}
+
+std::optional<Cache> Cache::FromSerialized(
+		const QByteArray &serialized,
+		int requestedSize) {
+	Expects(requestedSize > 0 && requestedSize <= kMaxSize);
+
+	if (serialized.size() <= sizeof(CacheHeader)) {
+		return {};
+	}
+	auto header = CacheHeader();
+	memcpy(&header, serialized.data(), sizeof(header));
+	const auto size = header.size;
+	if (size != requestedSize
+		|| header.frames <= 0
+		|| header.frames >= kMaxFrames
+		|| header.length <= 0
+		|| header.length > (size * size * header.frames * sizeof(int32))
+		|| (serialized.size() != sizeof(CacheHeader)
+			+ header.length
+			+ (header.frames * sizeof(Cache(0)._durations[0])))) {
+		return {};
+	}
+	const auto rows = (header.frames + kPerRow - 1) / kPerRow;
+	const auto columns = std::min(header.frames, kPerRow);
+	auto durations = std::vector<uint16>(header.frames, 0);
+	auto full = QImage(
+		columns * size,
+		rows * size,
+		QImage::Format_ARGB32_Premultiplied);
+	Assert(full.bytesPerLine() == full.width() * sizeof(int32));
+
+	const auto decompressed = LZ4_decompress_safe(
+		serialized.data() + sizeof(CacheHeader),
+		reinterpret_cast<char*>(full.bits()),
+		header.length,
+		full.bytesPerLine() * full.height());
+	if (decompressed <= 0) {
+		return {};
+	}
+	memcpy(
+		durations.data(),
+		serialized.data() + sizeof(CacheHeader) + header.length,
+		header.frames * sizeof(durations[0]));
+
+	auto result = Cache(size);
+	result._finished = true;
+	result._full = std::move(full);
+	result._frames = header.frames;
+	result._durations = std::move(durations);
+	return result;
+}
+
+QByteArray Cache::serialize() {
+	Expects(_finished);
+	Expects(_durations.size() == _frames);
+	Expects(_full.bytesPerLine() == sizeof(int32) * _full.width());
+
+	auto header = CacheHeader{
+		.version = kCacheVersion,
+		.size = _size,
+		.frames = _frames,
+	};
+	const auto input = _full.width() * _full.height() * sizeof(int32);
+	const auto max = sizeof(CacheHeader)
+		+ LZ4_compressBound(input)
+		+ (_frames * sizeof(_durations[0]));
+	auto result = QByteArray(max, Qt::Uninitialized);
+	header.length = LZ4_compress_default(
+		reinterpret_cast<const char*>(_full.constBits()),
+		result.data() + sizeof(CacheHeader),
+		input,
+		result.size() - sizeof(CacheHeader));
+	Assert(header.length > 0);
+	memcpy(result.data(), &header, sizeof(CacheHeader));
+	memcpy(
+		result.data() + sizeof(CacheHeader) + header.length,
+		_durations.data(),
+		_frames * sizeof(_durations[0]));
+	result.resize(sizeof(CacheHeader)
+		+ header.length
+		+ _frames * sizeof(_durations[0]));
+
+	return result;
+}
+
+int Cache::frames() const {
+	return _frames;
+}
+
+Cache::Frame Cache::frame(int index) const {
+	Expects(index < _frames);
+
+	const auto row = index / kPerRow;
+	const auto inrow = index % kPerRow;
+	if (_finished) {
+		return { &_full, { inrow * _size, row * _size, _size, _size } };
+	}
+	return { &_images[row], { 0, inrow * _size, _size, _size } };
+}
+
+int Cache::size() const {
+	return _size;
+}
+
+Preview Cache::makePreview() const {
+	Expects(_frames > 0);
+
+	const auto first = frame(0);
+	return { first.image->copy(first.source), true };
+}
+
+void Cache::reserve(int frames) {
+	Expects(!_finished);
+
+	const auto rows = (frames + kPerRow - 1) / kPerRow;
+	if (const auto add = rows - int(_images.size()); add > 0) {
+		_images.resize(rows);
+		for (auto e = end(_images), i = e - add; i != e; ++i) {
+			(*i) = QImage(
+				_size,
+				_size * kPerRow,
+				QImage::Format_ARGB32_Premultiplied);
+		}
+	}
+	_durations.reserve(frames);
+}
+
+int Cache::frameRowByteSize() const {
+	return _size * 4;
+}
+
+int Cache::frameByteSize() const {
+	return _size * frameRowByteSize();
+}
+
+void Cache::add(crl::time duration, const QImage &frame) {
+	Expects(!_finished);
+	Expects(frame.size() == QSize(_size, _size));
+	Expects(frame.format() == QImage::Format_ARGB32_Premultiplied);
+
+	const auto row = (_frames / kPerRow);
+	const auto inrow = (_frames % kPerRow);
+	const auto rows = row + 1;
+	while (_images.size() < rows) {
+		_images.emplace_back();
+		_images.back() = QImage(
+			_size,
+			_size * kPerRow,
+			QImage::Format_ARGB32_Premultiplied);
+	}
+	const auto srcPerLine = frame.bytesPerLine();
+	const auto dstPerLine = _images[row].bytesPerLine();
+	const auto perLine = std::min(srcPerLine, dstPerLine);
+	auto dst = _images[row].bits() + inrow * _size * dstPerLine;
+	auto src = frame.constBits();
+	for (auto y = 0; y != _size; ++y) {
+		memcpy(dst, src, perLine);
+		dst += dstPerLine;
+		src += srcPerLine;
+	}
+	++_frames;
+	_durations.push_back(std::clamp(
+		duration,
+		crl::time(0),
+		crl::time(std::numeric_limits<uint16>::max())));
+}
+
+void Cache::finish() {
+	_finished = true;
+	if (_frame == _frames) {
+		_frame = 0;
+	}
+	const auto rows = (_frames + kPerRow - 1) / kPerRow;
+	const auto columns = std::min(_frames, kPerRow);
+	const auto zero = (rows * columns) - _frames;
+	_full = QImage(
+		columns * _size,
+		rows * _size,
+		QImage::Format_ARGB32_Premultiplied);
+	auto dstData = _full.bits();
+	const auto perLine = _size * 4;
+	const auto dstPerLine = _full.bytesPerLine();
+	for (auto y = 0; y != rows; ++y) {
+		auto &row = _images[y];
+		auto src = row.bits();
+		const auto srcPerLine = row.bytesPerLine();
+		const auto till = columns - ((y + 1 == rows) ? zero : 0);
+		for (auto x = 0; x != till; ++x) {
+			auto dst = dstData + y * dstPerLine * _size + x * perLine;
+			for (auto line = 0; line != _size; ++line) {
+				memcpy(dst, src, perLine);
+				src += srcPerLine;
+				dst += dstPerLine;
+			}
+		}
+	}
+	if (const auto perLine = zero * _size) {
+		auto dst = dstData
+			+ (rows - 1) * dstPerLine * _size
+			+ (columns - zero) * _size * 4;
+		for (auto left = 0; left != _size; ++left) {
+			memset(dst, 0, perLine);
+			dst += dstPerLine;
+		}
+	}
+}
+
+PaintFrameResult Cache::paintCurrentFrame(
+		QPainter &p,
+		const Context &context) {
+	if (!_frames) {
+		return {};
+	}
+	const auto first = context.firstFrameOnly;
+	if (!first) {
+		const auto now = context.paused ? 0 : context.now;
+		const auto finishes = now ? currentFrameFinishes() : 0;
+		if (finishes && now >= finishes) {
+			++_frame;
+			if (_finished && _frame == _frames) {
+				_frame = 0;
+			}
+			_shown = now;
+		} else if (!_shown) {
+			_shown = now;
+		}
+	}
+	const auto index = first ? 0 : std::min(_frame, _frames - 1);
+	const auto info = frame(index);
+	const auto size = _size / style::DevicePixelRatio();
+	const auto rect = QRect(context.position, QSize(size, size));
+	PaintScaledImage(p, rect, info, context);
+	const auto next = first ? 0 : currentFrameFinishes();
+	return {
+		.painted = true,
+		.next = next,
+		.duration = next ? (next - _shown) : 0,
+	};
+}
+
+int Cache::currentFrame() const {
+	return _frame;
+}
+
+crl::time Cache::currentFrameFinishes() const {
+	if (!_shown || _frame >= _durations.size()) {
+		return 0;
+	} else if (const auto duration = _durations[_frame]) {
+		return _shown + duration;
+	}
+	return 0;
+}
+
+Cached::Cached(
+	const QString &entityData,
+	Fn<std::unique_ptr<Loader>()> unloader,
+	Cache cache)
+: _unloader(std::move(unloader))
+, _cache(std::move(cache))
+, _entityData(entityData) {
+}
+
+QString Cached::entityData() const {
+	return _entityData;
+}
+
+PaintFrameResult Cached::paint(QPainter &p, const Context &context) {
+	return _cache.paintCurrentFrame(p, context);
+}
+
+Preview Cached::makePreview() const {
+	return _cache.makePreview();
+}
+
+Loading Cached::unload() {
+	return Loading(_unloader(), makePreview());
+}
+
+Renderer::Renderer(RendererDescriptor &&descriptor)
+: _cache(descriptor.size)
+, _put(std::move(descriptor.put))
+, _loader(std::move(descriptor.loader)) {
+	Expects(_loader != nullptr);
+
+	const auto size = _cache.size();
+	const auto guard = base::make_weak(this);
+	crl::async([=, factory = std::move(descriptor.generator)]() mutable {
+		auto generator = factory();
+		auto rendered = generator->renderNext(
+			QImage(),
+			QSize(size, size),
+			Qt::KeepAspectRatio);
+		if (rendered.image.isNull()) {
+			return;
+		}
+		crl::on_main(guard, [
+			=,
+			frame = std::move(rendered),
+			generator = std::move(generator)
+		]() mutable {
+			frameReady(
+				std::move(generator),
+				frame.duration,
+				std::move(frame.image));
+		});
+	});
+}
+
+Renderer::~Renderer() = default;
+
+void Renderer::frameReady(
+		std::unique_ptr<Ui::FrameGenerator> generator,
+		crl::time duration,
+		QImage frame) {
+	if (frame.isNull()) {
+		finish();
+		return;
+	}
+	if (const auto count = generator->count()) {
+		if (!_cache.frames()) {
+			_cache.reserve(std::max(count, kMaxFrames));
+		}
+	}
+	const auto current = _cache.currentFrame();
+	const auto total = _cache.frames();
+	const auto explicitRepaint = (current == total);
+	_cache.add(duration, frame);
+	if (explicitRepaint && _repaint) {
+		_repaint();
+	}
+	if (!duration || total + 1 >= kMaxFrames) {
+		finish();
+	} else if (current + kPreloadFrames > total) {
+		renderNext(std::move(generator), std::move(frame));
+	} else {
+		_generator = std::move(generator);
+		_storage = std::move(frame);
+	}
+}
+
+void Renderer::renderNext(
+		std::unique_ptr<Ui::FrameGenerator> generator,
+		QImage storage) {
+	const auto size = _cache.size();
+	const auto guard = base::make_weak(this);
+	crl::async([
+		=,
+		storage = std::move(storage),
+		generator = std::move(generator)
+	]() mutable {
+		auto rendered = generator->renderNext(
+			std::move(storage),
+			QSize(size, size),
+			Qt::KeepAspectRatio);
+		crl::on_main(guard, [
+			=,
+			frame = std::move(rendered),
+			generator = std::move(generator)
+		]() mutable {
+			frameReady(
+				std::move(generator),
+				frame.duration,
+				std::move(frame.image));
+		});
+	});
+}
+
+void Renderer::finish() {
+	_finished = true;
+	_cache.finish();
+	if (_put) {
+		_put(_cache.serialize());
+	}
+}
+
+PaintFrameResult Renderer::paint(QPainter &p, const Context &context) {
+	const auto result = _cache.paintCurrentFrame(p, context);
+	if (_generator
+		&& (!result.painted
+			|| _cache.currentFrame() + kPreloadFrames >= _cache.frames())) {
+		renderNext(std::move(_generator), std::move(_storage));
+	}
+	return result;
+}
+
+std::optional<Cached> Renderer::ready(const QString &entityData) {
+	return _finished
+		? Cached{ entityData, std::move(_loader), std::move(_cache) }
+		: std::optional<Cached>();
+}
+
+std::unique_ptr<Loader> Renderer::cancel() {
+	return _loader();
+}
+
+bool Renderer::canMakePreview() const {
+	return _cache.frames() > 0;
+}
+
+Preview Renderer::makePreview() const {
+	return _cache.makePreview();
+}
+
+void Renderer::setRepaintCallback(Fn<void()> repaint) {
+	_repaint = std::move(repaint);
+}
+
+Cache Renderer::takeCache() {
+	return std::move(_cache);
+}
+
+Loading::Loading(std::unique_ptr<Loader> loader, Preview preview)
+: _loader(std::move(loader))
+, _preview(std::move(preview)) {
+}
+
+QString Loading::entityData() const {
+	return _loader->entityData();
+}
+
+void Loading::load(Fn<void(Loader::LoadResult)> done) {
+	_loader->load(crl::guard(this, [this, done = std::move(done)](
+			Loader::LoadResult result) mutable {
+		if (const auto caching = std::get_if<Caching>(&result)) {
+			caching->preview = _preview
+				? std::move(_preview)
+				: _loader->preview();
+		}
+		done(std::move(result));
+	}));
+}
+
+bool Loading::loading() const {
+	return _loader->loading();
+}
+
+void Loading::paint(QPainter &p, const Context &context) {
+	if (!_preview) {
+		if (auto preview = _loader->preview()) {
+			_preview = std::move(preview);
+		}
+	}
+	_preview.paint(p, context);
+}
+
+bool Loading::hasImagePreview() const {
+	return _preview.isImage();
+}
+
+Preview Loading::imagePreview() const {
+	return _preview.isImage() ? _preview : Preview();
+}
+
+void Loading::updatePreview(Preview preview) {
+	if (!_preview.isImage() && preview.isImage()) {
+		_preview = std::move(preview);
+	} else if (!_preview) {
+		if (auto loaderPreview = _loader->preview()) {
+			_preview = std::move(loaderPreview);
+		} else if (preview) {
+			_preview = std::move(preview);
+		}
+	}
+}
+
+void Loading::cancel() {
+	_loader->cancel();
+	invalidate_weak_ptrs(this);
+}
+
+Instance::Instance(
+	Loading loading,
+	Fn<void(not_null<Instance*>, RepaintRequest)> repaintLater)
+: _state(std::move(loading))
+, _repaintLater(std::move(repaintLater)) {
+}
+
+QString Instance::entityData() const {
+	return v::match(_state, [](const Loading &state) {
+		return state.entityData();
+	}, [](const Caching &state) {
+		return state.entityData;
+	}, [](const Cached &state) {
+		return state.entityData();
+	});
+}
+
+void Instance::paint(QPainter &p, const Context &context) {
+	v::match(_state, [&](Loading &state) {
+		state.paint(p, context);
+		load(state);
+	}, [&](Caching &state) {
+		auto result = state.renderer->paint(p, context);
+		if (!result.painted) {
+			state.preview.paint(p, context);
+		} else {
+			if (!state.preview.isExactImage()) {
+				state.preview = state.renderer->makePreview();
+			}
+			if (result.next > context.now) {
+				_repaintLater(this, { result.next, result.duration });
+			}
+		}
+		if (auto cached = state.renderer->ready(state.entityData)) {
+			_state = std::move(*cached);
+		}
+	}, [&](Cached &state) {
+		const auto result = state.paint(p, context);
+		if (result.next > context.now) {
+			_repaintLater(this, { result.next, result.duration });
+		}
+	});
+}
+
+bool Instance::ready() {
+	return v::match(_state, [&](Loading &state) {
+		if (state.hasImagePreview()) {
+			return true;
+		}
+		load(state);
+		return false;
+	}, [](Caching &state) {
+		return state.renderer->canMakePreview();
+	}, [](Cached &state) {
+		return true;
+	});
+}
+
+void Instance::load(Loading &state) {
+	state.load([=](Loader::LoadResult result) {
+		if (auto caching = std::get_if<Caching>(&result)) {
+			caching->renderer->setRepaintCallback([=] { repaint(); });
+			_state = std::move(*caching);
+		} else if (auto cached = std::get_if<Cached>(&result)) {
+			_state = std::move(*cached);
+			repaint();
+		} else {
+			Unexpected("Value in Loader::LoadResult.");
+		}
+	});
+}
+
+bool Instance::hasImagePreview() const {
+	return v::match(_state, [](const Loading &state) {
+		return state.hasImagePreview();
+	}, [](const Caching &state) {
+		return state.preview.isImage();
+	}, [](const Cached &state) {
+		return true;
+	});
+}
+
+Preview Instance::imagePreview() const {
+	return v::match(_state, [](const Loading &state) {
+		return state.imagePreview();
+	}, [](const Caching &state) {
+		return state.preview.isImage() ? state.preview : Preview();
+	}, [](const Cached &state) {
+		return state.makePreview();
+	});
+}
+
+void Instance::updatePreview(Preview preview) {
+	v::match(_state, [&](Loading &state) {
+		state.updatePreview(std::move(preview));
+	}, [&](Caching &state) {
+		if ((!state.preview.isImage() && preview.isImage())
+			|| (!state.preview && preview)) {
+			state.preview = std::move(preview);
+		}
+	}, [](const Cached &) {});
+}
+
+void Instance::repaint() {
+	for (const auto &object : _usage) {
+		object->repaint();
+	}
+}
+
+void Instance::incrementUsage(not_null<Object*> object) {
+	_usage.emplace(object);
+}
+
+void Instance::decrementUsage(not_null<Object*> object) {
+	_usage.remove(object);
+	if (!_usage.empty()) {
+		return;
+	}
+	v::match(_state, [](Loading &state) {
+		state.cancel();
+	}, [&](Caching &state) {
+		_state = Loading{
+			state.renderer->cancel(),
+			std::move(state.preview),
+		};
+	}, [&](Cached &state) {
+		_state = state.unload();
+	});
+	_repaintLater(this, RepaintRequest());
+}
+
+Object::Object(not_null<Instance*> instance, Fn<void()> repaint)
+: _instance(instance)
+, _repaint(std::move(repaint)) {
+}
+
+Object::~Object() {
+	unload();
+}
+
+QString Object::entityData() {
+	return _instance->entityData();
+}
+
+void Object::paint(QPainter &p, const Context &context) {
+	if (!_using) {
+		_using = true;
+		_instance->incrementUsage(this);
+	}
+	_instance->paint(p, context);
+}
+
+void Object::unload() {
+	if (_using) {
+		_using = false;
+		_instance->decrementUsage(this);
+	}
+}
+
+bool Object::ready() {
+	if (!_using) {
+		_using = true;
+		_instance->incrementUsage(this);
+	}
+	return _instance->ready();
+}
+
+void Object::repaint() {
+	_repaint();
+}
+
+} // namespace Ui::CustomEmoji
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
new file mode 100644
index 0000000..6efb6d1
--- /dev/null
+++ b/ui/text/custom_emoji_instance.h
@@ -0,0 +1,273 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/text_custom_emoji.h"
+#include "base/weak_ptr.h"
+#include "base/bytes.h"
+#include "base/timer.h"
+
+#include <QtGui/QPainterPath>
+
+class QColor;
+class QPainter;
+
+namespace Ui {
+class FrameGenerator;
+} // namespace Ui
+
+namespace Ui::CustomEmoji {
+
+using Context = Ui::Text::CustomEmoji::Context;
+
+class Preview final {
+public:
+	Preview() = default;
+	Preview(QImage image, bool exact);
+	Preview(QPainterPath path, float64 scale);
+
+	void paint(QPainter &p, const Context &context);
+	[[nodiscard]] bool isImage() const;
+	[[nodiscard]] bool isExactImage() const;
+	[[nodiscard]] QImage image() const;
+
+	[[nodiscard]] explicit operator bool() const {
+		return !v::is_null(_data);
+	}
+
+private:
+	struct ScaledPath {
+		QPainterPath path;
+		float64 scale = 1.;
+	};
+	struct Image {
+		QImage data;
+		bool exact = false;
+	};
+
+	void paintPath(
+		QPainter &p,
+		const Context &context,
+		const ScaledPath &path);
+
+	std::variant<v::null_t, ScaledPath, Image> _data;
+
+};
+
+struct PaintFrameResult {
+	bool painted = false;
+	crl::time next = 0;
+	crl::time duration = 0;
+};
+
+class Cache final {
+public:
+	Cache(int size);
+
+	struct Frame {
+		not_null<const QImage*> image;
+		QRect source;
+	};
+
+	[[nodiscard]] static std::optional<Cache> FromSerialized(
+		const QByteArray &serialized,
+		int requestedSize);
+	[[nodiscard]] QByteArray serialize();
+
+	[[nodiscard]] int size() const;
+	[[nodiscard]] int frames() const;
+	[[nodiscard]] Frame frame(int index) const;
+	void reserve(int frames);
+	void add(crl::time duration, const QImage &frame);
+	void finish();
+
+	[[nodiscard]] Preview makePreview() const;
+
+	PaintFrameResult paintCurrentFrame(QPainter &p, const Context &context);
+	[[nodiscard]] int currentFrame() const;
+
+private:
+	static constexpr auto kPerRow = 16;
+
+	[[nodiscard]] int frameRowByteSize() const;
+	[[nodiscard]] int frameByteSize() const;
+	[[nodiscard]] crl::time currentFrameFinishes() const;
+
+	std::vector<QImage> _images;
+	std::vector<uint16> _durations;
+	QImage _full;
+	crl::time _shown = 0;
+	int _frame = 0;
+	int _size = 0;
+	int _frames = 0;
+	bool _finished = false;
+
+};
+
+class Loader;
+class Loading;
+
+class Cached final {
+public:
+	Cached(
+		const QString &entityData,
+		Fn<std::unique_ptr<Loader>()> unloader,
+		Cache cache);
+
+	[[nodiscard]] QString entityData() const;
+	[[nodiscard]] Preview makePreview() const;
+	PaintFrameResult paint(QPainter &p, const Context &context);
+	[[nodiscard]] Loading unload();
+
+private:
+	Fn<std::unique_ptr<Loader>()> _unloader;
+	Cache _cache;
+	QString _entityData;
+
+};
+
+struct RendererDescriptor {
+	Fn<std::unique_ptr<Ui::FrameGenerator>()> generator;
+	Fn<void(QByteArray)> put;
+	Fn<std::unique_ptr<Loader>()> loader;
+	int size = 0;
+};
+
+class Renderer final : public base::has_weak_ptr {
+public:
+	explicit Renderer(RendererDescriptor &&descriptor);
+	virtual ~Renderer();
+
+	PaintFrameResult paint(QPainter &p, const Context &context);
+	[[nodiscard]] std::optional<Cached> ready(const QString &entityData);
+	[[nodiscard]] std::unique_ptr<Loader> cancel();
+
+	[[nodiscard]] bool canMakePreview() const;
+	[[nodiscard]] Preview makePreview() const;
+
+	void setRepaintCallback(Fn<void()> repaint);
+	[[nodiscard]] Cache takeCache();
+
+private:
+	void frameReady(
+		std::unique_ptr<Ui::FrameGenerator> generator,
+		crl::time duration,
+		QImage frame);
+	void renderNext(
+		std::unique_ptr<Ui::FrameGenerator> generator,
+		QImage storage);
+	void finish();
+
+	Cache _cache;
+	std::unique_ptr<Ui::FrameGenerator> _generator;
+	QImage _storage;
+	Fn<void(QByteArray)> _put;
+	Fn<void()> _repaint;
+	Fn<std::unique_ptr<Loader>()> _loader;
+	bool _finished = false;
+
+};
+
+struct Caching {
+	std::unique_ptr<Renderer> renderer;
+	QString entityData;
+	Preview preview;
+};
+
+class Loader {
+public:
+	using LoadResult = std::variant<Caching, Cached>;
+	[[nodiscard]] virtual QString entityData() = 0;
+	virtual void load(Fn<void(LoadResult)> loaded) = 0;
+	[[nodiscard]] virtual bool loading() = 0;
+	virtual void cancel() = 0;
+	[[nodiscard]] virtual Preview preview() = 0;
+	virtual ~Loader() = default;
+};
+
+class Loading final : public base::has_weak_ptr {
+public:
+	Loading(std::unique_ptr<Loader> loader, Preview preview);
+
+	[[nodiscard]] QString entityData() const;
+
+	void load(Fn<void(Loader::LoadResult)> done);
+	[[nodiscard]] bool loading() const;
+	void paint(QPainter &p, const Context &context);
+	[[nodiscard]] bool hasImagePreview() const;
+	[[nodiscard]] Preview imagePreview() const;
+	void updatePreview(Preview preview);
+	void cancel();
+
+private:
+	std::unique_ptr<Loader> _loader;
+	Preview _preview;
+
+};
+
+struct RepaintRequest {
+	crl::time when = 0;
+	crl::time duration = 0;
+};
+
+class Object;
+class Instance final : public base::has_weak_ptr {
+public:
+	Instance(
+		Loading loading,
+		Fn<void(not_null<Instance*>, RepaintRequest)> repaintLater);
+	Instance(const Instance&) = delete;
+	Instance &operator=(const Instance&) = delete;
+
+	[[nodiscard]] QString entityData() const;
+	void paint(QPainter &p, const Context &context);
+	[[nodiscard]] bool ready();
+	[[nodiscard]] bool hasImagePreview() const;
+	[[nodiscard]] Preview imagePreview() const;
+	void updatePreview(Preview preview);
+
+	void incrementUsage(not_null<Object*> object);
+	void decrementUsage(not_null<Object*> object);
+
+	void repaint();
+
+private:
+	void load(Loading &state);
+
+	std::variant<Loading, Caching, Cached> _state;
+	base::flat_set<not_null<Object*>> _usage;
+	Fn<void(not_null<Instance*> that, RepaintRequest)> _repaintLater;
+
+};
+
+class Delegate {
+public:
+	[[nodiscard]] virtual bool paused() = 0;
+	virtual ~Delegate() = default;
+};
+
+class Object final : public Ui::Text::CustomEmoji {
+public:
+	Object(not_null<Instance*> instance, Fn<void()> repaint);
+	~Object();
+
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+
+	void repaint();
+
+private:
+	const not_null<Instance*> _instance;
+	Fn<void()> _repaint;
+	bool _using = false;
+
+};
+
+} // namespace Ui::CustomEmoji

From 6dc6309269beb64a69e3184b671e030a2969f00e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 29 Aug 2022 17:27:32 +0400
Subject: [PATCH 216/635] Allow querying in-default-state from custom emoji.

---
 ui/text/custom_emoji_instance.cpp | 34 +++++++++++++++++++++++++++++++
 ui/text/custom_emoji_instance.h   |  5 +++++
 ui/text/text_custom_emoji.cpp     |  8 ++++++++
 ui/text/text_custom_emoji.h       |  3 +++
 4 files changed, 50 insertions(+)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index 928691a..1a5d004 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -220,6 +220,10 @@ int Cache::frames() const {
 	return _frames;
 }
 
+bool Cache::readyInDefaultState() const {
+	return (_frames > 0) && !_frame;
+}
+
 Cache::Frame Cache::frame(int index) const {
 	Expects(index < _frames);
 
@@ -401,6 +405,10 @@ PaintFrameResult Cached::paint(QPainter &p, const Context &context) {
 	return _cache.paintCurrentFrame(p, context);
 }
 
+bool Cached::inDefaultState() const {
+	return _cache.readyInDefaultState();
+}
+
 Preview Cached::makePreview() const {
 	return _cache.makePreview();
 }
@@ -534,6 +542,10 @@ Preview Renderer::makePreview() const {
 	return _cache.makePreview();
 }
 
+bool Renderer::readyInDefaultState() const {
+	return _cache.readyInDefaultState();
+}
+
 void Renderer::setRepaintCallback(Fn<void()> repaint) {
 	_repaint = std::move(repaint);
 }
@@ -659,6 +671,20 @@ bool Instance::ready() {
 	});
 }
 
+bool Instance::readyInDefaultState() {
+	return v::match(_state, [&](Loading &state) {
+		if (state.hasImagePreview()) {
+			return true;
+		}
+		load(state);
+		return false;
+	}, [](Caching &state) {
+		return state.renderer->readyInDefaultState();
+	}, [](Cached &state) {
+		return state.inDefaultState();
+	});
+}
+
 void Instance::load(Loading &state) {
 	state.load([=](Loader::LoadResult result) {
 		if (auto caching = std::get_if<Caching>(&result)) {
@@ -768,6 +794,14 @@ bool Object::ready() {
 	return _instance->ready();
 }
 
+bool Object::readyInDefaultState() {
+	if (!_using) {
+		_using = true;
+		_instance->incrementUsage(this);
+	}
+	return _instance->readyInDefaultState();
+}
+
 void Object::repaint() {
 	_repaint();
 }
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
index 6efb6d1..4ba9b31 100644
--- a/ui/text/custom_emoji_instance.h
+++ b/ui/text/custom_emoji_instance.h
@@ -81,6 +81,7 @@ public:
 
 	[[nodiscard]] int size() const;
 	[[nodiscard]] int frames() const;
+	[[nodiscard]] bool readyInDefaultState() const;
 	[[nodiscard]] Frame frame(int index) const;
 	void reserve(int frames);
 	void add(crl::time duration, const QImage &frame);
@@ -122,6 +123,7 @@ public:
 	[[nodiscard]] QString entityData() const;
 	[[nodiscard]] Preview makePreview() const;
 	PaintFrameResult paint(QPainter &p, const Context &context);
+	[[nodiscard]] bool inDefaultState() const;
 	[[nodiscard]] Loading unload();
 
 private:
@@ -149,6 +151,7 @@ public:
 
 	[[nodiscard]] bool canMakePreview() const;
 	[[nodiscard]] Preview makePreview() const;
+	[[nodiscard]] bool readyInDefaultState() const;
 
 	void setRepaintCallback(Fn<void()> repaint);
 	[[nodiscard]] Cache takeCache();
@@ -227,6 +230,7 @@ public:
 	[[nodiscard]] QString entityData() const;
 	void paint(QPainter &p, const Context &context);
 	[[nodiscard]] bool ready();
+	[[nodiscard]] bool readyInDefaultState();
 	[[nodiscard]] bool hasImagePreview() const;
 	[[nodiscard]] Preview imagePreview() const;
 	void updatePreview(Preview preview);
@@ -260,6 +264,7 @@ public:
 	void paint(QPainter &p, const Context &context) override;
 	void unload() override;
 	bool ready() override;
+	bool readyInDefaultState() override;
 
 	void repaint();
 
diff --git a/ui/text/text_custom_emoji.cpp b/ui/text/text_custom_emoji.cpp
index 0157951..ee2bae9 100644
--- a/ui/text/text_custom_emoji.cpp
+++ b/ui/text/text_custom_emoji.cpp
@@ -37,6 +37,10 @@ bool ShiftedEmoji::ready() {
 	return _wrapped->ready();
 }
 
+bool ShiftedEmoji::readyInDefaultState() {
+	return _wrapped->readyInDefaultState();
+}
+
 FirstFrameEmoji::FirstFrameEmoji(std::unique_ptr<CustomEmoji> wrapped)
 : _wrapped(std::move(wrapped)) {
 }
@@ -59,4 +63,8 @@ bool FirstFrameEmoji::ready() {
 	return _wrapped->ready();
 }
 
+bool FirstFrameEmoji::readyInDefaultState() {
+	return _wrapped->readyInDefaultState();
+}
+
 } // namespace Ui::Text
diff --git a/ui/text/text_custom_emoji.h b/ui/text/text_custom_emoji.h
index 53d134b..f960d40 100644
--- a/ui/text/text_custom_emoji.h
+++ b/ui/text/text_custom_emoji.h
@@ -39,6 +39,7 @@ public:
 	virtual void paint(QPainter &p, const Context &context) = 0;
 	virtual void unload() = 0;
 	[[nodiscard]] virtual bool ready() = 0;
+	[[nodiscard]] virtual bool readyInDefaultState() = 0;
 
 };
 
@@ -54,6 +55,7 @@ public:
 	void paint(QPainter &p, const Context &context) override;
 	void unload() override;
 	bool ready() override;
+	bool readyInDefaultState() override;
 
 private:
 	const std::unique_ptr<Ui::Text::CustomEmoji> _wrapped;
@@ -69,6 +71,7 @@ public:
 	void paint(QPainter &p, const Context &context) override;
 	void unload() override;
 	bool ready() override;
+	bool readyInDefaultState() override;
 
 private:
 	const std::unique_ptr<Ui::Text::CustomEmoji> _wrapped;

From 51657b3c8a643c9ca2721029fd48f63390417042 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 31 Aug 2022 12:27:50 +0400
Subject: [PATCH 217/635] Support colored custom emoji.

---
 ui/text/custom_emoji_instance.cpp | 49 ++++++++++++++++++++++++++++---
 ui/text/custom_emoji_instance.h   |  8 ++---
 ui/text/text_custom_emoji.h       |  7 +++++
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index 1a5d004..aa567ab 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -37,6 +37,25 @@ void PaintScaledImage(
 		const QRect &target,
 		const Cache::Frame &frame,
 		const Context &context) {
+	const auto colored = context.colored;
+	const auto cache = colored ? &colored->cache : nullptr;
+	auto q = std::optional<QPainter>();
+	if (colored) {
+		const auto ratio = style::DevicePixelRatio();
+		if (cache->width() < target.width() * ratio
+			|| cache->height() < target.height() * ratio) {
+			colored->cache = QImage(
+				std::max(cache->width(), target.width() * ratio),
+				std::max(cache->height(), target.height() * ratio),
+				QImage::Format_ARGB32_Premultiplied);
+			cache->setDevicePixelRatio(ratio);
+		}
+		q.emplace(cache);
+		q->setCompositionMode(QPainter::CompositionMode_Source);
+		q->fillRect(QRect(QPoint(), target.size()), Qt::transparent);
+		q->translate(-target.topLeft());
+	}
+	const auto to = q ? &*q : &p;
 	if (context.scaled) {
 		const auto sx = anim::interpolate(
 			target.width() / 2,
@@ -47,14 +66,21 @@ void PaintScaledImage(
 			: anim::interpolate(target.height() / 2, 0, context.scale);
 		const auto scaled = target.marginsRemoved({ sx, sy, sx, sy });
 		if (frame.source.isNull()) {
-			p.drawImage(scaled, *frame.image);
+			to->drawImage(scaled, *frame.image);
 		} else {
-			p.drawImage(scaled, *frame.image, frame.source);
+			to->drawImage(scaled, *frame.image, frame.source);
 		}
 	} else if (frame.source.isNull()) {
-		p.drawImage(target, *frame.image);
+		to->drawImage(target, *frame.image);
 	} else {
-		p.drawImage(target, *frame.image, frame.source);
+		to->drawImage(target, *frame.image, frame.source);
+	}
+	if (q) {
+		q.reset();
+		const auto ratio = style::DevicePixelRatio();
+		const auto source = QRect(QPoint(), target.size() * ratio);
+		style::colorizeImage(*cache, colored->color, cache, source);
+		p.drawImage(target, *cache, source);
 	}
 }
 
@@ -631,6 +657,9 @@ QString Instance::entityData() const {
 }
 
 void Instance::paint(QPainter &p, const Context &context) {
+	const auto colored = (context.colored && !_colored)
+		? base::take(context.colored)
+		: nullptr;
 	v::match(_state, [&](Loading &state) {
 		state.paint(p, context);
 		load(state);
@@ -655,6 +684,9 @@ void Instance::paint(QPainter &p, const Context &context) {
 			_repaintLater(this, { result.next, result.duration });
 		}
 	});
+	if (colored) {
+		context.colored = colored;
+	}
 }
 
 bool Instance::ready() {
@@ -730,6 +762,15 @@ void Instance::updatePreview(Preview preview) {
 	}, [](const Cached &) {});
 }
 
+void Instance::setColored() {
+	if (!_colored) {
+		_colored = true;
+		if (ready()) {
+			_repaintLater(this, { .when = crl::now() + 1 });
+		}
+	}
+}
+
 void Instance::repaint() {
 	for (const auto &object : _usage) {
 		object->repaint();
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
index 4ba9b31..4d65ec0 100644
--- a/ui/text/custom_emoji_instance.h
+++ b/ui/text/custom_emoji_instance.h
@@ -234,6 +234,7 @@ public:
 	[[nodiscard]] bool hasImagePreview() const;
 	[[nodiscard]] Preview imagePreview() const;
 	void updatePreview(Preview preview);
+	void setColored();
 
 	void incrementUsage(not_null<Object*> object);
 	void decrementUsage(not_null<Object*> object);
@@ -246,15 +247,10 @@ private:
 	std::variant<Loading, Caching, Cached> _state;
 	base::flat_set<not_null<Object*>> _usage;
 	Fn<void(not_null<Instance*> that, RepaintRequest)> _repaintLater;
+	bool _colored = false;
 
 };
 
-class Delegate {
-public:
-	[[nodiscard]] virtual bool paused() = 0;
-	virtual ~Delegate() = default;
-};
-
 class Object final : public Ui::Text::CustomEmoji {
 public:
 	Object(not_null<Instance*> instance, Fn<void()> repaint);
diff --git a/ui/text/text_custom_emoji.h b/ui/text/text_custom_emoji.h
index f960d40..052fcff 100644
--- a/ui/text/text_custom_emoji.h
+++ b/ui/text/text_custom_emoji.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <QtGui/QColor>
+#include <QtGui/QImage>
 #include <QtCore/QSize>
 #include <QtCore/QPoint>
 
@@ -18,8 +19,14 @@ namespace Ui::Text {
 
 [[nodiscard]] int AdjustCustomEmojiSize(int emojiSize);
 
+struct CustomEmojiColored {
+	QColor color;
+	QImage cache;
+};
+
 struct CustomEmojiPaintContext {
 	QColor preview;
+	mutable CustomEmojiColored *colored = nullptr;
 	QSize size; // Required only when scaled = true, for path scaling.
 	crl::time now = 0;
 	float64 scale = 0.;

From 4d453961746f5887e651e690971a93a423612b8b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 31 Aug 2022 17:50:35 +0400
Subject: [PATCH 218/635] Add custom-emoji wrapper with limited loops count.

---
 ui/text/text_custom_emoji.cpp | 46 +++++++++++++++++++++++++++++++++++
 ui/text/text_custom_emoji.h   | 20 ++++++++++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/ui/text/text_custom_emoji.cpp b/ui/text/text_custom_emoji.cpp
index ee2bae9..4eb1919 100644
--- a/ui/text/text_custom_emoji.cpp
+++ b/ui/text/text_custom_emoji.cpp
@@ -67,4 +67,50 @@ bool FirstFrameEmoji::readyInDefaultState() {
 	return _wrapped->readyInDefaultState();
 }
 
+LimitedLoopsEmoji::LimitedLoopsEmoji(
+	std::unique_ptr<CustomEmoji> wrapped,
+	int limit)
+: _wrapped(std::move(wrapped))
+, _limit(limit) {
+}
+
+QString LimitedLoopsEmoji::entityData() {
+	return _wrapped->entityData();
+}
+
+void LimitedLoopsEmoji::paint(QPainter &p, const Context &context) {
+	if (_played < _limit) {
+		if (_wrapped->readyInDefaultState()) {
+			if (_inLoop) {
+				_inLoop = false;
+				++_played;
+			}
+		} else if (_wrapped->ready()) {
+			_inLoop = true;
+		}
+	}
+	if (_played == _limit) {
+		const auto was = context.firstFrameOnly;
+		context.firstFrameOnly = true;
+		_wrapped->paint(p, context);
+		context.firstFrameOnly = was;
+	} else {
+		_wrapped->paint(p, context);
+	}
+}
+
+void LimitedLoopsEmoji::unload() {
+	_wrapped->unload();
+	_inLoop = false;
+	_played = 0;
+}
+
+bool LimitedLoopsEmoji::ready() {
+	return _wrapped->ready();
+}
+
+bool LimitedLoopsEmoji::readyInDefaultState() {
+	return _wrapped->readyInDefaultState();
+}
+
 } // namespace Ui::Text
diff --git a/ui/text/text_custom_emoji.h b/ui/text/text_custom_emoji.h
index 052fcff..a972e8b 100644
--- a/ui/text/text_custom_emoji.h
+++ b/ui/text/text_custom_emoji.h
@@ -31,7 +31,7 @@ struct CustomEmojiPaintContext {
 	crl::time now = 0;
 	float64 scale = 0.;
 	QPoint position;
-	bool firstFrameOnly = false;
+	mutable bool firstFrameOnly = false;
 	bool paused = false;
 	bool scaled = false;
 };
@@ -85,4 +85,22 @@ private:
 
 };
 
+class LimitedLoopsEmoji final : public CustomEmoji {
+public:
+	LimitedLoopsEmoji(std::unique_ptr<CustomEmoji> wrapped, int limit);
+
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	const std::unique_ptr<Ui::Text::CustomEmoji> _wrapped;
+	const int _limit = 0;
+	int _played = 0;
+	bool _inLoop = false;
+
+};
+
 } // namespace Ui::Text

From a5766cb1f6bfcd208814b0b71322128ecb47039a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 31 Aug 2022 17:50:54 +0400
Subject: [PATCH 219/635] Allow inserting actions in the middle of Menu.

---
 ui/widgets/menu/menu.cpp  | 42 ++++++++++++++++++++++-----------------
 ui/widgets/menu/menu.h    |  3 +++
 ui/widgets/popup_menu.cpp |  6 ++++++
 ui/widgets/popup_menu.h   |  3 +++
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/ui/widgets/menu/menu.cpp b/ui/widgets/menu/menu.cpp
index 40308c6..10197e1 100644
--- a/ui/widgets/menu/menu.cpp
+++ b/ui/widgets/menu/menu.cpp
@@ -94,21 +94,30 @@ not_null<QAction*> Menu::addAction(
 }
 
 not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
-	const auto action = widget->action();
-	_actions.emplace_back(action);
+	return insertAction(_actions.size(), std::move(widget));
+}
 
-	widget->setParent(this);
+not_null<QAction*> Menu::insertAction(
+		int position,
+		base::unique_qptr<ItemBase> widget) {
+	Expects(position >= 0 && position <= _actions.size());
+	Expects(position >= 0 && position <= _actionWidgets.size());
 
-	const auto top = _actionWidgets.empty()
-		? 0
-		: _actionWidgets.back()->y() + _actionWidgets.back()->height();
+	const auto raw = widget.get();
+	const auto action = raw->action();
+	_actions.insert(begin(_actions) + position, action);
 
-	widget->moveToLeft(0, top);
-	widget->show();
+	raw->setParent(this);
+	raw->show();
+	raw->setIndex(position);
+	for (auto i = position, to = int(_actionWidgets.size()); i != to; ++i) {
+		_actionWidgets[i]->setIndex(i + 1);
+	}
+	_actionWidgets.insert(
+		begin(_actionWidgets) + position,
+		std::move(widget));
 
-	widget->setIndex(_actionWidgets.size());
-
-	widget->selects(
+	raw->selects(
 	) | rpl::start_with_next([=](const CallbackData &data) {
 		if (!data.selected) {
 			if (!findSelectedAction()
@@ -128,16 +137,16 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
 		if (_activatedCallback) {
 			_activatedCallback(data);
 		}
-	}, widget->lifetime());
+	}, raw->lifetime());
 
-	widget->clicks(
+	raw->clicks(
 	) | rpl::start_with_next([=](const CallbackData &data) {
 		if (_triggeredCallback) {
 			_triggeredCallback(data);
 		}
-	}, widget->lifetime());
+	}, raw->lifetime());
 
-	QObject::connect(action.get(), &QAction::changed, widget.get(), [=] {
+	QObject::connect(action.get(), &QAction::changed, raw, [=] {
 		// Select an item under mouse that was disabled and became enabled.
 		if (_lastSelectedByMouse
 			&& !findSelectedAction()
@@ -146,9 +155,6 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
 		}
 	});
 
-	const auto raw = widget.get();
-	_actionWidgets.push_back(std::move(widget));
-
 	const auto recountWidth = [=] {
 		return _forceWidth
 			? _forceWidth
diff --git a/ui/widgets/menu/menu.h b/ui/widgets/menu/menu.h
index 288ec38..b4bb56d 100644
--- a/ui/widgets/menu/menu.h
+++ b/ui/widgets/menu/menu.h
@@ -53,6 +53,9 @@ public:
 		const style::icon *iconOver = nullptr);
 	not_null<QAction*> addSeparator(
 		const style::MenuSeparator *st = nullptr);
+	not_null<QAction*> insertAction(
+		int position,
+		base::unique_qptr<ItemBase> widget);
 	void clearActions();
 	void finishAnimating();
 
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 9f979b4..bffff75 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -407,6 +407,12 @@ not_null<QAction*> PopupMenu::addSeparator(const style::MenuSeparator *st) {
 	return _menu->addSeparator(st);
 }
 
+not_null<QAction*> PopupMenu::insertAction(
+		int position,
+		base::unique_qptr<Menu::ItemBase> widget) {
+	return _menu->insertAction(position, std::move(widget));
+}
+
 void PopupMenu::clearActions() {
 	_submenus.clear();
 	return _menu->clearActions();
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 53c1029..e9d60e5 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -51,6 +51,9 @@ public:
 		const style::icon *iconOver = nullptr);
 	not_null<QAction*> addSeparator(
 		const style::MenuSeparator *st = nullptr);
+	not_null<QAction*> insertAction(
+		int position,
+		base::unique_qptr<Menu::ItemBase> widget);
 	void clearActions();
 
 	[[nodiscard]] const std::vector<not_null<QAction*>> &actions() const;

From 746eb80300f788e1c340f8d5b363a9eac94f7499 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 1 Sep 2022 11:23:16 +0400
Subject: [PATCH 220/635] Allow interface scale of 50%.

---
 ui/style/style_core_scale.cpp |  2 +-
 ui/style/style_core_scale.h   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ui/style/style_core_scale.cpp b/ui/style/style_core_scale.cpp
index 2aefdc2..9e0038f 100644
--- a/ui/style/style_core_scale.cpp
+++ b/ui/style/style_core_scale.cpp
@@ -21,7 +21,7 @@ int DevicePixelRatio() {
 }
 
 void SetDevicePixelRatio(int ratio) {
-	DevicePixelRatioValue = ratio;
+	DevicePixelRatioValue = std::clamp(ratio, 1, kScaleMax / kScaleMin);
 }
 
 int Scale() {
diff --git a/ui/style/style_core_scale.h b/ui/style/style_core_scale.h
index 93ac4da..2fba205 100644
--- a/ui/style/style_core_scale.h
+++ b/ui/style/style_core_scale.h
@@ -16,7 +16,7 @@
 namespace style {
 
 inline constexpr auto kScaleAuto = 0;
-inline constexpr auto kScaleMin = 75;
+inline constexpr auto kScaleMin = 50;
 inline constexpr auto kScaleDefault = 100;
 inline constexpr auto kScaleMax = 300;
 
@@ -34,9 +34,12 @@ void SetScale(int scale);
 
 template <typename T>
 [[nodiscard]] inline T ConvertScale(T value, int scale) {
-	return (value < 0.)
-		? (-ConvertScale(-value, scale))
-		: T(base::SafeRound((double(value) * scale / 100.) - 0.01));
+	if (value < 0.) {
+		return -ConvertScale(-value, scale);
+	}
+	const auto result = T(base::SafeRound(
+		(double(value) * scale / 100.) - 0.01));
+	return (!std::is_integral_v<T> || !value || result) ? result : 1;
 }
 
 template <typename T>

From f420e302d7992e10cae8924701c3a3a85c0aa8b9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 2 Sep 2022 16:55:12 +0400
Subject: [PATCH 221/635] Support external menu content without enabled
 compositing.

---
 ui/widgets/popup_menu.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index bffff75..8cae306 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -254,7 +254,14 @@ void PopupMenu::init() {
 	hide();
 
 	setAttribute(Qt::WA_NoSystemBackground, true);
-	setAttribute(Qt::WA_TranslucentBackground, true);
+
+	_useTransparency = Platform::TranslucentWindowsSupported();
+	if (_useTransparency) {
+		setAttribute(Qt::WA_TranslucentBackground, true);
+	} else {
+		setAttribute(Qt::WA_TranslucentBackground, false);
+		setAttribute(Qt::WA_OpaquePaintEvent, true);
+	}
 }
 
 not_null<PopupMenu*> PopupMenu::ensureSubmenu(
@@ -297,12 +304,15 @@ void PopupMenu::checkSubmenuShow() {
 
 void PopupMenu::validateCompositingSupport() {
 	const auto line = st::lineWidth;
-	_useTransparency = Platform::TranslucentWindowsSupported();
+	const auto &additional = _additionalMenuPadding;
 	if (!_useTransparency) {
-		_padding = QMargins(line, line, line, line);
+		_padding = QMargins(
+			std::max(line, additional.left()),
+			std::max(line, additional.top()),
+			std::max(line, additional.right()),
+			std::max(line, additional.bottom()));
 		_extents = QMargins();
 	} else {
-		const auto &additional = _additionalMenuPadding;
 		_padding = QMargins(
 			std::max(_st.shadow.extend.left(), additional.left()),
 			std::max(_st.shadow.extend.top(), additional.top()),

From 47268d21ceb0878b0d01534d8a33d1d28f5320a1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 1 Sep 2022 16:31:28 +0400
Subject: [PATCH 222/635] Get wayland serial with new Qt 6.4 API

---
 .../linux/ui_linux_wayland_integration.cpp    | 34 ++++++-------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 32666b3..8dba5e9 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -15,23 +15,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <qpa/qplatformnativeinterface.h>
-
-// private QtWaylandClient headers are using keywords :(
-#ifdef QT_NO_KEYWORDS
-#define signals Q_SIGNALS
-#define slots Q_SLOTS
-#endif // QT_NO_KEYWORDS
-
-#include <private/qwaylanddisplay_p.h>
-#include <private/qwaylandwindow_p.h>
-#include <private/qwaylandinputdevice_p.h>
-
 #include <wayland-client.h>
 
 Q_DECLARE_METATYPE(QMargins);
 
-using QtWaylandClient::QWaylandWindow;
-
 namespace Ui {
 namespace Platform {
 namespace {
@@ -198,21 +185,20 @@ void WaylandIntegration::showWindowMenu(
 
 	const auto seat = reinterpret_cast<wl_seat*>(
 		native->nativeResourceForIntegration(QByteArray("wl_seat")));
-	
-	const auto serial = [&]() -> std::optional<uint32_t> {
-		const auto waylandWindow = static_cast<QWaylandWindow*>(
-			widget->windowHandle()->handle());
-		if (!waylandWindow) {
-			return std::nullopt;
-		}
-		return waylandWindow->display()->defaultInputDevice()->serial();
-	}();
 
-	if (!toplevel || !seat || !serial) {
+	const auto serial = uint32_t(reinterpret_cast<quintptr>(
+		native->nativeResourceForIntegration(QByteArray("serial"))));
+
+	if (!toplevel || !seat) {
 		return;
 	}
 
-	xdg_toplevel_show_window_menu(toplevel, seat, *serial, point.x(), point.y());
+	xdg_toplevel_show_window_menu(
+		toplevel,
+		seat,
+		serial,
+		point.x(),
+		point.y());
 }
 
 } // namespace Platform

From f6e875c748ae7a757164ae1203041bf513ba8db3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 1 Sep 2022 16:37:51 +0400
Subject: [PATCH 223/635] Use new Qt 6.4 API for window extents on Wayland

---
 CMakeLists.txt                                |  1 -
 .../linux/ui_linux_wayland_integration.cpp    | 46 ++++++++++++++-----
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8352b47..4190fa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,7 +295,6 @@ elseif(LINUX)
 
     target_link_libraries(lib_ui
     PUBLIC
-        desktop-app::lib_waylandshells
         desktop-app::external_wayland_client
     )
 endif()
diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 8dba5e9..aac886c 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -9,7 +9,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
-#include "waylandshells/xdg_shell.h"
 #include "qwayland-xdg-shell.h"
 
 #include <QtGui/QGuiApplication>
@@ -17,7 +16,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <qpa/qplatformnativeinterface.h>
 #include <wayland-client.h>
 
-Q_DECLARE_METATYPE(QMargins);
+typedef void (*SetWindowMarginsFunc)(
+	QWindow *window,
+	const QMargins &margins);
 
 namespace Ui {
 namespace Platform {
@@ -141,7 +142,20 @@ bool WaylandIntegration::xdgDecorationSupported() {
 }
 
 bool WaylandIntegration::windowExtentsSupported() {
-	return WaylandShells::XdgShell();
+	const auto native = QGuiApplication::platformNativeInterface();
+	if (!native) {
+		return false;
+	}
+
+	const auto setWindowMargins = reinterpret_cast<SetWindowMarginsFunc>(
+		reinterpret_cast<void*>(
+			native->nativeResourceFunctionForWindow("setmargins")));
+
+	if (!setWindowMargins) {
+		return false;
+	}
+
+	return true;
 }
 
 void WaylandIntegration::setWindowExtents(
@@ -152,10 +166,15 @@ void WaylandIntegration::setWindowExtents(
 		return;
 	}
 
-	native->setWindowProperty(
-		widget->windowHandle()->handle(),
-		"_desktopApp_waylandCustomMargins",
-		QVariant::fromValue<QMargins>(extents));
+	const auto setWindowMargins = reinterpret_cast<SetWindowMarginsFunc>(
+		reinterpret_cast<void*>(
+			native->nativeResourceFunctionForWindow("setmargins")));
+
+	if (!setWindowMargins) {
+		return;
+	}
+
+	setWindowMargins(widget->windowHandle(), extents);
 }
 
 void WaylandIntegration::unsetWindowExtents(not_null<QWidget*> widget) {
@@ -164,10 +183,15 @@ void WaylandIntegration::unsetWindowExtents(not_null<QWidget*> widget) {
 		return;
 	}
 
-	native->setWindowProperty(
-		widget->windowHandle()->handle(),
-		"_desktopApp_waylandCustomMargins",
-		QVariant());
+	const auto setWindowMargins = reinterpret_cast<SetWindowMarginsFunc>(
+		reinterpret_cast<void*>(
+			native->nativeResourceFunctionForWindow("setmargins")));
+
+	if (!setWindowMargins) {
+		return;
+	}
+
+	setWindowMargins(widget->windowHandle(), QMargins());
 }
 
 void WaylandIntegration::showWindowMenu(

From 95dd2c8465d4b5bfcbcdb47ce7a1d1e743d04477 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 1 Sep 2022 16:55:37 +0400
Subject: [PATCH 224/635] Fix various spaces on end of lines

---
 ui/platform/linux/ui_linux_wayland_integration_dummy.cpp | 2 +-
 ui/platform/win/ui_utility_win.cpp                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
index 1d3fa27..626b689 100644
--- a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
@@ -17,7 +17,7 @@ struct WaylandIntegration::Private {
 
 WaylandIntegration::WaylandIntegration() {
 }
-	
+
 WaylandIntegration::~WaylandIntegration() = default;
 
 WaylandIntegration *WaylandIntegration::Instance() {
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 6d3154d..6c42a73 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -62,7 +62,7 @@ std::optional<bool> IsOverlapped(
 		nullptr,
 		CLSCTX_ALL,
 		IID_PPV_ARGS(&virtualDesktopManager));
-	
+
 	if (SUCCEEDED(hr)) {
 		BOOL isCurrent;
 		hr = virtualDesktopManager->IsWindowOnCurrentVirtualDesktop(

From 2e63c6103e3b23bfcd65dcb8afb19c020511b168 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 5 Sep 2022 18:55:17 +0400
Subject: [PATCH 225/635] Allow strictly blurring images with alpha.

---
 ui/image/image_prepare.cpp | 4 ++--
 ui/image/image_prepare.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 5419eb4..e7c48e9 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -506,7 +506,7 @@ ReadResult Read(ReadArgs &&args) {
 		: Option::None);
 }
 
-QImage Blur(QImage &&image) {
+QImage Blur(QImage &&image, bool ignoreAlpha) {
 	if (image.isNull()) {
 		return std::move(image);
 	}
@@ -532,7 +532,7 @@ QImage Blur(QImage &&image) {
 	if (radius >= 16 || div >= w || div >= h || stride > w * 4) {
 		return std::move(image);
 	}
-	const auto withalpha = image.hasAlphaChannel();
+	const auto withalpha = !ignoreAlpha && image.hasAlphaChannel();
 	if (withalpha) {
 		auto smaller = QImage(image.size(), image.format());
 		{
diff --git a/ui/image/image_prepare.h b/ui/image/image_prepare.h
index 2efb6a7..b1a165d 100644
--- a/ui/image/image_prepare.h
+++ b/ui/image/image_prepare.h
@@ -100,7 +100,7 @@ inline constexpr auto is_flag_type(Option) { return true; };
 	ImageRoundRadius radius,
 	RectParts corners = RectPart::AllCorners);
 
-[[nodiscard]] QImage Blur(QImage &&image);
+[[nodiscard]] QImage Blur(QImage &&image, bool ignoreAlpha = false);
 [[nodiscard]] QImage Round(
 	QImage &&image,
 	ImageRoundRadius radius,

From 4ec399f169e9308cd5da194b6fa2104578c39e45 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 6 Sep 2022 11:20:23 +0400
Subject: [PATCH 226/635] Simplify labels with custom click handlers.

---
 ui/widgets/labels.cpp | 24 ++++++++++++++++++++++++
 ui/widgets/labels.h   |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 65bd7e5..034c75e 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -378,6 +378,30 @@ void FlatLabel::setClickHandlerFilter(ClickHandlerFilter &&filter) {
 	_clickHandlerFilter = std::move(filter);
 }
 
+void FlatLabel::overrideLinkClickHandler(Fn<void()> handler) {
+	setClickHandlerFilter([=](
+			const ClickHandlerPtr &link,
+			Qt::MouseButton button) {
+		if (button != Qt::LeftButton) {
+			return true;
+		}
+		handler();
+		return false;
+	});
+}
+
+void FlatLabel::overrideLinkClickHandler(Fn<void(QString url)> handler) {
+	setClickHandlerFilter([=](
+			const ClickHandlerPtr &link,
+			Qt::MouseButton button) {
+		if (button != Qt::LeftButton) {
+			return true;
+		}
+		handler(link->dragText());
+		return false;
+	});
+}
+
 void FlatLabel::mouseMoveEvent(QMouseEvent *e) {
 	_lastMousePos = e->globalPos();
 	dragActionUpdate();
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index 656e6b2..b7ab34d 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -139,6 +139,8 @@ public:
 
 	using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
 	void setClickHandlerFilter(ClickHandlerFilter &&filter);
+	void overrideLinkClickHandler(Fn<void()> handler);
+	void overrideLinkClickHandler(Fn<void(QString url)> handler);
 
 	// ClickHandlerHost interface
 	void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) override;

From d7c2185f5c72209bfc820e7cd3c396f31b41fb7b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 7 Sep 2022 00:50:06 +0400
Subject: [PATCH 227/635] Force ActivateWindowDelayed to use
 xcb_set_input_focus on X11 when activating a parent

There's logic in Qt that uses xcb_set_input_focus to focus parent windows as some X11 window managers ignore such focus requests leaving the parent activated, but without input focus. By the time delayed activation happens, current focus window may no more exist and the logic in Qt won't work. X11BypassWindowManagerHint says Qt it should use xcb_set_input_focus on X11 that asks X11 directly to set input focus to that window.
---
 ui/delayed_activation.cpp | 46 +++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/ui/delayed_activation.cpp b/ui/delayed_activation.cpp
index 63e373f..a7ae51e 100644
--- a/ui/delayed_activation.cpp
+++ b/ui/delayed_activation.cpp
@@ -9,9 +9,11 @@
 #include "ui/ui_utility.h"
 #include "base/call_delayed.h"
 #include "base/invoke_queued.h"
+#include "base/platform/base_platform_info.h"
 
 #include <QtCore/QPointer>
-#include <QtCore/QCoreApplication>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QWindow>
 
 namespace Ui {
 namespace {
@@ -40,15 +42,41 @@ void ActivateWindowDelayed(not_null<QWidget*> widget) {
 	} else if (std::exchange(Window, widget.get())) {
 		return;
 	}
-	crl::on_main(Window, [=] {
-		if (const auto widget = base::take(Window)) {
-			if (const auto window = widget->window()) {
-				if (!window->isHidden()) {
-					window->raise();
-					window->activateWindow();
-				}
-			}
+	const auto focusAncestor = [&] {
+		const auto focusWindow = QGuiApplication::focusWindow();
+		if (!focusWindow || !widget->window()) {
+			return false;
 		}
+		const auto handle = widget->window()->windowHandle();
+		if (!handle) {
+			return false;
+		}
+		return handle->isAncestorOf(focusWindow);
+	}();
+	crl::on_main(Window, [=] {
+		const auto widget = base::take(Window);
+		if (!widget) {
+			return;
+		}
+		const auto window = widget->window();
+		if (!window || window->isHidden()) {
+			return;
+		}
+		const auto guard = [&] {
+			if (!::Platform::IsX11() || !focusAncestor) {
+				return gsl::finally(Fn<void()>([] {}));
+			}
+			const auto handle = window->windowHandle();
+			if (!(handle->flags() & Qt::X11BypassWindowManagerHint)) {
+				handle->setFlag(Qt::X11BypassWindowManagerHint);
+				return gsl::finally(Fn<void()>([&] {
+					handle->setFlag(Qt::X11BypassWindowManagerHint, false);
+				}));
+			}
+			return gsl::finally(Fn<void()>([] {}));
+		}();
+		window->raise();
+		window->activateWindow();
 	});
 }
 

From 12b8b3804c1b458c124ca150de4320e3fda5035e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 7 Sep 2022 12:50:59 +0400
Subject: [PATCH 228/635] Add Ui::MapFrom for optimized
 mapFromGlobal(mapToGlobal(..)).

---
 ui/ui_utility.cpp | 16 ++++++++++++++++
 ui/ui_utility.h   | 10 ++++++++++
 2 files changed, 26 insertions(+)

diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp
index ee6173d..283b340 100644
--- a/ui/ui_utility.cpp
+++ b/ui/ui_utility.cpp
@@ -222,4 +222,20 @@ int WheelDirection(not_null<QWheelEvent*> e) {
 	return (delta / absDelta);
 }
 
+QPoint MapFrom(
+		not_null<QWidget*> to,
+		not_null<QWidget*> from,
+		QPoint point) {
+	return (to->window() != from->window())
+		? to->mapFromGlobal(from->mapToGlobal(point))
+		: to->mapFrom(to->window(), from->mapTo(from->window(), point));
+}
+
+[[nodiscard]] QRect MapFrom(
+		not_null<QWidget*> to,
+		not_null<QWidget*> from,
+		QRect rect) {
+	return { MapFrom(to, from, rect.topLeft()), rect.size() };
+}
+
 } // namespace Ui
diff --git a/ui/ui_utility.h b/ui/ui_utility.h
index 420f0ff..3242ed5 100644
--- a/ui/ui_utility.h
+++ b/ui/ui_utility.h
@@ -196,4 +196,14 @@ QPointer<const Widget> MakeWeak(not_null<const Widget*> object) {
 
 int WheelDirection(not_null<QWheelEvent*> e);
 
+[[nodiscard]] QPoint MapFrom(
+	not_null<QWidget*> to,
+	not_null<QWidget*> from,
+	QPoint point);
+
+[[nodiscard]] QRect MapFrom(
+	not_null<QWidget*> to,
+	not_null<QWidget*> from,
+	QRect rect);
+
 } // namespace Ui

From 4d2fc25d03e7f0234a047fe1de3ad3b1beb82e4c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 7 Sep 2022 16:11:46 +0400
Subject: [PATCH 229/635] Fix handle capture in ActivateWindowDelayed

---
 ui/delayed_activation.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/delayed_activation.cpp b/ui/delayed_activation.cpp
index a7ae51e..c20d18d 100644
--- a/ui/delayed_activation.cpp
+++ b/ui/delayed_activation.cpp
@@ -67,13 +67,13 @@ void ActivateWindowDelayed(not_null<QWidget*> widget) {
 				return gsl::finally(Fn<void()>([] {}));
 			}
 			const auto handle = window->windowHandle();
-			if (!(handle->flags() & Qt::X11BypassWindowManagerHint)) {
-				handle->setFlag(Qt::X11BypassWindowManagerHint);
-				return gsl::finally(Fn<void()>([&] {
-					handle->setFlag(Qt::X11BypassWindowManagerHint, false);
-				}));
+			if (handle->flags() & Qt::X11BypassWindowManagerHint) {
+				return gsl::finally(Fn<void()>([] {}));
 			}
-			return gsl::finally(Fn<void()>([] {}));
+			handle->setFlag(Qt::X11BypassWindowManagerHint);
+			return gsl::finally(Fn<void()>([handle] {
+				handle->setFlag(Qt::X11BypassWindowManagerHint, false);
+			}));
 		}();
 		window->raise();
 		window->activateWindow();

From 00a668c3f3471151791bf5b46decd61ff4eaa96e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 8 Sep 2022 13:13:03 +0400
Subject: [PATCH 230/635] Initial SpoilerMess implementation.

---
 CMakeLists.txt              |   2 +
 ui/effects/spoiler_mess.cpp | 202 ++++++++++++++++++++++++++++++++++++
 ui/effects/spoiler_mess.h   |  57 ++++++++++
 3 files changed, 261 insertions(+)
 create mode 100644 ui/effects/spoiler_mess.cpp
 create mode 100644 ui/effects/spoiler_mess.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4190fa6..6f237f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,8 @@ PRIVATE
     ui/effects/show_animation.h
     ui/effects/slide_animation.cpp
     ui/effects/slide_animation.h
+    ui/effects/spoiler_mess.cpp
+    ui/effects/spoiler_mess.h
     ui/gl/gl_detection.cpp
     ui/gl/gl_detection.h
     ui/gl/gl_image.cpp
diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
new file mode 100644
index 0000000..6f191c1
--- /dev/null
+++ b/ui/effects/spoiler_mess.cpp
@@ -0,0 +1,202 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/effects/spoiler_mess.h"
+
+#include "ui/painter.h"
+#include "base/random.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kFramesPerRow = 10;
+
+struct Particle {
+	crl::time start = 0;
+	int spriteIndex = 0;
+	int x = 0;
+	int y = 0;
+};
+
+[[nodiscard]] Particle GenerateParticle(
+		const SpoilerMessDescriptor &descriptor,
+		int index,
+		base::BufferedRandom<uint32> &random) {
+	return {
+		.start = (index * descriptor.framesCount * descriptor.frameDuration
+			/ descriptor.particlesCount),
+		.spriteIndex = RandomIndex(descriptor.particleSpritesCount, random),
+		.x = RandomIndex(descriptor.canvasSize, random),
+		.y = RandomIndex(descriptor.canvasSize, random),
+	};
+}
+
+[[nodiscard]] QImage GenerateSprite(
+		const SpoilerMessDescriptor &descriptor,
+		int index,
+		int size,
+		base::BufferedRandom<uint32> &random) {
+	Expects(index >= 0 && index < descriptor.particleSpritesCount);
+
+	const auto count = descriptor.particleSpritesCount;
+	const auto middle = count / 2;
+	const auto min = descriptor.particleSizeMin;
+	const auto delta = descriptor.particleSizeMax - min;
+	const auto width = (index < middle)
+		? (min + delta * (middle - index) / float64(middle))
+		: min;
+	const auto height = (index > middle)
+		? (min + delta * (index - middle) / float64(count - 1 - middle))
+		: min;
+	const auto radius = min / 2.;
+
+	auto result = QImage(size, size, QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+	auto p = QPainter(&result);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(Qt::white);
+	p.drawRoundedRect(1., 1., width, height, radius, radius);
+	p.end();
+	return result;
+}
+
+} // namespace
+
+SpoilerMessCached GenerateSpoilerMess(
+		const SpoilerMessDescriptor &descriptor) {
+	Expects(descriptor.framesCount > 0);
+	Expects(descriptor.frameDuration > 0);
+	Expects(descriptor.particlesCount > 0);
+	Expects(descriptor.canvasSize > 0);
+	Expects(descriptor.particleSizeMax >= descriptor.particleSizeMin);
+	Expects(descriptor.particleSizeMin > 0.);
+
+	const auto frames = descriptor.framesCount;
+	const auto rows = (frames + kFramesPerRow - 1) / kFramesPerRow;
+	const auto columns = std::min(frames, kFramesPerRow);
+	const auto size = descriptor.canvasSize;
+	const auto count = descriptor.particlesCount;
+	const auto width = size * columns;
+	const auto height = size * rows;
+	const auto spriteSize = 2 + int(std::ceil(descriptor.particleSizeMax));
+	const auto singleDuration = descriptor.particleFadeInDuration
+		+ descriptor.particleShownDuration
+		+ descriptor.particleFadeOutDuration;
+	const auto fullDuration = frames * descriptor.frameDuration;
+	Assert(fullDuration > singleDuration);
+
+	auto random = base::BufferedRandom<uint32>(count * 3);
+
+	auto particles = std::vector<Particle>();
+	particles.reserve(descriptor.particlesCount);
+	for (auto i = 0; i != descriptor.particlesCount; ++i) {
+		particles.push_back(GenerateParticle(descriptor, i, random));
+	}
+
+	auto sprites = std::vector<QImage>();
+	sprites.reserve(descriptor.particleSpritesCount);
+	for (auto i = 0; i != descriptor.particleSpritesCount; ++i) {
+		sprites.push_back(GenerateSprite(descriptor, i, spriteSize, random));
+	}
+
+	auto frame = 0;
+	auto image = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
+	image.fill(Qt::transparent);
+	auto p = QPainter(&image);
+	const auto paintOneAt = [&](const Particle &particle, crl::time time) {
+		if (time <= 0 || time >= singleDuration) {
+			return;
+		}
+		const auto opacity = (time < descriptor.particleFadeInDuration)
+			? (time / float64(descriptor.particleFadeInDuration))
+			: (time > singleDuration - descriptor.particleFadeOutDuration)
+			? ((singleDuration - time)
+				/ float64(descriptor.particleFadeOutDuration))
+			: 1.;
+		p.setOpacity(opacity);
+		const auto &sprite = sprites[particle.spriteIndex];
+		p.drawImage(particle.x, particle.y, sprite);
+		if (particle.x + spriteSize > size) {
+			p.drawImage(particle.x - size, particle.y, sprite);
+			if (particle.y + spriteSize > size) {
+				p.drawImage(particle.x, particle.y - size, sprite);
+				p.drawImage(particle.x - size, particle.y - size, sprite);
+			}
+		} else if (particle.y + spriteSize > size) {
+			p.drawImage(particle.x, particle.y - size, sprite);
+		}
+	};
+	const auto paintOne = [&](const Particle &particle, crl::time now) {
+		paintOneAt(particle, now - particle.start);
+		paintOneAt(particle, now + fullDuration - particle.start);
+	};
+	for (auto y = 0; y != rows; ++y) {
+		for (auto x = 0; x != columns; ++x) {
+			const auto rect = QRect(x * size, y * size, size, size);
+			p.setClipRect(rect);
+			p.translate(rect.topLeft());
+			const auto time = frame * descriptor.frameDuration;
+			for (auto index = 0; index != count; ++index) {
+				paintOne(particles[index], time);
+			}
+			p.translate(-rect.topLeft());
+			if (++frame >= frames) {
+				break;
+			}
+		}
+	}
+	return SpoilerMessCached(
+		std::move(image),
+		frames,
+		descriptor.frameDuration,
+		size);
+}
+
+SpoilerMessCached::SpoilerMessCached(
+	QImage image,
+	int framesCount,
+	crl::time frameDuration,
+	int canvasSize)
+: _image(std::move(image))
+, _frameDuration(frameDuration)
+, _framesCount(framesCount)
+, _canvasSize(canvasSize) {
+	Expects(_frameDuration > 0);
+	Expects(_framesCount > 0);
+	Expects(_canvasSize > 0);
+	Expects(_image.size() == QSize(
+		std::min(_framesCount, kFramesPerRow) * _canvasSize,
+		((_framesCount + kFramesPerRow - 1) / kFramesPerRow) * _canvasSize));
+}
+
+SpoilerMessFrame SpoilerMessCached::frame(int index) const {
+	const auto row = index / kFramesPerRow;
+	const auto column = index - row * kFramesPerRow;
+	return {
+		.image = &_image,
+		.source = QRect(
+			column * _canvasSize,
+			row * _canvasSize,
+			_canvasSize,
+			_canvasSize),
+	};
+}
+
+SpoilerMessFrame SpoilerMessCached::frame() const {
+	return frame((crl::now() / _frameDuration) % _framesCount);
+}
+
+QByteArray SpoilerMessCached::serialize() const {
+	return QByteArray();
+}
+
+std::optional<SpoilerMessCached> SpoilerMessCached::FromSerialized(
+		const QByteArray &data) {
+	return std::nullopt;
+}
+
+} // namespace Ui
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
new file mode 100644
index 0000000..380ac84
--- /dev/null
+++ b/ui/effects/spoiler_mess.h
@@ -0,0 +1,57 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include <crl/crl_time.h>
+
+namespace Ui {
+
+struct SpoilerMessDescriptor {
+	crl::time particleFadeInDuration = 0;
+	crl::time particleShownDuration = 0;
+	crl::time particleFadeOutDuration = 0;
+	float64 particleSizeMin = 0.;
+	float64 particleSizeMax = 0.;
+	int particleSpritesCount = 0;
+	int particlesCount = 0;
+	int canvasSize = 0;
+	int framesCount = 0;
+	crl::time frameDuration = 0;
+};
+
+struct SpoilerMessFrame {
+	not_null<const QImage*> image;
+	QRect source;
+};
+
+class SpoilerMessCached final {
+public:
+	SpoilerMessCached(
+		QImage image,
+		int framesCount,
+		crl::time frameDuration,
+		int size);
+
+	[[nodiscard]] SpoilerMessFrame frame(int index) const;
+	[[nodiscard]] SpoilerMessFrame frame() const; // Current by time.
+
+	[[nodiscard]] QByteArray serialize() const;
+	[[nodiscard]] static std::optional<SpoilerMessCached> FromSerialized(
+		const QByteArray &data);
+
+private:
+	QImage _image;
+	crl::time _frameDuration = 0;
+	int _framesCount = 0;
+	int _canvasSize = 0;
+
+};
+
+[[nodiscard]] SpoilerMessCached GenerateSpoilerMess(
+	const SpoilerMessDescriptor &descriptor);
+
+} // namespace Ui

From c732bd874fddd171ef14d8e934e16a90e12d011a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Sep 2022 11:51:08 +0400
Subject: [PATCH 231/635] Cache default SpoilerMess on disk.

---
 ui/effects/spoiler_mess.cpp | 248 +++++++++++++++++++++++++++++++++++-
 ui/effects/spoiler_mess.h   |  19 ++-
 2 files changed, 262 insertions(+), 5 deletions(-)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index 6f191c1..e246306 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -7,12 +7,39 @@
 #include "ui/effects/spoiler_mess.h"
 
 #include "ui/painter.h"
+#include "ui/integration.h"
 #include "base/random.h"
 
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+
+#include <crl/crl_async.h>
+#include <xxhash.h>
+
 namespace Ui {
 namespace {
 
+constexpr auto kVersion = 1;
 constexpr auto kFramesPerRow = 10;
+constexpr auto kImageSpoilerDarkenAlpha = 32;
+constexpr auto kMaxCacheSize = 5 * 1024 * 1024;
+constexpr auto kDefaultFrameDuration = crl::time(33);
+constexpr auto kDefaultFramesCount = 60;
+constexpr auto kDefaultCanvasSize = 100;
+
+std::atomic<const SpoilerMessCached*> DefaultMask/* = nullptr*/;
+std::condition_variable *DefaultMaskSignal/* = nullptr*/;
+std::mutex *DefaultMaskMutex/* = nullptr*/;
+
+struct Header {
+	uint32 version = 0;
+	uint32 dataLength = 0;
+	uint32 dataHash = 0;
+	int32 framesCount = 0;
+	int32 canvasSize = 0;
+	int32 frameDuration = 0;
+};
 
 struct Particle {
 	crl::time start = 0;
@@ -64,6 +91,39 @@ struct Particle {
 	return result;
 }
 
+[[nodiscard]] QString DefaultMaskCacheFolder() {
+	const auto base = Integration::Instance().emojiCacheFolder();
+	return base.isEmpty() ? QString() : (base + "/spoiler");
+}
+
+[[nodiscard]] QString DefaultMaskCachePath(const QString &folder) {
+	return folder + "/mask";
+}
+
+[[nodiscard]] std::optional<SpoilerMessCached> ReadDefaultMask(
+		std::optional<SpoilerMessCached::Validator> validator) {
+	const auto folder = DefaultMaskCacheFolder();
+	if (folder.isEmpty()) {
+		return {};
+	}
+	auto file = QFile(DefaultMaskCachePath(folder));
+	return (file.open(QIODevice::ReadOnly) && file.size() <= kMaxCacheSize)
+		? SpoilerMessCached::FromSerialized(file.readAll(), validator)
+		: std::nullopt;
+}
+
+void WriteDefaultMask(const SpoilerMessCached &mask) {
+	const auto folder = DefaultMaskCacheFolder();
+	if (!QDir().mkpath(folder)) {
+		return;
+	}
+	const auto bytes = mask.serialize();
+	auto file = QFile(DefaultMaskCachePath(folder));
+	if (file.open(QIODevice::WriteOnly) && bytes.size() <= kMaxCacheSize) {
+		file.write(bytes);
+	}
+}
+
 } // namespace
 
 SpoilerMessCached GenerateSpoilerMess(
@@ -173,6 +233,16 @@ SpoilerMessCached::SpoilerMessCached(
 		((_framesCount + kFramesPerRow - 1) / kFramesPerRow) * _canvasSize));
 }
 
+SpoilerMessCached::SpoilerMessCached(
+	const SpoilerMessCached &mask,
+	const QColor &color)
+: SpoilerMessCached(
+	style::colorizeImage(*mask.frame(0).image, color),
+	mask.framesCount(),
+	mask.frameDuration(),
+	mask.canvasSize()) {
+}
+
 SpoilerMessFrame SpoilerMessCached::frame(int index) const {
 	const auto row = index / kFramesPerRow;
 	const auto column = index - row * kFramesPerRow;
@@ -190,13 +260,185 @@ SpoilerMessFrame SpoilerMessCached::frame() const {
 	return frame((crl::now() / _frameDuration) % _framesCount);
 }
 
+crl::time SpoilerMessCached::frameDuration() const {
+	return _frameDuration;
+}
+
+int SpoilerMessCached::framesCount() const {
+	return _framesCount;
+}
+
+int SpoilerMessCached::canvasSize() const {
+	return _canvasSize;
+}
+
 QByteArray SpoilerMessCached::serialize() const {
-	return QByteArray();
+	Expects(_frameDuration < std::numeric_limits<int32>::max());
+
+	const auto skip = sizeof(Header);
+	auto result = QByteArray(skip, Qt::Uninitialized);
+	auto header = Header{
+		.version = kVersion,
+		.framesCount = _framesCount,
+		.canvasSize = _canvasSize,
+		.frameDuration = int32(_frameDuration),
+	};
+	const auto width = int(_image.width());
+	const auto height = int(_image.height());
+	auto grayscale = QImage(width, height, QImage::Format_Grayscale8);
+	{
+		auto tobytes = grayscale.bits();
+		auto frombytes = _image.constBits();
+		const auto toadd = grayscale.bytesPerLine() - width;
+		const auto fromadd = _image.bytesPerLine() - (width * 4);
+		for (auto y = 0; y != height; ++y) {
+			for (auto x = 0; x != width; ++x) {
+				*tobytes++ = *frombytes;
+				frombytes += 4;
+			}
+			tobytes += toadd;
+			frombytes += fromadd;
+		}
+	}
+
+	auto device = QBuffer(&result);
+	device.open(QIODevice::WriteOnly);
+	device.seek(skip);
+	grayscale.save(&device, "PNG");
+	device.close();
+	header.dataLength = result.size() - skip;
+	header.dataHash = XXH32(result.data() + skip, header.dataLength, 0);
+	memcpy(result.data(), &header, skip);
+	return result;
 }
 
 std::optional<SpoilerMessCached> SpoilerMessCached::FromSerialized(
-		const QByteArray &data) {
-	return std::nullopt;
+		QByteArray data,
+		std::optional<Validator> validator) {
+	const auto skip = sizeof(Header);
+	const auto length = data.size();
+	const auto bytes = reinterpret_cast<const uchar*>(data.constData());
+	if (length <= skip) {
+		return {};
+	}
+	auto header = Header();
+	memcpy(&header, bytes, skip);
+	if (header.version != kVersion
+		|| header.canvasSize <= 0
+		|| header.framesCount <= 0
+		|| header.frameDuration <= 0
+		|| (validator
+			&& (validator->frameDuration != header.frameDuration
+				|| validator->framesCount != header.framesCount
+				|| validator->canvasSize != header.canvasSize))
+		|| (skip + header.dataLength != length)
+		|| (XXH32(bytes + skip, header.dataLength, 0) != header.dataHash)) {
+		return {};
+	}
+	auto grayscale = QImage();
+	if (!grayscale.loadFromData(bytes + skip, header.dataLength, "PNG")
+		|| (grayscale.format() != QImage::Format_Grayscale8)) {
+		return {};
+	}
+	const auto count = header.framesCount;
+	const auto rows = (count + kFramesPerRow - 1) / kFramesPerRow;
+	const auto columns = std::min(count, kFramesPerRow);
+	const auto width = grayscale.width();
+	const auto height = grayscale.height();
+	if (QSize(width, height) != QSize(columns, rows) * header.canvasSize) {
+		return {};
+	}
+	auto image = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
+	{
+		Assert(image.bytesPerLine() % 4 == 0);
+		auto toints = reinterpret_cast<uint32*>(image.bits());
+		auto frombytes = grayscale.constBits();
+		const auto toadd = (image.bytesPerLine() / 4) - width;
+		const auto fromadd = grayscale.bytesPerLine() - width;
+		for (auto y = 0; y != height; ++y) {
+			for (auto x = 0; x != width; ++x) {
+				const auto byte = uint32(*frombytes++);
+				*toints++ = (byte << 24) | (byte << 16) | (byte << 8) | byte;
+			}
+			toints += toadd;
+			frombytes += fromadd;
+		}
+
+	}
+	return SpoilerMessCached(
+		std::move(image),
+		count,
+		header.frameDuration,
+		header.canvasSize);
+}
+
+void PrepareDefaultSpoilerMess() {
+	DefaultMaskSignal = new std::condition_variable();
+	DefaultMaskMutex = new std::mutex();
+	crl::async([] {
+		const auto ratio = style::DevicePixelRatio();
+		const auto size = style::ConvertScale(kDefaultCanvasSize) * ratio;
+		auto cached = ReadDefaultMask(SpoilerMessCached::Validator{
+			.frameDuration = kDefaultFrameDuration,
+			.framesCount = kDefaultFramesCount,
+			.canvasSize = size,
+		});
+		if (cached) {
+			DefaultMask = new SpoilerMessCached(std::move(*cached));
+		} else {
+			DefaultMask = new SpoilerMessCached(GenerateSpoilerMess({
+				.particleFadeInDuration = 200,
+				.particleFadeOutDuration = 200,
+				.particleSizeMin = style::ConvertScaleExact(1.5) * ratio,
+				.particleSizeMax = style::ConvertScaleExact(2.) * ratio,
+				.particleSpritesCount = 5,
+				.particlesCount = 2000,
+				.canvasSize = size,
+				.framesCount = kDefaultFramesCount,
+				.frameDuration = kDefaultFrameDuration,
+			}));
+		}
+		auto lock = std::unique_lock(*DefaultMaskMutex);
+		DefaultMaskSignal->notify_all();
+		if (!cached) {
+			WriteDefaultMask(*DefaultMask);
+		}
+	});
+}
+
+const SpoilerMessCached &DefaultSpoilerMask() {
+	if (const auto result = DefaultMask.load()) {
+		return *result;
+	}
+	Assert(DefaultMaskSignal != nullptr);
+	Assert(DefaultMaskMutex != nullptr);
+	while (true) {
+		auto lock = std::unique_lock(*DefaultMaskMutex);
+		if (const auto result = DefaultMask.load()) {
+			return *result;
+		}
+		DefaultMaskSignal->wait(lock);
+	}
+}
+
+const SpoilerMessCached &DefaultImageSpoiler() {
+	static const auto result = [&] {
+		const auto mask = Ui::DefaultSpoilerMask();
+		const auto frame = mask.frame(0);
+		auto image = QImage(
+			frame.image->size(),
+			QImage::Format_ARGB32_Premultiplied);
+		image.fill(QColor(0, 0, 0, kImageSpoilerDarkenAlpha));
+		auto p = QPainter(&image);
+		p.drawImage(0, 0, *frame.image);
+		p.end();
+		return Ui::SpoilerMessCached(
+			std::move(image),
+			mask.framesCount(),
+			mask.frameDuration(),
+			mask.canvasSize());
+	}();
+	return result;
 }
 
 } // namespace Ui
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
index 380ac84..93ae0f1 100644
--- a/ui/effects/spoiler_mess.h
+++ b/ui/effects/spoiler_mess.h
@@ -34,14 +34,25 @@ public:
 		QImage image,
 		int framesCount,
 		crl::time frameDuration,
-		int size);
+		int canvasSize);
+	SpoilerMessCached(const SpoilerMessCached &mask, const QColor &color);
 
 	[[nodiscard]] SpoilerMessFrame frame(int index) const;
 	[[nodiscard]] SpoilerMessFrame frame() const; // Current by time.
 
+	[[nodiscard]] crl::time frameDuration() const;
+	[[nodiscard]] int framesCount() const;
+	[[nodiscard]] int canvasSize() const;
+
+	struct Validator {
+		crl::time frameDuration = 0;
+		int framesCount = 0;
+		int canvasSize = 0;
+	};
 	[[nodiscard]] QByteArray serialize() const;
 	[[nodiscard]] static std::optional<SpoilerMessCached> FromSerialized(
-		const QByteArray &data);
+		QByteArray data,
+		std::optional<Validator> validator = {});
 
 private:
 	QImage _image;
@@ -54,4 +65,8 @@ private:
 [[nodiscard]] SpoilerMessCached GenerateSpoilerMess(
 	const SpoilerMessDescriptor &descriptor);
 
+void PrepareDefaultSpoilerMess();
+[[nodiscard]] const SpoilerMessCached &DefaultSpoilerMask();
+[[nodiscard]] const SpoilerMessCached &DefaultImageSpoiler();
+
 } // namespace Ui

From ff85d2226cd33bd20e273b3b2576cebc73b4116d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Sep 2022 12:41:07 +0400
Subject: [PATCH 232/635] Provide simple spoiler animations manager.

---
 ui/effects/spoiler_mess.cpp | 63 +++++++++++++++++++++++++++++++++++++
 ui/effects/spoiler_mess.h   | 18 +++++++++++
 2 files changed, 81 insertions(+)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index e246306..0c608a9 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -6,6 +6,7 @@
 //
 #include "ui/effects/spoiler_mess.h"
 
+#include "ui/effects/animations.h"
 #include "ui/painter.h"
 #include "ui/integration.h"
 #include "base/random.h"
@@ -32,6 +33,13 @@ std::atomic<const SpoilerMessCached*> DefaultMask/* = nullptr*/;
 std::condition_variable *DefaultMaskSignal/* = nullptr*/;
 std::mutex *DefaultMaskMutex/* = nullptr*/;
 
+struct AnimationManager {
+	Ui::Animations::Basic animation;
+	base::flat_set<not_null<SpoilerAnimation*>> list;
+};
+
+AnimationManager *DefaultAnimationManager/* = nullptr*/;
+
 struct Header {
 	uint32 version = 0;
 	uint32 dataLength = 0;
@@ -124,6 +132,28 @@ void WriteDefaultMask(const SpoilerMessCached &mask) {
 	}
 }
 
+void Register(not_null<SpoilerAnimation*> animation) {
+	if (!DefaultAnimationManager) {
+		DefaultAnimationManager = new AnimationManager();
+		DefaultAnimationManager->animation.init([] {
+			for (const auto &animation : DefaultAnimationManager->list) {
+				animation->repaint();
+			}
+		});
+		DefaultAnimationManager->animation.start();
+	}
+	DefaultAnimationManager->list.emplace(animation);
+}
+
+void Unregister(not_null<SpoilerAnimation*> animation) {
+	Expects(DefaultAnimationManager != nullptr);
+
+	DefaultAnimationManager->list.remove(animation);
+	if (DefaultAnimationManager->list.empty()) {
+		delete base::take(DefaultAnimationManager);
+	}
+}
+
 } // namespace
 
 SpoilerMessCached GenerateSpoilerMess(
@@ -372,6 +402,39 @@ std::optional<SpoilerMessCached> SpoilerMessCached::FromSerialized(
 		header.canvasSize);
 }
 
+SpoilerAnimation::SpoilerAnimation(Fn<void()> repaint)
+: _repaint(std::move(repaint)) {
+	Expects(_repaint != nullptr);
+}
+
+SpoilerAnimation::~SpoilerAnimation() {
+	if (_animating) {
+		_animating = false;
+		Unregister(this);
+	}
+}
+
+int SpoilerAnimation::index(crl::time now, bool paused) {
+	const auto add = std::min(now - _last, kDefaultFrameDuration);
+	if (!paused || _last) {
+		_accumulated += add;
+		_last = paused ? 0 : now;
+	}
+	const auto absolute = (_accumulated / kDefaultFrameDuration);
+	if (!paused && !_animating) {
+		_animating = true;
+		Register(this);
+	} else if (paused && _animating) {
+		_animating = false;
+		Unregister(this);
+	}
+	return absolute % kDefaultFramesCount;
+}
+
+void SpoilerAnimation::repaint() {
+	_repaint();
+}
+
 void PrepareDefaultSpoilerMess() {
 	DefaultMaskSignal = new std::condition_variable();
 	DefaultMaskMutex = new std::mutex();
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
index 93ae0f1..2a1f80a 100644
--- a/ui/effects/spoiler_mess.h
+++ b/ui/effects/spoiler_mess.h
@@ -62,6 +62,24 @@ private:
 
 };
 
+// Works with default frame duration and default frame count.
+class SpoilerAnimation final {
+public:
+	explicit SpoilerAnimation(Fn<void()> repaint);
+	~SpoilerAnimation();
+
+	int index(crl::time now, bool paused);
+
+	void repaint();
+
+private:
+	const Fn<void()> _repaint;
+	crl::time _accumulated = 0;
+	crl::time _last = 0;
+	bool _animating = false;
+
+};
+
 [[nodiscard]] SpoilerMessCached GenerateSpoilerMess(
 	const SpoilerMessDescriptor &descriptor);
 

From 0edb817ccdb67654f1b3650e9bff1274e8c2b73d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Sep 2022 15:42:38 +0400
Subject: [PATCH 233/635] Make moving particles in the SpoilerMess.

---
 ui/effects/spoiler_mess.cpp | 74 +++++++++++++++++++++++++++----------
 ui/effects/spoiler_mess.h   |  2 +
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index 0c608a9..aef76f7 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -27,7 +27,11 @@ constexpr auto kImageSpoilerDarkenAlpha = 32;
 constexpr auto kMaxCacheSize = 5 * 1024 * 1024;
 constexpr auto kDefaultFrameDuration = crl::time(33);
 constexpr auto kDefaultFramesCount = 60;
-constexpr auto kDefaultCanvasSize = 100;
+constexpr auto kDefaultCanvasSize = 128;
+constexpr auto kDefaultParticlesCount = 3000;
+constexpr auto kDefaultFadeInDuration = crl::time(300);
+constexpr auto kDefaultParticleShownDuration = crl::time(0);
+constexpr auto kDefaultFadeOutDuration = crl::time(300);
 
 std::atomic<const SpoilerMessCached*> DefaultMask/* = nullptr*/;
 std::condition_variable *DefaultMaskSignal/* = nullptr*/;
@@ -54,18 +58,43 @@ struct Particle {
 	int spriteIndex = 0;
 	int x = 0;
 	int y = 0;
+	float64 dx = 0.;
+	float64 dy = 0.;
 };
 
+[[nodiscard]] std::pair<float64, float64> RandomSpeed(
+		const SpoilerMessDescriptor &descriptor,
+		base::BufferedRandom<uint32> &random) {
+	const auto count = descriptor.particlesCount;
+	const auto speedMax = descriptor.particleSpeedMax;
+	const auto speedMin = descriptor.particleSpeedMin;
+	const auto value = RandomIndex(2 * count + 2, random);
+	const auto negative = (value < count + 1);
+	const auto module = (negative ? value : (value - count - 1));
+	const auto speed = speedMin + (((speedMax - speedMin) * module) / count);
+	const auto lifetime = descriptor.particleFadeInDuration
+		+ descriptor.particleShownDuration
+		+ descriptor.particleFadeOutDuration;
+	const auto max = int(std::ceil(speedMax * lifetime));
+	const auto k = speed / lifetime;
+	const auto x = (RandomIndex(2 * max + 1, random) - max) / float64(max);
+	const auto y = sqrt(1 - x * x) * (negative ? -1 : 1);
+	return { k * x, k * y };
+}
+
 [[nodiscard]] Particle GenerateParticle(
 		const SpoilerMessDescriptor &descriptor,
 		int index,
 		base::BufferedRandom<uint32> &random) {
+	const auto speed = RandomSpeed(descriptor, random);
 	return {
 		.start = (index * descriptor.framesCount * descriptor.frameDuration
 			/ descriptor.particlesCount),
 		.spriteIndex = RandomIndex(descriptor.particleSpritesCount, random),
 		.x = RandomIndex(descriptor.canvasSize, random),
 		.y = RandomIndex(descriptor.canvasSize, random),
+		.dx = speed.first,
+		.dy = speed.second,
 	};
 }
 
@@ -179,7 +208,7 @@ SpoilerMessCached GenerateSpoilerMess(
 	const auto fullDuration = frames * descriptor.frameDuration;
 	Assert(fullDuration > singleDuration);
 
-	auto random = base::BufferedRandom<uint32>(count * 3);
+	auto random = base::BufferedRandom<uint32>(count * 5);
 
 	auto particles = std::vector<Particle>();
 	particles.reserve(descriptor.particlesCount);
@@ -197,27 +226,31 @@ SpoilerMessCached GenerateSpoilerMess(
 	auto image = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
 	image.fill(Qt::transparent);
 	auto p = QPainter(&image);
-	const auto paintOneAt = [&](const Particle &particle, crl::time time) {
-		if (time <= 0 || time >= singleDuration) {
+	const auto paintOneAt = [&](const Particle &particle, crl::time now) {
+		if (now <= 0 || now >= singleDuration) {
 			return;
 		}
-		const auto opacity = (time < descriptor.particleFadeInDuration)
-			? (time / float64(descriptor.particleFadeInDuration))
-			: (time > singleDuration - descriptor.particleFadeOutDuration)
-			? ((singleDuration - time)
+		const auto x = (particle.x + int(base::SafeRound(now * particle.dx)))
+			% size;
+		const auto y = (particle.y + int(base::SafeRound(now * particle.dy)))
+			% size;
+		const auto opacity = (now < descriptor.particleFadeInDuration)
+			? (now / float64(descriptor.particleFadeInDuration))
+			: (now > singleDuration - descriptor.particleFadeOutDuration)
+			? ((singleDuration - now)
 				/ float64(descriptor.particleFadeOutDuration))
 			: 1.;
 		p.setOpacity(opacity);
 		const auto &sprite = sprites[particle.spriteIndex];
-		p.drawImage(particle.x, particle.y, sprite);
-		if (particle.x + spriteSize > size) {
-			p.drawImage(particle.x - size, particle.y, sprite);
-			if (particle.y + spriteSize > size) {
-				p.drawImage(particle.x, particle.y - size, sprite);
-				p.drawImage(particle.x - size, particle.y - size, sprite);
+		p.drawImage(x, y, sprite);
+		if (x + spriteSize > size) {
+			p.drawImage(x - size, y, sprite);
+			if (y + spriteSize > size) {
+				p.drawImage(x, y - size, sprite);
+				p.drawImage(x - size, y - size, sprite);
 			}
-		} else if (particle.y + spriteSize > size) {
-			p.drawImage(particle.x, particle.y - size, sprite);
+		} else if (y + spriteSize > size) {
+			p.drawImage(x, y - size, sprite);
 		}
 	};
 	const auto paintOne = [&](const Particle &particle, crl::time now) {
@@ -450,12 +483,15 @@ void PrepareDefaultSpoilerMess() {
 			DefaultMask = new SpoilerMessCached(std::move(*cached));
 		} else {
 			DefaultMask = new SpoilerMessCached(GenerateSpoilerMess({
-				.particleFadeInDuration = 200,
-				.particleFadeOutDuration = 200,
+				.particleFadeInDuration = kDefaultFadeInDuration,
+				.particleShownDuration = kDefaultParticleShownDuration,
+				.particleFadeOutDuration = kDefaultFadeOutDuration,
 				.particleSizeMin = style::ConvertScaleExact(1.5) * ratio,
 				.particleSizeMax = style::ConvertScaleExact(2.) * ratio,
+				.particleSpeedMin = style::ConvertScaleExact(10.),
+				.particleSpeedMax = style::ConvertScaleExact(20.),
 				.particleSpritesCount = 5,
-				.particlesCount = 2000,
+				.particlesCount = kDefaultParticlesCount,
 				.canvasSize = size,
 				.framesCount = kDefaultFramesCount,
 				.frameDuration = kDefaultFrameDuration,
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
index 2a1f80a..d96fddc 100644
--- a/ui/effects/spoiler_mess.h
+++ b/ui/effects/spoiler_mess.h
@@ -16,6 +16,8 @@ struct SpoilerMessDescriptor {
 	crl::time particleFadeOutDuration = 0;
 	float64 particleSizeMin = 0.;
 	float64 particleSizeMax = 0.;
+	float64 particleSpeedMin = 0.;
+	float64 particleSpeedMax = 0.;
 	int particleSpritesCount = 0;
 	int particlesCount = 0;
 	int canvasSize = 0;

From a7d90843a39db75cc7fc8a4859fa23dfdaf7709f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Sep 2022 20:09:07 +0400
Subject: [PATCH 234/635] Implement partially-rounded rect with a SpoilerMess
 frame.

---
 ui/effects/spoiler_mess.cpp | 169 ++++++++++++++++++++++++++++++++++++
 ui/effects/spoiler_mess.h   |  25 ++++++
 2 files changed, 194 insertions(+)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index aef76f7..60b906c 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -7,9 +7,11 @@
 #include "ui/effects/spoiler_mess.h"
 
 #include "ui/effects/animations.h"
+#include "ui/image/image_prepare.h"
 #include "ui/painter.h"
 #include "ui/integration.h"
 #include "base/random.h"
+#include "base/flags.h"
 
 #include <QtCore/QBuffer>
 #include <QtCore/QFile>
@@ -279,6 +281,173 @@ SpoilerMessCached GenerateSpoilerMess(
 		size);
 }
 
+void FillSpoilerRect(
+		QPainter &p,
+		QRect rect,
+		const SpoilerMessFrame &frame,
+		QPoint originShift) {
+	if (rect.isEmpty()) {
+		return;
+	}
+	const auto &image = *frame.image;
+	const auto source = frame.source;
+	const auto ratio = style::DevicePixelRatio();
+	const auto origin = rect.topLeft() + originShift;
+	const auto size = source.width() / ratio;
+	const auto xSkipFrames = (origin.x() <= rect.x())
+		? ((rect.x() - origin.x()) / size)
+		: -((origin.x() - rect.x() + size - 1) / size);
+	const auto ySkipFrames = (origin.y() <= rect.y())
+		? ((rect.y() - origin.y()) / size)
+		: -((origin.y() - rect.y() + size - 1) / size);
+	const auto xFrom = origin.x() + size * xSkipFrames;
+	const auto yFrom = origin.y() + size * ySkipFrames;
+	Assert((xFrom <= rect.x())
+		&& (yFrom <= rect.y())
+		&& (xFrom + size > rect.x())
+		&& (yFrom + size > rect.y()));
+	const auto xTill = rect.x() + rect.width();
+	const auto yTill = rect.y() + rect.height();
+	const auto xCount = (xTill - xFrom + size - 1) / size;
+	const auto yCount = (yTill - yFrom + size - 1) / size;
+	Assert(xCount > 0 && yCount > 0);
+	const auto xFullFrom = (xFrom < rect.x()) ? 1 : 0;
+	const auto yFullFrom = (yFrom < rect.y()) ? 1 : 0;
+	const auto xFullTill = xCount - (xFrom + xCount * size > xTill ? 1 : 0);
+	const auto yFullTill = yCount - (yFrom + yCount * size > yTill ? 1 : 0);
+	const auto targetRect = [&](int x, int y) {
+		return QRect(xFrom + x * size, yFrom + y * size, size, size);
+	};
+	const auto drawFull = [&](int x, int y) {
+		p.drawImage(targetRect(x, y), image, source);
+	};
+	const auto drawPart = [&](int x, int y) {
+		const auto target = targetRect(x, y);
+		const auto fill = target.intersected(rect);
+		Assert(!fill.isEmpty());
+		p.drawImage(fill, image, QRect(
+			source.topLeft() + ((fill.topLeft() - target.topLeft()) * ratio),
+			fill.size() * ratio));
+	};
+	if (yFullFrom) {
+		for (auto x = 0; x != xCount; ++x) {
+			drawPart(x, 0);
+		}
+	}
+	if (yFullFrom < yFullTill) {
+		if (xFullFrom) {
+			for (auto y = yFullFrom; y != yFullTill; ++y) {
+				drawPart(0, y);
+			}
+		}
+		if (xFullFrom < xFullTill) {
+			for (auto y = yFullFrom; y != yFullTill; ++y) {
+				for (auto x = xFullFrom; x != xFullTill; ++x) {
+					drawFull(x, y);
+				}
+			}
+		}
+		if (xFullFrom <= xFullTill && xFullTill < xCount) {
+			for (auto y = yFullFrom; y != yFullTill; ++y) {
+				drawPart(xFullTill, y);
+			}
+		}
+	}
+	if (yFullFrom <= yFullTill && yFullTill < yCount) {
+		for (auto x = 0; x != xCount; ++x) {
+			drawPart(x, yFullTill);
+		}
+	}
+}
+
+void FillSpoilerRect(
+		QPainter &p,
+		QRect rect,
+		ImageRoundRadius radius,
+		RectParts corners,
+		const SpoilerMessFrame &frame,
+		QImage &cornerCache,
+		QPoint originShift) {
+	if (radius == ImageRoundRadius::None || !corners) {
+		FillSpoilerRect(p, rect, frame, originShift);
+		return;
+	}
+	const auto &mask = Images::CornersMask(radius);
+	const auto side = mask[0].width() / style::DevicePixelRatio();
+	const auto xFillFrom = (corners & RectPart::FullLeft) ? side : 0;
+	const auto xFillTo = rect.width()
+		- ((corners & RectPart::FullRight) ? side : 0);
+	const auto yFillFrom = (corners & RectPart::FullTop) ? side : 0;
+	const auto yFillTo = rect.height()
+		- ((corners & RectPart::FullBottom) ? side : 0);
+	const auto xFill = xFillTo - xFillFrom;
+	const auto yFill = yFillTo - yFillFrom;
+	if (xFill < 0 || yFill < 0) {
+		// Unexpected.. but maybe not fatal, just glitchy.
+		FillSpoilerRect(p, rect, frame, originShift);
+		return;
+	}
+	const auto ratio = style::DevicePixelRatio();
+	const auto paintPart = [&](int x, int y, int w, int h) {
+		FillSpoilerRect(
+			p,
+			{ rect.x() + x, rect.y() + y, w, h },
+			frame,
+			originShift - QPoint(x, y));
+	};
+	const auto paintCorner = [&](QPoint position, const QImage &mask) {
+		if (cornerCache.width() < mask.width()
+			|| cornerCache.height() < mask.height()) {
+			cornerCache = QImage(
+				std::max(cornerCache.width(), mask.width()),
+				std::max(cornerCache.height(), mask.height()),
+				QImage::Format_ARGB32_Premultiplied);
+			cornerCache.setDevicePixelRatio(ratio);
+		}
+		const auto size = mask.size() / ratio;
+		const auto target = QRect(QPoint(), size);
+		auto q = QPainter(&cornerCache);
+		q.setCompositionMode(QPainter::CompositionMode_Source);
+		FillSpoilerRect(
+			q,
+			target,
+			frame,
+			originShift - rect.topLeft() - position);
+		q.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+		q.drawImage(target, mask);
+		q.end();
+		p.drawImage(
+			QRect(rect.topLeft() + position, size),
+			cornerCache,
+			QRect(QPoint(), mask.size()));
+	};
+	if (yFillFrom > 0) {
+		if (xFillFrom > 0) {
+			paintCorner({}, mask[0]);
+		}
+		if (xFill) {
+			paintPart(xFillFrom, 0, xFill, yFillFrom);
+		}
+		if (xFillTo < rect.width()) {
+			paintCorner({ xFillTo, 0 }, mask[1]);
+		}
+	}
+	if (yFill) {
+		paintPart(0, yFillFrom, rect.width(), yFill);
+	}
+	if (yFillTo < rect.height()) {
+		if (xFillFrom > 0) {
+			paintCorner({ 0, yFillTo }, mask[2]);
+		}
+		if (xFill) {
+			paintPart(xFillFrom, yFillTo, xFill, rect.height() - yFillTo);
+		}
+		if (xFillTo < rect.width()) {
+			paintCorner({ xFillTo, yFillTo }, mask[3]);
+		}
+	}
+}
+
 SpoilerMessCached::SpoilerMessCached(
 	QImage image,
 	int framesCount,
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
index d96fddc..b6510b0 100644
--- a/ui/effects/spoiler_mess.h
+++ b/ui/effects/spoiler_mess.h
@@ -8,6 +8,16 @@
 
 #include <crl/crl_time.h>
 
+enum class ImageRoundRadius;
+
+namespace base {
+template <typename EnumType>
+class flags;
+} // namespace base
+
+enum class RectPart;
+using RectParts = base::flags<RectPart>;
+
 namespace Ui {
 
 struct SpoilerMessDescriptor {
@@ -30,6 +40,21 @@ struct SpoilerMessFrame {
 	QRect source;
 };
 
+void FillSpoilerRect(
+	QPainter &p,
+	QRect rect,
+	const SpoilerMessFrame &frame,
+	QPoint originShift = {});
+
+void FillSpoilerRect(
+	QPainter &p,
+	QRect rect,
+	ImageRoundRadius radius,
+	RectParts corners,
+	const SpoilerMessFrame &frame,
+	QImage &cornerCache,
+	QPoint originShift = {});
+
 class SpoilerMessCached final {
 public:
 	SpoilerMessCached(

From e16cff487ddd01522436f8a2789a8cff3b4c1da6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 9 Sep 2022 21:03:33 +0400
Subject: [PATCH 235/635] Pause spoilers when animations are disabled.

---
 ui/effects/spoiler_mess.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index 60b906c..f2183dd 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -618,6 +618,9 @@ SpoilerAnimation::~SpoilerAnimation() {
 
 int SpoilerAnimation::index(crl::time now, bool paused) {
 	const auto add = std::min(now - _last, kDefaultFrameDuration);
+	if (anim::Disabled()) {
+		paused = true;
+	}
 	if (!paused || _last) {
 		_accumulated += add;
 		_last = paused ? 0 : now;

From 38875a85be4d5639f078068385c6fe7c9af05faa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 10 Sep 2022 11:04:08 +0400
Subject: [PATCH 236/635] Fix build with GCC.

---
 ui/effects/spoiler_mess.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index f2183dd..997a5fc 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -19,6 +19,8 @@
 
 #include <crl/crl_async.h>
 #include <xxhash.h>
+#include <mutex>
+#include <condition_variable>
 
 namespace Ui {
 namespace {

From f82162f05a72352bfee0fb79f9e50c350b3a98f3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 15 Sep 2022 02:33:21 +0400
Subject: [PATCH 237/635] Add missing external_xxhash dependency

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f237f4..f565386 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,4 +314,5 @@ PRIVATE
     desktop-app::external_zlib
     desktop-app::external_jpeg
     desktop-app::external_lz4
+    desktop-app::external_xxhash
 )

From 73b6bc5e136df9aa13bad8841d9a95c4f357a4de Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 17 Sep 2022 00:22:08 +0400
Subject: [PATCH 238/635] Implement animated spoilers.

---
 CMakeLists.txt                       |    4 +
 ui/effects/cross_animation.cpp       |    4 +-
 ui/effects/cross_animation.h         |    4 +-
 ui/effects/cross_line.cpp            |    6 +-
 ui/effects/cross_line.h              |    6 +-
 ui/effects/spoiler_mess.cpp          |  301 ++-
 ui/effects/spoiler_mess.h            |   15 +-
 ui/integration.cpp                   |    4 +
 ui/integration.h                     |    2 +
 ui/layers/layer_widget.cpp           |    1 +
 ui/paint/arcs.cpp                    |    2 +-
 ui/paint/arcs.h                      |    2 +-
 ui/paint/blob.cpp                    |    4 +-
 ui/paint/blob.h                      |    4 +-
 ui/paint/blobs.cpp                   |    2 +-
 ui/paint/blobs.h                     |    2 +-
 ui/paint/blobs_linear.cpp            |    2 +-
 ui/paint/blobs_linear.h              |    4 +-
 ui/painter.h                         |   14 +
 ui/text/text.cpp                     | 3036 ++------------------------
 ui/text/text.h                       |   72 +-
 ui/text/text_block.cpp               |   10 +
 ui/text/text_block.h                 |   18 +-
 ui/text/text_parser.cpp              |  739 +++++++
 ui/text/text_parser.h                |  128 ++
 ui/text/text_renderer.cpp            | 1922 ++++++++++++++++
 ui/text/text_renderer.h              |  158 ++
 ui/text/text_spoiler_data.h          |   10 +-
 ui/toast/toast_widget.cpp            |    1 +
 ui/widgets/buttons.cpp               |    2 +-
 ui/widgets/checkbox.cpp              |    9 +-
 ui/widgets/checkbox.h                |   11 +-
 ui/widgets/icon_button_with_text.cpp |    2 +-
 ui/widgets/input_fields.cpp          |    9 +-
 ui/widgets/input_fields.h            |    4 +-
 ui/widgets/labels.cpp                |    1 +
 ui/widgets/menu/menu.cpp             |    3 +-
 ui/widgets/menu/menu_action.cpp      |    2 +-
 ui/widgets/menu/menu_action.h        |    2 +-
 ui/widgets/menu/menu_toggle.cpp      |    2 +-
 ui/widgets/separate_panel.cpp        |    9 +-
 ui/widgets/separate_panel.h          |    4 +-
 ui/widgets/side_bar_button.cpp       |    1 +
 ui/widgets/time_input.cpp            |    2 +-
 ui/widgets/tooltip.cpp               |    3 +-
 45 files changed, 3469 insertions(+), 3074 deletions(-)
 create mode 100644 ui/text/text_parser.cpp
 create mode 100644 ui/text/text_parser.h
 create mode 100644 ui/text/text_renderer.cpp
 create mode 100644 ui/text/text_renderer.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f565386..efd551e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,6 +162,10 @@ PRIVATE
     ui/text/text_entity.cpp
     ui/text/text_entity.h
     ui/text/text_isolated_emoji.h
+    ui/text/text_parser.cpp
+    ui/text/text_parser.h
+    ui/text/text_renderer.cpp
+    ui/text/text_renderer.h
     ui/text/text_spoiler_data.h
     ui/text/text_utilities.cpp
     ui/text/text_utilities.h
diff --git a/ui/effects/cross_animation.cpp b/ui/effects/cross_animation.cpp
index 4b6f7f9..865bc8a 100644
--- a/ui/effects/cross_animation.cpp
+++ b/ui/effects/cross_animation.cpp
@@ -99,7 +99,7 @@ void transformLoadingCross(float64 loading, std::array<QPointF, kPointCount> &po
 } // namespace
 
 void CrossAnimation::paintStaticLoading(
-		Painter &p,
+		QPainter &p,
 		const style::CrossAnimation &st,
 		style::color color,
 		int x,
@@ -110,7 +110,7 @@ void CrossAnimation::paintStaticLoading(
 }
 
 void CrossAnimation::paint(
-		Painter &p,
+		QPainter &p,
 		const style::CrossAnimation &st,
 		style::color color,
 		int x,
diff --git a/ui/effects/cross_animation.h b/ui/effects/cross_animation.h
index ffa17bd..e0ca4c4 100644
--- a/ui/effects/cross_animation.h
+++ b/ui/effects/cross_animation.h
@@ -15,7 +15,7 @@ namespace Ui {
 class CrossAnimation {
 public:
 	static void paint(
-		Painter &p,
+		QPainter &p,
 		const style::CrossAnimation &st,
 		style::color color,
 		int x,
@@ -24,7 +24,7 @@ public:
 		float64 shown,
 		float64 loading = 0.);
 	static void paintStaticLoading(
-		Painter &p,
+		QPainter &p,
 		const style::CrossAnimation &st,
 		style::color color,
 		int x,
diff --git a/ui/effects/cross_line.cpp b/ui/effects/cross_line.cpp
index c1e0f96..aeffdef 100644
--- a/ui/effects/cross_line.cpp
+++ b/ui/effects/cross_line.cpp
@@ -36,7 +36,7 @@ CrossLineAnimation::CrossLineAnimation(
 }
 
 void CrossLineAnimation::paint(
-		Painter &p,
+		QPainter &p,
 		QPoint position,
 		float64 progress,
 		std::optional<QColor> colorOverride) {
@@ -44,7 +44,7 @@ void CrossLineAnimation::paint(
 }
 
 void CrossLineAnimation::paint(
-		Painter &p,
+		QPainter &p,
 		int left,
 		int top,
 		float64 progress,
@@ -86,7 +86,7 @@ void CrossLineAnimation::fillFrame(
 	topLine.setLength(topLine.length() * progress);
 	auto bottomLine = topLine.translated(0, _strokePen.widthF() + 1);
 
-	Painter q(&_frame);
+	auto q = QPainter(&_frame);
 	PainterHighQualityEnabler hq(q);
 	const auto colorize = ((colorOverride && colorOverride->alpha() != 255)
 		|| (!colorOverride && _st.fg->c.alpha() != 255));
diff --git a/ui/effects/cross_line.h b/ui/effects/cross_line.h
index f8a27ea..99fc506 100644
--- a/ui/effects/cross_line.h
+++ b/ui/effects/cross_line.h
@@ -8,8 +8,6 @@
 
 #include "styles/style_widgets.h"
 
-class Painter;
-
 namespace Ui {
 
 class CrossLineAnimation {
@@ -20,12 +18,12 @@ public:
 		float angle = 315);
 
 	void paint(
-		Painter &p,
+		QPainter &p,
 		QPoint position,
 		float64 progress,
 		std::optional<QColor> colorOverride = std::nullopt);
 	void paint(
-		Painter &p,
+		QPainter &p,
 		int left,
 		int top,
 		float64 progress,
diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index 997a5fc..a125bd5 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -31,22 +31,77 @@ constexpr auto kImageSpoilerDarkenAlpha = 32;
 constexpr auto kMaxCacheSize = 5 * 1024 * 1024;
 constexpr auto kDefaultFrameDuration = crl::time(33);
 constexpr auto kDefaultFramesCount = 60;
-constexpr auto kDefaultCanvasSize = 128;
-constexpr auto kDefaultParticlesCount = 3000;
-constexpr auto kDefaultFadeInDuration = crl::time(300);
-constexpr auto kDefaultParticleShownDuration = crl::time(0);
-constexpr auto kDefaultFadeOutDuration = crl::time(300);
+constexpr auto kAutoPauseTimeout = crl::time(1000);
 
-std::atomic<const SpoilerMessCached*> DefaultMask/* = nullptr*/;
-std::condition_variable *DefaultMaskSignal/* = nullptr*/;
-std::mutex *DefaultMaskMutex/* = nullptr*/;
+[[nodiscard]] SpoilerMessDescriptor DefaultDescriptorText() {
+	const auto ratio = style::DevicePixelRatio();
+	const auto size = style::ConvertScale(128) * ratio;
+	return {
+		.particleFadeInDuration = crl::time(200),
+		.particleShownDuration = crl::time(200),
+		.particleFadeOutDuration = crl::time(200),
+		.particleSizeMin = style::ConvertScaleExact(1.5) * ratio,
+		.particleSizeMax = style::ConvertScaleExact(2.) * ratio,
+		.particleSpeedMin = style::ConvertScaleExact(4.),
+		.particleSpeedMax = style::ConvertScaleExact(8.),
+		.particleSpritesCount = 5,
+		.particlesCount = 9000,
+		.canvasSize = size,
+		.framesCount = kDefaultFramesCount,
+		.frameDuration = kDefaultFrameDuration,
+	};
+}
+
+[[nodiscard]] SpoilerMessDescriptor DefaultDescriptorImage() {
+	const auto ratio = style::DevicePixelRatio();
+	const auto size = style::ConvertScale(128) * ratio;
+	return {
+		.particleFadeInDuration = crl::time(300),
+		.particleShownDuration = crl::time(0),
+		.particleFadeOutDuration = crl::time(300),
+		.particleSizeMin = style::ConvertScaleExact(1.5) * ratio,
+		.particleSizeMax = style::ConvertScaleExact(2.) * ratio,
+		.particleSpeedMin = style::ConvertScaleExact(10.),
+		.particleSpeedMax = style::ConvertScaleExact(20.),
+		.particleSpritesCount = 5,
+		.particlesCount = 3000,
+		.canvasSize = size,
+		.framesCount = kDefaultFramesCount,
+		.frameDuration = kDefaultFrameDuration,
+	};
+}
+
+} // namespace
+
+class SpoilerAnimationManager final {
+public:
+	explicit SpoilerAnimationManager(not_null<SpoilerAnimation*> animation);
+
+	void add(not_null<SpoilerAnimation*> animation);
+	void remove(not_null<SpoilerAnimation*> animation);
+
+private:
+	void destroyIfEmpty();
+
+	Ui::Animations::Basic _animation;
+	base::flat_set<not_null<SpoilerAnimation*>> _list;
 
-struct AnimationManager {
-	Ui::Animations::Basic animation;
-	base::flat_set<not_null<SpoilerAnimation*>> list;
 };
 
-AnimationManager *DefaultAnimationManager/* = nullptr*/;
+namespace {
+
+struct DefaultSpoilerWaiter {
+	std::condition_variable variable;
+	std::mutex mutex;
+};
+struct DefaultSpoiler {
+	std::atomic<const SpoilerMessCached*> cached/* = nullptr*/;
+	std::atomic<DefaultSpoilerWaiter*> waiter/* = nullptr*/;
+};
+DefaultSpoiler DefaultTextMask;
+DefaultSpoiler DefaultImageCached;
+
+SpoilerAnimationManager *DefaultAnimationManager/* = nullptr*/;
 
 struct Header {
 	uint32 version = 0;
@@ -137,58 +192,139 @@ struct Particle {
 	return base.isEmpty() ? QString() : (base + "/spoiler");
 }
 
-[[nodiscard]] QString DefaultMaskCachePath(const QString &folder) {
-	return folder + "/mask";
-}
-
 [[nodiscard]] std::optional<SpoilerMessCached> ReadDefaultMask(
+		const QString &name,
 		std::optional<SpoilerMessCached::Validator> validator) {
 	const auto folder = DefaultMaskCacheFolder();
 	if (folder.isEmpty()) {
 		return {};
 	}
-	auto file = QFile(DefaultMaskCachePath(folder));
+	auto file = QFile(folder + '/' + name);
 	return (file.open(QIODevice::ReadOnly) && file.size() <= kMaxCacheSize)
 		? SpoilerMessCached::FromSerialized(file.readAll(), validator)
 		: std::nullopt;
 }
 
-void WriteDefaultMask(const SpoilerMessCached &mask) {
+void WriteDefaultMask(
+		const QString &name,
+		const SpoilerMessCached &mask) {
 	const auto folder = DefaultMaskCacheFolder();
 	if (!QDir().mkpath(folder)) {
 		return;
 	}
 	const auto bytes = mask.serialize();
-	auto file = QFile(DefaultMaskCachePath(folder));
+	auto file = QFile(folder + '/' + name);
 	if (file.open(QIODevice::WriteOnly) && bytes.size() <= kMaxCacheSize) {
 		file.write(bytes);
 	}
 }
 
 void Register(not_null<SpoilerAnimation*> animation) {
-	if (!DefaultAnimationManager) {
-		DefaultAnimationManager = new AnimationManager();
-		DefaultAnimationManager->animation.init([] {
-			for (const auto &animation : DefaultAnimationManager->list) {
-				animation->repaint();
-			}
-		});
-		DefaultAnimationManager->animation.start();
+	if (DefaultAnimationManager) {
+		DefaultAnimationManager->add(animation);
+	} else {
+		new SpoilerAnimationManager(animation);
 	}
-	DefaultAnimationManager->list.emplace(animation);
 }
 
 void Unregister(not_null<SpoilerAnimation*> animation) {
 	Expects(DefaultAnimationManager != nullptr);
 
-	DefaultAnimationManager->list.remove(animation);
-	if (DefaultAnimationManager->list.empty()) {
-		delete base::take(DefaultAnimationManager);
+	DefaultAnimationManager->remove(animation);
+}
+
+// DescriptorFactory: (void) -> SpoilerMessDescriptor.
+// Postprocess: (unique_ptr<MessCached>) -> unique_ptr<MessCached>.
+template <typename DescriptorFactory, typename Postprocess>
+void PrepareDefaultSpoiler(
+		DefaultSpoiler &spoiler,
+		const char *nameFactory,
+		DescriptorFactory descriptorFactory,
+		Postprocess postprocess) {
+	if (spoiler.waiter.load()) {
+		return;
+	}
+	const auto waiter = new DefaultSpoilerWaiter();
+	auto expected = (DefaultSpoilerWaiter*)nullptr;
+	if (!spoiler.waiter.compare_exchange_strong(expected, waiter)) {
+		delete waiter;
+		return;
+	}
+	const auto name = QString::fromUtf8(nameFactory);
+	crl::async([=, &spoiler] {
+		const auto descriptor = descriptorFactory();
+		auto cached = ReadDefaultMask(name, SpoilerMessCached::Validator{
+			.frameDuration = descriptor.frameDuration,
+			.framesCount = descriptor.framesCount,
+			.canvasSize = descriptor.canvasSize,
+		});
+		spoiler.cached = postprocess(cached
+			? std::make_unique<SpoilerMessCached>(std::move(*cached))
+			: std::make_unique<SpoilerMessCached>(
+				GenerateSpoilerMess(descriptor))
+		).release();
+		auto lock = std::unique_lock(waiter->mutex);
+		waiter->variable.notify_all();
+		if (!cached) {
+			WriteDefaultMask(name, *spoiler.cached);
+		}
+	});
+}
+
+[[nodiscard]] const SpoilerMessCached &WaitDefaultSpoiler(
+		DefaultSpoiler &spoiler) {
+	const auto &cached = spoiler.cached;
+	if (const auto result = cached.load()) {
+		return *result;
+	}
+	const auto waiter = spoiler.waiter.load();
+	Assert(waiter != nullptr);
+	while (true) {
+		auto lock = std::unique_lock(waiter->mutex);
+		if (const auto result = cached.load()) {
+			return *result;
+		}
+		waiter->variable.wait(lock);
 	}
 }
 
 } // namespace
 
+SpoilerAnimationManager::SpoilerAnimationManager(
+	not_null<SpoilerAnimation*> animation)
+: _animation([=](crl::time now) {
+	for (auto i = begin(_list); i != end(_list);) {
+		if ((*i)->repaint(now)) {
+			++i;
+		} else {
+			i = _list.erase(i);
+		}
+	}
+	destroyIfEmpty();
+})
+, _list{ { animation } } {
+	Expects(!DefaultAnimationManager);
+
+	DefaultAnimationManager = this;
+	_animation.start();
+}
+
+void SpoilerAnimationManager::add(not_null<SpoilerAnimation*> animation) {
+	_list.emplace(animation);
+}
+
+void SpoilerAnimationManager::remove(not_null<SpoilerAnimation*> animation) {
+	_list.remove(animation);
+	destroyIfEmpty();
+}
+
+void SpoilerAnimationManager::destroyIfEmpty() {
+	if (_list.empty()) {
+		Assert(DefaultAnimationManager == this);
+		delete base::take(DefaultAnimationManager);
+	}
+}
+
 SpoilerMessCached GenerateSpoilerMess(
 		const SpoilerMessDescriptor &descriptor) {
 	Expects(descriptor.framesCount > 0);
@@ -619,6 +755,7 @@ SpoilerAnimation::~SpoilerAnimation() {
 }
 
 int SpoilerAnimation::index(crl::time now, bool paused) {
+	_scheduled = false;
 	const auto add = std::min(now - _last, kDefaultFrameDuration);
 	if (anim::Disabled()) {
 		paused = true;
@@ -638,66 +775,34 @@ int SpoilerAnimation::index(crl::time now, bool paused) {
 	return absolute % kDefaultFramesCount;
 }
 
-void SpoilerAnimation::repaint() {
-	_repaint();
-}
-
-void PrepareDefaultSpoilerMess() {
-	DefaultMaskSignal = new std::condition_variable();
-	DefaultMaskMutex = new std::mutex();
-	crl::async([] {
-		const auto ratio = style::DevicePixelRatio();
-		const auto size = style::ConvertScale(kDefaultCanvasSize) * ratio;
-		auto cached = ReadDefaultMask(SpoilerMessCached::Validator{
-			.frameDuration = kDefaultFrameDuration,
-			.framesCount = kDefaultFramesCount,
-			.canvasSize = size,
-		});
-		if (cached) {
-			DefaultMask = new SpoilerMessCached(std::move(*cached));
-		} else {
-			DefaultMask = new SpoilerMessCached(GenerateSpoilerMess({
-				.particleFadeInDuration = kDefaultFadeInDuration,
-				.particleShownDuration = kDefaultParticleShownDuration,
-				.particleFadeOutDuration = kDefaultFadeOutDuration,
-				.particleSizeMin = style::ConvertScaleExact(1.5) * ratio,
-				.particleSizeMax = style::ConvertScaleExact(2.) * ratio,
-				.particleSpeedMin = style::ConvertScaleExact(10.),
-				.particleSpeedMax = style::ConvertScaleExact(20.),
-				.particleSpritesCount = 5,
-				.particlesCount = kDefaultParticlesCount,
-				.canvasSize = size,
-				.framesCount = kDefaultFramesCount,
-				.frameDuration = kDefaultFrameDuration,
-			}));
-		}
-		auto lock = std::unique_lock(*DefaultMaskMutex);
-		DefaultMaskSignal->notify_all();
-		if (!cached) {
-			WriteDefaultMask(*DefaultMask);
-		}
-	});
-}
-
-const SpoilerMessCached &DefaultSpoilerMask() {
-	if (const auto result = DefaultMask.load()) {
-		return *result;
-	}
-	Assert(DefaultMaskSignal != nullptr);
-	Assert(DefaultMaskMutex != nullptr);
-	while (true) {
-		auto lock = std::unique_lock(*DefaultMaskMutex);
-		if (const auto result = DefaultMask.load()) {
-			return *result;
-		}
-		DefaultMaskSignal->wait(lock);
+bool SpoilerAnimation::repaint(crl::time now) {
+	if (!_scheduled) {
+		_scheduled = true;
+		_repaint();
+	} else if (_animating && _last && _last + kAutoPauseTimeout <= now) {
+		_animating = false;
+		return false;
 	}
+	return true;
 }
 
-const SpoilerMessCached &DefaultImageSpoiler() {
-	static const auto result = [&] {
-		const auto mask = Ui::DefaultSpoilerMask();
-		const auto frame = mask.frame(0);
+void PrepareTextSpoilerMask() {
+	PrepareDefaultSpoiler(
+		DefaultTextMask,
+		"text",
+		DefaultDescriptorText,
+		[](std::unique_ptr<SpoilerMessCached> cached) { return cached; });
+}
+
+const SpoilerMessCached &DefaultTextSpoilerMask() {
+	return WaitDefaultSpoiler(DefaultTextMask);
+}
+
+void PrepareImageSpoiler() {
+	const auto postprocess = [](std::unique_ptr<SpoilerMessCached> cached) {
+		Expects(cached != nullptr);
+
+		const auto frame = cached->frame(0);
 		auto image = QImage(
 			frame.image->size(),
 			QImage::Format_ARGB32_Premultiplied);
@@ -705,13 +810,21 @@ const SpoilerMessCached &DefaultImageSpoiler() {
 		auto p = QPainter(&image);
 		p.drawImage(0, 0, *frame.image);
 		p.end();
-		return Ui::SpoilerMessCached(
+		return std::make_unique<SpoilerMessCached>(
 			std::move(image),
-			mask.framesCount(),
-			mask.frameDuration(),
-			mask.canvasSize());
-	}();
-	return result;
+			cached->framesCount(),
+			cached->frameDuration(),
+			cached->canvasSize());
+	};
+	PrepareDefaultSpoiler(
+		DefaultImageCached,
+		"image",
+		DefaultDescriptorImage,
+		postprocess);
+}
+
+const SpoilerMessCached &DefaultImageSpoiler() {
+	return WaitDefaultSpoiler(DefaultImageCached);
 }
 
 } // namespace Ui
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
index b6510b0..0ca429f 100644
--- a/ui/effects/spoiler_mess.h
+++ b/ui/effects/spoiler_mess.h
@@ -90,6 +90,7 @@ private:
 };
 
 // Works with default frame duration and default frame count.
+class SpoilerAnimationManager;
 class SpoilerAnimation final {
 public:
 	explicit SpoilerAnimation(Fn<void()> repaint);
@@ -97,21 +98,25 @@ public:
 
 	int index(crl::time now, bool paused);
 
-	void repaint();
-
 private:
+	friend class SpoilerAnimationManager;
+
+	[[nodiscard]] bool repaint(crl::time now);
+
 	const Fn<void()> _repaint;
 	crl::time _accumulated = 0;
 	crl::time _last = 0;
-	bool _animating = false;
+	bool _animating : 1 = false;
+	bool _scheduled : 1 = false;
 
 };
 
 [[nodiscard]] SpoilerMessCached GenerateSpoilerMess(
 	const SpoilerMessDescriptor &descriptor);
 
-void PrepareDefaultSpoilerMess();
-[[nodiscard]] const SpoilerMessCached &DefaultSpoilerMask();
+void PrepareTextSpoilerMask();
+[[nodiscard]] const SpoilerMessCached &DefaultTextSpoilerMask();
+void PrepareImageSpoiler();
 [[nodiscard]] const SpoilerMessCached &DefaultImageSpoiler();
 
 } // namespace Ui
diff --git a/ui/integration.cpp b/ui/integration.cpp
index ee44160..99ab7c4 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -76,6 +76,10 @@ std::unique_ptr<Text::CustomEmoji> Integration::createCustomEmoji(
 	return nullptr;
 }
 
+Fn<void()> Integration::createSpoilerRepaint(const std::any &context) {
+	return nullptr;
+}
+
 bool Integration::handleUrlClick(
 		const QString &url,
 		const QVariant &context) {
diff --git a/ui/integration.h b/ui/integration.h
index 6eb7d06..db065d5 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -63,6 +63,8 @@ public:
 	[[nodiscard]] virtual auto createCustomEmoji(
 		const QString &data,
 		const std::any &context) -> std::unique_ptr<Text::CustomEmoji>;
+	[[nodiscard]] virtual Fn<void()> createSpoilerRepaint(
+		const std::any &context);
 
 	[[nodiscard]] virtual rpl::producer<> forcePopupMenuHideRequests();
 
diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 5f07694..4a67d03 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -10,6 +10,7 @@
 #include "ui/layers/box_layer_widget.h"
 #include "ui/widgets/shadow.h"
 #include "ui/image/image_prepare.h"
+#include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "ui/round_rect.h"
 #include "styles/style_layers.h"
diff --git a/ui/paint/arcs.cpp b/ui/paint/arcs.cpp
index 0204e06..2f346e4 100644
--- a/ui/paint/arcs.cpp
+++ b/ui/paint/arcs.cpp
@@ -186,7 +186,7 @@ bool ArcsAnimation::isArcFinished(const Arc &arc) const {
 		|| ((arc.threshold <= _currentValue) && (arc.progress == 0.));
 }
 
-void ArcsAnimation::paint(Painter &p, std::optional<QColor> colorOverride) {
+void ArcsAnimation::paint(QPainter &p, std::optional<QColor> colorOverride) {
 	PainterHighQualityEnabler hq(p);
 	QPen pen;
 	if (_strokeRatio) {
diff --git a/ui/paint/arcs.h b/ui/paint/arcs.h
index 022b6d6..27d98bd 100644
--- a/ui/paint/arcs.h
+++ b/ui/paint/arcs.h
@@ -29,7 +29,7 @@ public:
 		Direction direction);
 
 	void paint(
-		Painter &p,
+		QPainter &p,
 		std::optional<QColor> colorOverride = std::nullopt);
 
 	void setValue(float64 value);
diff --git a/ui/paint/blob.cpp b/ui/paint/blob.cpp
index c694ebc..5722659 100644
--- a/ui/paint/blob.cpp
+++ b/ui/paint/blob.cpp
@@ -82,7 +82,7 @@ RadialBlob::RadialBlob(int n, float minScale, float minSpeed, float maxSpeed)
 , _segments(n) {
 }
 
-void RadialBlob::paint(Painter &p, const QBrush &brush, float outerScale) {
+void RadialBlob::paint(QPainter &p, const QBrush &brush, float outerScale) {
 	auto path = QPainterPath();
 	auto m = QTransform();
 
@@ -172,7 +172,7 @@ LinearBlob::LinearBlob(
 , _segments(_segmentsCount) {
 }
 
-void LinearBlob::paint(Painter &p, const QBrush &brush, int width) {
+void LinearBlob::paint(QPainter &p, const QBrush &brush, int width) {
 	if (!width) {
 		return;
 	}
diff --git a/ui/paint/blob.h b/ui/paint/blob.h
index 805914b..4006d25 100644
--- a/ui/paint/blob.h
+++ b/ui/paint/blob.h
@@ -58,7 +58,7 @@ class RadialBlob final : public Blob {
 public:
 	RadialBlob(int n, float minScale, float minSpeed = 0, float maxSpeed = 0);
 
-	void paint(Painter &p, const QBrush &brush, float outerScale = 1.);
+	void paint(QPainter &p, const QBrush &brush, float outerScale = 1.);
 	void update(float level, float speedScale, float64 rate);
 
 private:
@@ -94,7 +94,7 @@ public:
 		float minSpeed = 0,
 		float maxSpeed = 0);
 
-	void paint(Painter &p, const QBrush &brush, int width);
+	void paint(QPainter &p, const QBrush &brush, int width);
 
 private:
 	struct Segment : Blob::Segment {
diff --git a/ui/paint/blobs.cpp b/ui/paint/blobs.cpp
index 903f5d9..00e2cb8 100644
--- a/ui/paint/blobs.cpp
+++ b/ui/paint/blobs.cpp
@@ -80,7 +80,7 @@ void Blobs::resetLevel() {
 	_levelValue.reset();
 }
 
-void Blobs::paint(Painter &p, const QBrush &brush, float outerScale) {
+void Blobs::paint(QPainter &p, const QBrush &brush, float outerScale) {
 	const auto opacity = p.opacity();
 	for (auto i = 0; i < _blobs.size(); i++) {
 		const auto alpha = _blobDatas[i].alpha;
diff --git a/ui/paint/blobs.h b/ui/paint/blobs.h
index c93f419..2dc446c 100644
--- a/ui/paint/blobs.h
+++ b/ui/paint/blobs.h
@@ -38,7 +38,7 @@ public:
 
 	void setLevel(float value);
 	void resetLevel();
-	void paint(Painter &p, const QBrush &brush, float outerScale = 1.);
+	void paint(QPainter &p, const QBrush &brush, float outerScale = 1.);
 	void updateLevel(crl::time dt);
 
 	[[nodiscard]] float maxRadius() const;
diff --git a/ui/paint/blobs_linear.cpp b/ui/paint/blobs_linear.cpp
index 1f46e1f..4d274f2 100644
--- a/ui/paint/blobs_linear.cpp
+++ b/ui/paint/blobs_linear.cpp
@@ -78,7 +78,7 @@ void LinearBlobs::setLevel(float value) {
 	_levelValue.start(to);
 }
 
-void LinearBlobs::paint(Painter &p, const QBrush &brush, int width) {
+void LinearBlobs::paint(QPainter &p, const QBrush &brush, int width) {
 	PainterHighQualityEnabler hq(p);
 	const auto opacity = p.opacity();
 	for (auto i = 0; i < _blobs.size(); i++) {
diff --git a/ui/paint/blobs_linear.h b/ui/paint/blobs_linear.h
index e175870..ea85f0e 100644
--- a/ui/paint/blobs_linear.h
+++ b/ui/paint/blobs_linear.h
@@ -9,8 +9,6 @@
 #include "ui/effects/animation_value.h"
 #include "ui/paint/blob.h"
 
-class Painter;
-
 namespace Ui::Paint {
 
 class LinearBlobs final {
@@ -38,7 +36,7 @@ public:
 	Blob::Radiuses radiusesAt(int index);
 
 	void setLevel(float value);
-	void paint(Painter &p, const QBrush &brush, int width);
+	void paint(QPainter &p, const QBrush &brush, int width);
 	void updateLevel(crl::time dt);
 
 	[[nodiscard]] float maxRadius() const;
diff --git a/ui/painter.h b/ui/painter.h
index d2b73d8..4d15b82 100644
--- a/ui/painter.h
+++ b/ui/painter.h
@@ -11,6 +11,10 @@
 #include <QtCore/QPoint>
 #include <QtGui/QPainter>
 
+namespace Ui::Text {
+struct SpoilerMess;
+} // namespace Ui::Text
+
 class Painter : public QPainter {
 public:
 	explicit Painter(QPaintDevice *device) : QPainter(device) {
@@ -78,9 +82,19 @@ public:
 	[[nodiscard]] bool inactive() const {
 		return _inactive;
 	}
+	void setTextSpoilerMess(not_null<Ui::Text::SpoilerMess*> mess) {
+		_spoilerMess = mess;
+	}
+	void restoreTextSpoilerMess() {
+		_spoilerMess = nullptr;
+	}
+	[[nodiscard]] Ui::Text::SpoilerMess *textSpoilerMess() const {
+		return _spoilerMess;
+	}
 
 private:
 	const style::TextPalette *_textPalette = nullptr;
+	Ui::Text::SpoilerMess *_spoilerMess = nullptr;
 	bool _inactive = false;
 
 };
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 7a2af6c..764d01b 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -6,34 +6,22 @@
 //
 #include "ui/text/text.h"
 
-#include "ui/basic_click_handlers.h"
-#include "ui/text/text_block.h"
 #include "ui/text/text_isolated_emoji.h"
+#include "ui/text/text_parser.h"
+#include "ui/text/text_renderer.h"
 #include "ui/text/text_spoiler_data.h"
-#include "ui/emoji_config.h"
-#include "ui/integration.h"
-#include "ui/round_rect.h"
-#include "ui/image/image_prepare.h"
+#include "ui/basic_click_handlers.h"
+#include "ui/painter.h"
 #include "ui/spoiler_click_handler.h"
 #include "base/platform/base_platform_info.h"
-#include "base/qt/qt_common_adapters.h"
-
-#include <private/qfontengine_p.h>
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <private/qharfbuzz_p.h>
-#endif // Qt < 6.0.0
+#include "styles/style_basic.h"
 
 namespace Ui::Text {
 namespace {
 
-constexpr auto kStringLinkIndexShift = uint16(0x8000);
-constexpr auto kMaxDiacAfterSymbol = 2;
+constexpr auto kDefaultSpoilerCacheCapacity = 24;
 
-inline bool IsMono(int32 flags) {
-	return (flags & TextBlockFPre) || (flags & TextBlockFCode);
-}
-
-Qt::LayoutDirection StringDirection(
+[[nodiscard]] Qt::LayoutDirection StringDirection(
 		const QString &str,
 		int from,
 		int to) {
@@ -62,66 +50,6 @@ Qt::LayoutDirection StringDirection(
 	return Qt::LayoutDirectionAuto;
 }
 
-TextWithEntities PrepareRichFromRich(
-		const TextWithEntities &text,
-		const TextParseOptions &options) {
-	auto result = text;
-	const auto &preparsed = text.entities;
-	const bool parseLinks = (options.flags & TextParseLinks);
-	const bool parsePlainLinks = (options.flags & TextParsePlainLinks);
-	if (!preparsed.isEmpty() && (parseLinks || parsePlainLinks)) {
-		bool parseMentions = (options.flags & TextParseMentions);
-		bool parseHashtags = (options.flags & TextParseHashtags);
-		bool parseBotCommands = (options.flags & TextParseBotCommands);
-		bool parseMarkdown = (options.flags & TextParseMarkdown);
-		if (!parseMentions || !parseHashtags || !parseBotCommands || !parseMarkdown) {
-			int32 i = 0, l = preparsed.size();
-			result.entities.clear();
-			result.entities.reserve(l);
-			for (; i < l; ++i) {
-				auto type = preparsed.at(i).type();
-				if (((type == EntityType::Mention || type == EntityType::MentionName) && !parseMentions) ||
-					(type == EntityType::Hashtag && !parseHashtags) ||
-					(type == EntityType::Cashtag && !parseHashtags) ||
-					(type == EntityType::PlainLink
-						&& !parsePlainLinks
-						&& !parseMarkdown) ||
-					(!parseLinks
-						&& (type == EntityType::Url
-							|| type == EntityType::CustomUrl)) ||
-					(type == EntityType::BotCommand && !parseBotCommands) || // #TODO entities
-					(!parseMarkdown && (type == EntityType::Bold
-						|| type == EntityType::Semibold
-						|| type == EntityType::Italic
-						|| type == EntityType::Underline
-						|| type == EntityType::StrikeOut
-						|| type == EntityType::Code
-						|| type == EntityType::Pre))) {
-					continue;
-				}
-				result.entities.push_back(preparsed.at(i));
-			}
-		}
-	}
-	return result;
-}
-
-QFixed ComputeStopAfter(
-		const TextParseOptions &options,
-		const style::TextStyle &st) {
-	return (options.maxw > 0 && options.maxh > 0)
-		? ((options.maxh / st.font->height) + 1) * options.maxw
-		: QFIXED_MAX;
-}
-
-// Open Sans tilde fix.
-bool ComputeCheckTilde(const style::TextStyle &st) {
-	const auto &font = st.font;
-	return (font->size() * style::DevicePixelRatio() == 13)
-		&& (font->flags() == 0)
-		&& (font->f.family() == qstr("DAOpenSansRegular"));
-}
-
 bool IsParagraphSeparator(QChar ch) {
 	switch (ch.unicode()) {
 	case QChar::LineFeed:
@@ -132,42 +60,6 @@ bool IsParagraphSeparator(QChar ch) {
 	return false;
 }
 
-bool IsBad(QChar ch) {
-	return (ch == 0)
-		|| (ch >= 8232 && ch < 8237)
-		|| (ch >= 65024 && ch < 65040 && ch != 65039)
-		|| (ch >= 127 && ch < 160 && ch != 156)
-
-		// qt harfbuzz crash see https://github.com/telegramdesktop/tdesktop/issues/4551
-		|| (Platform::IsMac() && ch == 6158);
-}
-
-void InitTextItemWithScriptItem(QTextItemInt &ti, const QScriptItem &si) {
-	// explicitly initialize flags so that initFontAttributes can be called
-	// multiple times on the same TextItem
-	ti.flags = { };
-	if (si.analysis.bidiLevel %2)
-		ti.flags |= QTextItem::RightToLeft;
-	ti.ascent = si.ascent;
-	ti.descent = si.descent;
-
-	if (ti.charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
-		ti.underlineStyle = ti.charFormat.underlineStyle();
-	} else if (ti.charFormat.boolProperty(QTextFormat::FontUnderline)
-				|| ti.f->underline()) {
-		ti.underlineStyle = QTextCharFormat::SingleUnderline;
-	}
-
-	// compat
-	if (ti.underlineStyle == QTextCharFormat::SingleUnderline)
-		ti.flags |= QTextItem::Underline;
-
-	if (ti.f->overline() || ti.charFormat.fontOverline())
-		ti.flags |= QTextItem::Overline;
-	if (ti.f->strikeOut() || ti.charFormat.fontStrikeOut())
-		ti.flags |= QTextItem::StrikeOut;
-}
-
 } // namespace
 } // namespace Ui::Text
 
@@ -192,2771 +84,61 @@ const TextParseOptions kPlainTextOptions = {
 	Qt::LayoutDirectionAuto, // dir
 };
 
-namespace Ui {
-namespace Text {
+namespace Ui::Text {
 
-class Parser {
-public:
-	Parser(
-		not_null<String*> string,
-		const TextWithEntities &textWithEntities,
-		const TextParseOptions &options,
-		const std::any &context);
+SpoilerMessCache::SpoilerMessCache(int capacity) : _capacity(capacity) {
+	Expects(capacity > 0);
 
-private:
-	struct ReadyToken {
+	_cache.reserve(capacity);
+}
+
+not_null<SpoilerMessCached*> SpoilerMessCache::lookup(QColor color) {
+	for (auto &entry : _cache) {
+		if (entry.color == color) {
+			entry.generation = ++_generation;
+			return &entry.mess;
+		}
+	}
+	if (_cache.size() == _capacity) {
+		const auto i = ranges::min_element(
+			_cache,
+			ranges::less(),
+			&Entry::generation);
+		i->generation = ++_generation;
+		i->color = color;
+		i->mess = Ui::SpoilerMessCached(DefaultTextSpoilerMask(), color);
+		return &i->mess;
+	}
+	_cache.push_back({
+		.mess = Ui::SpoilerMessCached(DefaultTextSpoilerMask(), color),
+		.color = color,
+		.generation = ++_generation,
+	});
+	return &_cache.back().mess;
+}
+
+void SpoilerMessCache::reset() {
+	_cache.clear();
+}
+
+not_null<SpoilerMessCache*> DefaultSpoilerCache() {
+	struct Data {
+		Data() : cache(kDefaultSpoilerCacheCapacity) {
+			style::PaletteChanged() | rpl::start_with_next([=] {
+				cache.reset();
+			}, lifetime);
+		}
+
+		SpoilerMessCache cache;
+		rpl::lifetime lifetime;
 	};
 
-	class StartedEntity {
-	public:
-		enum class Type {
-			Flags,
-			Link,
-			IndexedLink,
-			Spoiler,
-			CustomEmoji,
-		};
-
-		explicit StartedEntity(TextBlockFlags flags);
-		explicit StartedEntity(uint16 index, Type type);
-
-		[[nodiscard]] Type type() const;
-		[[nodiscard]] std::optional<TextBlockFlags> flags() const;
-		[[nodiscard]] std::optional<uint16> lnkIndex() const;
-		[[nodiscard]] std::optional<uint16> spoilerIndex() const;
-
-	private:
-		const int _value = 0;
-		const Type _type;
-
-	};
-
-	Parser(
-		not_null<String*> string,
-		TextWithEntities &&source,
-		const TextParseOptions &options,
-		const std::any &context,
-		ReadyToken);
-
-	void trimSourceRange();
-	void blockCreated();
-	void createBlock(int32 skipBack = 0);
-	// void createSkipBlock(int32 w, int32 h);
-	void createNewlineBlock();
-
-	// Returns true if at least one entity was parsed in the current position.
-	bool checkEntities();
-	void parseCurrentChar();
-	void parseEmojiFromCurrent();
-	void finalize(const TextParseOptions &options);
-
-	void finishEntities();
-	void skipPassedEntities();
-	void skipBadEntities();
-
-	bool isInvalidEntity(const EntityInText &entity) const;
-	bool isLinkEntity(const EntityInText &entity) const;
-
-	bool processCustomIndex(uint16 index);
-
-	void parse(const TextParseOptions &options);
-	void computeLinkText(
-		const QString &linkData,
-		QString *outLinkText,
-		EntityLinkShown *outShown);
-
-	const not_null<String*> _t;
-	const TextWithEntities _source;
-	const std::any &_context;
-	const QChar * const _start = nullptr;
-	const QChar *_end = nullptr; // mutable, because we trim by decrementing.
-	const QChar *_ptr = nullptr;
-	const EntitiesInText::const_iterator _entitiesEnd;
-	EntitiesInText::const_iterator _waitingEntity;
-	QString _customEmojiData;
-	const bool _multiline = false;
-
-	const QFixed _stopAfterWidth; // summary width of all added words
-	const bool _checkTilde = false; // do we need a special text block for tilde symbol
-
-	std::vector<uint16> _linksIndexes;
-
-	std::vector<EntityLinkData> _links;
-	std::vector<EntityLinkData> _spoilers;
-	std::vector<EntityLinkData> _monos;
-	base::flat_map<
-		const QChar*,
-		std::vector<StartedEntity>> _startedEntities;
-
-	uint16 _maxLnkIndex = 0;
-	uint16 _maxShiftedLnkIndex = 0;
-
-	// current state
-	int32 _flags = 0;
-	uint16 _lnkIndex = 0;
-	uint16 _spoilerIndex = 0;
-	uint16 _monoIndex = 0;
-	EmojiPtr _emoji = nullptr; // current emoji, if current word is an emoji, or zero
-	int32 _blockStart = 0; // offset in result, from which current parsed block is started
-	int32 _diacs = 0; // diac chars skipped without good char
-	QFixed _sumWidth;
-	bool _sumFinished = false;
-	bool _newlineAwaited = false;
-
-	// current char data
-	QChar _ch; // current char (low surrogate, if current char is surrogate pair)
-	int32 _emojiLookback = 0; // how far behind the current ptr to look for current emoji
-	bool _lastSkipped = false; // did we skip current char
-
-};
-
-Parser::StartedEntity::StartedEntity(TextBlockFlags flags)
-: _value(flags)
-, _type(Type::Flags) {
-	Expects(_value >= 0 && _value < int(kStringLinkIndexShift));
+	static auto data = Data();
+	return &data.cache;
 }
 
-Parser::StartedEntity::StartedEntity(uint16 index, Type type)
-: _value(index)
-, _type(type) {
-	Expects((_type == Type::Link)
-		? (_value >= kStringLinkIndexShift)
-		: (_value < kStringLinkIndexShift));
-}
-
-Parser::StartedEntity::Type Parser::StartedEntity::type() const {
-	return _type;
-}
-
-std::optional<TextBlockFlags> Parser::StartedEntity::flags() const {
-	if (_value < int(kStringLinkIndexShift) && (_type == Type::Flags)) {
-		return TextBlockFlags(_value);
-	}
-	return std::nullopt;
-}
-
-std::optional<uint16> Parser::StartedEntity::lnkIndex() const {
-	if ((_value < int(kStringLinkIndexShift) && (_type == Type::IndexedLink))
-		|| (_value >= int(kStringLinkIndexShift) && (_type == Type::Link))) {
-		return uint16(_value);
-	}
-	return std::nullopt;
-}
-
-std::optional<uint16> Parser::StartedEntity::spoilerIndex() const {
-	if (_value < int(kStringLinkIndexShift) && (_type == Type::Spoiler)) {
-		return uint16(_value);
-	}
-	return std::nullopt;
-}
-
-Parser::Parser(
-	not_null<String*> string,
-	const TextWithEntities &textWithEntities,
-	const TextParseOptions &options,
-	const std::any &context)
-: Parser(
-	string,
-	PrepareRichFromRich(textWithEntities, options),
-	options,
-	context,
-	ReadyToken()) {
-}
-
-Parser::Parser(
-	not_null<String*> string,
-	TextWithEntities &&source,
-	const TextParseOptions &options,
-	const std::any &context,
-	ReadyToken)
-: _t(string)
-, _source(std::move(source))
-, _context(context)
-, _start(_source.text.constData())
-, _end(_start + _source.text.size())
-, _ptr(_start)
-, _entitiesEnd(_source.entities.end())
-, _waitingEntity(_source.entities.begin())
-, _multiline(options.flags & TextParseMultiline)
-, _stopAfterWidth(ComputeStopAfter(options, *_t->_st))
-, _checkTilde(ComputeCheckTilde(*_t->_st)) {
-	parse(options);
-}
-
-void Parser::blockCreated() {
-	_sumWidth += _t->_blocks.back()->f_width();
-	if (_sumWidth.floor().toInt() > _stopAfterWidth) {
-		_sumFinished = true;
-	}
-}
-
-void Parser::createBlock(int32 skipBack) {
-	if (_lnkIndex < kStringLinkIndexShift && _lnkIndex > _maxLnkIndex) {
-		_maxLnkIndex = _lnkIndex;
-	}
-	if (_lnkIndex > kStringLinkIndexShift) {
-		_maxShiftedLnkIndex = std::max(
-			uint16(_lnkIndex - kStringLinkIndexShift),
-			_maxShiftedLnkIndex);
-	}
-
-	int32 len = int32(_t->_text.size()) + skipBack - _blockStart;
-	if (len > 0) {
-		bool newline = !_emoji && (len == 1 && _t->_text.at(_blockStart) == QChar::LineFeed);
-		if (_newlineAwaited) {
-			_newlineAwaited = false;
-			if (!newline) {
-				_t->_text.insert(_blockStart, QChar::LineFeed);
-				createBlock(skipBack - len);
-			}
-		}
-		_lastSkipped = false;
-		const auto lnkIndex = _monoIndex ? _monoIndex : _lnkIndex;
-		auto custom = _customEmojiData.isEmpty()
-			? nullptr
-			: Integration::Instance().createCustomEmoji(
-				_customEmojiData,
-				_context);
-		if (custom) {
-			_t->_blocks.push_back(Block::CustomEmoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, std::move(custom)));
-			_lastSkipped = true;
-		} else if (_emoji) {
-			_t->_blocks.push_back(Block::Emoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, _emoji));
-			_lastSkipped = true;
-		} else if (newline) {
-			_t->_blocks.push_back(Block::Newline(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
-		} else {
-			_t->_blocks.push_back(Block::Text(_t->_st->font, _t->_text, _t->_minResizeWidth, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
-		}
-		_blockStart += len;
-		_customEmojiData = QByteArray();
-		_emoji = nullptr;
-		blockCreated();
-	}
-}
-
-// Unused.
-// void Parser::createSkipBlock(int32 w, int32 h) {
-// 	createBlock();
-// 	_t->_text.push_back('_');
-// 	_t->_blocks.push_back(Block::Skip(_t->_st->font, _t->_text, _blockStart++, w, h, _monoIndex ? _monoIndex : _lnkIndex, _spoilerIndex));
-// 	blockCreated();
-// }
-
-void Parser::createNewlineBlock() {
-	createBlock();
-	_t->_text.push_back(QChar::LineFeed);
-	createBlock();
-}
-
-void Parser::finishEntities() {
-	while (!_startedEntities.empty()
-		&& (_ptr >= _startedEntities.begin()->first || _ptr >= _end)) {
-		auto list = std::move(_startedEntities.begin()->second);
-		_startedEntities.erase(_startedEntities.begin());
-
-		while (!list.empty()) {
-			if (list.back().type() == StartedEntity::Type::CustomEmoji) {
-				createBlock();
-			} else if (const auto flags = list.back().flags()) {
-				if (_flags & (*flags)) {
-					createBlock();
-					_flags &= ~(*flags);
-					if (((*flags) & TextBlockFPre)
-						&& !_t->_blocks.empty()
-						&& _t->_blocks.back()->type() != TextBlockTNewline) {
-						_newlineAwaited = true;
-					}
-					if (IsMono(*flags)) {
-						_monoIndex = 0;
-					}
-				}
-			} else if (const auto lnkIndex = list.back().lnkIndex()) {
-				if (_lnkIndex == *lnkIndex) {
-					createBlock();
-					_lnkIndex = 0;
-				}
-			} else if (const auto spoilerIndex = list.back().spoilerIndex()) {
-				if (_spoilerIndex == *spoilerIndex && (_spoilerIndex != 0)) {
-					createBlock();
-					_spoilerIndex = 0;
-				}
-			}
-			list.pop_back();
-		}
-	}
-}
-
-// Returns true if at least one entity was parsed in the current position.
-bool Parser::checkEntities() {
-	finishEntities();
-	skipPassedEntities();
-	if (_waitingEntity == _entitiesEnd
-		|| _ptr < _start + _waitingEntity->offset()) {
-		return false;
-	}
-
-	auto flags = TextBlockFlags();
-	auto link = EntityLinkData();
-	auto monoIndex = 0;
-	const auto entityType = _waitingEntity->type();
-	const auto entityLength = _waitingEntity->length();
-	const auto entityBegin = _start + _waitingEntity->offset();
-	const auto entityEnd = entityBegin + entityLength;
-	const auto pushSimpleUrl = [&](EntityType type) {
-		link.type = type;
-		link.data = QString(entityBegin, entityLength);
-		if (type == EntityType::Url) {
-			computeLinkText(link.data, &link.text, &link.shown);
-		} else {
-			link.text = link.data;
-		}
-	};
-	const auto pushComplexUrl = [&] {
-		link.type = entityType;
-		link.data = _waitingEntity->data();
-		link.text = QString(entityBegin, entityLength);
-	};
-
-	using Type = StartedEntity::Type;
-
-	if (entityType == EntityType::CustomEmoji) {
-		createBlock();
-		_customEmojiData = _waitingEntity->data();
-		_startedEntities[entityEnd].emplace_back(0, Type::CustomEmoji);
-	} else if (entityType == EntityType::Bold) {
-		flags = TextBlockFBold;
-	} else if (entityType == EntityType::Semibold) {
-		flags = TextBlockFSemibold;
-	} else if (entityType == EntityType::Italic) {
-		flags = TextBlockFItalic;
-	} else if (entityType == EntityType::Underline) {
-		flags = TextBlockFUnderline;
-	} else if (entityType == EntityType::PlainLink) {
-		flags = TextBlockFPlainLink;
-	} else if (entityType == EntityType::StrikeOut) {
-		flags = TextBlockFStrikeOut;
-	} else if ((entityType == EntityType::Code) // #TODO entities
-		|| (entityType == EntityType::Pre)) {
-		if (entityType == EntityType::Code) {
-			flags = TextBlockFCode;
-		} else {
-			flags = TextBlockFPre;
-			createBlock();
-			if (!_t->_blocks.empty()
-				&& _t->_blocks.back()->type() != TextBlockTNewline
-				&& _customEmojiData.isEmpty()) {
-				createNewlineBlock();
-			}
-		}
-		const auto text = QString(entityBegin, entityLength);
-
-		// It is better to trim the text to identify "Sample\n" as inline.
-		const auto trimmed = text.trimmed();
-		const auto isSingleLine = !trimmed.isEmpty()
-			&& ranges::none_of(trimmed, IsNewline);
-
-		// TODO: remove trimming.
-		if (isSingleLine && (entityType == EntityType::Code)) {
-			_monos.push_back({ .text = text, .type = entityType });
-			monoIndex = _monos.size();
-		}
-	} else if (entityType == EntityType::Url
-		|| entityType == EntityType::Email
-		|| entityType == EntityType::Mention
-		|| entityType == EntityType::Hashtag
-		|| entityType == EntityType::Cashtag
-		|| entityType == EntityType::BotCommand) {
-		pushSimpleUrl(entityType);
-	} else if (entityType == EntityType::CustomUrl) {
-		const auto url = _waitingEntity->data();
-		const auto text = QString(entityBegin, entityLength);
-		if (url == text) {
-			pushSimpleUrl(EntityType::Url);
-		} else {
-			pushComplexUrl();
-		}
-	} else if (entityType == EntityType::MentionName) {
-		pushComplexUrl();
-	}
-
-	if (link.type != EntityType::Invalid) {
-		createBlock();
-
-		_links.push_back(link);
-		const auto tempIndex = _links.size();
-		const auto useCustom = processCustomIndex(tempIndex);
-		_lnkIndex = tempIndex + (useCustom ? 0 : kStringLinkIndexShift);
-		_startedEntities[entityEnd].emplace_back(
-			_lnkIndex,
-			useCustom ? Type::IndexedLink : Type::Link);
-	} else if (flags) {
-		if (!(_flags & flags)) {
-			createBlock();
-			_flags |= flags;
-			_startedEntities[entityEnd].emplace_back(flags);
-			_monoIndex = monoIndex;
-		}
-	} else if (entityType == EntityType::Spoiler) {
-		createBlock();
-
-		_spoilers.push_back(EntityLinkData{
-			.data = QString::number(_spoilers.size() + 1),
-			.type = entityType,
-		});
-		_spoilerIndex = _spoilers.size();
-
-		_startedEntities[entityEnd].emplace_back(
-			_spoilerIndex,
-			Type::Spoiler);
-	}
-
-	++_waitingEntity;
-	skipBadEntities();
-	return true;
-}
-
-bool Parser::processCustomIndex(uint16 index) {
-	auto &url = _links[index - 1].data;
-	if (url.isEmpty()) {
-		return false;
-	}
-	if (url.startsWith("internal:index")) {
-		const auto customIndex = uint16(url.back().unicode());
-		// if (customIndex != index) {
-			url = QString();
-			_linksIndexes.push_back(customIndex);
-			return true;
-		// }
-	}
-	return false;
-}
-
-void Parser::skipPassedEntities() {
-	while (_waitingEntity != _entitiesEnd
-		&& _start + _waitingEntity->offset() + _waitingEntity->length() <= _ptr) {
-		++_waitingEntity;
-	}
-}
-
-void Parser::skipBadEntities() {
-	if (_links.size() >= 0x7FFF) {
-		while (_waitingEntity != _entitiesEnd
-			&& (isLinkEntity(*_waitingEntity)
-				|| isInvalidEntity(*_waitingEntity))) {
-			++_waitingEntity;
-		}
-	} else {
-		while (_waitingEntity != _entitiesEnd && isInvalidEntity(*_waitingEntity)) {
-			++_waitingEntity;
-		}
-	}
-}
-
-void Parser::parseCurrentChar() {
-	_ch = ((_ptr < _end) ? *_ptr : 0);
-	_emojiLookback = 0;
-	const auto inCustomEmoji = !_customEmojiData.isEmpty();
-	const auto isNewLine = !inCustomEmoji && _multiline && IsNewline(_ch);
-	const auto isSpace = IsSpace(_ch);
-	const auto isDiac = IsDiac(_ch);
-	const auto isTilde = !inCustomEmoji && _checkTilde && (_ch == '~');
-	const auto skip = [&] {
-		if (IsBad(_ch) || _ch.isLowSurrogate()) {
-			return true;
-		} else if (_ch == 0xFE0F && Platform::IsMac()) {
-			// Some sequences like 0x0E53 0xFE0F crash OS X harfbuzz text processing :(
-			return true;
-		} else if (isDiac) {
-			if (_lastSkipped || _emoji || ++_diacs > kMaxDiacAfterSymbol) {
-				return true;
-			}
-		} else if (_ch.isHighSurrogate()) {
-			if (_ptr + 1 >= _end || !(_ptr + 1)->isLowSurrogate()) {
-				return true;
-			}
-			const auto ucs4 = QChar::surrogateToUcs4(_ch, *(_ptr + 1));
-			if (ucs4 >= 0xE0000) {
-				// Unicode tags are skipped.
-				// Only place they work is in some flag emoji,
-				// but in that case they were already parsed as emoji before.
-				//
-				// For unknown reason in some unknown cases strings with such
-				// symbols lead to crashes on some Linux distributions, see
-				// https://github.com/telegramdesktop/tdesktop/issues/7005
-				//
-				// At least one crashing text was starting that way:
-				//
-				// 0xd83d 0xdcda 0xdb40 0xdc69 0xdb40 0xdc64 0xdb40 0xdc6a
-				// 0xdb40 0xdc77 0xdb40 0xdc7f 0x32 ... simple text here ...
-				//
-				// or in codepoints:
-				//
-				// 0x1f4da 0xe0069 0xe0064 0xe006a 0xe0077 0xe007f 0x32 ...
-				return true;
-			}
-		}
-		return false;
-	}();
-
-	if (_ch.isHighSurrogate() && !skip) {
-		_t->_text.push_back(_ch);
-		++_ptr;
-		_ch = *_ptr;
-		_emojiLookback = 1;
-	}
-
-	_lastSkipped = skip;
-	if (skip) {
-		_ch = 0;
-	} else {
-		if (isTilde) { // tilde fix in OpenSans
-			if (!(_flags & TextBlockFTilde)) {
-				createBlock(-_emojiLookback);
-				_flags |= TextBlockFTilde;
-			}
-		} else {
-			if (_flags & TextBlockFTilde) {
-				createBlock(-_emojiLookback);
-				_flags &= ~TextBlockFTilde;
-			}
-		}
-		if (isNewLine) {
-			createNewlineBlock();
-		} else if (isSpace) {
-			_t->_text.push_back(QChar::Space);
-		} else {
-			if (_emoji) {
-				createBlock(-_emojiLookback);
-			}
-			_t->_text.push_back(_ch);
-		}
-		if (!isDiac) _diacs = 0;
-	}
-}
-
-void Parser::parseEmojiFromCurrent() {
-	if (!_customEmojiData.isEmpty()) {
-		return;
-	}
-	int len = 0;
-	auto e = Emoji::Find(_ptr - _emojiLookback, _end, &len);
-	if (!e) return;
-
-	for (int l = len - _emojiLookback - 1; l > 0; --l) {
-		_t->_text.push_back(*++_ptr);
-	}
-	if (e->hasPostfix()) {
-		Assert(!_t->_text.isEmpty());
-		const auto last = _t->_text[_t->_text.size() - 1];
-		if (last.unicode() != Emoji::kPostfix) {
-			_t->_text.push_back(QChar(Emoji::kPostfix));
-			++len;
-		}
-	}
-
-	createBlock(-len);
-	_emoji = e;
-}
-
-bool Parser::isInvalidEntity(const EntityInText &entity) const {
-	const auto length = entity.length();
-	return (_start + entity.offset() + length > _end) || (length <= 0);
-}
-
-bool Parser::isLinkEntity(const EntityInText &entity) const {
-	const auto type = entity.type();
-	const auto urls = {
-		EntityType::Url,
-		EntityType::CustomUrl,
-		EntityType::Email,
-		EntityType::Hashtag,
-		EntityType::Cashtag,
-		EntityType::Mention,
-		EntityType::MentionName,
-		EntityType::BotCommand
-	};
-	return ranges::find(urls, type) != std::end(urls);
-}
-
-void Parser::parse(const TextParseOptions &options) {
-	skipBadEntities();
-	trimSourceRange();
-
-	_t->_text.resize(0);
-	_t->_text.reserve(_end - _ptr);
-
-	for (; _ptr <= _end; ++_ptr) {
-		while (checkEntities()) {
-		}
-		parseCurrentChar();
-		parseEmojiFromCurrent();
-
-		if (_sumFinished || _t->_text.size() >= 0x8000) {
-			break; // 32k max
-		}
-	}
-	createBlock();
-	finalize(options);
-}
-
-void Parser::trimSourceRange() {
-	const auto firstMonospaceOffset = EntityInText::FirstMonospaceOffset(
-		_source.entities,
-		_end - _start);
-
-	while (_ptr != _end && IsTrimmed(*_ptr) && _ptr != _start + firstMonospaceOffset) {
-		++_ptr;
-	}
-	while (_ptr != _end && IsTrimmed(*(_end - 1))) {
-		--_end;
-	}
-}
-
-// void Parser::checkForElidedSkipBlock() {
-// 	if (!_sumFinished || !_rich) {
-// 		return;
-// 	}
-// 	// We could've skipped the final skip block command.
-// 	for (; _ptr < _end; ++_ptr) {
-// 		if (*_ptr == TextCommand && readSkipBlockCommand()) {
-// 			break;
-// 		}
-// 	}
-// }
-
-void Parser::finalize(const TextParseOptions &options) {
-	_t->_links.resize(_maxLnkIndex + _maxShiftedLnkIndex);
-	auto counterCustomIndex = uint16(0);
-	auto currentIndex = uint16(0); // Current the latest index of _t->_links.
-	struct {
-		uint16 mono = 0;
-		uint16 lnk = 0;
-	} lastHandlerIndex;
-	const auto avoidIntersectionsWithCustom = [&] {
-		while (ranges::contains(_linksIndexes, currentIndex)) {
-			currentIndex++;
-		}
-	};
-	auto isolatedEmojiCount = 0;
-	_t->_hasCustomEmoji = false;
-	_t->_isIsolatedEmoji = true;
-	_t->_isOnlyCustomEmoji = true;
-	for (auto &block : _t->_blocks) {
-		if (block->type() == TextBlockTCustomEmoji) {
-			_t->_hasCustomEmoji = true;
-		} else if (block->type() != TextBlockTNewline
-			&& block->type() != TextBlockTSkip) {
-			_t->_isOnlyCustomEmoji = false;
-		} else if (block->lnkIndex()) {
-			_t->_isOnlyCustomEmoji = _t->_isIsolatedEmoji = false;
-		}
-		if (_t->_isIsolatedEmoji) {
-			if (block->type() == TextBlockTCustomEmoji
-				|| block->type() == TextBlockTEmoji) {
-				if (++isolatedEmojiCount > kIsolatedEmojiLimit) {
-					_t->_isIsolatedEmoji = false;
-				}
-			} else if (block->type() != TextBlockTSkip) {
-				_t->_isIsolatedEmoji = false;
-			}
-		}
-		const auto spoilerIndex = block->spoilerIndex();
-		if (spoilerIndex) {
-			if (!_t->_spoiler) {
-				_t->_spoiler = std::make_shared<SpoilerData>();
-			}
-			if (_t->_spoiler->links.size() < spoilerIndex) {
-				_t->_spoiler->links.resize(spoilerIndex);
-				const auto handler = (options.flags & TextParseLinks)
-					? std::make_shared<SpoilerClickHandler>()
-					: nullptr;
-				_t->setSpoiler(spoilerIndex, std::move(handler));
-			}
-		}
-		const auto shiftedIndex = block->lnkIndex();
-		auto useCustomIndex = false;
-		if (shiftedIndex <= kStringLinkIndexShift) {
-			if (IsMono(block->flags()) && shiftedIndex) {
-				const auto monoIndex = shiftedIndex;
-
-				if (lastHandlerIndex.mono == monoIndex) {
-					block->setLnkIndex(currentIndex);
-					continue; // Optimization.
-				} else {
-					currentIndex++;
-				}
-				avoidIntersectionsWithCustom();
-				block->setLnkIndex(currentIndex);
-				const auto handler = Integration::Instance().createLinkHandler(
-					_monos[monoIndex - 1],
-					_context);
-				_t->_links.resize(currentIndex);
-				if (handler) {
-					_t->setLink(currentIndex, handler);
-				}
-				lastHandlerIndex.mono = monoIndex;
-				continue;
-			} else if (shiftedIndex) {
-				useCustomIndex = true;
-			} else {
-				continue;
-			}
-		}
-		const auto usedIndex = [&] {
-			return useCustomIndex
-				? _linksIndexes[counterCustomIndex - 1]
-				: currentIndex;
-		};
-		const auto realIndex = useCustomIndex
-			? shiftedIndex
-			: (shiftedIndex - kStringLinkIndexShift);
-		if (lastHandlerIndex.lnk == realIndex) {
-			block->setLnkIndex(usedIndex());
-			continue; // Optimization.
-		} else {
-			(useCustomIndex ? counterCustomIndex : currentIndex)++;
-		}
-		if (!useCustomIndex) {
-			avoidIntersectionsWithCustom();
-		}
-		block->setLnkIndex(usedIndex());
-
-		_t->_links.resize(std::max(usedIndex(), uint16(_t->_links.size())));
-		const auto handler = Integration::Instance().createLinkHandler(
-			_links[realIndex - 1],
-			_context);
-		if (handler) {
-			_t->setLink(usedIndex(), handler);
-		}
-		lastHandlerIndex.lnk = realIndex;
-	}
-	if (!_t->_hasCustomEmoji || _t->_spoiler) {
-		_t->_isOnlyCustomEmoji = false;
-	}
-	if (_t->_blocks.empty() || _t->_spoiler) {
-		_t->_isIsolatedEmoji = false;
-	}
-	_t->_links.squeeze();
-	if (_t->_spoiler) {
-		_t->_spoiler->links.squeeze();
-	}
-	_t->_blocks.shrink_to_fit();
-	_t->_text.squeeze();
-}
-
-void Parser::computeLinkText(
-		const QString &linkData,
-		QString *outLinkText,
-		EntityLinkShown *outShown) {
-	auto url = QUrl(linkData);
-	auto good = QUrl(url.isValid()
-		? url.toEncoded()
-		: QByteArray());
-	auto readable = good.isValid()
-		? good.toDisplayString()
-		: linkData;
-	*outLinkText = _t->_st->font->elided(readable, st::linkCropLimit);
-	*outShown = (*outLinkText == readable)
-		? EntityLinkShown::Full
-		: EntityLinkShown::Partial;
-}
-
-namespace {
-
-// COPIED FROM qtextengine.cpp AND MODIFIED
-
-struct BidiStatus {
-	BidiStatus() {
-		eor = QChar::DirON;
-		lastStrong = QChar::DirON;
-		last = QChar:: DirON;
-		dir = QChar::DirON;
-	}
-	QChar::Direction eor;
-	QChar::Direction lastStrong;
-	QChar::Direction last;
-	QChar::Direction dir;
-};
-
-enum { _MaxBidiLevel = 61 };
-enum { _MaxItemLength = 4096 };
-
-struct BidiControl {
-	inline BidiControl(bool rtl)
-		: base(rtl ? 1 : 0), level(rtl ? 1 : 0) {}
-
-	inline void embed(bool rtl, bool o = false) {
-		unsigned int toAdd = 1;
-		if((level%2 != 0) == rtl ) {
-			++toAdd;
-		}
-		if (level + toAdd <= _MaxBidiLevel) {
-			ctx[cCtx].level = level;
-			ctx[cCtx].override = override;
-			cCtx++;
-			override = o;
-			level += toAdd;
-		}
-	}
-	inline bool canPop() const { return cCtx != 0; }
-	inline void pdf() {
-		Q_ASSERT(cCtx);
-		--cCtx;
-		level = ctx[cCtx].level;
-		override = ctx[cCtx].override;
-	}
-
-	inline QChar::Direction basicDirection() const {
-		return (base ? QChar::DirR : QChar:: DirL);
-	}
-	inline unsigned int baseLevel() const {
-		return base;
-	}
-	inline QChar::Direction direction() const {
-		return ((level%2) ? QChar::DirR : QChar:: DirL);
-	}
-
-	struct {
-		unsigned int level = 0;
-		bool override = false;
-	} ctx[_MaxBidiLevel];
-	unsigned int cCtx = 0;
-	const unsigned int base;
-	unsigned int level;
-	bool override = false;
-};
-
-static void eAppendItems(QScriptAnalysis *analysis, int &start, int &stop, const BidiControl &control, QChar::Direction dir) {
-	if (start > stop)
-		return;
-
-	int level = control.level;
-
-	if(dir != QChar::DirON && !control.override) {
-		// add level of run (cases I1 & I2)
-		if(level % 2) {
-			if(dir == QChar::DirL || dir == QChar::DirAN || dir == QChar::DirEN)
-				level++;
-		} else {
-			if(dir == QChar::DirR)
-				level++;
-			else if(dir == QChar::DirAN || dir == QChar::DirEN)
-				level += 2;
-		}
-	}
-
-	QScriptAnalysis *s = analysis + start;
-	const QScriptAnalysis *e = analysis + stop;
-	while (s <= e) {
-		s->bidiLevel = level;
-		++s;
-	}
-	++stop;
-	start = stop;
-}
-
-inline int32 countBlockHeight(const AbstractBlock *b, const style::TextStyle *st) {
-	return (b->type() == TextBlockTSkip) ? static_cast<const SkipBlock*>(b)->height() : (st->lineHeight > st->font->height) ? st->lineHeight : st->font->height;
-}
-
-} // namespace
-
-class Renderer {
-public:
-	Renderer(Painter *p, const String *t)
-	: _p(p)
-	, _t(t)
-	, _originalPen(p ? p->pen() : QPen()) {
-	}
-
-	~Renderer() {
-		restoreAfterElided();
-		if (_p) {
-			_p->setPen(_originalPen);
-		}
-	}
-
-	void draw(int32 left, int32 top, int32 w, style::align align, int32 yFrom, int32 yTo, TextSelection selection = { 0, 0 }, bool fullWidthSelection = true) {
-		if (_t->isEmpty()) return;
-
-		_blocksSize = _t->_blocks.size();
-		if (_p) {
-			_p->setFont(_t->_st->font);
-			_textPalette = &_p->textPalette();
-			_originalPenSelected = (_textPalette->selectFg->c.alphaF() == 0) ? _originalPen : _textPalette->selectFg->p;
-		}
-
-		_x = left;
-		_y = top;
-		_yFrom = yFrom + top;
-		_yTo = (yTo < 0) ? -1 : (yTo + top);
-		_selection = selection;
-		_fullWidthSelection = fullWidthSelection;
-		_wLeft = _w = w;
-		if (_elideLast) {
-			_yToElide = _yTo;
-			if (_elideRemoveFromEnd > 0 && !_t->_blocks.empty()) {
-				int firstBlockHeight = countBlockHeight(_t->_blocks.front().get(), _t->_st);
-				if (_y + firstBlockHeight >= _yToElide) {
-					_wLeft -= _elideRemoveFromEnd;
-				}
-			}
-		}
-		_str = _t->_text.unicode();
-
-		if (_p) {
-			auto clip = _p->hasClipping() ? _p->clipBoundingRect() : QRect();
-			if (clip.width() > 0 || clip.height() > 0) {
-				if (_yFrom < clip.y()) _yFrom = clip.y();
-				if (_yTo < 0 || _yTo > clip.y() + clip.height()) _yTo = clip.y() + clip.height();
-			}
-		}
-
-		_align = align;
-
-		_parDirection = _t->_startDir;
-		if (_parDirection == Qt::LayoutDirectionAuto) _parDirection = style::LayoutDirection();
-		if ((*_t->_blocks.cbegin())->type() != TextBlockTNewline) {
-			initNextParagraph(_t->_blocks.cbegin());
-		}
-
-		_lineStart = 0;
-		_lineStartBlock = 0;
-
-		_lineHeight = 0;
-		_fontHeight = _t->_st->font->height;
-		auto last_rBearing = QFixed(0);
-		_last_rPadding = QFixed(0);
-
-		auto blockIndex = 0;
-		bool longWordLine = true;
-		auto e = _t->_blocks.cend();
-		for (auto i = _t->_blocks.cbegin(); i != e; ++i, ++blockIndex) {
-			auto b = i->get();
-			auto _btype = b->type();
-			auto blockHeight = countBlockHeight(b, _t->_st);
-
-			if (_btype == TextBlockTNewline) {
-				if (!_lineHeight) _lineHeight = blockHeight;
-				if (!drawLine((*i)->from(), i, e)) {
-					return;
-				}
-
-				_y += _lineHeight;
-				_lineHeight = 0;
-				_lineStart = _t->countBlockEnd(i, e);
-				_lineStartBlock = blockIndex + 1;
-
-				last_rBearing = b->f_rbearing();
-				_last_rPadding = b->f_rpadding();
-				_wLeft = _w - (b->f_width() - last_rBearing);
-				if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
-					_wLeft -= _elideRemoveFromEnd;
-				}
-
-				_parDirection = static_cast<const NewlineBlock*>(b)->nextDirection();
-				if (_parDirection == Qt::LayoutDirectionAuto) _parDirection = style::LayoutDirection();
-				initNextParagraph(i + 1);
-
-				longWordLine = true;
-				continue;
-			}
-
-			auto b__f_rbearing = b->f_rbearing();
-			auto newWidthLeft = _wLeft - last_rBearing - (_last_rPadding + b->f_width() - b__f_rbearing);
-			if (newWidthLeft >= 0) {
-				last_rBearing = b__f_rbearing;
-				_last_rPadding = b->f_rpadding();
-				_wLeft = newWidthLeft;
-
-				_lineHeight = qMax(_lineHeight, blockHeight);
-
-				longWordLine = false;
-				continue;
-			}
-
-			if (_btype == TextBlockTText) {
-				auto t = static_cast<const TextBlock*>(b);
-				if (t->_words.isEmpty()) { // no words in this block, spaces only => layout this block in the same line
-					_last_rPadding += b->f_rpadding();
-
-					_lineHeight = qMax(_lineHeight, blockHeight);
-
-					longWordLine = false;
-					continue;
-				}
-
-				auto f_wLeft = _wLeft; // vars for saving state of the last word start
-				auto f_lineHeight = _lineHeight; // f points to the last word-start element of t->_words
-				for (auto j = t->_words.cbegin(), en = t->_words.cend(), f = j; j != en; ++j) {
-					auto wordEndsHere = (j->f_width() >= 0);
-					auto j_width = wordEndsHere ? j->f_width() : -j->f_width();
-
-					auto newWidthLeft = _wLeft - last_rBearing - (_last_rPadding + j_width - j->f_rbearing());
-					if (newWidthLeft >= 0) {
-						last_rBearing = j->f_rbearing();
-						_last_rPadding = j->f_rpadding();
-						_wLeft = newWidthLeft;
-
-						_lineHeight = qMax(_lineHeight, blockHeight);
-
-						if (wordEndsHere) {
-							longWordLine = false;
-						}
-						if (wordEndsHere || longWordLine) {
-							f = j + 1;
-							f_wLeft = _wLeft;
-							f_lineHeight = _lineHeight;
-						}
-						continue;
-					}
-
-					auto elidedLineHeight = qMax(_lineHeight, blockHeight);
-					auto elidedLine = _elideLast && (_y + elidedLineHeight >= _yToElide);
-					if (elidedLine) {
-						_lineHeight = elidedLineHeight;
-					} else if (f != j && !_breakEverywhere) {
-						// word did not fit completely, so we roll back the state to the beginning of this long word
-						j = f;
-						_wLeft = f_wLeft;
-						_lineHeight = f_lineHeight;
-						j_width = (j->f_width() >= 0) ? j->f_width() : -j->f_width();
-					}
-					if (!drawLine(elidedLine ? ((j + 1 == en) ? _t->countBlockEnd(i, e) : (j + 1)->from()) : j->from(), i, e)) {
-						return;
-					}
-					_y += _lineHeight;
-					_lineHeight = qMax(0, blockHeight);
-					_lineStart = j->from();
-					_lineStartBlock = blockIndex;
-
-					last_rBearing = j->f_rbearing();
-					_last_rPadding = j->f_rpadding();
-					_wLeft = _w - (j_width - last_rBearing);
-					if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
-						_wLeft -= _elideRemoveFromEnd;
-					}
-
-					longWordLine = !wordEndsHere;
-					f = j + 1;
-					f_wLeft = _wLeft;
-					f_lineHeight = _lineHeight;
-				}
-				continue;
-			}
-
-			auto elidedLineHeight = qMax(_lineHeight, blockHeight);
-			auto elidedLine = _elideLast && (_y + elidedLineHeight >= _yToElide);
-			if (elidedLine) {
-				_lineHeight = elidedLineHeight;
-			}
-			if (!drawLine(elidedLine ? _t->countBlockEnd(i, e) : b->from(), i, e)) {
-				return;
-			}
-			_y += _lineHeight;
-			_lineHeight = qMax(0, blockHeight);
-			_lineStart = b->from();
-			_lineStartBlock = blockIndex;
-
-			last_rBearing = b__f_rbearing;
-			_last_rPadding = b->f_rpadding();
-			_wLeft = _w - (b->f_width() - last_rBearing);
-			if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
-				_wLeft -= _elideRemoveFromEnd;
-			}
-
-			longWordLine = true;
-			continue;
-		}
-		if (_lineStart < _t->_text.size()) {
-			if (!drawLine(_t->_text.size(), e, e)) return;
-		}
-		if (!_p && _lookupSymbol) {
-			_lookupResult.symbol = _t->_text.size();
-			_lookupResult.afterSymbol = false;
-		}
-	}
-
-	void drawElided(int32 left, int32 top, int32 w, style::align align, int32 lines, int32 yFrom, int32 yTo, int32 removeFromEnd, bool breakEverywhere, TextSelection selection) {
-		if (lines <= 0 || _t->isNull()) return;
-
-		if (yTo < 0 || (lines - 1) * _t->_st->font->height < yTo) {
-			yTo = lines * _t->_st->font->height;
-			_elideLast = true;
-			_elideRemoveFromEnd = removeFromEnd;
-		}
-		_breakEverywhere = breakEverywhere;
-		draw(left, top, w, align, yFrom, yTo, selection);
-	}
-
-	StateResult getState(QPoint point, int w, StateRequest request) {
-		if (!_t->isNull() && point.y() >= 0) {
-			_lookupRequest = request;
-			_lookupX = point.x();
-			_lookupY = point.y();
-
-			_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
-			_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
-			_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
-			if (_lookupSymbol || (_lookupX >= 0 && _lookupX < w)) {
-				draw(0, 0, w, _lookupRequest.align, _lookupY, _lookupY + 1);
-			}
-		}
-		return _lookupResult;
-	}
-
-	StateResult getStateElided(QPoint point, int w, StateRequestElided request) {
-		if (!_t->isNull() && point.y() >= 0 && request.lines > 0) {
-			_lookupRequest = request;
-			_lookupX = point.x();
-			_lookupY = point.y();
-
-			_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
-			_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
-			_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
-			if (_lookupSymbol || (_lookupX >= 0 && _lookupX < w)) {
-				int yTo = _lookupY + 1;
-				if (yTo < 0 || (request.lines - 1) * _t->_st->font->height < yTo) {
-					yTo = request.lines * _t->_st->font->height;
-					_elideLast = true;
-					_elideRemoveFromEnd = request.removeFromEnd;
-				}
-				draw(0, 0, w, _lookupRequest.align, _lookupY, _lookupY + 1);
-			}
-		}
-		return _lookupResult;
-	}
-
-private:
-	void initNextParagraph(String::TextBlocks::const_iterator i) {
-		_parStartBlock = i;
-		const auto e = _t->_blocks.cend();
-		if (i == e) {
-			_parStart = _t->_text.size();
-			_parLength = 0;
-		} else {
-			_parStart = (*i)->from();
-			for (; i != e; ++i) {
-				if ((*i)->type() == TextBlockTNewline) {
-					break;
-				}
-			}
-			_parLength = ((i == e) ? _t->_text.size() : (*i)->from()) - _parStart;
-		}
-		_parAnalysis.resize(0);
-	}
-
-	void initParagraphBidi() {
-		if (!_parLength || !_parAnalysis.isEmpty()) return;
-
-		String::TextBlocks::const_iterator i = _parStartBlock, e = _t->_blocks.cend(), n = i + 1;
-
-		bool ignore = false;
-		bool rtl = (_parDirection == Qt::RightToLeft);
-		if (!ignore && !rtl) {
-			ignore = true;
-			const ushort *start = reinterpret_cast<const ushort*>(_str) + _parStart;
-			const ushort *curr = start;
-			const ushort *end = start + _parLength;
-			while (curr < end) {
-				while (n != e && (*n)->from() <= _parStart + (curr - start)) {
-					i = n;
-					++n;
-				}
-				const auto type = (*i)->type();
-				if (type != TextBlockTEmoji
-					&& type != TextBlockTCustomEmoji
-					&& *curr >= 0x590) {
-					ignore = false;
-					break;
-				}
-				++curr;
-			}
-		}
-
-		_parAnalysis.resize(_parLength);
-		QScriptAnalysis *analysis = _parAnalysis.data();
-
-		BidiControl control(rtl);
-
-		_parHasBidi = false;
-		if (ignore) {
-			memset(analysis, 0, _parLength * sizeof(QScriptAnalysis));
-			if (rtl) {
-				for (int i = 0; i < _parLength; ++i)
-					analysis[i].bidiLevel = 1;
-				_parHasBidi = true;
-			}
-		} else {
-			_parHasBidi = eBidiItemize(analysis, control);
-		}
-	}
-
-	bool drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterator &_endBlockIter, const String::TextBlocks::const_iterator &_end) {
-		_yDelta = (_lineHeight - _fontHeight) / 2;
-		if (_yTo >= 0 && (_y + _yDelta >= _yTo || _y >= _yTo)) return false;
-		if (_y + _yDelta + _fontHeight <= _yFrom) {
-			if (_lookupSymbol) {
-				_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
-				_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
-			}
-			return true;
-		}
-
-		// Trimming pending spaces, because they sometimes don't fit on the line.
-		// They also are not counted in the line width, they're in the right padding.
-		// Line width is a sum of block / word widths and paddings between them, without trailing one.
-		auto trimmedLineEnd = _lineEnd;
-		for (; trimmedLineEnd > _lineStart; --trimmedLineEnd) {
-			auto ch = _t->_text[trimmedLineEnd - 1];
-			if (ch != QChar::Space && ch != QChar::LineFeed) {
-				break;
-			}
-		}
-
-		auto _endBlock = (_endBlockIter == _end) ? nullptr : _endBlockIter->get();
-		auto elidedLine = _elideLast && (_y + _lineHeight >= _yToElide);
-		if (elidedLine) {
-			// If we decided to draw the last line elided only because of the skip block
-			// that did not fit on this line, we just draw the line till the very end.
-			// Skip block is ignored in the elided lines, instead "removeFromEnd" is used.
-			if (_endBlock && _endBlock->type() == TextBlockTSkip) {
-				_endBlock = nullptr;
-			}
-			if (!_endBlock) {
-				elidedLine = false;
-			}
-		}
-
-		auto blockIndex = _lineStartBlock;
-		auto currentBlock = _t->_blocks[blockIndex].get();
-		auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-
-		const auto extendLeft = (currentBlock->from() < _lineStart)
-			? qMin(_lineStart - currentBlock->from(), 2)
-			: 0;
-		_localFrom = _lineStart - extendLeft;
-		const auto extendedLineEnd = (_endBlock && _endBlock->from() < trimmedLineEnd && !elidedLine)
-			? qMin(uint16(trimmedLineEnd + 2), _t->countBlockEnd(_endBlockIter, _end))
-			: trimmedLineEnd;
-
-		auto lineText = _t->_text.mid(_localFrom, extendedLineEnd - _localFrom);
-		auto lineStart = extendLeft;
-		auto lineLength = trimmedLineEnd - _lineStart;
-
-		if (elidedLine) {
-			initParagraphBidi();
-			prepareElidedLine(lineText, lineStart, lineLength, _endBlock);
-		}
-
-		auto x = _x;
-		if (_align & Qt::AlignHCenter) {
-			x += (_wLeft / 2).toInt();
-		} else if (((_align & Qt::AlignLeft) && _parDirection == Qt::RightToLeft) || ((_align & Qt::AlignRight) && _parDirection == Qt::LeftToRight)) {
-			x += _wLeft;
-		}
-
-		if (!_p) {
-			if (_lookupX < x) {
-				if (_lookupSymbol) {
-					if (_parDirection == Qt::RightToLeft) {
-						_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
-						_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
-//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
-					} else {
-						_lookupResult.symbol = _lineStart;
-						_lookupResult.afterSymbol = false;
-//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineStart > 0)) ? true : false;
-					}
-				}
-				if (_lookupLink) {
-					_lookupResult.link = nullptr;
-				}
-				_lookupResult.uponSymbol = false;
-				return false;
-			} else if (_lookupX >= x + (_w - _wLeft)) {
-				if (_parDirection == Qt::RightToLeft) {
-					_lookupResult.symbol = _lineStart;
-					_lookupResult.afterSymbol = false;
-//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineStart > 0)) ? true : false;
-				} else {
-					_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
-					_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
-//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
-				}
-				if (_lookupLink) {
-					_lookupResult.link = nullptr;
-				}
-				_lookupResult.uponSymbol = false;
-				return false;
-			}
-		}
-
-		if (_fullWidthSelection) {
-			const auto selectFromStart = (_selection.to > _lineStart)
-				&& (_lineStart > 0)
-				&& (_selection.from <= _lineStart);
-			const auto selectTillEnd = (_selection.to > trimmedLineEnd)
-				&& (trimmedLineEnd < _t->_text.size())
-				&& (_selection.from <= trimmedLineEnd)
-				&& (!_endBlock || _endBlock->type() != TextBlockTSkip);
-
-			if ((selectFromStart && _parDirection == Qt::LeftToRight)
-				|| (selectTillEnd && _parDirection == Qt::RightToLeft)) {
-				if (x > _x) {
-					fillSelectRange(_x, x);
-				}
-			}
-			if ((selectTillEnd && _parDirection == Qt::LeftToRight)
-				|| (selectFromStart && _parDirection == Qt::RightToLeft)) {
-				if (x < _x + _wLeft) {
-					fillSelectRange(x + _w - _wLeft, _x + _w);
-				}
-			}
-		}
-		if (trimmedLineEnd == _lineStart && !elidedLine) {
-			return true;
-		}
-
-		if (!elidedLine) initParagraphBidi(); // if was not inited
-
-		_f = _t->_st->font;
-		QStackTextEngine engine(lineText, _f->f);
-		engine.option.setTextDirection(_parDirection);
-		_e = &engine;
-
-		eItemize();
-
-		QScriptLine line;
-		line.from = lineStart;
-		line.length = lineLength;
-		eShapeLine(line);
-
-		int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
-		int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0;
-		if (!nItems) {
-			return true;
-		}
-
-		int skipIndex = -1;
-		QVarLengthArray<int> visualOrder(nItems);
-		QVarLengthArray<uchar> levels(nItems);
-		for (int i = 0; i < nItems; ++i) {
-			auto &si = engine.layoutData->items[firstItem + i];
-			while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
-				currentBlock = nextBlock;
-				nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-			}
-			auto _type = currentBlock->type();
-			if (_type == TextBlockTSkip) {
-				levels[i] = si.analysis.bidiLevel = 0;
-				skipIndex = i;
-			} else {
-				levels[i] = si.analysis.bidiLevel;
-			}
-			if (si.analysis.flags == QScriptAnalysis::Object) {
-				if (_type == TextBlockTEmoji
-					|| _type == TextBlockTCustomEmoji
-					|| _type == TextBlockTSkip) {
-					si.width = currentBlock->f_width()
-						+ (nextBlock == _endBlock && (!nextBlock || nextBlock->from() >= trimmedLineEnd)
-							? 0
-							: currentBlock->f_rpadding());
-				}
-			}
-		}
-		QTextEngine::bidiReorder(nItems, levels.data(), visualOrder.data());
-		if (style::RightToLeft() && skipIndex == nItems - 1) {
-			for (int32 i = nItems; i > 1;) {
-				--i;
-				visualOrder[i] = visualOrder[i - 1];
-			}
-			visualOrder[0] = skipIndex;
-		}
-
-		blockIndex = _lineStartBlock;
-		currentBlock = _t->_blocks[blockIndex].get();
-		nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-
-		int32 textY = _y + _yDelta + _t->_st->font->ascent, emojiY = (_t->_st->font->height - st::emojiSize) / 2;
-
-		applyBlockProperties(currentBlock);
-		for (int i = 0; i < nItems; ++i) {
-			int item = firstItem + visualOrder[i];
-			const QScriptItem &si = engine.layoutData->items.at(item);
-			bool rtl = (si.analysis.bidiLevel % 2);
-
-			while (blockIndex > _lineStartBlock + 1 && _t->_blocks[blockIndex - 1]->from() > _localFrom + si.position) {
-				nextBlock = currentBlock;
-				currentBlock = _t->_blocks[--blockIndex - 1].get();
-				applyBlockProperties(currentBlock);
-			}
-			while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
-				currentBlock = nextBlock;
-				nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-				applyBlockProperties(currentBlock);
-			}
-			if (si.analysis.flags >= QScriptAnalysis::TabOrObject) {
-				TextBlockType _type = currentBlock->type();
-				if (!_p && _lookupX >= x && _lookupX < x + si.width) { // _lookupRequest
-					if (_lookupLink) {
-						if (_lookupY >= _y + _yDelta && _lookupY < _y + _yDelta + _fontHeight) {
-							const auto spoilerLink = _t->spoilerLink(currentBlock->spoilerIndex());
-							const auto resultLink = (spoilerLink || !currentBlock->lnkIndex())
-								? spoilerLink
-								: _t->_links.at(currentBlock->lnkIndex() - 1);
-							if (resultLink) {
-								_lookupResult.link = resultLink;
-							}
-						}
-					}
-					if (_type != TextBlockTSkip) {
-						_lookupResult.uponSymbol = true;
-					}
-					if (_lookupSymbol) {
-						if (_type == TextBlockTSkip) {
-							if (_parDirection == Qt::RightToLeft) {
-								_lookupResult.symbol = _lineStart;
-								_lookupResult.afterSymbol = false;
-							} else {
-								_lookupResult.symbol = (trimmedLineEnd > _lineStart) ? (trimmedLineEnd - 1) : _lineStart;
-								_lookupResult.afterSymbol = (trimmedLineEnd > _lineStart) ? true : false;
-							}
-							return false;
-						}
-
-						// Emoji with spaces after symbol lookup
-						auto chFrom = _str + currentBlock->from();
-						auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
-						auto spacesWidth = (si.width - currentBlock->f_width());
-						auto spacesCount = 0;
-						while (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space) {
-							++spacesCount;
-							--chTo;
-						}
-						if (spacesCount > 0) { // Check if we're over a space.
-							if (rtl) {
-								if (_lookupX < x + spacesWidth) {
-									_lookupResult.symbol = (chTo - _str); // up to a space, included, rtl
-									_lookupResult.afterSymbol = (_lookupX < x + (spacesWidth / 2)) ? true : false;
-									return false;
-								}
-							} else if (_lookupX >= x + si.width - spacesWidth) {
-								_lookupResult.symbol = (chTo - _str); // up to a space, inclided, ltr
-								_lookupResult.afterSymbol = (_lookupX >= x + si.width - spacesWidth + (spacesWidth / 2)) ? true : false;
-								return false;
-							}
-						}
-						if (_lookupX < x + (rtl ? (si.width - currentBlock->f_width()) : 0) + (currentBlock->f_width() / 2)) {
-							_lookupResult.symbol = ((rtl && chTo > chFrom) ? (chTo - 1) : chFrom) - _str;
-							_lookupResult.afterSymbol = (rtl && chTo > chFrom) ? true : false;
-						} else {
-							_lookupResult.symbol = ((rtl || chTo <= chFrom) ? chFrom : (chTo - 1)) - _str;
-							_lookupResult.afterSymbol = (rtl || chTo <= chFrom) ? false : true;
-						}
-					}
-					return false;
-				} else if (_p && (_type == TextBlockTEmoji || _type == TextBlockTCustomEmoji)) {
-					auto glyphX = x;
-					auto spacesWidth = (si.width - currentBlock->f_width());
-					if (rtl) {
-						glyphX += spacesWidth;
-					}
-					struct {
-						QFixed from;
-						QFixed to;
-					} fillSelect;
-					struct {
-						QFixed from;
-						QFixed width;
-					} fillSpoiler;
-					if (_background.selectActiveBlock) {
-						fillSelect = { x, x + si.width };
-					} else if (_localFrom + si.position < _selection.to) {
-						auto chFrom = _str + currentBlock->from();
-						auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
-						if (_localFrom + si.position >= _selection.from) { // could be without space
-							if (chTo == chFrom || (chTo - 1)->unicode() != QChar::Space || _selection.to >= (chTo - _str)) {
-								fillSelect = { x, x + si.width };
-							} else { // or with space
-								fillSelect = { glyphX, glyphX + currentBlock->f_width() };
-							}
-						} else if (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space && (chTo - 1 - _str) >= _selection.from) {
-							if (rtl) { // rtl space only
-								fillSelect = { x, glyphX };
-							} else { // ltr space only
-								fillSelect = { x + currentBlock->f_width(), x + si.width };
-							}
-						}
-					}
-					const auto hasSpoiler = _background.color &&
-						(_background.inFront || _background.startMs);
-					if (hasSpoiler) {
-						fillSpoiler = { x, si.width };
-					}
-					const auto spoilerOpacity = hasSpoiler
-						? fillSpoilerOpacity()
-						: 0.;
-					const auto hasSelect = fillSelect.to != QFixed();
-					if (hasSelect) {
-						fillSelectRange(fillSelect.from, fillSelect.to);
-					}
-					const auto opacity = _p->opacity();
-					if (spoilerOpacity < 1.) {
-						if (hasSpoiler) {
-							_p->setOpacity(opacity * (1. - spoilerOpacity));
-						}
-						const auto x = (glyphX + st::emojiPadding).toInt();
-						const auto y = _y + _yDelta + emojiY;
-						if (_type == TextBlockTEmoji) {
-							Emoji::Draw(
-								*_p,
-								static_cast<const EmojiBlock*>(currentBlock)->_emoji,
-								Emoji::GetSizeNormal(),
-								x,
-								y);
-						} else if (const auto custom = static_cast<const CustomEmojiBlock*>(currentBlock)->_custom.get()) {
-							if (!_now) {
-								_now = crl::now();
-							}
-							if (!_customEmojiSize) {
-								_customEmojiSize = AdjustCustomEmojiSize(st::emojiSize);
-								_customEmojiSkip = (st::emojiSize - _customEmojiSize) / 2;
-							}
-							custom->paint(*_p, {
-								.preview = _textPalette->spoilerActiveBg->c,
-								.now = _now,
-								.position = { x + _customEmojiSkip, y + _customEmojiSkip },
-								.paused = _p->inactive(),
-							});
-						}
-					}
-					if (hasSpoiler) {
-						_p->setOpacity(opacity * spoilerOpacity);
-						fillSpoilerRange(
-							fillSpoiler.from,
-							fillSpoiler.width,
-							blockIndex,
-							currentBlock->from(),
-							(nextBlock ? nextBlock->from() : _t->_text.size()));
-						_p->setOpacity(opacity);
-					}
-//				} else if (_p && currentBlock->type() == TextBlockSkip) { // debug
-//					_p->fillRect(QRect(x.toInt(), _y, currentBlock->width(), static_cast<SkipBlock*>(currentBlock)->height()), QColor(0, 0, 0, 32));
-				}
-				x += si.width;
-				continue;
-			}
-
-			unsigned short *logClusters = engine.logClusters(&si);
-			QGlyphLayout glyphs = engine.shapedGlyphs(&si);
-
-			int itemStart = qMax(line.from, si.position), itemEnd;
-			int itemLength = engine.length(item);
-			int glyphsStart = logClusters[itemStart - si.position], glyphsEnd;
-			if (line.from + line.length < si.position + itemLength) {
-				itemEnd = line.from + line.length;
-				glyphsEnd = logClusters[itemEnd - si.position];
-			} else {
-				itemEnd = si.position + itemLength;
-				glyphsEnd = si.num_glyphs;
-			}
-
-			QFixed itemWidth = 0;
-			for (int g = glyphsStart; g < glyphsEnd; ++g)
-				itemWidth += glyphs.effectiveAdvance(g);
-
-			if (!_p && _lookupX >= x && _lookupX < x + itemWidth) { // _lookupRequest
-				if (_lookupLink) {
-					if (_lookupY >= _y + _yDelta && _lookupY < _y + _yDelta + _fontHeight) {
-						const auto spoilerLink = _t->spoilerLink(currentBlock->spoilerIndex());
-						const auto resultLink = (spoilerLink || !currentBlock->lnkIndex())
-							? spoilerLink
-							: _t->_links.at(currentBlock->lnkIndex() - 1);
-						if (resultLink) {
-							_lookupResult.link = resultLink;
-						}
-					}
-				}
-				_lookupResult.uponSymbol = true;
-				if (_lookupSymbol) {
-					QFixed tmpx = rtl ? (x + itemWidth) : x;
-					for (int ch = 0, g, itemL = itemEnd - itemStart; ch < itemL;) {
-						g = logClusters[itemStart - si.position + ch];
-						QFixed gwidth = glyphs.effectiveAdvance(g);
-						// ch2 - glyph end, ch - glyph start, (ch2 - ch) - how much chars it takes
-						int ch2 = ch + 1;
-						while ((ch2 < itemL) && (g == logClusters[itemStart - si.position + ch2])) {
-							++ch2;
-						}
-						for (int charsCount = (ch2 - ch); ch < ch2; ++ch) {
-							QFixed shift1 = QFixed(2 * (charsCount - (ch2 - ch)) + 2) * gwidth / QFixed(2 * charsCount),
-								shift2 = QFixed(2 * (charsCount - (ch2 - ch)) + 1) * gwidth / QFixed(2 * charsCount);
-							if ((rtl && _lookupX >= tmpx - shift1) ||
-								(!rtl && _lookupX < tmpx + shift1)) {
-								_lookupResult.symbol = _localFrom + itemStart + ch;
-								if ((rtl && _lookupX >= tmpx - shift2) ||
-									(!rtl && _lookupX < tmpx + shift2)) {
-									_lookupResult.afterSymbol = false;
-								} else {
-									_lookupResult.afterSymbol = true;
-								}
-								return false;
-							}
-						}
-						if (rtl) {
-							tmpx -= gwidth;
-						} else {
-							tmpx += gwidth;
-						}
-					}
-					if (itemEnd > itemStart) {
-						_lookupResult.symbol = _localFrom + itemEnd - 1;
-						_lookupResult.afterSymbol = true;
-					} else {
-						_lookupResult.symbol = _localFrom + itemStart;
-						_lookupResult.afterSymbol = false;
-					}
-				}
-				return false;
-			} else if (_p) {
-				QTextItemInt gf;
-				gf.glyphs = glyphs.mid(glyphsStart, glyphsEnd - glyphsStart);
-				gf.f = &_e->fnt;
-				gf.chars = engine.layoutData->string.unicode() + itemStart;
-				gf.num_chars = itemEnd - itemStart;
-				gf.fontEngine = engine.fontEngine(si);
-				gf.logClusters = logClusters + itemStart - si.position;
-				gf.width = itemWidth;
-				gf.justified = false;
-				InitTextItemWithScriptItem(gf, si);
-
-				auto hasSelected = false;
-				auto hasNotSelected = true;
-				auto selectedRect = QRect();
-				if (_background.selectActiveBlock) {
-					fillSelectRange(x, x + itemWidth);
-				} else if (_localFrom + itemStart < _selection.to && _localFrom + itemEnd > _selection.from) {
-					hasSelected = true;
-					auto selX = x;
-					auto selWidth = itemWidth;
-					if (_localFrom + itemStart >= _selection.from && _localFrom + itemEnd <= _selection.to) {
-						hasNotSelected = false;
-					} else {
-						selWidth = 0;
-						int itemL = itemEnd - itemStart;
-						int selStart = _selection.from - (_localFrom + itemStart), selEnd = _selection.to - (_localFrom + itemStart);
-						if (selStart < 0) selStart = 0;
-						if (selEnd > itemL) selEnd = itemL;
-						for (int ch = 0, g; ch < selEnd;) {
-							g = logClusters[itemStart - si.position + ch];
-							QFixed gwidth = glyphs.effectiveAdvance(g);
-							// ch2 - glyph end, ch - glyph start, (ch2 - ch) - how much chars it takes
-							int ch2 = ch + 1;
-							while ((ch2 < itemL) && (g == logClusters[itemStart - si.position + ch2])) {
-								++ch2;
-							}
-							if (ch2 <= selStart) {
-								selX += gwidth;
-							} else if (ch >= selStart && ch2 <= selEnd) {
-								selWidth += gwidth;
-							} else {
-								int sStart = ch, sEnd = ch2;
-								if (ch < selStart) {
-									sStart = selStart;
-									selX += QFixed(sStart - ch) * gwidth / QFixed(ch2 - ch);
-								}
-								if (ch2 >= selEnd) {
-									sEnd = selEnd;
-									selWidth += QFixed(sEnd - sStart) * gwidth / QFixed(ch2 - ch);
-									break;
-								}
-								selWidth += QFixed(sEnd - sStart) * gwidth / QFixed(ch2 - ch);
-							}
-							ch = ch2;
-						}
-					}
-					if (rtl) selX = x + itemWidth - (selX - x) - selWidth;
-					selectedRect = QRect(selX.toInt(), _y + _yDelta, (selX + selWidth).toInt() - selX.toInt(), _fontHeight);
-					fillSelectRange(selX, selX + selWidth);
-				}
-				const auto hasSpoiler = (_background.inFront || _background.startMs);
-				const auto spoilerOpacity = hasSpoiler
-					? fillSpoilerOpacity()
-					: 0.;
-				const auto opacity = _p->opacity();
-				const auto isElidedBlock = (!rtl)
-					&& (_indexOfElidedBlock == blockIndex);
-				if ((spoilerOpacity < 1.) || isElidedBlock) {
-					if (hasSpoiler && !isElidedBlock) {
-						_p->setOpacity(opacity * (1. - spoilerOpacity));
-					}
-					if (Q_UNLIKELY(hasSelected)) {
-						if (Q_UNLIKELY(hasNotSelected)) {
-							// There is a bug in retina QPainter clipping stack.
-							// You can see glitches in rendering in such text:
-							// aA
-							// Aa
-							// Where selection is both 'A'-s.
-							// I can't debug it right now, this is a workaround.
-#ifdef Q_OS_MAC
-							_p->save();
-#endif // Q_OS_MAC
-							const auto clippingEnabled = _p->hasClipping();
-							const auto clippingRegion = _p->clipRegion();
-							_p->setClipRect(selectedRect, Qt::IntersectClip);
-							_p->setPen(*_currentPenSelected);
-							_p->drawTextItem(QPointF(x.toReal(), textY), gf);
-							const auto externalClipping = clippingEnabled
-								? clippingRegion
-								: QRegion(QRect(
-									(_x - _w).toInt(),
-									_y - _lineHeight,
-									(_x + 2 * _w).toInt(),
-									_y + 2 * _lineHeight));
-							_p->setClipRegion(externalClipping - selectedRect);
-							_p->setPen(*_currentPen);
-							_p->drawTextItem(QPointF(x.toReal(), textY), gf);
-#ifdef Q_OS_MAC
-							_p->restore();
-#else // Q_OS_MAC
-							if (clippingEnabled) {
-								_p->setClipRegion(clippingRegion);
-							} else {
-								_p->setClipping(false);
-							}
-#endif // Q_OS_MAC
-						} else {
-							_p->setPen(*_currentPenSelected);
-							_p->drawTextItem(QPointF(x.toReal(), textY), gf);
-						}
-					} else {
-						_p->setPen(*_currentPen);
-						_p->drawTextItem(QPointF(x.toReal(), textY), gf);
-					}
-				}
-
-				if (hasSpoiler) {
-					_p->setOpacity(opacity * spoilerOpacity);
-					fillSpoilerRange(
-						x,
-						itemWidth,
-						blockIndex,
-						_localFrom + itemStart,
-						_localFrom + itemEnd);
-					_p->setOpacity(opacity);
-				}
-			}
-
-			x += itemWidth;
-		}
-		return true;
-	}
-	void fillSelectRange(QFixed from, QFixed to) {
-		auto left = from.toInt();
-		auto width = to.toInt() - left;
-		_p->fillRect(left, _y + _yDelta, width, _fontHeight, _textPalette->selectBg);
-	}
-
-	float fillSpoilerOpacity() {
-		if (!_background.startMs) {
-			return 1.;
-		}
-		if (!_now) {
-			_now = crl::now();
-		}
-		const auto progress = float64(_now - _background.startMs)
-			/ st::fadeWrapDuration;
-		if ((progress > 1.) && _background.spoilerIndex && _t->_spoiler) {
-			const auto link = _t->_spoiler->links.at(
-				_background.spoilerIndex - 1);
-			if (link) {
-				link->setStartMs(0);
-			}
-		}
-		return (1. - std::min(progress, 1.));
-	}
-
-	void fillSpoilerRange(
-			QFixed x,
-			QFixed width,
-			int currentBlockIndex,
-			int positionFrom,
-			int positionTill) {
-		if (!_background.color) {
-			return;
-		}
-		if (!_t->_spoiler) {
-			return;
-		}
-		const auto elideOffset = (_indexOfElidedBlock == currentBlockIndex)
-			? (_elideRemoveFromEnd + _f->elidew)
-			: 0;
-
-		const auto parts = [&] {
-			const auto blockIndex = currentBlockIndex - 1;
-			const auto block = _t->_blocks[blockIndex].get();
-			const auto nextBlock = (blockIndex + 1 < _t->_blocks.size())
-				? _t->_blocks[blockIndex + 1].get()
-				: nullptr;
-			const auto blockEnd = nextBlock ? nextBlock->from() : _t->_text.size();
-			const auto now = block->spoilerIndex();
-			const auto was = (positionFrom > block->from())
-				? now
-				: (blockIndex > 0)
-				? _t->_blocks[blockIndex - 1]->spoilerIndex()
-				: 0;
-			const auto will = elideOffset
-				? 0
-				: (positionTill < blockEnd)
-				? now
-				: nextBlock
-				? nextBlock->spoilerIndex()
-				: 0;
-			return RectPart::None
-				| ((now != was) ? (RectPart::FullLeft) : RectPart::None)
-				| ((now != will) ? (RectPart::FullRight) : RectPart::None);
-		}();
-		const auto hasLeft = (parts & RectPart::Left) != 0;
-		const auto hasRight = (parts & RectPart::Right) != 0;
-
-		const auto &cache = _background.inFront
-			? _t->_spoiler->spoilerCache
-			: _t->_spoiler->spoilerShownCache;
-		const auto cornerWidth = cache.corners[0].width()
-			/ style::DevicePixelRatio();
-		const auto useWidth = ((x + width).toInt() - x.toInt()) - elideOffset;
-		const auto rect = QRect(
-			x.toInt(),
-			_y + _yDelta,
-			std::max(
-				useWidth,
-				(hasRight ? cornerWidth : 0) + (hasLeft ? cornerWidth : 0)),
-			_fontHeight);
-		if (!rect.isValid()) {
-			return;
-		}
-
-		if (parts != RectPart::None) {
-			DrawRoundedRect(
-				*_p,
-				rect,
-				*_background.color,
-				cache.corners,
-				parts);
-		}
-		_p->fillRect(
-			rect.left() + (hasLeft ? cornerWidth : 0),
-			rect.top(),
-			rect.width()
-				- (hasRight ? cornerWidth : 0)
-				- (hasLeft ? cornerWidth : 0),
-			rect.height(),
-			*_background.color);
-	}
-
-	void elideSaveBlock(int32 blockIndex, const AbstractBlock *&_endBlock, int32 elideStart, int32 elideWidth) {
-		if (_elideSavedBlock) {
-			restoreAfterElided();
-		}
-
-		_elideSavedIndex = blockIndex;
-		auto mutableText = const_cast<String*>(_t);
-		_elideSavedBlock = std::move(mutableText->_blocks[blockIndex]);
-		mutableText->_blocks[blockIndex] = Block::Text(_t->_st->font, _t->_text, QFIXED_MAX, elideStart, 0, (*_elideSavedBlock)->flags(), (*_elideSavedBlock)->lnkIndex(), (*_elideSavedBlock)->spoilerIndex());
-		_blocksSize = blockIndex + 1;
-		_endBlock = (blockIndex + 1 < _t->_blocks.size() ? _t->_blocks[blockIndex + 1].get() : nullptr);
-	}
-
-	void setElideBidi(int32 elideStart, int32 elideLen) {
-		int32 newParLength = elideStart + elideLen - _parStart;
-		if (newParLength > _parAnalysis.size()) {
-			_parAnalysis.resize(newParLength);
-		}
-		for (int32 i = elideLen; i > 0; --i) {
-			_parAnalysis[newParLength - i].bidiLevel = (_parDirection == Qt::RightToLeft) ? 1 : 0;
-		}
-	}
-
-	void prepareElidedLine(QString &lineText, int32 lineStart, int32 &lineLength, const AbstractBlock *&_endBlock, int repeat = 0) {
-		_f = _t->_st->font;
-		QStackTextEngine engine(lineText, _f->f);
-		engine.option.setTextDirection(_parDirection);
-		_e = &engine;
-
-		eItemize();
-
-		auto blockIndex = _lineStartBlock;
-		auto currentBlock = _t->_blocks[blockIndex].get();
-		auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-
-		QScriptLine line;
-		line.from = lineStart;
-		line.length = lineLength;
-		eShapeLine(line);
-
-		auto elideWidth = _f->elidew;
-		_wLeft = _w - elideWidth - _elideRemoveFromEnd;
-
-		int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
-		int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0, i;
-
-		for (i = 0; i < nItems; ++i) {
-			QScriptItem &si(engine.layoutData->items[firstItem + i]);
-			while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
-				currentBlock = nextBlock;
-				nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-			}
-			TextBlockType _type = currentBlock->type();
-			if (si.analysis.flags == QScriptAnalysis::Object) {
-				if (_type == TextBlockTEmoji
-					|| _type == TextBlockTCustomEmoji
-					|| _type == TextBlockTSkip) {
-					si.width = currentBlock->f_width() + currentBlock->f_rpadding();
-				}
-			}
-			if (_type == TextBlockTEmoji
-				|| _type == TextBlockTCustomEmoji
-				|| _type == TextBlockTSkip
-				|| _type == TextBlockTNewline) {
-				if (_wLeft < si.width) {
-					lineText = lineText.mid(0, currentBlock->from() - _localFrom) + kQEllipsis;
-					lineLength = currentBlock->from() + kQEllipsis.size() - _lineStart;
-					_selection.to = qMin(_selection.to, currentBlock->from());
-					_indexOfElidedBlock = blockIndex + (nextBlock ? 1 : 0);
-					setElideBidi(currentBlock->from(), kQEllipsis.size());
-					elideSaveBlock(blockIndex - 1, _endBlock, currentBlock->from(), elideWidth);
-					return;
-				}
-				_wLeft -= si.width;
-			} else if (_type == TextBlockTText) {
-				unsigned short *logClusters = engine.logClusters(&si);
-				QGlyphLayout glyphs = engine.shapedGlyphs(&si);
-
-				int itemStart = qMax(line.from, si.position), itemEnd;
-				int itemLength = engine.length(firstItem + i);
-				int glyphsStart = logClusters[itemStart - si.position], glyphsEnd;
-				if (line.from + line.length < si.position + itemLength) {
-					itemEnd = line.from + line.length;
-					glyphsEnd = logClusters[itemEnd - si.position];
-				} else {
-					itemEnd = si.position + itemLength;
-					glyphsEnd = si.num_glyphs;
-				}
-
-				for (auto g = glyphsStart; g < glyphsEnd; ++g) {
-					auto adv = glyphs.effectiveAdvance(g);
-					if (_wLeft < adv) {
-						auto pos = itemStart;
-						while (pos < itemEnd && logClusters[pos - si.position] < g) {
-							++pos;
-						}
-
-						if (lineText.size() <= pos || repeat > 3) {
-							lineText += kQEllipsis;
-							lineLength = _localFrom + pos + kQEllipsis.size() - _lineStart;
-							_selection.to = qMin(_selection.to, uint16(_localFrom + pos));
-							_indexOfElidedBlock = blockIndex + (nextBlock ? 1 : 0);
-							setElideBidi(_localFrom + pos, kQEllipsis.size());
-							_blocksSize = blockIndex;
-							_endBlock = nextBlock;
-						} else {
-							lineText = lineText.mid(0, pos);
-							lineLength = _localFrom + pos - _lineStart;
-							_blocksSize = blockIndex;
-							_endBlock = nextBlock;
-							prepareElidedLine(lineText, lineStart, lineLength, _endBlock, repeat + 1);
-						}
-						return;
-					} else {
-						_wLeft -= adv;
-					}
-				}
-			}
-		}
-
-		int32 elideStart = _localFrom + lineText.size();
-		_selection.to = qMin(_selection.to, uint16(elideStart));
-		_indexOfElidedBlock = blockIndex + (nextBlock ? 1 : 0);
-		setElideBidi(elideStart, kQEllipsis.size());
-
-		lineText += kQEllipsis;
-		lineLength += kQEllipsis.size();
-
-		if (!repeat) {
-			for (; blockIndex < _blocksSize && _t->_blocks[blockIndex].get() != _endBlock && _t->_blocks[blockIndex]->from() < elideStart; ++blockIndex) {
-			}
-			if (blockIndex < _blocksSize) {
-				elideSaveBlock(blockIndex, _endBlock, elideStart, elideWidth);
-			}
-		}
-	}
-
-	void restoreAfterElided() {
-		if (_elideSavedBlock) {
-			const_cast<String*>(_t)->_blocks[_elideSavedIndex] = std::move(*_elideSavedBlock);
-		}
-	}
-
-	// COPIED FROM qtextengine.cpp AND MODIFIED
-	void eShapeLine(const QScriptLine &line) {
-		int item = _e->findItem(line.from);
-		if (item == -1)
-			return;
-
-		auto end = _e->findItem(line.from + line.length - 1, item);
-		auto blockIndex = _lineStartBlock;
-		auto currentBlock = _t->_blocks[blockIndex].get();
-		auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-		eSetFont(currentBlock);
-		for (; item <= end; ++item) {
-			QScriptItem &si = _e->layoutData->items[item];
-			while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
-				currentBlock = nextBlock;
-				nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-				eSetFont(currentBlock);
-			}
-			_e->shape(item);
-		}
-	}
-
-	style::font applyFlags(int32 flags, const style::font &f) {
-		if (!flags) {
-			return f;
-		}
-		auto result = f;
-		if (IsMono(flags)) {
-			result = result->monospace();
-		} else {
-			if (flags & TextBlockFBold) {
-				result = result->bold();
-			} else if (flags & TextBlockFSemibold) {
-				result = result->semibold();
-			}
-			if (flags & TextBlockFItalic) result = result->italic();
-			if (flags & TextBlockFUnderline) result = result->underline();
-			if (flags & TextBlockFStrikeOut) result = result->strikeout();
-			if (flags & TextBlockFTilde) { // tilde fix in OpenSans
-				result = result->semibold();
-			}
-		}
-		return result;
-	}
-
-	void eSetFont(const AbstractBlock *block) {
-		const auto flags = block->flags();
-		const auto usedFont = [&] {
-			if (const auto index = block->lnkIndex()) {
-				const auto active = ClickHandler::showAsActive(
-					_t->_links.at(index - 1)
-				) || (_textPalette && _textPalette->linkAlwaysActive > 0);
-				return active
-					? _t->_st->linkFontOver
-					: _t->_st->linkFont;
-			}
-			return _t->_st->font;
-		}();
-		const auto newFont = applyFlags(flags, usedFont);
-		if (newFont != _f) {
-			_f = (newFont->family() == _t->_st->font->family())
-				? applyFlags(flags | newFont->flags(), _t->_st->font)
-				: newFont;
-			_e->fnt = _f->f;
-			_e->resetFontEngineCache();
-		}
-	}
-
-	void eItemize() {
-		_e->validate();
-		if (_e->layoutData->items.size())
-			return;
-
-		int length = _e->layoutData->string.length();
-		if (!length)
-			return;
-
-		const ushort *string = reinterpret_cast<const ushort*>(_e->layoutData->string.unicode());
-
-		auto blockIndex = _lineStartBlock;
-		auto currentBlock = _t->_blocks[blockIndex].get();
-		auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-
-		_e->layoutData->hasBidi = _parHasBidi;
-		auto analysis = _parAnalysis.data() + (_localFrom - _parStart);
-
-		{
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-			QUnicodeTools::ScriptItemArray scriptItems;
-			QUnicodeTools::initScripts(_e->layoutData->string, &scriptItems);
-			for (int i = 0; i < scriptItems.length(); ++i) {
-				const auto &item = scriptItems.at(i);
-				int end = i < scriptItems.length() - 1 ? scriptItems.at(i + 1).position : length;
-				for (int j = item.position; j < end; ++j)
-					analysis[j].script = item.script;
-			}
-#else // Qt >= 6.0.0
-			QVarLengthArray<uchar> scripts(length);
-			QUnicodeTools::initScripts(string, length, scripts.data());
-			for (int i = 0; i < length; ++i)
-				analysis[i].script = scripts.at(i);
-#endif // Qt < 6.0.0
-		}
-
-		blockIndex = _lineStartBlock;
-		currentBlock = _t->_blocks[blockIndex].get();
-		nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-
-		auto start = string;
-		auto end = start + length;
-		while (start < end) {
-			while (nextBlock && nextBlock->from() <= _localFrom + (start - string)) {
-				currentBlock = nextBlock;
-				nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-			}
-			auto _type = currentBlock->type();
-			if (_type == TextBlockTEmoji
-				|| _type == TextBlockTCustomEmoji
-				|| _type == TextBlockTSkip) {
-				analysis->script = QChar::Script_Common;
-				analysis->flags = QScriptAnalysis::Object;
-			} else {
-				analysis->flags = QScriptAnalysis::None;
-			}
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-			analysis->script = hbscript_to_script(script_to_hbscript(analysis->script)); // retain the old behavior
-#endif // Qt < 6.0.0
-			++start;
-			++analysis;
-		}
-
-		{
-			auto i_string = &_e->layoutData->string;
-			auto i_analysis = _parAnalysis.data() + (_localFrom - _parStart);
-			auto i_items = &_e->layoutData->items;
-
-			blockIndex = _lineStartBlock;
-			currentBlock = _t->_blocks[blockIndex].get();
-			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-			auto startBlock = currentBlock;
-
-			if (!length) {
-				return;
-			}
-			auto start = 0;
-			auto end = start + length;
-			for (int i = start + 1; i < end; ++i) {
-				while (nextBlock && nextBlock->from() <= _localFrom + i) {
-					currentBlock = nextBlock;
-					nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
-				}
-				// According to the unicode spec we should be treating characters in the Common script
-				// (punctuation, spaces, etc) as being the same script as the surrounding text for the
-				// purpose of splitting up text. This is important because, for example, a fullstop
-				// (0x2E) can be used to indicate an abbreviation and so must be treated as part of a
-				// word.  Thus it must be passed along with the word in languages that have to calculate
-				// word breaks.  For example the thai word "ครม." has no word breaks but the word "ครม"
-				// does.
-				// Unfortuntely because we split up the strings for both wordwrapping and for setting
-				// the font and because Japanese and Chinese are also aliases of the script "Common",
-				// doing this would break too many things.  So instead we only pass the full stop
-				// along, and nothing else.
-				if (currentBlock == startBlock
-					&& i_analysis[i].bidiLevel == i_analysis[start].bidiLevel
-					&& i_analysis[i].flags == i_analysis[start].flags
-					&& (i_analysis[i].script == i_analysis[start].script || i_string->at(i) == QLatin1Char('.'))
-//					&& i_analysis[i].flags < QScriptAnalysis::SpaceTabOrObject // only emojis are objects here, no tabs
-					&& i - start < _MaxItemLength)
-					continue;
-				i_items->append(QScriptItem(start, i_analysis[start]));
-				start = i;
-				startBlock = currentBlock;
-			}
-			i_items->append(QScriptItem(start, i_analysis[start]));
-		}
-	}
-
-	QChar::Direction eSkipBoundryNeutrals(QScriptAnalysis *analysis,
-											const ushort *unicode,
-											int &sor, int &eor, BidiControl &control,
-											String::TextBlocks::const_iterator i) {
-		String::TextBlocks::const_iterator e = _t->_blocks.cend(), n = i + 1;
-
-		QChar::Direction dir = control.basicDirection();
-		int level = sor > 0 ? analysis[sor - 1].bidiLevel : control.level;
-		while (sor <= _parLength) {
-			while (i != _parStartBlock && (*i)->from() > _parStart + sor) {
-				n = i;
-				--i;
-			}
-			while (n != e && (*n)->from() <= _parStart + sor) {
-				i = n;
-				++n;
-			}
-
-			TextBlockType _itype = (*i)->type();
-			if (eor == _parLength)
-				dir = control.basicDirection();
-			else if (_itype == TextBlockTEmoji
-				|| _itype == TextBlockTCustomEmoji)
-				dir = QChar::DirCS;
-			else if (_itype == TextBlockTSkip)
-				dir = QChar::DirCS;
-			else
-				dir = QChar::direction(unicode[sor]);
-			// Keep skipping DirBN as if it doesn't exist
-			if (dir != QChar::DirBN)
-				break;
-			analysis[sor++].bidiLevel = level;
-		}
-
-		eor = sor;
-
-		return dir;
-	}
-
-	// creates the next QScript items.
-	bool eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
-		bool rightToLeft = (control.basicDirection() == 1);
-		bool hasBidi = rightToLeft;
-
-		int sor = 0;
-		int eor = -1;
-
-		const ushort *unicode = reinterpret_cast<const ushort*>(_t->_text.unicode()) + _parStart;
-		int current = 0;
-
-		QChar::Direction dir = rightToLeft ? QChar::DirR : QChar::DirL;
-		BidiStatus status;
-
-		String::TextBlocks::const_iterator i = _parStartBlock, e = _t->_blocks.cend(), n = i + 1;
-
-		QChar::Direction sdir;
-		TextBlockType _stype = (*_parStartBlock)->type();
-		if (_stype == TextBlockTEmoji || _stype == TextBlockTCustomEmoji)
-			sdir = QChar::DirCS;
-		else if (_stype == TextBlockTSkip)
-			sdir = QChar::DirCS;
-		else
-			sdir = QChar::direction(*unicode);
-		if (sdir != QChar::DirL && sdir != QChar::DirR && sdir != QChar::DirEN && sdir != QChar::DirAN)
-			sdir = QChar::DirON;
-		else
-			dir = QChar::DirON;
-
-		status.eor = sdir;
-		status.lastStrong = rightToLeft ? QChar::DirR : QChar::DirL;
-		status.last = status.lastStrong;
-		status.dir = sdir;
-
-		while (current <= _parLength) {
-			while (n != e && (*n)->from() <= _parStart + current) {
-				i = n;
-				++n;
-			}
-
-			QChar::Direction dirCurrent;
-			TextBlockType _itype = (*i)->type();
-			if (current == (int)_parLength)
-				dirCurrent = control.basicDirection();
-			else if (_itype == TextBlockTEmoji
-				|| _itype == TextBlockTCustomEmoji)
-				dirCurrent = QChar::DirCS;
-			else if (_itype == TextBlockTSkip)
-				dirCurrent = QChar::DirCS;
-			else
-				dirCurrent = QChar::direction(unicode[current]);
-
-			switch (dirCurrent) {
-
-				// embedding and overrides (X1-X9 in the BiDi specs)
-			case QChar::DirRLE:
-			case QChar::DirRLO:
-			case QChar::DirLRE:
-			case QChar::DirLRO:
-				{
-					bool rtl = (dirCurrent == QChar::DirRLE || dirCurrent == QChar::DirRLO);
-					hasBidi |= rtl;
-					bool override = (dirCurrent == QChar::DirLRO || dirCurrent == QChar::DirRLO);
-
-					unsigned int level = control.level+1;
-					if ((level%2 != 0) == rtl) ++level;
-					if (level < _MaxBidiLevel) {
-						eor = current-1;
-						eAppendItems(analysis, sor, eor, control, dir);
-						eor = current;
-						control.embed(rtl, override);
-						QChar::Direction edir = (rtl ? QChar::DirR : QChar::DirL);
-						dir = status.eor = edir;
-						status.lastStrong = edir;
-					}
-					break;
-				}
-			case QChar::DirPDF:
-				{
-					if (control.canPop()) {
-						if (dir != control.direction()) {
-							eor = current-1;
-							eAppendItems(analysis, sor, eor, control, dir);
-							dir = control.direction();
-						}
-						eor = current;
-						eAppendItems(analysis, sor, eor, control, dir);
-						control.pdf();
-						dir = QChar::DirON; status.eor = QChar::DirON;
-						status.last = control.direction();
-						if (control.override)
-							dir = control.direction();
-						else
-							dir = QChar::DirON;
-						status.lastStrong = control.direction();
-					}
-					break;
-				}
-
-				// strong types
-			case QChar::DirL:
-				if(dir == QChar::DirON)
-					dir = QChar::DirL;
-				switch(status.last)
-					{
-					case QChar::DirL:
-						eor = current; status.eor = QChar::DirL; break;
-					case QChar::DirR:
-					case QChar::DirAL:
-					case QChar::DirEN:
-					case QChar::DirAN:
-						if (eor >= 0) {
-							eAppendItems(analysis, sor, eor, control, dir);
-							status.eor = dir = eSkipBoundryNeutrals(analysis, unicode, sor, eor, control, i);
-						} else {
-							eor = current; status.eor = dir;
-						}
-						break;
-					case QChar::DirES:
-					case QChar::DirET:
-					case QChar::DirCS:
-					case QChar::DirBN:
-					case QChar::DirB:
-					case QChar::DirS:
-					case QChar::DirWS:
-					case QChar::DirON:
-						if(dir != QChar::DirL) {
-							//last stuff takes embedding dir
-							if(control.direction() == QChar::DirR) {
-								if(status.eor != QChar::DirR) {
-									// AN or EN
-									eAppendItems(analysis, sor, eor, control, dir);
-									status.eor = QChar::DirON;
-									dir = QChar::DirR;
-								}
-								eor = current - 1;
-								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = dir = eSkipBoundryNeutrals(analysis, unicode, sor, eor, control, i);
-							} else {
-								if(status.eor != QChar::DirL) {
-									eAppendItems(analysis, sor, eor, control, dir);
-									status.eor = QChar::DirON;
-									dir = QChar::DirL;
-								} else {
-									eor = current; status.eor = QChar::DirL; break;
-								}
-							}
-						} else {
-							eor = current; status.eor = QChar::DirL;
-						}
-					default:
-						break;
-					}
-				status.lastStrong = QChar::DirL;
-				break;
-			case QChar::DirAL:
-			case QChar::DirR:
-				hasBidi = true;
-				if(dir == QChar::DirON) dir = QChar::DirR;
-				switch(status.last)
-					{
-					case QChar::DirL:
-					case QChar::DirEN:
-					case QChar::DirAN:
-						if (eor >= 0)
-							eAppendItems(analysis, sor, eor, control, dir);
-						// fall through
-					case QChar::DirR:
-					case QChar::DirAL:
-						dir = QChar::DirR; eor = current; status.eor = QChar::DirR; break;
-					case QChar::DirES:
-					case QChar::DirET:
-					case QChar::DirCS:
-					case QChar::DirBN:
-					case QChar::DirB:
-					case QChar::DirS:
-					case QChar::DirWS:
-					case QChar::DirON:
-						if(status.eor != QChar::DirR && status.eor != QChar::DirAL) {
-							//last stuff takes embedding dir
-							if(control.direction() == QChar::DirR
-							   || status.lastStrong == QChar::DirR || status.lastStrong == QChar::DirAL) {
-								eAppendItems(analysis, sor, eor, control, dir);
-								dir = QChar::DirR; status.eor = QChar::DirON;
-								eor = current;
-							} else {
-								eor = current - 1;
-								eAppendItems(analysis, sor, eor, control, dir);
-								dir = QChar::DirR; status.eor = QChar::DirON;
-							}
-						} else {
-							eor = current; status.eor = QChar::DirR;
-						}
-					default:
-						break;
-					}
-				status.lastStrong = dirCurrent;
-				break;
-
-				// weak types:
-
-			case QChar::DirNSM:
-				if (eor == current-1)
-					eor = current;
-				break;
-			case QChar::DirEN:
-				// if last strong was AL change EN to AN
-				if(status.lastStrong != QChar::DirAL) {
-					if(dir == QChar::DirON) {
-						if(status.lastStrong == QChar::DirL)
-							dir = QChar::DirL;
-						else
-							dir = QChar::DirEN;
-					}
-					switch(status.last)
-						{
-						case QChar::DirET:
-							if (status.lastStrong == QChar::DirR || status.lastStrong == QChar::DirAL) {
-								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = QChar::DirON;
-								dir = QChar::DirAN;
-							}
-							[[fallthrough]];
-						case QChar::DirEN:
-						case QChar::DirL:
-							eor = current;
-							status.eor = dirCurrent;
-							break;
-						case QChar::DirR:
-						case QChar::DirAL:
-						case QChar::DirAN:
-							if (eor >= 0)
-								eAppendItems(analysis, sor, eor, control, dir);
-							else
-								eor = current;
-							status.eor = QChar::DirEN;
-							dir = QChar::DirAN;
-							break;
-						case QChar::DirES:
-						case QChar::DirCS:
-							if(status.eor == QChar::DirEN || dir == QChar::DirAN) {
-								eor = current; break;
-							}
-							[[fallthrough]];
-						case QChar::DirBN:
-						case QChar::DirB:
-						case QChar::DirS:
-						case QChar::DirWS:
-						case QChar::DirON:
-							if(status.eor == QChar::DirR) {
-								// neutrals go to R
-								eor = current - 1;
-								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = QChar::DirEN;
-								dir = QChar::DirAN;
-							}
-							else if(status.eor == QChar::DirL ||
-									 (status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
-								eor = current; status.eor = dirCurrent;
-							} else {
-								// numbers on both sides, neutrals get right to left direction
-								if(dir != QChar::DirL) {
-									eAppendItems(analysis, sor, eor, control, dir);
-									status.eor = QChar::DirON;
-									eor = current - 1;
-									dir = QChar::DirR;
-									eAppendItems(analysis, sor, eor, control, dir);
-									status.eor = QChar::DirON;
-									dir = QChar::DirAN;
-								} else {
-									eor = current; status.eor = dirCurrent;
-								}
-							}
-							[[fallthrough]];
-						default:
-							break;
-						}
-					break;
-				}
-				[[fallthrough]];
-			case QChar::DirAN:
-				hasBidi = true;
-				dirCurrent = QChar::DirAN;
-				if(dir == QChar::DirON) dir = QChar::DirAN;
-				switch(status.last)
-					{
-					case QChar::DirL:
-					case QChar::DirAN:
-						eor = current; status.eor = QChar::DirAN;
-						break;
-					case QChar::DirR:
-					case QChar::DirAL:
-					case QChar::DirEN:
-						if (eor >= 0){
-							eAppendItems(analysis, sor, eor, control, dir);
-						} else {
-							eor = current;
-						}
-						dir = QChar::DirAN; status.eor = QChar::DirAN;
-						break;
-					case QChar::DirCS:
-						if(status.eor == QChar::DirAN) {
-							eor = current; break;
-						}
-						[[fallthrough]];
-					case QChar::DirES:
-					case QChar::DirET:
-					case QChar::DirBN:
-					case QChar::DirB:
-					case QChar::DirS:
-					case QChar::DirWS:
-					case QChar::DirON:
-						if(status.eor == QChar::DirR) {
-							// neutrals go to R
-							eor = current - 1;
-							eAppendItems(analysis, sor, eor, control, dir);
-							status.eor = QChar::DirAN;
-							dir = QChar::DirAN;
-						} else if(status.eor == QChar::DirL ||
-								   (status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
-							eor = current; status.eor = dirCurrent;
-						} else {
-							// numbers on both sides, neutrals get right to left direction
-							if(dir != QChar::DirL) {
-								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = QChar::DirON;
-								eor = current - 1;
-								dir = QChar::DirR;
-								eAppendItems(analysis, sor, eor, control, dir);
-								status.eor = QChar::DirAN;
-								dir = QChar::DirAN;
-							} else {
-								eor = current; status.eor = dirCurrent;
-							}
-						}
-						[[fallthrough]];
-					default:
-						break;
-					}
-				break;
-			case QChar::DirES:
-			case QChar::DirCS:
-				break;
-			case QChar::DirET:
-				if(status.last == QChar::DirEN) {
-					dirCurrent = QChar::DirEN;
-					eor = current; status.eor = dirCurrent;
-				}
-				break;
-
-				// boundary neutrals should be ignored
-			case QChar::DirBN:
-				break;
-				// neutrals
-			case QChar::DirB:
-				// ### what do we do with newline and paragraph separators that come to here?
-				break;
-			case QChar::DirS:
-				// ### implement rule L1
-				break;
-			case QChar::DirWS:
-			case QChar::DirON:
-				break;
-			default:
-				break;
-			}
-
-			if(current >= (int)_parLength) break;
-
-			// set status.last as needed.
-			switch(dirCurrent) {
-			case QChar::DirET:
-			case QChar::DirES:
-			case QChar::DirCS:
-			case QChar::DirS:
-			case QChar::DirWS:
-			case QChar::DirON:
-				switch(status.last)
-				{
-				case QChar::DirL:
-				case QChar::DirR:
-				case QChar::DirAL:
-				case QChar::DirEN:
-				case QChar::DirAN:
-					status.last = dirCurrent;
-					break;
-				default:
-					status.last = QChar::DirON;
-				}
-				break;
-			case QChar::DirNSM:
-			case QChar::DirBN:
-				// ignore these
-				break;
-			case QChar::DirLRO:
-			case QChar::DirLRE:
-				status.last = QChar::DirL;
-				break;
-			case QChar::DirRLO:
-			case QChar::DirRLE:
-				status.last = QChar::DirR;
-				break;
-			case QChar::DirEN:
-				if (status.last == QChar::DirL) {
-					status.last = QChar::DirL;
-					break;
-				}
-				[[fallthrough]];
-			default:
-				status.last = dirCurrent;
-			}
-
-			++current;
-		}
-
-		eor = current - 1; // remove dummy char
-
-		if (sor <= eor)
-			eAppendItems(analysis, sor, eor, control, dir);
-
-		return hasBidi;
-	}
-
-private:
-	void applyBlockProperties(const AbstractBlock *block) {
-		eSetFont(block);
-		if (_p) {
-			const auto isMono = IsMono(block->flags());
-			_background = {};
-			if (block->spoilerIndex() && _t->_spoiler) {
-				const auto handler
-					= _t->_spoiler->links.at(block->spoilerIndex() - 1);
-				const auto inBack = (handler && handler->shown());
-				_background.inFront = !inBack;
-				_background.color = inBack
-					? &_textPalette->spoilerActiveBg
-					: &_textPalette->spoilerBg;
-				_background.startMs = handler ? handler->startMs() : 0;
-				_background.spoilerIndex = block->spoilerIndex();
-
-				Assert(_t->_spoiler != nullptr);
-				const auto &cache = _background.inFront
-					? _t->_spoiler->spoilerCache
-					: _t->_spoiler->spoilerShownCache;
-				if (cache.color != (*_background.color)->c) {
-					auto mutableText = const_cast<String*>(_t);
-					auto &mutableCache = _background.inFront
-						? mutableText->_spoiler->spoilerCache
-						: mutableText->_spoiler->spoilerShownCache;
-					mutableCache.corners = Images::PrepareCorners(
-						ImageRoundRadius::Small,
-						*_background.color);
-					mutableCache.color = (*_background.color)->c;
-				}
-			}
-			if (isMono && block->lnkIndex() && !_background.inFront) {
-				_background.selectActiveBlock = ClickHandler::showAsPressed(
-					_t->_links.at(block->lnkIndex() - 1));
-			}
-
-			if (isMono) {
-				_currentPen = &_textPalette->monoFg->p;
-				_currentPenSelected = &_textPalette->selectMonoFg->p;
-			} else if (block->lnkIndex()
-				|| (block->flags() & TextBlockFPlainLink)) {
-				_currentPen = &_textPalette->linkFg->p;
-				_currentPenSelected = &_textPalette->selectLinkFg->p;
-			} else {
-				_currentPen = &_originalPen;
-				_currentPenSelected = &_originalPenSelected;
-			}
-		}
-	}
-
-	Painter *_p = nullptr;
-	const style::TextPalette *_textPalette = nullptr;
-	const String *_t = nullptr;
-	bool _elideLast = false;
-	bool _breakEverywhere = false;
-	int _elideRemoveFromEnd = 0;
-	style::align _align = style::al_topleft;
-	const QPen _originalPen;
-	QPen _originalPenSelected;
-	const QPen *_currentPen = nullptr;
-	const QPen *_currentPenSelected = nullptr;
-	struct {
-		const style::color *color = nullptr;
-		bool inFront = false;
-		crl::time startMs = 0;
-		uint16 spoilerIndex = 0;
-
-		bool selectActiveBlock = false; // For monospace.
-	} _background;
-	int _yFrom = 0;
-	int _yTo = 0;
-	int _yToElide = 0;
-	TextSelection _selection = { 0, 0 };
-	bool _fullWidthSelection = true;
-	const QChar *_str = nullptr;
-	crl::time _now = 0;
-
-	int _customEmojiSize = 0;
-	int _customEmojiSkip = 0;
-	int _indexOfElidedBlock = -1; // For spoilers.
-
-	// current paragraph data
-	String::TextBlocks::const_iterator _parStartBlock;
-	Qt::LayoutDirection _parDirection;
-	int _parStart = 0;
-	int _parLength = 0;
-	bool _parHasBidi = false;
-	QVarLengthArray<QScriptAnalysis, 4096> _parAnalysis;
-
-	// current line data
-	QTextEngine *_e = nullptr;
-	style::font _f;
-	QFixed _x, _w, _wLeft, _last_rPadding;
-	int32 _y, _yDelta, _lineHeight, _fontHeight;
-
-	// elided hack support
-	int _blocksSize = 0;
-	int _elideSavedIndex = 0;
-	std::optional<Block> _elideSavedBlock;
-
-	int _lineStart = 0;
-	int _localFrom = 0;
-	int _lineStartBlock = 0;
-
-	// link and symbol resolve
-	QFixed _lookupX = 0;
-	int _lookupY = 0;
-	bool _lookupSymbol = false;
-	bool _lookupLink = false;
-	StateRequest _lookupRequest;
-	StateResult _lookupResult;
-
-};
-
 String::String(int32 minResizeWidth)
-: _minResizeWidth(minResizeWidth)
-, _hasCustomEmoji(false)
-, _isOnlyCustomEmoji(false) {
+: _minResizeWidth(minResizeWidth) {
 }
 
 String::String(
@@ -2964,12 +146,16 @@ String::String(
 	const QString &text,
 	const TextParseOptions &options,
 	int32 minResizeWidth)
-: _minResizeWidth(minResizeWidth)
-, _hasCustomEmoji(false)
-, _isOnlyCustomEmoji(false) {
+: _minResizeWidth(minResizeWidth) {
 	setText(st, text, options);
 }
 
+String::String(String &&other) = default;
+
+String &String::operator=(String &&other) = default;
+
+String::~String() = default;
+
 void String::setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options) {
 	_st = &st;
 	clear();
@@ -2989,7 +175,7 @@ void String::recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir) {
 	for (auto &block : _blocks) {
 		auto b = block.get();
 		auto _btype = b->type();
-		auto blockHeight = countBlockHeight(b, _st);
+		auto blockHeight = CountBlockHeight(b, _st);
 		if (_btype == TextBlockTNewline) {
 			if (!lineHeight) lineHeight = blockHeight;
 			if (initial) {
@@ -3046,7 +232,7 @@ void String::recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir) {
 		}
 	}
 	if (_width > 0) {
-		if (!lineHeight) lineHeight = countBlockHeight(_blocks.back().get(), _st);
+		if (!lineHeight) lineHeight = CountBlockHeight(_blocks.back().get(), _st);
 		_minHeight += lineHeight;
 		accumulate_max(_maxWidth, _width);
 	}
@@ -3250,7 +436,7 @@ void String::enumerateLines(
 	bool longWordLine = true;
 	for (auto &b : _blocks) {
 		auto _btype = b->type();
-		int blockHeight = countBlockHeight(b.get(), _st);
+		int blockHeight = CountBlockHeight(b.get(), _st);
 
 		if (_btype == TextBlockTNewline) {
 			if (!lineHeight) lineHeight = blockHeight;
@@ -3350,19 +536,55 @@ void String::enumerateLines(
 	}
 }
 
-void String::draw(Painter &painter, int32 left, int32 top, int32 w, style::align align, int32 yFrom, int32 yTo, TextSelection selection, bool fullWidthSelection) const {
-//	painter.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
-	Renderer p(&painter, this);
-	p.draw(left, top, w, align, yFrom, yTo, selection, fullWidthSelection);
+void String::draw(QPainter &p, const PaintContext &context) const {
+	Renderer(*this).draw(p, context);
 }
 
-void String::drawElided(Painter &painter, int32 left, int32 top, int32 w, int32 lines, style::align align, int32 yFrom, int32 yTo, int32 removeFromEnd, bool breakEverywhere, TextSelection selection) const {
-//	painter.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
-	Renderer p(&painter, this);
-	p.drawElided(left, top, w, align, lines, yFrom, yTo, removeFromEnd, breakEverywhere, selection);
+void String::draw(Painter &p, int32 left, int32 top, int32 w, style::align align, int32 yFrom, int32 yTo, TextSelection selection, bool fullWidthSelection) const {
+//	p.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
+	Renderer(*this).draw(p, {
+		.position = { left, top },
+		.availableWidth = w,
+		.align = align,
+		.clip = (yTo >= 0
+			? QRect(left, top + yFrom, w, yTo - yFrom)
+			: QRect()),
+		.palette = &p.textPalette(),
+		.paused = p.inactive(),
+		.selection = selection,
+		.fullWidthSelection = fullWidthSelection,
+	});
+}
+
+void String::drawElided(Painter &p, int32 left, int32 top, int32 w, int32 lines, style::align align, int32 yFrom, int32 yTo, int32 removeFromEnd, bool breakEverywhere, TextSelection selection) const {
+//	p.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
+	Renderer(*this).draw(p, {
+		.position = { left, top },
+		.availableWidth = w,
+		.align = align,
+		.clip = (yTo >= 0
+			? QRect(left, top + yFrom, w, yTo - yFrom)
+			: QRect()),
+		.palette = &p.textPalette(),
+		.paused = p.inactive(),
+		.selection = selection,
+		.elisionLines = lines,
+		.elisionRemoveFromEnd = removeFromEnd,
+	});
 }
 
 void String::drawLeft(Painter &p, int32 left, int32 top, int32 width, int32 outerw, style::align align, int32 yFrom, int32 yTo, TextSelection selection) const {
+	Renderer(*this).draw(p, {
+		.position = { left, top },
+		.availableWidth = width,
+		.align = align,
+		.clip = (yTo >= 0
+			? QRect(left, top + yFrom, width, yTo - yFrom)
+			: QRect()),
+		.palette = &p.textPalette(),
+		.paused = p.inactive(),
+		.selection = selection,
+	});
 	draw(p, style::RightToLeft() ? (outerw - left - width) : left, top, width, align, yFrom, yTo, selection);
 }
 
@@ -3371,15 +593,15 @@ void String::drawLeftElided(Painter &p, int32 left, int32 top, int32 width, int3
 }
 
 void String::drawRight(Painter &p, int32 right, int32 top, int32 width, int32 outerw, style::align align, int32 yFrom, int32 yTo, TextSelection selection) const {
-	draw(p, style::RightToLeft() ? right : (outerw - right - width), top, width, align, yFrom, yTo, selection);
+	drawLeft(p, (outerw - right - width), top, width, outerw, align, yFrom, yTo, selection);
 }
 
 void String::drawRightElided(Painter &p, int32 right, int32 top, int32 width, int32 outerw, int32 lines, style::align align, int32 yFrom, int32 yTo, int32 removeFromEnd, bool breakEverywhere, TextSelection selection) const {
-	drawElided(p, style::RightToLeft() ? right : (outerw - right - width), top, width, lines, align, yFrom, yTo, removeFromEnd, breakEverywhere, selection);
+	drawLeftElided(p, (outerw - right - width), top, width, outerw, lines, align, yFrom, yTo, removeFromEnd, breakEverywhere, selection);
 }
 
 StateResult String::getState(QPoint point, int width, StateRequest request) const {
-	return Renderer(nullptr, this).getState(point, width, request);
+	return Renderer(*this).getState(point, width, request);
 }
 
 StateResult String::getStateLeft(QPoint point, int width, int outerw, StateRequest request) const {
@@ -3387,7 +609,7 @@ StateResult String::getStateLeft(QPoint point, int width, int outerw, StateReque
 }
 
 StateResult String::getStateElided(QPoint point, int width, StateRequestElided request) const {
-	return Renderer(nullptr, this).getStateElided(point, width, request);
+	return Renderer(*this).getStateElided(point, width, request);
 }
 
 StateResult String::getStateElidedLeft(QPoint point, int width, int outerw, StateRequestElided request) const {
@@ -3583,18 +805,17 @@ void String::enumerateText(
 	}
 }
 
-bool String::hasCustomEmoji() const {
-	return _hasCustomEmoji;
+bool String::hasPersistentAnimation() const {
+	return _hasCustomEmoji || _spoiler;
 }
 
-void String::unloadCustomEmoji() {
-	if (!_hasCustomEmoji) {
-		return;
-	}
-	for (const auto &block : _blocks) {
-		const auto raw = block.get();
-		if (raw->type() == TextBlockTCustomEmoji) {
-			static_cast<const CustomEmojiBlock*>(raw)->_custom->unload();
+void String::unloadPersistentAnimation() {
+	if (_hasCustomEmoji) {
+		for (const auto &block : _blocks) {
+			const auto raw = block.get();
+			if (raw->type() == TextBlockTCustomEmoji) {
+				static_cast<const CustomEmojiBlock*>(raw)->_custom->unload();
+			}
 		}
 	}
 }
@@ -3838,6 +1059,16 @@ ClickHandlerPtr String::spoilerLink(uint16 spoilerIndex) const {
 	return nullptr;
 }
 
+bool IsBad(QChar ch) {
+	return (ch == 0)
+		|| (ch >= 8232 && ch < 8237)
+		|| (ch >= 65024 && ch < 65040 && ch != 65039)
+		|| (ch >= 127 && ch < 160 && ch != 156)
+
+		// qt harfbuzz crash see https://github.com/telegramdesktop/tdesktop/issues/4551
+		|| (Platform::IsMac() && ch == 6158);
+}
+
 bool IsWordSeparator(QChar ch) {
 	switch (ch.unicode()) {
 	case QChar::Space:
@@ -3944,5 +1175,4 @@ bool IsTrimmed(QChar ch) {
 	return (IsSpace(ch) || IsBad(ch));
 }
 
-} // namespace Text
-} // namespace Ui
+} // namespace Ui::Text
diff --git a/ui/text/text.h b/ui/text/text.h
index 2b3e86d..47de231 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -8,15 +8,20 @@
 
 #include "ui/text/text_entity.h"
 #include "ui/text/text_block.h"
-#include "ui/painter.h"
+#include "ui/effects/spoiler_mess.h"
 #include "ui/click_handler.h"
 #include "base/flags.h"
 
 #include <private/qfixed_p.h>
 #include <any>
 
+class Painter;
 class SpoilerClickHandler;
 
+namespace style {
+struct TextPalette;
+} // namespace style
+
 namespace Ui {
 static const auto kQEllipsis = QStringLiteral("...");
 } // namespace Ui
@@ -90,7 +95,7 @@ struct StateResult {
 	uint16 symbol = 0;
 };
 
-struct StateRequestElided : public StateRequest {
+struct StateRequestElided : StateRequest {
 	StateRequestElided() {
 	}
 	StateRequestElided(const StateRequest &other) : StateRequest(other) {
@@ -99,6 +104,48 @@ struct StateRequestElided : public StateRequest {
 	int removeFromEnd = 0;
 };
 
+class SpoilerMessCache {
+public:
+	explicit SpoilerMessCache(int capacity);
+
+	[[nodiscard]] not_null<SpoilerMessCached*> lookup(QColor color);
+	void reset();
+
+private:
+	struct Entry {
+		SpoilerMessCached mess;
+		QColor color;
+		int generation = 0;
+	};
+
+	std::vector<Entry> _cache;
+	const int _capacity = 0;
+	int _generation = 0;
+
+};
+
+[[nodiscard]] not_null<SpoilerMessCache*> DefaultSpoilerCache();
+
+struct PaintContext {
+	QPoint position;
+	int outerWidth = 0; // For automatic RTL Ui inversion.
+	int availableWidth = 0;
+	style::align align = style::al_left;
+	QRect clip;
+
+	const style::TextPalette *palette = nullptr;
+	SpoilerMessCache *spoiler = nullptr;
+	crl::time now = 0;
+	bool paused = false;
+
+	TextSelection selection;
+	bool fullWidthSelection = true;
+
+	int elisionLines = 0;
+	int elisionRemoveFromEnd = 0;
+	bool elisionBreakEverywhere = false;
+};
+
 class String {
 public:
 	String(int32 minResizeWidth = QFIXED_MAX);
@@ -107,9 +154,9 @@ public:
 		const QString &text,
 		const TextParseOptions &options = kDefaultTextOptions,
 		int32 minResizeWidth = QFIXED_MAX);
-	String(String &&other) = default;
-	String &operator=(String &&other) = default;
-	~String() = default;
+	String(String &&other);
+	String &operator=(String &&other);
+	~String();
 
 	[[nodiscard]] int countWidth(int width, bool breakEverywhere = false) const;
 	[[nodiscard]] int countHeight(int width, bool breakEverywhere = false) const;
@@ -137,6 +184,8 @@ public:
 	}
 	[[nodiscard]] int countMaxMonospaceWidth() const;
 
+	void draw(QPainter &p, const PaintContext &context) const;
+
 	void draw(Painter &p, int32 left, int32 top, int32 width, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, TextSelection selection = { 0, 0 }, bool fullWidthSelection = true) const;
 	void drawElided(Painter &p, int32 left, int32 top, int32 width, int32 lines = 1, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, int32 removeFromEnd = 0, bool breakEverywhere = false, TextSelection selection = { 0, 0 }) const;
 	void drawLeft(Painter &p, int32 left, int32 top, int32 width, int32 outerw, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, TextSelection selection = { 0, 0 }) const;
@@ -169,8 +218,8 @@ public:
 	[[nodiscard]] TextForMimeData toTextForMimeData(
 		TextSelection selection = AllTextSelection) const;
 
-	[[nodiscard]] bool hasCustomEmoji() const;
-	void unloadCustomEmoji();
+	[[nodiscard]] bool hasPersistentAnimation() const;
+	void unloadPersistentAnimation();
 
 	[[nodiscard]] bool isIsolatedEmoji() const;
 	[[nodiscard]] IsolatedEmoji toIsolatedEmoji() const;
@@ -217,9 +266,9 @@ private:
 	QFixed _minResizeWidth;
 	QFixed _maxWidth = 0;
 	int32 _minHeight = 0;
-	bool _hasCustomEmoji : 1;
-	bool _isIsolatedEmoji : 1;
-	bool _isOnlyCustomEmoji : 1;
+	bool _hasCustomEmoji : 1 = false;
+	bool _isIsolatedEmoji : 1 = false;
+	bool _isOnlyCustomEmoji : 1 = false;
 
 	QString _text;
 	const style::TextStyle *_st = nullptr;
@@ -229,13 +278,14 @@ private:
 
 	Qt::LayoutDirection _startDir = Qt::LayoutDirectionAuto;
 
-	std::shared_ptr<SpoilerData> _spoiler;
+	std::unique_ptr<SpoilerData> _spoiler;
 
 	friend class Parser;
 	friend class Renderer;
 
 };
 
+[[nodiscard]] bool IsBad(QChar ch);
 [[nodiscard]] bool IsWordSeparator(QChar ch);
 [[nodiscard]] bool IsAlmostLinkEnd(QChar ch);
 [[nodiscard]] bool IsLinkEnd(QChar ch);
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index f3d2275..5cd9f92 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -758,5 +758,15 @@ void Block::destroy() {
 	}
 }
 
+int CountBlockHeight(
+		const AbstractBlock *block,
+		const style::TextStyle *st) {
+	return (block->type() == TextBlockTSkip)
+		? static_cast<const SkipBlock*>(block)->height()
+		: (st->lineHeight > st->font->height)
+		? st->lineHeight
+		: st->font->height;
+}
+
 } // namespace Text
 } // namespace Ui
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index 0580146..b5a140a 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -14,8 +14,11 @@
 
 #include <crl/crl_time.h>
 
-namespace Ui {
-namespace Text {
+namespace style {
+struct TextStyle;
+} // namespace style
+
+namespace Ui::Text {
 
 enum TextBlockType {
 	TextBlockTNewline = 0x01,
@@ -318,5 +321,12 @@ private:
 
 };
 
-} // namespace Text
-} // namespace Ui
+[[nodiscard]] int CountBlockHeight(
+	const AbstractBlock *block,
+	const style::TextStyle *st);
+
+[[nodiscard]] inline bool IsMono(int32 flags) {
+	return (flags & TextBlockFPre) || (flags & TextBlockFCode);
+}
+
+} // namespace Ui::Text
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
new file mode 100644
index 0000000..0db97da
--- /dev/null
+++ b/ui/text/text_parser.cpp
@@ -0,0 +1,739 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/text/text_parser.h"
+
+#include "base/platform/base_platform_info.h"
+#include "ui/integration.h"
+#include "ui/text/text_isolated_emoji.h"
+#include "ui/text/text_spoiler_data.h"
+#include "ui/spoiler_click_handler.h"
+#include "styles/style_basic.h"
+
+#include <QtCore/QUrl>
+
+namespace Ui::Text {
+namespace {
+
+constexpr auto kStringLinkIndexShift = uint16(0x8000);
+constexpr auto kMaxDiacAfterSymbol = 2;
+
+[[nodiscard]] TextWithEntities PrepareRichFromRich(
+		const TextWithEntities &text,
+		const TextParseOptions &options) {
+	auto result = text;
+	const auto &preparsed = text.entities;
+	const bool parseLinks = (options.flags & TextParseLinks);
+	const bool parsePlainLinks = (options.flags & TextParsePlainLinks);
+	if (!preparsed.isEmpty() && (parseLinks || parsePlainLinks)) {
+		bool parseMentions = (options.flags & TextParseMentions);
+		bool parseHashtags = (options.flags & TextParseHashtags);
+		bool parseBotCommands = (options.flags & TextParseBotCommands);
+		bool parseMarkdown = (options.flags & TextParseMarkdown);
+		if (!parseMentions || !parseHashtags || !parseBotCommands || !parseMarkdown) {
+			int32 i = 0, l = preparsed.size();
+			result.entities.clear();
+			result.entities.reserve(l);
+			for (; i < l; ++i) {
+				auto type = preparsed.at(i).type();
+				if (((type == EntityType::Mention || type == EntityType::MentionName) && !parseMentions) ||
+					(type == EntityType::Hashtag && !parseHashtags) ||
+					(type == EntityType::Cashtag && !parseHashtags) ||
+					(type == EntityType::PlainLink
+						&& !parsePlainLinks
+						&& !parseMarkdown) ||
+					(!parseLinks
+						&& (type == EntityType::Url
+							|| type == EntityType::CustomUrl)) ||
+					(type == EntityType::BotCommand && !parseBotCommands) || // #TODO entities
+					(!parseMarkdown && (type == EntityType::Bold
+						|| type == EntityType::Semibold
+						|| type == EntityType::Italic
+						|| type == EntityType::Underline
+						|| type == EntityType::StrikeOut
+						|| type == EntityType::Code
+						|| type == EntityType::Pre))) {
+					continue;
+				}
+				result.entities.push_back(preparsed.at(i));
+			}
+		}
+	}
+	return result;
+}
+
+[[nodiscard]] QFixed ComputeStopAfter(
+		const TextParseOptions &options,
+		const style::TextStyle &st) {
+	return (options.maxw > 0 && options.maxh > 0)
+		? ((options.maxh / st.font->height) + 1) * options.maxw
+		: QFIXED_MAX;
+}
+
+// Open Sans tilde fix.
+[[nodiscard]] bool ComputeCheckTilde(const style::TextStyle &st) {
+	const auto &font = st.font;
+	return (font->size() * style::DevicePixelRatio() == 13)
+		&& (font->flags() == 0)
+		&& (font->f.family() == qstr("DAOpenSansRegular"));
+}
+
+} // namespace
+
+Parser::StartedEntity::StartedEntity(TextBlockFlags flags)
+: _value(flags)
+, _type(Type::Flags) {
+	Expects(_value >= 0 && _value < int(kStringLinkIndexShift));
+}
+
+Parser::StartedEntity::StartedEntity(uint16 index, Type type)
+: _value(index)
+, _type(type) {
+	Expects((_type == Type::Link)
+		? (_value >= kStringLinkIndexShift)
+		: (_value < kStringLinkIndexShift));
+}
+
+Parser::StartedEntity::Type Parser::StartedEntity::type() const {
+	return _type;
+}
+
+std::optional<TextBlockFlags> Parser::StartedEntity::flags() const {
+	if (_value < int(kStringLinkIndexShift) && (_type == Type::Flags)) {
+		return TextBlockFlags(_value);
+	}
+	return std::nullopt;
+}
+
+std::optional<uint16> Parser::StartedEntity::lnkIndex() const {
+	if ((_value < int(kStringLinkIndexShift) && (_type == Type::IndexedLink))
+		|| (_value >= int(kStringLinkIndexShift) && (_type == Type::Link))) {
+		return uint16(_value);
+	}
+	return std::nullopt;
+}
+
+std::optional<uint16> Parser::StartedEntity::spoilerIndex() const {
+	if (_value < int(kStringLinkIndexShift) && (_type == Type::Spoiler)) {
+		return uint16(_value);
+	}
+	return std::nullopt;
+}
+
+Parser::Parser(
+	not_null<String*> string,
+	const TextWithEntities &textWithEntities,
+	const TextParseOptions &options,
+	const std::any &context)
+: Parser(
+	string,
+	PrepareRichFromRich(textWithEntities, options),
+	options,
+	context,
+	ReadyToken()) {
+}
+
+Parser::Parser(
+	not_null<String*> string,
+	TextWithEntities &&source,
+	const TextParseOptions &options,
+	const std::any &context,
+	ReadyToken)
+: _t(string)
+, _source(std::move(source))
+, _context(context)
+, _start(_source.text.constData())
+, _end(_start + _source.text.size())
+, _ptr(_start)
+, _entitiesEnd(_source.entities.end())
+, _waitingEntity(_source.entities.begin())
+, _multiline(options.flags & TextParseMultiline)
+, _stopAfterWidth(ComputeStopAfter(options, *_t->_st))
+, _checkTilde(ComputeCheckTilde(*_t->_st)) {
+	parse(options);
+}
+
+void Parser::blockCreated() {
+	_sumWidth += _t->_blocks.back()->f_width();
+	if (_sumWidth.floor().toInt() > _stopAfterWidth) {
+		_sumFinished = true;
+	}
+}
+
+void Parser::createBlock(int32 skipBack) {
+	if (_lnkIndex < kStringLinkIndexShift && _lnkIndex > _maxLnkIndex) {
+		_maxLnkIndex = _lnkIndex;
+	}
+	if (_lnkIndex > kStringLinkIndexShift) {
+		_maxShiftedLnkIndex = std::max(
+			uint16(_lnkIndex - kStringLinkIndexShift),
+			_maxShiftedLnkIndex);
+	}
+
+	int32 len = int32(_t->_text.size()) + skipBack - _blockStart;
+	if (len > 0) {
+		bool newline = !_emoji && (len == 1 && _t->_text.at(_blockStart) == QChar::LineFeed);
+		if (_newlineAwaited) {
+			_newlineAwaited = false;
+			if (!newline) {
+				_t->_text.insert(_blockStart, QChar::LineFeed);
+				createBlock(skipBack - len);
+			}
+		}
+		_lastSkipped = false;
+		const auto lnkIndex = _monoIndex ? _monoIndex : _lnkIndex;
+		auto custom = _customEmojiData.isEmpty()
+			? nullptr
+			: Integration::Instance().createCustomEmoji(
+				_customEmojiData,
+				_context);
+		if (custom) {
+			_t->_blocks.push_back(Block::CustomEmoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, std::move(custom)));
+			_lastSkipped = true;
+		} else if (_emoji) {
+			_t->_blocks.push_back(Block::Emoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, _emoji));
+			_lastSkipped = true;
+		} else if (newline) {
+			_t->_blocks.push_back(Block::Newline(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
+		} else {
+			_t->_blocks.push_back(Block::Text(_t->_st->font, _t->_text, _t->_minResizeWidth, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
+		}
+		_blockStart += len;
+		_customEmojiData = QByteArray();
+		_emoji = nullptr;
+		blockCreated();
+	}
+}
+
+// Unused.
+// void Parser::createSkipBlock(int32 w, int32 h) {
+// 	createBlock();
+// 	_t->_text.push_back('_');
+// 	_t->_blocks.push_back(Block::Skip(_t->_st->font, _t->_text, _blockStart++, w, h, _monoIndex ? _monoIndex : _lnkIndex, _spoilerIndex));
+// 	blockCreated();
+// }
+
+void Parser::createNewlineBlock() {
+	createBlock();
+	_t->_text.push_back(QChar::LineFeed);
+	createBlock();
+}
+
+void Parser::finishEntities() {
+	while (!_startedEntities.empty()
+		&& (_ptr >= _startedEntities.begin()->first || _ptr >= _end)) {
+		auto list = std::move(_startedEntities.begin()->second);
+		_startedEntities.erase(_startedEntities.begin());
+
+		while (!list.empty()) {
+			if (list.back().type() == StartedEntity::Type::CustomEmoji) {
+				createBlock();
+			} else if (const auto flags = list.back().flags()) {
+				if (_flags & (*flags)) {
+					createBlock();
+					_flags &= ~(*flags);
+					if (((*flags) & TextBlockFPre)
+						&& !_t->_blocks.empty()
+						&& _t->_blocks.back()->type() != TextBlockTNewline) {
+						_newlineAwaited = true;
+					}
+					if (IsMono(*flags)) {
+						_monoIndex = 0;
+					}
+				}
+			} else if (const auto lnkIndex = list.back().lnkIndex()) {
+				if (_lnkIndex == *lnkIndex) {
+					createBlock();
+					_lnkIndex = 0;
+				}
+			} else if (const auto spoilerIndex = list.back().spoilerIndex()) {
+				if (_spoilerIndex == *spoilerIndex && (_spoilerIndex != 0)) {
+					createBlock();
+					_spoilerIndex = 0;
+				}
+			}
+			list.pop_back();
+		}
+	}
+}
+
+// Returns true if at least one entity was parsed in the current position.
+bool Parser::checkEntities() {
+	finishEntities();
+	skipPassedEntities();
+	if (_waitingEntity == _entitiesEnd
+		|| _ptr < _start + _waitingEntity->offset()) {
+		return false;
+	}
+
+	auto flags = TextBlockFlags();
+	auto link = EntityLinkData();
+	auto monoIndex = 0;
+	const auto entityType = _waitingEntity->type();
+	const auto entityLength = _waitingEntity->length();
+	const auto entityBegin = _start + _waitingEntity->offset();
+	const auto entityEnd = entityBegin + entityLength;
+	const auto pushSimpleUrl = [&](EntityType type) {
+		link.type = type;
+		link.data = QString(entityBegin, entityLength);
+		if (type == EntityType::Url) {
+			computeLinkText(link.data, &link.text, &link.shown);
+		} else {
+			link.text = link.data;
+		}
+	};
+	const auto pushComplexUrl = [&] {
+		link.type = entityType;
+		link.data = _waitingEntity->data();
+		link.text = QString(entityBegin, entityLength);
+	};
+
+	using Type = StartedEntity::Type;
+
+	if (entityType == EntityType::CustomEmoji) {
+		createBlock();
+		_customEmojiData = _waitingEntity->data();
+		_startedEntities[entityEnd].emplace_back(0, Type::CustomEmoji);
+	} else if (entityType == EntityType::Bold) {
+		flags = TextBlockFBold;
+	} else if (entityType == EntityType::Semibold) {
+		flags = TextBlockFSemibold;
+	} else if (entityType == EntityType::Italic) {
+		flags = TextBlockFItalic;
+	} else if (entityType == EntityType::Underline) {
+		flags = TextBlockFUnderline;
+	} else if (entityType == EntityType::PlainLink) {
+		flags = TextBlockFPlainLink;
+	} else if (entityType == EntityType::StrikeOut) {
+		flags = TextBlockFStrikeOut;
+	} else if ((entityType == EntityType::Code) // #TODO entities
+		|| (entityType == EntityType::Pre)) {
+		if (entityType == EntityType::Code) {
+			flags = TextBlockFCode;
+		} else {
+			flags = TextBlockFPre;
+			createBlock();
+			if (!_t->_blocks.empty()
+				&& _t->_blocks.back()->type() != TextBlockTNewline
+				&& _customEmojiData.isEmpty()) {
+				createNewlineBlock();
+			}
+		}
+		const auto text = QString(entityBegin, entityLength);
+
+		// It is better to trim the text to identify "Sample\n" as inline.
+		const auto trimmed = text.trimmed();
+		const auto isSingleLine = !trimmed.isEmpty()
+			&& ranges::none_of(trimmed, IsNewline);
+
+		// TODO: remove trimming.
+		if (isSingleLine && (entityType == EntityType::Code)) {
+			_monos.push_back({ .text = text, .type = entityType });
+			monoIndex = _monos.size();
+		}
+	} else if (entityType == EntityType::Url
+		|| entityType == EntityType::Email
+		|| entityType == EntityType::Mention
+		|| entityType == EntityType::Hashtag
+		|| entityType == EntityType::Cashtag
+		|| entityType == EntityType::BotCommand) {
+		pushSimpleUrl(entityType);
+	} else if (entityType == EntityType::CustomUrl) {
+		const auto url = _waitingEntity->data();
+		const auto text = QString(entityBegin, entityLength);
+		if (url == text) {
+			pushSimpleUrl(EntityType::Url);
+		} else {
+			pushComplexUrl();
+		}
+	} else if (entityType == EntityType::MentionName) {
+		pushComplexUrl();
+	}
+
+	if (link.type != EntityType::Invalid) {
+		createBlock();
+
+		_links.push_back(link);
+		const auto tempIndex = _links.size();
+		const auto useCustom = processCustomIndex(tempIndex);
+		_lnkIndex = tempIndex + (useCustom ? 0 : kStringLinkIndexShift);
+		_startedEntities[entityEnd].emplace_back(
+			_lnkIndex,
+			useCustom ? Type::IndexedLink : Type::Link);
+	} else if (flags) {
+		if (!(_flags & flags)) {
+			createBlock();
+			_flags |= flags;
+			_startedEntities[entityEnd].emplace_back(flags);
+			_monoIndex = monoIndex;
+		}
+	} else if (entityType == EntityType::Spoiler) {
+		createBlock();
+
+		_spoilers.push_back(EntityLinkData{
+			.data = QString::number(_spoilers.size() + 1),
+			.type = entityType,
+		});
+		_spoilerIndex = _spoilers.size();
+
+		_startedEntities[entityEnd].emplace_back(
+			_spoilerIndex,
+			Type::Spoiler);
+	}
+
+	++_waitingEntity;
+	skipBadEntities();
+	return true;
+}
+
+bool Parser::processCustomIndex(uint16 index) {
+	auto &url = _links[index - 1].data;
+	if (url.isEmpty()) {
+		return false;
+	}
+	if (url.startsWith("internal:index")) {
+		const auto customIndex = uint16(url.back().unicode());
+		// if (customIndex != index) {
+			url = QString();
+			_linksIndexes.push_back(customIndex);
+			return true;
+		// }
+	}
+	return false;
+}
+
+void Parser::skipPassedEntities() {
+	while (_waitingEntity != _entitiesEnd
+		&& _start + _waitingEntity->offset() + _waitingEntity->length() <= _ptr) {
+		++_waitingEntity;
+	}
+}
+
+void Parser::skipBadEntities() {
+	if (_links.size() >= 0x7FFF) {
+		while (_waitingEntity != _entitiesEnd
+			&& (isLinkEntity(*_waitingEntity)
+				|| isInvalidEntity(*_waitingEntity))) {
+			++_waitingEntity;
+		}
+	} else {
+		while (_waitingEntity != _entitiesEnd && isInvalidEntity(*_waitingEntity)) {
+			++_waitingEntity;
+		}
+	}
+}
+
+void Parser::parseCurrentChar() {
+	_ch = ((_ptr < _end) ? *_ptr : 0);
+	_emojiLookback = 0;
+	const auto inCustomEmoji = !_customEmojiData.isEmpty();
+	const auto isNewLine = !inCustomEmoji && _multiline && IsNewline(_ch);
+	const auto isSpace = IsSpace(_ch);
+	const auto isDiac = IsDiac(_ch);
+	const auto isTilde = !inCustomEmoji && _checkTilde && (_ch == '~');
+	const auto skip = [&] {
+		if (IsBad(_ch) || _ch.isLowSurrogate()) {
+			return true;
+		} else if (_ch == 0xFE0F && Platform::IsMac()) {
+			// Some sequences like 0x0E53 0xFE0F crash OS X harfbuzz text processing :(
+			return true;
+		} else if (isDiac) {
+			if (_lastSkipped || _emoji || ++_diacs > kMaxDiacAfterSymbol) {
+				return true;
+			}
+		} else if (_ch.isHighSurrogate()) {
+			if (_ptr + 1 >= _end || !(_ptr + 1)->isLowSurrogate()) {
+				return true;
+			}
+			const auto ucs4 = QChar::surrogateToUcs4(_ch, *(_ptr + 1));
+			if (ucs4 >= 0xE0000) {
+				// Unicode tags are skipped.
+				// Only place they work is in some flag emoji,
+				// but in that case they were already parsed as emoji before.
+				//
+				// For unknown reason in some unknown cases strings with such
+				// symbols lead to crashes on some Linux distributions, see
+				// https://github.com/telegramdesktop/tdesktop/issues/7005
+				//
+				// At least one crashing text was starting that way:
+				//
+				// 0xd83d 0xdcda 0xdb40 0xdc69 0xdb40 0xdc64 0xdb40 0xdc6a
+				// 0xdb40 0xdc77 0xdb40 0xdc7f 0x32 ... simple text here ...
+				//
+				// or in codepoints:
+				//
+				// 0x1f4da 0xe0069 0xe0064 0xe006a 0xe0077 0xe007f 0x32 ...
+				return true;
+			}
+		}
+		return false;
+	}();
+
+	if (_ch.isHighSurrogate() && !skip) {
+		_t->_text.push_back(_ch);
+		++_ptr;
+		_ch = *_ptr;
+		_emojiLookback = 1;
+	}
+
+	_lastSkipped = skip;
+	if (skip) {
+		_ch = 0;
+	} else {
+		if (isTilde) { // tilde fix in OpenSans
+			if (!(_flags & TextBlockFTilde)) {
+				createBlock(-_emojiLookback);
+				_flags |= TextBlockFTilde;
+			}
+		} else {
+			if (_flags & TextBlockFTilde) {
+				createBlock(-_emojiLookback);
+				_flags &= ~TextBlockFTilde;
+			}
+		}
+		if (isNewLine) {
+			createNewlineBlock();
+		} else if (isSpace) {
+			_t->_text.push_back(QChar::Space);
+		} else {
+			if (_emoji) {
+				createBlock(-_emojiLookback);
+			}
+			_t->_text.push_back(_ch);
+		}
+		if (!isDiac) _diacs = 0;
+	}
+}
+
+void Parser::parseEmojiFromCurrent() {
+	if (!_customEmojiData.isEmpty()) {
+		return;
+	}
+	int len = 0;
+	auto e = Emoji::Find(_ptr - _emojiLookback, _end, &len);
+	if (!e) return;
+
+	for (int l = len - _emojiLookback - 1; l > 0; --l) {
+		_t->_text.push_back(*++_ptr);
+	}
+	if (e->hasPostfix()) {
+		Assert(!_t->_text.isEmpty());
+		const auto last = _t->_text[_t->_text.size() - 1];
+		if (last.unicode() != Emoji::kPostfix) {
+			_t->_text.push_back(QChar(Emoji::kPostfix));
+			++len;
+		}
+	}
+
+	createBlock(-len);
+	_emoji = e;
+}
+
+bool Parser::isInvalidEntity(const EntityInText &entity) const {
+	const auto length = entity.length();
+	return (_start + entity.offset() + length > _end) || (length <= 0);
+}
+
+bool Parser::isLinkEntity(const EntityInText &entity) const {
+	const auto type = entity.type();
+	const auto urls = {
+		EntityType::Url,
+		EntityType::CustomUrl,
+		EntityType::Email,
+		EntityType::Hashtag,
+		EntityType::Cashtag,
+		EntityType::Mention,
+		EntityType::MentionName,
+		EntityType::BotCommand
+	};
+	return ranges::find(urls, type) != std::end(urls);
+}
+
+void Parser::parse(const TextParseOptions &options) {
+	skipBadEntities();
+	trimSourceRange();
+
+	_t->_text.resize(0);
+	_t->_text.reserve(_end - _ptr);
+
+	for (; _ptr <= _end; ++_ptr) {
+		while (checkEntities()) {
+		}
+		parseCurrentChar();
+		parseEmojiFromCurrent();
+
+		if (_sumFinished || _t->_text.size() >= 0x8000) {
+			break; // 32k max
+		}
+	}
+	createBlock();
+	finalize(options);
+}
+
+void Parser::trimSourceRange() {
+	const auto firstMonospaceOffset = EntityInText::FirstMonospaceOffset(
+		_source.entities,
+		_end - _start);
+
+	while (_ptr != _end && IsTrimmed(*_ptr) && _ptr != _start + firstMonospaceOffset) {
+		++_ptr;
+	}
+	while (_ptr != _end && IsTrimmed(*(_end - 1))) {
+		--_end;
+	}
+}
+
+// void Parser::checkForElidedSkipBlock() {
+// 	if (!_sumFinished || !_rich) {
+// 		return;
+// 	}
+// 	// We could've skipped the final skip block command.
+// 	for (; _ptr < _end; ++_ptr) {
+// 		if (*_ptr == TextCommand && readSkipBlockCommand()) {
+// 			break;
+// 		}
+// 	}
+// }
+
+void Parser::finalize(const TextParseOptions &options) {
+	_t->_links.resize(_maxLnkIndex + _maxShiftedLnkIndex);
+	auto counterCustomIndex = uint16(0);
+	auto currentIndex = uint16(0); // Current the latest index of _t->_links.
+	struct {
+		uint16 mono = 0;
+		uint16 lnk = 0;
+	} lastHandlerIndex;
+	const auto avoidIntersectionsWithCustom = [&] {
+		while (ranges::contains(_linksIndexes, currentIndex)) {
+			currentIndex++;
+		}
+	};
+	auto isolatedEmojiCount = 0;
+	_t->_hasCustomEmoji = false;
+	_t->_isIsolatedEmoji = true;
+	_t->_isOnlyCustomEmoji = true;
+	for (auto &block : _t->_blocks) {
+		if (block->type() == TextBlockTCustomEmoji) {
+			_t->_hasCustomEmoji = true;
+		} else if (block->type() != TextBlockTNewline
+			&& block->type() != TextBlockTSkip) {
+			_t->_isOnlyCustomEmoji = false;
+		} else if (block->lnkIndex()) {
+			_t->_isOnlyCustomEmoji = _t->_isIsolatedEmoji = false;
+		}
+		if (_t->_isIsolatedEmoji) {
+			if (block->type() == TextBlockTCustomEmoji
+				|| block->type() == TextBlockTEmoji) {
+				if (++isolatedEmojiCount > kIsolatedEmojiLimit) {
+					_t->_isIsolatedEmoji = false;
+				}
+			} else if (block->type() != TextBlockTSkip) {
+				_t->_isIsolatedEmoji = false;
+			}
+		}
+		const auto spoilerIndex = block->spoilerIndex();
+		if (spoilerIndex) {
+			if (!_t->_spoiler) {
+				_t->_spoiler = std::make_unique<SpoilerData>(
+					Integration::Instance().createSpoilerRepaint(_context));
+			}
+			if (_t->_spoiler->links.size() < spoilerIndex) {
+				_t->_spoiler->links.resize(spoilerIndex);
+				const auto handler = (options.flags & TextParseLinks)
+					? std::make_shared<SpoilerClickHandler>()
+					: nullptr;
+				_t->setSpoiler(spoilerIndex, std::move(handler));
+			}
+		}
+		const auto shiftedIndex = block->lnkIndex();
+		auto useCustomIndex = false;
+		if (shiftedIndex <= kStringLinkIndexShift) {
+			if (IsMono(block->flags()) && shiftedIndex) {
+				const auto monoIndex = shiftedIndex;
+
+				if (lastHandlerIndex.mono == monoIndex) {
+					block->setLnkIndex(currentIndex);
+					continue; // Optimization.
+				} else {
+					currentIndex++;
+				}
+				avoidIntersectionsWithCustom();
+				block->setLnkIndex(currentIndex);
+				const auto handler = Integration::Instance().createLinkHandler(
+					_monos[monoIndex - 1],
+					_context);
+				_t->_links.resize(currentIndex);
+				if (handler) {
+					_t->setLink(currentIndex, handler);
+				}
+				lastHandlerIndex.mono = monoIndex;
+				continue;
+			} else if (shiftedIndex) {
+				useCustomIndex = true;
+			} else {
+				continue;
+			}
+		}
+		const auto usedIndex = [&] {
+			return useCustomIndex
+				? _linksIndexes[counterCustomIndex - 1]
+				: currentIndex;
+		};
+		const auto realIndex = useCustomIndex
+			? shiftedIndex
+			: (shiftedIndex - kStringLinkIndexShift);
+		if (lastHandlerIndex.lnk == realIndex) {
+			block->setLnkIndex(usedIndex());
+			continue; // Optimization.
+		} else {
+			(useCustomIndex ? counterCustomIndex : currentIndex)++;
+		}
+		if (!useCustomIndex) {
+			avoidIntersectionsWithCustom();
+		}
+		block->setLnkIndex(usedIndex());
+
+		_t->_links.resize(std::max(usedIndex(), uint16(_t->_links.size())));
+		const auto handler = Integration::Instance().createLinkHandler(
+			_links[realIndex - 1],
+			_context);
+		if (handler) {
+			_t->setLink(usedIndex(), handler);
+		}
+		lastHandlerIndex.lnk = realIndex;
+	}
+	if (!_t->_hasCustomEmoji || _t->_spoiler) {
+		_t->_isOnlyCustomEmoji = false;
+	}
+	if (_t->_blocks.empty() || _t->_spoiler) {
+		_t->_isIsolatedEmoji = false;
+	}
+	_t->_links.squeeze();
+	if (_t->_spoiler) {
+		_t->_spoiler->links.squeeze();
+	}
+	_t->_blocks.shrink_to_fit();
+	_t->_text.squeeze();
+}
+
+void Parser::computeLinkText(
+		const QString &linkData,
+		QString *outLinkText,
+		EntityLinkShown *outShown) {
+	auto url = QUrl(linkData);
+	auto good = QUrl(url.isValid()
+		? url.toEncoded()
+		: QByteArray());
+	auto readable = good.isValid()
+		? good.toDisplayString()
+		: linkData;
+	*outLinkText = _t->_st->font->elided(readable, st::linkCropLimit);
+	*outShown = (*outLinkText == readable)
+		? EntityLinkShown::Full
+		: EntityLinkShown::Partial;
+}
+
+} // namespace Ui::Text
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
new file mode 100644
index 0000000..f105a1c
--- /dev/null
+++ b/ui/text/text_parser.h
@@ -0,0 +1,128 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/text/text.h"
+
+namespace Ui::Text {
+
+class Parser {
+public:
+	Parser(
+		not_null<String*> string,
+		const TextWithEntities &textWithEntities,
+		const TextParseOptions &options,
+		const std::any &context);
+
+private:
+	struct ReadyToken {
+	};
+
+	class StartedEntity {
+	public:
+		enum class Type {
+			Flags,
+			Link,
+			IndexedLink,
+			Spoiler,
+			CustomEmoji,
+		};
+
+		explicit StartedEntity(TextBlockFlags flags);
+		explicit StartedEntity(uint16 index, Type type);
+
+		[[nodiscard]] Type type() const;
+		[[nodiscard]] std::optional<TextBlockFlags> flags() const;
+		[[nodiscard]] std::optional<uint16> lnkIndex() const;
+		[[nodiscard]] std::optional<uint16> spoilerIndex() const;
+
+	private:
+		const int _value = 0;
+		const Type _type;
+
+	};
+
+	Parser(
+		not_null<String*> string,
+		TextWithEntities &&source,
+		const TextParseOptions &options,
+		const std::any &context,
+		ReadyToken);
+
+	void trimSourceRange();
+	void blockCreated();
+	void createBlock(int32 skipBack = 0);
+	// void createSkipBlock(int32 w, int32 h);
+	void createNewlineBlock();
+
+	// Returns true if at least one entity was parsed in the current position.
+	bool checkEntities();
+	void parseCurrentChar();
+	void parseEmojiFromCurrent();
+	void finalize(const TextParseOptions &options);
+
+	void finishEntities();
+	void skipPassedEntities();
+	void skipBadEntities();
+
+	bool isInvalidEntity(const EntityInText &entity) const;
+	bool isLinkEntity(const EntityInText &entity) const;
+
+	bool processCustomIndex(uint16 index);
+
+	void parse(const TextParseOptions &options);
+	void computeLinkText(
+		const QString &linkData,
+		QString *outLinkText,
+		EntityLinkShown *outShown);
+
+	const not_null<String*> _t;
+	const TextWithEntities _source;
+	const std::any &_context;
+	const QChar * const _start = nullptr;
+	const QChar *_end = nullptr; // mutable, because we trim by decrementing.
+	const QChar *_ptr = nullptr;
+	const EntitiesInText::const_iterator _entitiesEnd;
+	EntitiesInText::const_iterator _waitingEntity;
+	QString _customEmojiData;
+	const bool _multiline = false;
+
+	const QFixed _stopAfterWidth; // summary width of all added words
+	const bool _checkTilde = false; // do we need a special text block for tilde symbol
+
+	std::vector<uint16> _linksIndexes;
+
+	std::vector<EntityLinkData> _links;
+	std::vector<EntityLinkData> _spoilers;
+	std::vector<EntityLinkData> _monos;
+	base::flat_map<
+		const QChar*,
+		std::vector<StartedEntity>> _startedEntities;
+
+	uint16 _maxLnkIndex = 0;
+	uint16 _maxShiftedLnkIndex = 0;
+
+	// current state
+	int32 _flags = 0;
+	uint16 _lnkIndex = 0;
+	uint16 _spoilerIndex = 0;
+	uint16 _monoIndex = 0;
+	EmojiPtr _emoji = nullptr; // current emoji, if current word is an emoji, or zero
+	int32 _blockStart = 0; // offset in result, from which current parsed block is started
+	int32 _diacs = 0; // diac chars skipped without good char
+	QFixed _sumWidth;
+	bool _sumFinished = false;
+	bool _newlineAwaited = false;
+
+	// current char data
+	QChar _ch; // current char (low surrogate, if current char is surrogate pair)
+	int32 _emojiLookback = 0; // how far behind the current ptr to look for current emoji
+	bool _lastSkipped = false; // did we skip current char
+
+};
+
+} // namespace Ui::Text
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
new file mode 100644
index 0000000..9735de6
--- /dev/null
+++ b/ui/text/text_renderer.cpp
@@ -0,0 +1,1922 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/text/text_renderer.h"
+
+#include "ui/text/text_spoiler_data.h"
+#include "ui/spoiler_click_handler.h"
+#include "styles/style_basic.h"
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <private/qharfbuzz_p.h>
+#endif // Qt < 6.0.0
+
+namespace Ui::Text {
+namespace {
+
+// COPIED FROM qtextengine.cpp AND MODIFIED
+
+struct BidiStatus {
+	BidiStatus() {
+		eor = QChar::DirON;
+		lastStrong = QChar::DirON;
+		last = QChar::DirON;
+		dir = QChar::DirON;
+	}
+	QChar::Direction eor;
+	QChar::Direction lastStrong;
+	QChar::Direction last;
+	QChar::Direction dir;
+};
+
+enum { _MaxBidiLevel = 61 };
+enum { _MaxItemLength = 4096 };
+
+void InitTextItemWithScriptItem(QTextItemInt &ti, const QScriptItem &si) {
+	// explicitly initialize flags so that initFontAttributes can be called
+	// multiple times on the same TextItem
+	ti.flags = { };
+	if (si.analysis.bidiLevel % 2)
+		ti.flags |= QTextItem::RightToLeft;
+	ti.ascent = si.ascent;
+	ti.descent = si.descent;
+
+	if (ti.charFormat.hasProperty(QTextFormat::TextUnderlineStyle)) {
+		ti.underlineStyle = ti.charFormat.underlineStyle();
+	} else if (ti.charFormat.boolProperty(QTextFormat::FontUnderline)
+		|| ti.f->underline()) {
+		ti.underlineStyle = QTextCharFormat::SingleUnderline;
+	}
+
+	// compat
+	if (ti.underlineStyle == QTextCharFormat::SingleUnderline)
+		ti.flags |= QTextItem::Underline;
+
+	if (ti.f->overline() || ti.charFormat.fontOverline())
+		ti.flags |= QTextItem::Overline;
+	if (ti.f->strikeOut() || ti.charFormat.fontStrikeOut())
+		ti.flags |= QTextItem::StrikeOut;
+}
+
+} // namespace
+
+
+struct Renderer::BidiControl {
+	inline BidiControl(bool rtl)
+		: base(rtl ? 1 : 0), level(rtl ? 1 : 0) {}
+
+	inline void embed(bool rtl, bool o = false) {
+		unsigned int toAdd = 1;
+		if ((level % 2 != 0) == rtl) {
+			++toAdd;
+		}
+		if (level + toAdd <= _MaxBidiLevel) {
+			ctx[cCtx].level = level;
+			ctx[cCtx].override = override;
+			cCtx++;
+			override = o;
+			level += toAdd;
+		}
+	}
+	inline bool canPop() const { return cCtx != 0; }
+	inline void pdf() {
+		Q_ASSERT(cCtx);
+		--cCtx;
+		level = ctx[cCtx].level;
+		override = ctx[cCtx].override;
+	}
+
+	inline QChar::Direction basicDirection() const {
+		return (base ? QChar::DirR : QChar::DirL);
+	}
+	inline unsigned int baseLevel() const {
+		return base;
+	}
+	inline QChar::Direction direction() const {
+		return ((level % 2) ? QChar::DirR : QChar::DirL);
+	}
+
+	struct {
+		unsigned int level = 0;
+		bool override = false;
+	} ctx[_MaxBidiLevel];
+	unsigned int cCtx = 0;
+	const unsigned int base;
+	unsigned int level;
+	bool override = false;
+};
+
+Renderer::Renderer(const Ui::Text::String &t)
+: _t(&t) {
+}
+
+Renderer::~Renderer() {
+	restoreAfterElided();
+	if (_p) {
+		_p->setPen(_originalPen);
+	}
+}
+
+void Renderer::draw(QPainter &p, const PaintContext &context) {
+	if (_t->isEmpty()) {
+		return;
+	}
+
+	_p = &p;
+	_p->setFont(_t->_st->font);
+	_palette = context.palette ? context.palette : &st::defaultTextPalette;
+	_originalPen = _p->pen();
+	_originalPenSelected = (_palette->selectFg->c.alphaF() == 0)
+		? _originalPen
+		: _palette->selectFg->p;
+
+	_x = context.position.x();
+	_y = context.position.y();
+	_yFrom = context.clip.isNull() ? 0 : context.clip.y();
+	_yTo = context.clip.isNull()
+		? -1
+		: (context.clip.y() + context.clip.height());
+	if (const auto lines = context.elisionLines) {
+		if (context.clip.isNull())
+		if (_yTo < 0 || (_y + (lines - 1) * _t->_st->font->height) < _yTo) {
+			_yTo = _y + (lines * _t->_st->font->height);
+			_elideLast = true;
+			_elideRemoveFromEnd = context.elisionRemoveFromEnd;
+		}
+		_breakEverywhere = context.elisionBreakEverywhere;
+	}
+	_spoilerCache = context.spoiler;
+	_selection = context.selection;
+	_fullWidthSelection = context.fullWidthSelection;
+	_w = context.availableWidth;
+	_align = context.align;
+	_cachedNow = context.now;
+	_paused = context.paused;
+	enumerate();
+}
+
+void Renderer::enumerate() {
+	_blocksSize = _t->_blocks.size();
+	_wLeft = _w;
+	if (_elideLast) {
+		_yToElide = _yTo;
+		if (_elideRemoveFromEnd > 0 && !_t->_blocks.empty()) {
+			int firstBlockHeight = CountBlockHeight(_t->_blocks.front().get(), _t->_st);
+			if (_y + firstBlockHeight >= _yToElide) {
+				_wLeft -= _elideRemoveFromEnd;
+			}
+		}
+	}
+	_str = _t->_text.unicode();
+
+	if (_p) {
+		auto clip = _p->hasClipping() ? _p->clipBoundingRect() : QRect();
+		if (clip.width() > 0 || clip.height() > 0) {
+			if (_yFrom < clip.y()) _yFrom = clip.y();
+			if (_yTo < 0 || _yTo > clip.y() + clip.height()) _yTo = clip.y() + clip.height();
+		}
+	}
+
+	_parDirection = _t->_startDir;
+	if (_parDirection == Qt::LayoutDirectionAuto) _parDirection = style::LayoutDirection();
+	if ((*_t->_blocks.cbegin())->type() != TextBlockTNewline) {
+		initNextParagraph(_t->_blocks.cbegin());
+	}
+
+	_lineStart = 0;
+	_lineStartBlock = 0;
+
+	_lineHeight = 0;
+	_fontHeight = _t->_st->font->height;
+	auto last_rBearing = QFixed(0);
+	_last_rPadding = QFixed(0);
+
+	auto blockIndex = 0;
+	bool longWordLine = true;
+	auto e = _t->_blocks.cend();
+	for (auto i = _t->_blocks.cbegin(); i != e; ++i, ++blockIndex) {
+		auto b = i->get();
+		auto _btype = b->type();
+		auto blockHeight = CountBlockHeight(b, _t->_st);
+
+		if (_btype == TextBlockTNewline) {
+			if (!_lineHeight) _lineHeight = blockHeight;
+			if (!drawLine((*i)->from(), i, e)) {
+				return;
+			}
+
+			_y += _lineHeight;
+			_lineHeight = 0;
+			_lineStart = _t->countBlockEnd(i, e);
+			_lineStartBlock = blockIndex + 1;
+
+			last_rBearing = b->f_rbearing();
+			_last_rPadding = b->f_rpadding();
+			_wLeft = _w - (b->f_width() - last_rBearing);
+			if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
+				_wLeft -= _elideRemoveFromEnd;
+			}
+
+			_parDirection = static_cast<const NewlineBlock*>(b)->nextDirection();
+			if (_parDirection == Qt::LayoutDirectionAuto) _parDirection = style::LayoutDirection();
+			initNextParagraph(i + 1);
+
+			longWordLine = true;
+			continue;
+		}
+
+		auto b__f_rbearing = b->f_rbearing();
+		auto newWidthLeft = _wLeft - last_rBearing - (_last_rPadding + b->f_width() - b__f_rbearing);
+		if (newWidthLeft >= 0) {
+			last_rBearing = b__f_rbearing;
+			_last_rPadding = b->f_rpadding();
+			_wLeft = newWidthLeft;
+
+			_lineHeight = qMax(_lineHeight, blockHeight);
+
+			longWordLine = false;
+			continue;
+		}
+
+		if (_btype == TextBlockTText) {
+			auto t = static_cast<const TextBlock*>(b);
+			if (t->_words.isEmpty()) { // no words in this block, spaces only => layout this block in the same line
+				_last_rPadding += b->f_rpadding();
+
+				_lineHeight = qMax(_lineHeight, blockHeight);
+
+				longWordLine = false;
+				continue;
+			}
+
+			auto f_wLeft = _wLeft; // vars for saving state of the last word start
+			auto f_lineHeight = _lineHeight; // f points to the last word-start element of t->_words
+			for (auto j = t->_words.cbegin(), en = t->_words.cend(), f = j; j != en; ++j) {
+				auto wordEndsHere = (j->f_width() >= 0);
+				auto j_width = wordEndsHere ? j->f_width() : -j->f_width();
+
+				auto newWidthLeft = _wLeft - last_rBearing - (_last_rPadding + j_width - j->f_rbearing());
+				if (newWidthLeft >= 0) {
+					last_rBearing = j->f_rbearing();
+					_last_rPadding = j->f_rpadding();
+					_wLeft = newWidthLeft;
+
+					_lineHeight = qMax(_lineHeight, blockHeight);
+
+					if (wordEndsHere) {
+						longWordLine = false;
+					}
+					if (wordEndsHere || longWordLine) {
+						f = j + 1;
+						f_wLeft = _wLeft;
+						f_lineHeight = _lineHeight;
+					}
+					continue;
+				}
+
+				auto elidedLineHeight = qMax(_lineHeight, blockHeight);
+				auto elidedLine = _elideLast && (_y + elidedLineHeight >= _yToElide);
+				if (elidedLine) {
+					_lineHeight = elidedLineHeight;
+				} else if (f != j && !_breakEverywhere) {
+					// word did not fit completely, so we roll back the state to the beginning of this long word
+					j = f;
+					_wLeft = f_wLeft;
+					_lineHeight = f_lineHeight;
+					j_width = (j->f_width() >= 0) ? j->f_width() : -j->f_width();
+				}
+				if (!drawLine(elidedLine ? ((j + 1 == en) ? _t->countBlockEnd(i, e) : (j + 1)->from()) : j->from(), i, e)) {
+					return;
+				}
+				_y += _lineHeight;
+				_lineHeight = qMax(0, blockHeight);
+				_lineStart = j->from();
+				_lineStartBlock = blockIndex;
+
+				last_rBearing = j->f_rbearing();
+				_last_rPadding = j->f_rpadding();
+				_wLeft = _w - (j_width - last_rBearing);
+				if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
+					_wLeft -= _elideRemoveFromEnd;
+				}
+
+				longWordLine = !wordEndsHere;
+				f = j + 1;
+				f_wLeft = _wLeft;
+				f_lineHeight = _lineHeight;
+			}
+			continue;
+		}
+
+		auto elidedLineHeight = qMax(_lineHeight, blockHeight);
+		auto elidedLine = _elideLast && (_y + elidedLineHeight >= _yToElide);
+		if (elidedLine) {
+			_lineHeight = elidedLineHeight;
+		}
+		if (!drawLine(elidedLine ? _t->countBlockEnd(i, e) : b->from(), i, e)) {
+			return;
+		}
+		_y += _lineHeight;
+		_lineHeight = qMax(0, blockHeight);
+		_lineStart = b->from();
+		_lineStartBlock = blockIndex;
+
+		last_rBearing = b__f_rbearing;
+		_last_rPadding = b->f_rpadding();
+		_wLeft = _w - (b->f_width() - last_rBearing);
+		if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
+			_wLeft -= _elideRemoveFromEnd;
+		}
+
+		longWordLine = true;
+		continue;
+	}
+	if (_lineStart < _t->_text.size()) {
+		if (!drawLine(_t->_text.size(), e, e)) return;
+	}
+	if (!_p && _lookupSymbol) {
+		_lookupResult.symbol = _t->_text.size();
+		_lookupResult.afterSymbol = false;
+	}
+}
+
+StateResult Renderer::getState(QPoint point, int w, StateRequest request) {
+	if (!_t->isNull() && point.y() >= 0) {
+		_lookupRequest = request;
+		_lookupX = point.x();
+		_lookupY = point.y();
+
+		_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
+		_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
+		_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
+		if (_lookupSymbol || (_lookupX >= 0 && _lookupX < w)) {
+			_w = w;
+			_yFrom = _lookupY;
+			_yTo = _lookupY + 1;
+			_align = _lookupRequest.align;
+			enumerate();
+		}
+	}
+	return _lookupResult;
+}
+
+StateResult Renderer::getStateElided(QPoint point, int w, StateRequestElided request) {
+	if (!_t->isNull() && point.y() >= 0 && request.lines > 0) {
+		_lookupRequest = request;
+		_lookupX = point.x();
+		_lookupY = point.y();
+
+		_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
+		_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
+		_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
+		if (_lookupSymbol || (_lookupX >= 0 && _lookupX < w)) {
+			int yTo = _lookupY + 1;
+			if (yTo < 0 || (request.lines - 1) * _t->_st->font->height < yTo) {
+				yTo = request.lines * _t->_st->font->height;
+				_elideLast = true;
+				_elideRemoveFromEnd = request.removeFromEnd;
+			}
+			_w = w;
+			_yFrom = _lookupY;
+			_yTo = _lookupY + 1;
+			_align = _lookupRequest.align;
+			enumerate();
+		}
+	}
+	return _lookupResult;
+}
+
+crl::time Renderer::now() const {
+	if (!_cachedNow) {
+		_cachedNow = crl::now();
+	}
+	return _cachedNow;
+}
+
+void Renderer::initNextParagraph(String::TextBlocks::const_iterator i) {
+	_parStartBlock = i;
+	const auto e = _t->_blocks.cend();
+	if (i == e) {
+		_parStart = _t->_text.size();
+		_parLength = 0;
+	} else {
+		_parStart = (*i)->from();
+		for (; i != e; ++i) {
+			if ((*i)->type() == TextBlockTNewline) {
+				break;
+			}
+		}
+		_parLength = ((i == e) ? _t->_text.size() : (*i)->from()) - _parStart;
+	}
+	_parAnalysis.resize(0);
+}
+
+void Renderer::initParagraphBidi() {
+	if (!_parLength || !_parAnalysis.isEmpty()) return;
+
+	String::TextBlocks::const_iterator i = _parStartBlock, e = _t->_blocks.cend(), n = i + 1;
+
+	bool ignore = false;
+	bool rtl = (_parDirection == Qt::RightToLeft);
+	if (!ignore && !rtl) {
+		ignore = true;
+		const ushort *start = reinterpret_cast<const ushort*>(_str) + _parStart;
+		const ushort *curr = start;
+		const ushort *end = start + _parLength;
+		while (curr < end) {
+			while (n != e && (*n)->from() <= _parStart + (curr - start)) {
+				i = n;
+				++n;
+			}
+			const auto type = (*i)->type();
+			if (type != TextBlockTEmoji
+				&& type != TextBlockTCustomEmoji
+				&& *curr >= 0x590) {
+				ignore = false;
+				break;
+			}
+			++curr;
+		}
+	}
+
+	_parAnalysis.resize(_parLength);
+	QScriptAnalysis *analysis = _parAnalysis.data();
+
+	BidiControl control(rtl);
+
+	_parHasBidi = false;
+	if (ignore) {
+		memset(analysis, 0, _parLength * sizeof(QScriptAnalysis));
+		if (rtl) {
+			for (int i = 0; i < _parLength; ++i)
+				analysis[i].bidiLevel = 1;
+			_parHasBidi = true;
+		}
+	} else {
+		_parHasBidi = eBidiItemize(analysis, control);
+	}
+}
+
+bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterator &_endBlockIter, const String::TextBlocks::const_iterator &_end) {
+	_yDelta = (_lineHeight - _fontHeight) / 2;
+	if (_yTo >= 0 && (_y + _yDelta >= _yTo || _y >= _yTo)) return false;
+	if (_y + _yDelta + _fontHeight <= _yFrom) {
+		if (_lookupSymbol) {
+			_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
+			_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
+		}
+		return true;
+	}
+
+	// Trimming pending spaces, because they sometimes don't fit on the line.
+	// They also are not counted in the line width, they're in the right padding.
+	// Line width is a sum of block / word widths and paddings between them, without trailing one.
+	auto trimmedLineEnd = _lineEnd;
+	for (; trimmedLineEnd > _lineStart; --trimmedLineEnd) {
+		auto ch = _t->_text[trimmedLineEnd - 1];
+		if (ch != QChar::Space && ch != QChar::LineFeed) {
+			break;
+		}
+	}
+
+	auto _endBlock = (_endBlockIter == _end) ? nullptr : _endBlockIter->get();
+	auto elidedLine = _elideLast && (_y + _lineHeight >= _yToElide);
+	if (elidedLine) {
+		// If we decided to draw the last line elided only because of the skip block
+		// that did not fit on this line, we just draw the line till the very end.
+		// Skip block is ignored in the elided lines, instead "removeFromEnd" is used.
+		if (_endBlock && _endBlock->type() == TextBlockTSkip) {
+			_endBlock = nullptr;
+		}
+		if (!_endBlock) {
+			elidedLine = false;
+		}
+	}
+
+	auto blockIndex = _lineStartBlock;
+	auto currentBlock = _t->_blocks[blockIndex].get();
+	auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+
+	const auto extendLeft = (currentBlock->from() < _lineStart)
+		? qMin(_lineStart - currentBlock->from(), 2)
+		: 0;
+	_localFrom = _lineStart - extendLeft;
+	const auto extendedLineEnd = (_endBlock && _endBlock->from() < trimmedLineEnd && !elidedLine)
+		? qMin(uint16(trimmedLineEnd + 2), _t->countBlockEnd(_endBlockIter, _end))
+		: trimmedLineEnd;
+
+	auto lineText = _t->_text.mid(_localFrom, extendedLineEnd - _localFrom);
+	auto lineStart = extendLeft;
+	auto lineLength = trimmedLineEnd - _lineStart;
+
+	if (elidedLine) {
+		initParagraphBidi();
+		prepareElidedLine(lineText, lineStart, lineLength, _endBlock);
+	}
+
+	auto x = _x;
+	if (_align & Qt::AlignHCenter) {
+		x += (_wLeft / 2).toInt();
+	} else if (((_align & Qt::AlignLeft) && _parDirection == Qt::RightToLeft) || ((_align & Qt::AlignRight) && _parDirection == Qt::LeftToRight)) {
+		x += _wLeft;
+	}
+
+	if (!_p) {
+		if (_lookupX < x) {
+			if (_lookupSymbol) {
+				if (_parDirection == Qt::RightToLeft) {
+					_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
+					_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
+					//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
+				} else {
+					_lookupResult.symbol = _lineStart;
+					_lookupResult.afterSymbol = false;
+					//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineStart > 0)) ? true : false;
+				}
+			}
+			if (_lookupLink) {
+				_lookupResult.link = nullptr;
+			}
+			_lookupResult.uponSymbol = false;
+			return false;
+		} else if (_lookupX >= x + (_w - _wLeft)) {
+			if (_parDirection == Qt::RightToLeft) {
+				_lookupResult.symbol = _lineStart;
+				_lookupResult.afterSymbol = false;
+				//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineStart > 0)) ? true : false;
+			} else {
+				_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
+				_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
+				//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
+			}
+			if (_lookupLink) {
+				_lookupResult.link = nullptr;
+			}
+			_lookupResult.uponSymbol = false;
+			return false;
+		}
+	}
+
+	if (_fullWidthSelection) {
+		const auto selectFromStart = (_selection.to > _lineStart)
+			&& (_lineStart > 0)
+			&& (_selection.from <= _lineStart);
+		const auto selectTillEnd = (_selection.to > trimmedLineEnd)
+			&& (trimmedLineEnd < _t->_text.size())
+			&& (_selection.from <= trimmedLineEnd)
+			&& (!_endBlock || _endBlock->type() != TextBlockTSkip);
+
+		if ((selectFromStart && _parDirection == Qt::LeftToRight)
+			|| (selectTillEnd && _parDirection == Qt::RightToLeft)) {
+			if (x > _x) {
+				fillSelectRange(_x, x);
+			}
+		}
+		if ((selectTillEnd && _parDirection == Qt::LeftToRight)
+			|| (selectFromStart && _parDirection == Qt::RightToLeft)) {
+			if (x < _x + _wLeft) {
+				fillSelectRange(x + _w - _wLeft, _x + _w);
+			}
+		}
+	}
+	if (trimmedLineEnd == _lineStart && !elidedLine) {
+		return true;
+	}
+
+	if (!elidedLine) initParagraphBidi(); // if was not inited
+
+	_f = _t->_st->font;
+	QStackTextEngine engine(lineText, _f->f);
+	engine.option.setTextDirection(_parDirection);
+	_e = &engine;
+
+	eItemize();
+
+	QScriptLine line;
+	line.from = lineStart;
+	line.length = lineLength;
+	eShapeLine(line);
+
+	int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
+	int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0;
+	if (!nItems) {
+		return true;
+	}
+
+	int skipIndex = -1;
+	QVarLengthArray<int> visualOrder(nItems);
+	QVarLengthArray<uchar> levels(nItems);
+	for (int i = 0; i < nItems; ++i) {
+		auto &si = engine.layoutData->items[firstItem + i];
+		while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
+			currentBlock = nextBlock;
+			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+		}
+		auto _type = currentBlock->type();
+		if (_type == TextBlockTSkip) {
+			levels[i] = si.analysis.bidiLevel = 0;
+			skipIndex = i;
+		} else {
+			levels[i] = si.analysis.bidiLevel;
+		}
+		if (si.analysis.flags == QScriptAnalysis::Object) {
+			if (_type == TextBlockTEmoji
+				|| _type == TextBlockTCustomEmoji
+				|| _type == TextBlockTSkip) {
+				si.width = currentBlock->f_width()
+					+ (nextBlock == _endBlock && (!nextBlock || nextBlock->from() >= trimmedLineEnd)
+						? 0
+						: currentBlock->f_rpadding());
+			}
+		}
+	}
+	QTextEngine::bidiReorder(nItems, levels.data(), visualOrder.data());
+	if (style::RightToLeft() && skipIndex == nItems - 1) {
+		for (int32 i = nItems; i > 1;) {
+			--i;
+			visualOrder[i] = visualOrder[i - 1];
+		}
+		visualOrder[0] = skipIndex;
+	}
+
+	blockIndex = _lineStartBlock;
+	currentBlock = _t->_blocks[blockIndex].get();
+	nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+
+	int32 textY = _y + _yDelta + _t->_st->font->ascent, emojiY = (_t->_st->font->height - st::emojiSize) / 2;
+
+	applyBlockProperties(currentBlock);
+	for (int i = 0; i < nItems; ++i) {
+		int item = firstItem + visualOrder[i];
+		const QScriptItem &si = engine.layoutData->items.at(item);
+		bool rtl = (si.analysis.bidiLevel % 2);
+
+		while (blockIndex > _lineStartBlock + 1 && _t->_blocks[blockIndex - 1]->from() > _localFrom + si.position) {
+			nextBlock = currentBlock;
+			currentBlock = _t->_blocks[--blockIndex - 1].get();
+			applyBlockProperties(currentBlock);
+		}
+		while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
+			currentBlock = nextBlock;
+			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+			applyBlockProperties(currentBlock);
+		}
+		if (si.analysis.flags >= QScriptAnalysis::TabOrObject) {
+			TextBlockType _type = currentBlock->type();
+			if (!_p && _lookupX >= x && _lookupX < x + si.width) { // _lookupRequest
+				if (_lookupLink) {
+					if (_lookupY >= _y + _yDelta && _lookupY < _y + _yDelta + _fontHeight) {
+						const auto spoilerLink = _t->spoilerLink(currentBlock->spoilerIndex());
+						const auto resultLink = (spoilerLink || !currentBlock->lnkIndex())
+							? spoilerLink
+							: _t->_links.at(currentBlock->lnkIndex() - 1);
+						if (resultLink) {
+							_lookupResult.link = resultLink;
+						}
+					}
+				}
+				if (_type != TextBlockTSkip) {
+					_lookupResult.uponSymbol = true;
+				}
+				if (_lookupSymbol) {
+					if (_type == TextBlockTSkip) {
+						if (_parDirection == Qt::RightToLeft) {
+							_lookupResult.symbol = _lineStart;
+							_lookupResult.afterSymbol = false;
+						} else {
+							_lookupResult.symbol = (trimmedLineEnd > _lineStart) ? (trimmedLineEnd - 1) : _lineStart;
+							_lookupResult.afterSymbol = (trimmedLineEnd > _lineStart) ? true : false;
+						}
+						return false;
+					}
+
+					// Emoji with spaces after symbol lookup
+					auto chFrom = _str + currentBlock->from();
+					auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
+					auto spacesWidth = (si.width - currentBlock->f_width());
+					auto spacesCount = 0;
+					while (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space) {
+						++spacesCount;
+						--chTo;
+					}
+					if (spacesCount > 0) { // Check if we're over a space.
+						if (rtl) {
+							if (_lookupX < x + spacesWidth) {
+								_lookupResult.symbol = (chTo - _str); // up to a space, included, rtl
+								_lookupResult.afterSymbol = (_lookupX < x + (spacesWidth / 2)) ? true : false;
+								return false;
+							}
+						} else if (_lookupX >= x + si.width - spacesWidth) {
+							_lookupResult.symbol = (chTo - _str); // up to a space, inclided, ltr
+							_lookupResult.afterSymbol = (_lookupX >= x + si.width - spacesWidth + (spacesWidth / 2)) ? true : false;
+							return false;
+						}
+					}
+					if (_lookupX < x + (rtl ? (si.width - currentBlock->f_width()) : 0) + (currentBlock->f_width() / 2)) {
+						_lookupResult.symbol = ((rtl && chTo > chFrom) ? (chTo - 1) : chFrom) - _str;
+						_lookupResult.afterSymbol = (rtl && chTo > chFrom) ? true : false;
+					} else {
+						_lookupResult.symbol = ((rtl || chTo <= chFrom) ? chFrom : (chTo - 1)) - _str;
+						_lookupResult.afterSymbol = (rtl || chTo <= chFrom) ? false : true;
+					}
+				}
+				return false;
+			} else if (_p && (_type == TextBlockTEmoji || _type == TextBlockTCustomEmoji)) {
+				auto glyphX = x;
+				auto spacesWidth = (si.width - currentBlock->f_width());
+				if (rtl) {
+					glyphX += spacesWidth;
+				}
+				struct {
+					QFixed from;
+					QFixed to;
+				} fillSelect;
+				struct {
+					QFixed from;
+					QFixed width;
+				} fillSpoiler;
+				if (_background.selectActiveBlock) {
+					fillSelect = { x, x + si.width };
+				} else if (_localFrom + si.position < _selection.to) {
+					auto chFrom = _str + currentBlock->from();
+					auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
+					if (_localFrom + si.position >= _selection.from) { // could be without space
+						if (chTo == chFrom || (chTo - 1)->unicode() != QChar::Space || _selection.to >= (chTo - _str)) {
+							fillSelect = { x, x + si.width };
+						} else { // or with space
+							fillSelect = { glyphX, glyphX + currentBlock->f_width() };
+						}
+					} else if (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space && (chTo - 1 - _str) >= _selection.from) {
+						if (rtl) { // rtl space only
+							fillSelect = { x, glyphX };
+						} else { // ltr space only
+							fillSelect = { x + currentBlock->f_width(), x + si.width };
+						}
+					}
+				}
+				const auto hasSpoiler = _background.color &&
+					(_background.inFront || _background.startMs);
+				if (hasSpoiler) {
+					fillSpoiler = { x, si.width };
+				}
+				const auto spoilerOpacity = hasSpoiler
+					? fillSpoilerOpacity()
+					: 0.;
+				const auto hasSelect = fillSelect.to != QFixed();
+				if (hasSelect) {
+					fillSelectRange(fillSelect.from, fillSelect.to);
+				}
+				const auto opacity = _p->opacity();
+				if (spoilerOpacity < 1.) {
+					if (hasSpoiler) {
+						_p->setOpacity(opacity * (1. - spoilerOpacity));
+					}
+					const auto x = (glyphX + st::emojiPadding).toInt();
+					const auto y = _y + _yDelta + emojiY;
+					if (_type == TextBlockTEmoji) {
+						Emoji::Draw(
+							*_p,
+							static_cast<const EmojiBlock*>(currentBlock)->_emoji,
+							Emoji::GetSizeNormal(),
+							x,
+							y);
+					} else if (const auto custom = static_cast<const CustomEmojiBlock*>(currentBlock)->_custom.get()) {
+						if (!_customEmojiSize) {
+							_customEmojiSize = AdjustCustomEmojiSize(st::emojiSize);
+							_customEmojiSkip = (st::emojiSize - _customEmojiSize) / 2;
+						}
+						custom->paint(*_p, {
+							.preview = _palette->spoilerActiveBg->c,
+							.now = now(),
+							.position = { x + _customEmojiSkip, y + _customEmojiSkip },
+							.paused = _paused,
+						});
+					}
+				}
+				if (hasSpoiler) {
+					_p->setOpacity(opacity * spoilerOpacity);
+					fillSpoilerRange(
+						fillSpoiler.from,
+						fillSpoiler.width,
+						blockIndex,
+						currentBlock->from(),
+						(nextBlock ? nextBlock->from() : _t->_text.size()));
+					_p->setOpacity(opacity);
+				}
+			//} else if (_p && currentBlock->type() == TextBlockSkip) { // debug
+			//	_p->fillRect(QRect(x.toInt(), _y, currentBlock->width(), static_cast<SkipBlock*>(currentBlock)->height()), QColor(0, 0, 0, 32));
+			}
+			x += si.width;
+			continue;
+		}
+
+		unsigned short *logClusters = engine.logClusters(&si);
+		QGlyphLayout glyphs = engine.shapedGlyphs(&si);
+
+		int itemStart = qMax(line.from, si.position), itemEnd;
+		int itemLength = engine.length(item);
+		int glyphsStart = logClusters[itemStart - si.position], glyphsEnd;
+		if (line.from + line.length < si.position + itemLength) {
+			itemEnd = line.from + line.length;
+			glyphsEnd = logClusters[itemEnd - si.position];
+		} else {
+			itemEnd = si.position + itemLength;
+			glyphsEnd = si.num_glyphs;
+		}
+
+		QFixed itemWidth = 0;
+		for (int g = glyphsStart; g < glyphsEnd; ++g)
+			itemWidth += glyphs.effectiveAdvance(g);
+
+		if (!_p && _lookupX >= x && _lookupX < x + itemWidth) { // _lookupRequest
+			if (_lookupLink) {
+				if (_lookupY >= _y + _yDelta && _lookupY < _y + _yDelta + _fontHeight) {
+					const auto spoilerLink = _t->spoilerLink(currentBlock->spoilerIndex());
+					const auto resultLink = (spoilerLink || !currentBlock->lnkIndex())
+						? spoilerLink
+						: _t->_links.at(currentBlock->lnkIndex() - 1);
+					if (resultLink) {
+						_lookupResult.link = resultLink;
+					}
+				}
+			}
+			_lookupResult.uponSymbol = true;
+			if (_lookupSymbol) {
+				QFixed tmpx = rtl ? (x + itemWidth) : x;
+				for (int ch = 0, g, itemL = itemEnd - itemStart; ch < itemL;) {
+					g = logClusters[itemStart - si.position + ch];
+					QFixed gwidth = glyphs.effectiveAdvance(g);
+					// ch2 - glyph end, ch - glyph start, (ch2 - ch) - how much chars it takes
+					int ch2 = ch + 1;
+					while ((ch2 < itemL) && (g == logClusters[itemStart - si.position + ch2])) {
+						++ch2;
+					}
+					for (int charsCount = (ch2 - ch); ch < ch2; ++ch) {
+						QFixed shift1 = QFixed(2 * (charsCount - (ch2 - ch)) + 2) * gwidth / QFixed(2 * charsCount),
+							shift2 = QFixed(2 * (charsCount - (ch2 - ch)) + 1) * gwidth / QFixed(2 * charsCount);
+						if ((rtl && _lookupX >= tmpx - shift1) ||
+							(!rtl && _lookupX < tmpx + shift1)) {
+							_lookupResult.symbol = _localFrom + itemStart + ch;
+							if ((rtl && _lookupX >= tmpx - shift2) ||
+								(!rtl && _lookupX < tmpx + shift2)) {
+								_lookupResult.afterSymbol = false;
+							} else {
+								_lookupResult.afterSymbol = true;
+							}
+							return false;
+						}
+					}
+					if (rtl) {
+						tmpx -= gwidth;
+					} else {
+						tmpx += gwidth;
+					}
+				}
+				if (itemEnd > itemStart) {
+					_lookupResult.symbol = _localFrom + itemEnd - 1;
+					_lookupResult.afterSymbol = true;
+				} else {
+					_lookupResult.symbol = _localFrom + itemStart;
+					_lookupResult.afterSymbol = false;
+				}
+			}
+			return false;
+		} else if (_p) {
+			QTextItemInt gf;
+			gf.glyphs = glyphs.mid(glyphsStart, glyphsEnd - glyphsStart);
+			gf.f = &_e->fnt;
+			gf.chars = engine.layoutData->string.unicode() + itemStart;
+			gf.num_chars = itemEnd - itemStart;
+			gf.fontEngine = engine.fontEngine(si);
+			gf.logClusters = logClusters + itemStart - si.position;
+			gf.width = itemWidth;
+			gf.justified = false;
+			InitTextItemWithScriptItem(gf, si);
+
+			auto hasSelected = false;
+			auto hasNotSelected = true;
+			auto selectedRect = QRect();
+			if (_background.selectActiveBlock) {
+				fillSelectRange(x, x + itemWidth);
+			} else if (_localFrom + itemStart < _selection.to && _localFrom + itemEnd > _selection.from) {
+				hasSelected = true;
+				auto selX = x;
+				auto selWidth = itemWidth;
+				if (_localFrom + itemStart >= _selection.from && _localFrom + itemEnd <= _selection.to) {
+					hasNotSelected = false;
+				} else {
+					selWidth = 0;
+					int itemL = itemEnd - itemStart;
+					int selStart = _selection.from - (_localFrom + itemStart), selEnd = _selection.to - (_localFrom + itemStart);
+					if (selStart < 0) selStart = 0;
+					if (selEnd > itemL) selEnd = itemL;
+					for (int ch = 0, g; ch < selEnd;) {
+						g = logClusters[itemStart - si.position + ch];
+						QFixed gwidth = glyphs.effectiveAdvance(g);
+						// ch2 - glyph end, ch - glyph start, (ch2 - ch) - how much chars it takes
+						int ch2 = ch + 1;
+						while ((ch2 < itemL) && (g == logClusters[itemStart - si.position + ch2])) {
+							++ch2;
+						}
+						if (ch2 <= selStart) {
+							selX += gwidth;
+						} else if (ch >= selStart && ch2 <= selEnd) {
+							selWidth += gwidth;
+						} else {
+							int sStart = ch, sEnd = ch2;
+							if (ch < selStart) {
+								sStart = selStart;
+								selX += QFixed(sStart - ch) * gwidth / QFixed(ch2 - ch);
+							}
+							if (ch2 >= selEnd) {
+								sEnd = selEnd;
+								selWidth += QFixed(sEnd - sStart) * gwidth / QFixed(ch2 - ch);
+								break;
+							}
+							selWidth += QFixed(sEnd - sStart) * gwidth / QFixed(ch2 - ch);
+						}
+						ch = ch2;
+					}
+				}
+				if (rtl) selX = x + itemWidth - (selX - x) - selWidth;
+				selectedRect = QRect(selX.toInt(), _y + _yDelta, (selX + selWidth).toInt() - selX.toInt(), _fontHeight);
+				fillSelectRange(selX, selX + selWidth);
+			}
+			const auto hasSpoiler = (_background.inFront || _background.startMs);
+			const auto spoilerOpacity = hasSpoiler
+				? fillSpoilerOpacity()
+				: 0.;
+			const auto opacity = _p->opacity();
+			const auto isElidedBlock = (!rtl)
+				&& (_indexOfElidedBlock == blockIndex);
+			if ((spoilerOpacity < 1.) || isElidedBlock) {
+				if (hasSpoiler && !isElidedBlock) {
+					_p->setOpacity(opacity * (1. - spoilerOpacity));
+				}
+				if (Q_UNLIKELY(hasSelected)) {
+					if (Q_UNLIKELY(hasNotSelected)) {
+						// There is a bug in retina QPainter clipping stack.
+						// You can see glitches in rendering in such text:
+						// aA
+						// Aa
+						// Where selection is both 'A'-s.
+						// I can't debug it right now, this is a workaround.
+#ifdef Q_OS_MAC
+						_p->save();
+#endif // Q_OS_MAC
+						const auto clippingEnabled = _p->hasClipping();
+						const auto clippingRegion = _p->clipRegion();
+						_p->setClipRect(selectedRect, Qt::IntersectClip);
+						_p->setPen(*_currentPenSelected);
+						_p->drawTextItem(QPointF(x.toReal(), textY), gf);
+						const auto externalClipping = clippingEnabled
+							? clippingRegion
+							: QRegion(QRect(
+								(_x - _w).toInt(),
+								_y - _lineHeight,
+								(_x + 2 * _w).toInt(),
+								_y + 2 * _lineHeight));
+						_p->setClipRegion(externalClipping - selectedRect);
+						_p->setPen(*_currentPen);
+						_p->drawTextItem(QPointF(x.toReal(), textY), gf);
+#ifdef Q_OS_MAC
+						_p->restore();
+#else // Q_OS_MAC
+						if (clippingEnabled) {
+							_p->setClipRegion(clippingRegion);
+						} else {
+							_p->setClipping(false);
+						}
+#endif // Q_OS_MAC
+					} else {
+						_p->setPen(*_currentPenSelected);
+						_p->drawTextItem(QPointF(x.toReal(), textY), gf);
+					}
+				} else {
+					_p->setPen(*_currentPen);
+					_p->drawTextItem(QPointF(x.toReal(), textY), gf);
+				}
+			}
+
+			if (hasSpoiler) {
+				_p->setOpacity(opacity * spoilerOpacity);
+				fillSpoilerRange(
+					x,
+					itemWidth,
+					blockIndex,
+					_localFrom + itemStart,
+					_localFrom + itemEnd);
+				_p->setOpacity(opacity);
+			}
+		}
+
+		x += itemWidth;
+	}
+	return true;
+}
+
+void Renderer::fillSelectRange(QFixed from, QFixed to) {
+	auto left = from.toInt();
+	auto width = to.toInt() - left;
+	_p->fillRect(left, _y + _yDelta, width, _fontHeight, _palette->selectBg);
+}
+
+float64 Renderer::fillSpoilerOpacity() {
+	if (!_background.startMs) {
+		return 1.;
+	}
+	const auto progress = float64(now() - _background.startMs)
+		/ st::fadeWrapDuration;
+	if ((progress > 1.) && _background.spoilerIndex && _t->_spoiler) {
+		const auto link = _t->_spoiler->links.at(
+			_background.spoilerIndex - 1);
+		if (link) {
+			link->setStartMs(0);
+		}
+	}
+	return (1. - std::min(progress, 1.));
+}
+
+void Renderer::fillSpoilerRange(
+		QFixed x,
+		QFixed width,
+		int currentBlockIndex,
+		int positionFrom,
+		int positionTill) {
+	if (!_background.color || !_t->_spoiler) {
+		return;
+	}
+	const auto elided = (_indexOfElidedBlock == currentBlockIndex)
+		? (_elideRemoveFromEnd + _f->elidew)
+		: 0;
+	const auto left = x.toInt();
+	const auto useWidth = ((x + width).toInt() - left) - elided;
+	if (useWidth <= 0) {
+		return;
+	}
+	const auto rect = QRect(
+		left,
+		_y + _yDelta,
+		useWidth,
+		_fontHeight);
+	if (_spoilerCache) {
+		const auto mess = _spoilerCache->lookup((*_background.color)->c);
+		const auto spoiler = _t->_spoiler.get();
+		const auto frame = mess->frame(
+			spoiler->animation.index(now(), _paused));
+		Ui::FillSpoilerRect(*_p, rect, frame, -rect.topLeft());
+	} else {
+		// Show forgotten spoiler context part.
+		_p->fillRect(rect, Qt::red);
+	}
+}
+
+void Renderer::elideSaveBlock(int32 blockIndex, const AbstractBlock *&_endBlock, int32 elideStart, int32 elideWidth) {
+	if (_elideSavedBlock) {
+		restoreAfterElided();
+	}
+
+	_elideSavedIndex = blockIndex;
+	auto mutableText = const_cast<String*>(_t);
+	_elideSavedBlock = std::move(mutableText->_blocks[blockIndex]);
+	mutableText->_blocks[blockIndex] = Block::Text(_t->_st->font, _t->_text, QFIXED_MAX, elideStart, 0, (*_elideSavedBlock)->flags(), (*_elideSavedBlock)->lnkIndex(), (*_elideSavedBlock)->spoilerIndex());
+	_blocksSize = blockIndex + 1;
+	_endBlock = (blockIndex + 1 < _t->_blocks.size() ? _t->_blocks[blockIndex + 1].get() : nullptr);
+}
+
+void Renderer::setElideBidi(int32 elideStart, int32 elideLen) {
+	int32 newParLength = elideStart + elideLen - _parStart;
+	if (newParLength > _parAnalysis.size()) {
+		_parAnalysis.resize(newParLength);
+	}
+	for (int32 i = elideLen; i > 0; --i) {
+		_parAnalysis[newParLength - i].bidiLevel = (_parDirection == Qt::RightToLeft) ? 1 : 0;
+	}
+}
+
+void Renderer::prepareElidedLine(QString &lineText, int32 lineStart, int32 &lineLength, const AbstractBlock *&_endBlock, int repeat) {
+	_f = _t->_st->font;
+	QStackTextEngine engine(lineText, _f->f);
+	engine.option.setTextDirection(_parDirection);
+	_e = &engine;
+
+	eItemize();
+
+	auto blockIndex = _lineStartBlock;
+	auto currentBlock = _t->_blocks[blockIndex].get();
+	auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+
+	QScriptLine line;
+	line.from = lineStart;
+	line.length = lineLength;
+	eShapeLine(line);
+
+	auto elideWidth = _f->elidew;
+	_wLeft = _w - elideWidth - _elideRemoveFromEnd;
+
+	int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
+	int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0, i;
+
+	for (i = 0; i < nItems; ++i) {
+		QScriptItem &si(engine.layoutData->items[firstItem + i]);
+		while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
+			currentBlock = nextBlock;
+			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+		}
+		TextBlockType _type = currentBlock->type();
+		if (si.analysis.flags == QScriptAnalysis::Object) {
+			if (_type == TextBlockTEmoji
+				|| _type == TextBlockTCustomEmoji
+				|| _type == TextBlockTSkip) {
+				si.width = currentBlock->f_width() + currentBlock->f_rpadding();
+			}
+		}
+		if (_type == TextBlockTEmoji
+			|| _type == TextBlockTCustomEmoji
+			|| _type == TextBlockTSkip
+			|| _type == TextBlockTNewline) {
+			if (_wLeft < si.width) {
+				lineText = lineText.mid(0, currentBlock->from() - _localFrom) + kQEllipsis;
+				lineLength = currentBlock->from() + kQEllipsis.size() - _lineStart;
+				_selection.to = qMin(_selection.to, currentBlock->from());
+				_indexOfElidedBlock = blockIndex + (nextBlock ? 1 : 0);
+				setElideBidi(currentBlock->from(), kQEllipsis.size());
+				elideSaveBlock(blockIndex - 1, _endBlock, currentBlock->from(), elideWidth);
+				return;
+			}
+			_wLeft -= si.width;
+		} else if (_type == TextBlockTText) {
+			unsigned short *logClusters = engine.logClusters(&si);
+			QGlyphLayout glyphs = engine.shapedGlyphs(&si);
+
+			int itemStart = qMax(line.from, si.position), itemEnd;
+			int itemLength = engine.length(firstItem + i);
+			int glyphsStart = logClusters[itemStart - si.position], glyphsEnd;
+			if (line.from + line.length < si.position + itemLength) {
+				itemEnd = line.from + line.length;
+				glyphsEnd = logClusters[itemEnd - si.position];
+			} else {
+				itemEnd = si.position + itemLength;
+				glyphsEnd = si.num_glyphs;
+			}
+
+			for (auto g = glyphsStart; g < glyphsEnd; ++g) {
+				auto adv = glyphs.effectiveAdvance(g);
+				if (_wLeft < adv) {
+					auto pos = itemStart;
+					while (pos < itemEnd && logClusters[pos - si.position] < g) {
+						++pos;
+					}
+
+					if (lineText.size() <= pos || repeat > 3) {
+						lineText += kQEllipsis;
+						lineLength = _localFrom + pos + kQEllipsis.size() - _lineStart;
+						_selection.to = qMin(_selection.to, uint16(_localFrom + pos));
+						_indexOfElidedBlock = blockIndex + (nextBlock ? 1 : 0);
+						setElideBidi(_localFrom + pos, kQEllipsis.size());
+						_blocksSize = blockIndex;
+						_endBlock = nextBlock;
+					} else {
+						lineText = lineText.mid(0, pos);
+						lineLength = _localFrom + pos - _lineStart;
+						_blocksSize = blockIndex;
+						_endBlock = nextBlock;
+						prepareElidedLine(lineText, lineStart, lineLength, _endBlock, repeat + 1);
+					}
+					return;
+				} else {
+					_wLeft -= adv;
+				}
+			}
+		}
+	}
+
+	int32 elideStart = _localFrom + lineText.size();
+	_selection.to = qMin(_selection.to, uint16(elideStart));
+	_indexOfElidedBlock = blockIndex + (nextBlock ? 1 : 0);
+	setElideBidi(elideStart, kQEllipsis.size());
+
+	lineText += kQEllipsis;
+	lineLength += kQEllipsis.size();
+
+	if (!repeat) {
+		for (; blockIndex < _blocksSize && _t->_blocks[blockIndex].get() != _endBlock && _t->_blocks[blockIndex]->from() < elideStart; ++blockIndex) {
+		}
+		if (blockIndex < _blocksSize) {
+			elideSaveBlock(blockIndex, _endBlock, elideStart, elideWidth);
+		}
+	}
+}
+
+void Renderer::restoreAfterElided() {
+	if (_elideSavedBlock) {
+		const_cast<String*>(_t)->_blocks[_elideSavedIndex] = std::move(*_elideSavedBlock);
+	}
+}
+
+// COPIED FROM qtextengine.cpp AND MODIFIED
+void Renderer::eAppendItems(QScriptAnalysis *analysis, int &start, int &stop, const BidiControl &control, QChar::Direction dir) {
+	if (start > stop)
+		return;
+
+	int level = control.level;
+
+	if(dir != QChar::DirON && !control.override) {
+		// add level of run (cases I1 & I2)
+		if(level % 2) {
+			if(dir == QChar::DirL || dir == QChar::DirAN || dir == QChar::DirEN)
+				level++;
+		} else {
+			if(dir == QChar::DirR)
+				level++;
+			else if(dir == QChar::DirAN || dir == QChar::DirEN)
+				level += 2;
+		}
+	}
+
+	QScriptAnalysis *s = analysis + start;
+	const QScriptAnalysis *e = analysis + stop;
+	while (s <= e) {
+		s->bidiLevel = level;
+		++s;
+	}
+	++stop;
+	start = stop;
+}
+
+void Renderer::eShapeLine(const QScriptLine &line) {
+	int item = _e->findItem(line.from);
+	if (item == -1)
+		return;
+
+	auto end = _e->findItem(line.from + line.length - 1, item);
+	auto blockIndex = _lineStartBlock;
+	auto currentBlock = _t->_blocks[blockIndex].get();
+	auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+	eSetFont(currentBlock);
+	for (; item <= end; ++item) {
+		QScriptItem &si = _e->layoutData->items[item];
+		while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
+			currentBlock = nextBlock;
+			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+			eSetFont(currentBlock);
+		}
+		_e->shape(item);
+	}
+}
+
+style::font Renderer::applyFlags(int32 flags, const style::font &f) {
+	if (!flags) {
+		return f;
+	}
+	auto result = f;
+	if (IsMono(flags)) {
+		result = result->monospace();
+	} else {
+		if (flags & TextBlockFBold) {
+			result = result->bold();
+		} else if (flags & TextBlockFSemibold) {
+			result = result->semibold();
+		}
+		if (flags & TextBlockFItalic) result = result->italic();
+		if (flags & TextBlockFUnderline) result = result->underline();
+		if (flags & TextBlockFStrikeOut) result = result->strikeout();
+		if (flags & TextBlockFTilde) { // tilde fix in OpenSans
+			result = result->semibold();
+		}
+	}
+	return result;
+}
+
+void Renderer::eSetFont(const AbstractBlock *block) {
+	const auto flags = block->flags();
+	const auto usedFont = [&] {
+		if (const auto index = block->lnkIndex()) {
+			const auto active = ClickHandler::showAsActive(
+				_t->_links.at(index - 1)
+			) || (_palette && _palette->linkAlwaysActive > 0);
+			return active
+				? _t->_st->linkFontOver
+				: _t->_st->linkFont;
+		}
+		return _t->_st->font;
+	}();
+	const auto newFont = applyFlags(flags, usedFont);
+	if (newFont != _f) {
+		_f = (newFont->family() == _t->_st->font->family())
+			? applyFlags(flags | newFont->flags(), _t->_st->font)
+			: newFont;
+		_e->fnt = _f->f;
+		_e->resetFontEngineCache();
+	}
+}
+
+void Renderer::eItemize() {
+	_e->validate();
+	if (_e->layoutData->items.size())
+		return;
+
+	int length = _e->layoutData->string.length();
+	if (!length)
+		return;
+
+	const ushort *string = reinterpret_cast<const ushort*>(_e->layoutData->string.unicode());
+
+	auto blockIndex = _lineStartBlock;
+	auto currentBlock = _t->_blocks[blockIndex].get();
+	auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+
+	_e->layoutData->hasBidi = _parHasBidi;
+	auto analysis = _parAnalysis.data() + (_localFrom - _parStart);
+
+	{
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		QUnicodeTools::ScriptItemArray scriptItems;
+		QUnicodeTools::initScripts(_e->layoutData->string, &scriptItems);
+		for (int i = 0; i < scriptItems.length(); ++i) {
+			const auto &item = scriptItems.at(i);
+			int end = i < scriptItems.length() - 1 ? scriptItems.at(i + 1).position : length;
+			for (int j = item.position; j < end; ++j)
+				analysis[j].script = item.script;
+		}
+#else // Qt >= 6.0.0
+		QVarLengthArray<uchar> scripts(length);
+		QUnicodeTools::initScripts(string, length, scripts.data());
+		for (int i = 0; i < length; ++i)
+			analysis[i].script = scripts.at(i);
+#endif // Qt < 6.0.0
+	}
+
+	blockIndex = _lineStartBlock;
+	currentBlock = _t->_blocks[blockIndex].get();
+	nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+
+	auto start = string;
+	auto end = start + length;
+	while (start < end) {
+		while (nextBlock && nextBlock->from() <= _localFrom + (start - string)) {
+			currentBlock = nextBlock;
+			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+		}
+		auto _type = currentBlock->type();
+		if (_type == TextBlockTEmoji
+			|| _type == TextBlockTCustomEmoji
+			|| _type == TextBlockTSkip) {
+			analysis->script = QChar::Script_Common;
+			analysis->flags = QScriptAnalysis::Object;
+		} else {
+			analysis->flags = QScriptAnalysis::None;
+		}
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+		analysis->script = hbscript_to_script(script_to_hbscript(analysis->script)); // retain the old behavior
+#endif // Qt < 6.0.0
+		++start;
+		++analysis;
+	}
+
+	{
+		auto i_string = &_e->layoutData->string;
+		auto i_analysis = _parAnalysis.data() + (_localFrom - _parStart);
+		auto i_items = &_e->layoutData->items;
+
+		blockIndex = _lineStartBlock;
+		currentBlock = _t->_blocks[blockIndex].get();
+		nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+		auto startBlock = currentBlock;
+
+		if (!length) {
+			return;
+		}
+		auto start = 0;
+		auto end = start + length;
+		for (int i = start + 1; i < end; ++i) {
+			while (nextBlock && nextBlock->from() <= _localFrom + i) {
+				currentBlock = nextBlock;
+				nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+			}
+			// According to the unicode spec we should be treating characters in the Common script
+			// (punctuation, spaces, etc) as being the same script as the surrounding text for the
+			// purpose of splitting up text. This is important because, for example, a fullstop
+			// (0x2E) can be used to indicate an abbreviation and so must be treated as part of a
+			// word.  Thus it must be passed along with the word in languages that have to calculate
+			// word breaks. For example the thai word "[lookup-in-git]." has no word breaks
+			// but the word "[lookup-too]" does.
+			// Unfortuntely because we split up the strings for both wordwrapping and for setting
+			// the font and because Japanese and Chinese are also aliases of the script "Common",
+			// doing this would break too many things.  So instead we only pass the full stop
+			// along, and nothing else.
+			if (currentBlock == startBlock
+				&& i_analysis[i].bidiLevel == i_analysis[start].bidiLevel
+				&& i_analysis[i].flags == i_analysis[start].flags
+				&& (i_analysis[i].script == i_analysis[start].script || i_string->at(i) == QLatin1Char('.'))
+				//					&& i_analysis[i].flags < QScriptAnalysis::SpaceTabOrObject // only emojis are objects here, no tabs
+				&& i - start < _MaxItemLength)
+				continue;
+			i_items->append(QScriptItem(start, i_analysis[start]));
+			start = i;
+			startBlock = currentBlock;
+		}
+		i_items->append(QScriptItem(start, i_analysis[start]));
+	}
+}
+
+QChar::Direction Renderer::eSkipBoundryNeutrals(QScriptAnalysis *analysis,
+	const ushort *unicode,
+	int &sor, int &eor, BidiControl &control,
+	String::TextBlocks::const_iterator i) {
+	String::TextBlocks::const_iterator e = _t->_blocks.cend(), n = i + 1;
+
+	QChar::Direction dir = control.basicDirection();
+	int level = sor > 0 ? analysis[sor - 1].bidiLevel : control.level;
+	while (sor <= _parLength) {
+		while (i != _parStartBlock && (*i)->from() > _parStart + sor) {
+			n = i;
+			--i;
+		}
+		while (n != e && (*n)->from() <= _parStart + sor) {
+			i = n;
+			++n;
+		}
+
+		TextBlockType _itype = (*i)->type();
+		if (eor == _parLength)
+			dir = control.basicDirection();
+		else if (_itype == TextBlockTEmoji
+			|| _itype == TextBlockTCustomEmoji)
+			dir = QChar::DirCS;
+		else if (_itype == TextBlockTSkip)
+			dir = QChar::DirCS;
+		else
+			dir = QChar::direction(unicode[sor]);
+		// Keep skipping DirBN as if it doesn't exist
+		if (dir != QChar::DirBN)
+			break;
+		analysis[sor++].bidiLevel = level;
+	}
+
+	eor = sor;
+
+	return dir;
+}
+
+// creates the next QScript items.
+bool Renderer::eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
+	bool rightToLeft = (control.basicDirection() == 1);
+	bool hasBidi = rightToLeft;
+
+	int sor = 0;
+	int eor = -1;
+
+	const ushort *unicode = reinterpret_cast<const ushort*>(_t->_text.unicode()) + _parStart;
+	int current = 0;
+
+	QChar::Direction dir = rightToLeft ? QChar::DirR : QChar::DirL;
+	BidiStatus status;
+
+	String::TextBlocks::const_iterator i = _parStartBlock, e = _t->_blocks.cend(), n = i + 1;
+
+	QChar::Direction sdir;
+	TextBlockType _stype = (*_parStartBlock)->type();
+	if (_stype == TextBlockTEmoji || _stype == TextBlockTCustomEmoji)
+		sdir = QChar::DirCS;
+	else if (_stype == TextBlockTSkip)
+		sdir = QChar::DirCS;
+	else
+		sdir = QChar::direction(*unicode);
+	if (sdir != QChar::DirL && sdir != QChar::DirR && sdir != QChar::DirEN && sdir != QChar::DirAN)
+		sdir = QChar::DirON;
+	else
+		dir = QChar::DirON;
+
+	status.eor = sdir;
+	status.lastStrong = rightToLeft ? QChar::DirR : QChar::DirL;
+	status.last = status.lastStrong;
+	status.dir = sdir;
+
+	while (current <= _parLength) {
+		while (n != e && (*n)->from() <= _parStart + current) {
+			i = n;
+			++n;
+		}
+
+		QChar::Direction dirCurrent;
+		TextBlockType _itype = (*i)->type();
+		if (current == (int)_parLength)
+			dirCurrent = control.basicDirection();
+		else if (_itype == TextBlockTEmoji
+			|| _itype == TextBlockTCustomEmoji)
+			dirCurrent = QChar::DirCS;
+		else if (_itype == TextBlockTSkip)
+			dirCurrent = QChar::DirCS;
+		else
+			dirCurrent = QChar::direction(unicode[current]);
+
+		switch (dirCurrent) {
+
+			// embedding and overrides (X1-X9 in the BiDi specs)
+		case QChar::DirRLE:
+		case QChar::DirRLO:
+		case QChar::DirLRE:
+		case QChar::DirLRO:
+		{
+			bool rtl = (dirCurrent == QChar::DirRLE || dirCurrent == QChar::DirRLO);
+			hasBidi |= rtl;
+			bool override = (dirCurrent == QChar::DirLRO || dirCurrent == QChar::DirRLO);
+
+			unsigned int level = control.level + 1;
+			if ((level % 2 != 0) == rtl) ++level;
+			if (level < _MaxBidiLevel) {
+				eor = current - 1;
+				eAppendItems(analysis, sor, eor, control, dir);
+				eor = current;
+				control.embed(rtl, override);
+				QChar::Direction edir = (rtl ? QChar::DirR : QChar::DirL);
+				dir = status.eor = edir;
+				status.lastStrong = edir;
+			}
+			break;
+		}
+		case QChar::DirPDF:
+		{
+			if (control.canPop()) {
+				if (dir != control.direction()) {
+					eor = current - 1;
+					eAppendItems(analysis, sor, eor, control, dir);
+					dir = control.direction();
+				}
+				eor = current;
+				eAppendItems(analysis, sor, eor, control, dir);
+				control.pdf();
+				dir = QChar::DirON; status.eor = QChar::DirON;
+				status.last = control.direction();
+				if (control.override)
+					dir = control.direction();
+				else
+					dir = QChar::DirON;
+				status.lastStrong = control.direction();
+			}
+			break;
+		}
+
+		// strong types
+		case QChar::DirL:
+			if (dir == QChar::DirON)
+				dir = QChar::DirL;
+			switch (status.last)
+			{
+			case QChar::DirL:
+				eor = current; status.eor = QChar::DirL; break;
+			case QChar::DirR:
+			case QChar::DirAL:
+			case QChar::DirEN:
+			case QChar::DirAN:
+				if (eor >= 0) {
+					eAppendItems(analysis, sor, eor, control, dir);
+					status.eor = dir = eSkipBoundryNeutrals(analysis, unicode, sor, eor, control, i);
+				} else {
+					eor = current; status.eor = dir;
+				}
+				break;
+			case QChar::DirES:
+			case QChar::DirET:
+			case QChar::DirCS:
+			case QChar::DirBN:
+			case QChar::DirB:
+			case QChar::DirS:
+			case QChar::DirWS:
+			case QChar::DirON:
+				if (dir != QChar::DirL) {
+					//last stuff takes embedding dir
+					if (control.direction() == QChar::DirR) {
+						if (status.eor != QChar::DirR) {
+							// AN or EN
+							eAppendItems(analysis, sor, eor, control, dir);
+							status.eor = QChar::DirON;
+							dir = QChar::DirR;
+						}
+						eor = current - 1;
+						eAppendItems(analysis, sor, eor, control, dir);
+						status.eor = dir = eSkipBoundryNeutrals(analysis, unicode, sor, eor, control, i);
+					} else {
+						if (status.eor != QChar::DirL) {
+							eAppendItems(analysis, sor, eor, control, dir);
+							status.eor = QChar::DirON;
+							dir = QChar::DirL;
+						} else {
+							eor = current; status.eor = QChar::DirL; break;
+						}
+					}
+				} else {
+					eor = current; status.eor = QChar::DirL;
+				}
+			default:
+				break;
+			}
+			status.lastStrong = QChar::DirL;
+			break;
+		case QChar::DirAL:
+		case QChar::DirR:
+			hasBidi = true;
+			if (dir == QChar::DirON) dir = QChar::DirR;
+			switch (status.last)
+			{
+			case QChar::DirL:
+			case QChar::DirEN:
+			case QChar::DirAN:
+				if (eor >= 0)
+					eAppendItems(analysis, sor, eor, control, dir);
+				// fall through
+			case QChar::DirR:
+			case QChar::DirAL:
+				dir = QChar::DirR; eor = current; status.eor = QChar::DirR; break;
+			case QChar::DirES:
+			case QChar::DirET:
+			case QChar::DirCS:
+			case QChar::DirBN:
+			case QChar::DirB:
+			case QChar::DirS:
+			case QChar::DirWS:
+			case QChar::DirON:
+				if (status.eor != QChar::DirR && status.eor != QChar::DirAL) {
+					//last stuff takes embedding dir
+					if (control.direction() == QChar::DirR
+						|| status.lastStrong == QChar::DirR || status.lastStrong == QChar::DirAL) {
+						eAppendItems(analysis, sor, eor, control, dir);
+						dir = QChar::DirR; status.eor = QChar::DirON;
+						eor = current;
+					} else {
+						eor = current - 1;
+						eAppendItems(analysis, sor, eor, control, dir);
+						dir = QChar::DirR; status.eor = QChar::DirON;
+					}
+				} else {
+					eor = current; status.eor = QChar::DirR;
+				}
+			default:
+				break;
+			}
+			status.lastStrong = dirCurrent;
+			break;
+
+			// weak types:
+
+		case QChar::DirNSM:
+			if (eor == current - 1)
+				eor = current;
+			break;
+		case QChar::DirEN:
+			// if last strong was AL change EN to AN
+			if (status.lastStrong != QChar::DirAL) {
+				if (dir == QChar::DirON) {
+					if (status.lastStrong == QChar::DirL)
+						dir = QChar::DirL;
+					else
+						dir = QChar::DirEN;
+				}
+				switch (status.last)
+				{
+				case QChar::DirET:
+					if (status.lastStrong == QChar::DirR || status.lastStrong == QChar::DirAL) {
+						eAppendItems(analysis, sor, eor, control, dir);
+						status.eor = QChar::DirON;
+						dir = QChar::DirAN;
+					}
+					[[fallthrough]];
+				case QChar::DirEN:
+				case QChar::DirL:
+					eor = current;
+					status.eor = dirCurrent;
+					break;
+				case QChar::DirR:
+				case QChar::DirAL:
+				case QChar::DirAN:
+					if (eor >= 0)
+						eAppendItems(analysis, sor, eor, control, dir);
+					else
+						eor = current;
+					status.eor = QChar::DirEN;
+					dir = QChar::DirAN;
+					break;
+				case QChar::DirES:
+				case QChar::DirCS:
+					if (status.eor == QChar::DirEN || dir == QChar::DirAN) {
+						eor = current; break;
+					}
+					[[fallthrough]];
+				case QChar::DirBN:
+				case QChar::DirB:
+				case QChar::DirS:
+				case QChar::DirWS:
+				case QChar::DirON:
+					if (status.eor == QChar::DirR) {
+						// neutrals go to R
+						eor = current - 1;
+						eAppendItems(analysis, sor, eor, control, dir);
+						status.eor = QChar::DirEN;
+						dir = QChar::DirAN;
+					} else if (status.eor == QChar::DirL ||
+						(status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
+						eor = current; status.eor = dirCurrent;
+					} else {
+						// numbers on both sides, neutrals get right to left direction
+						if (dir != QChar::DirL) {
+							eAppendItems(analysis, sor, eor, control, dir);
+							status.eor = QChar::DirON;
+							eor = current - 1;
+							dir = QChar::DirR;
+							eAppendItems(analysis, sor, eor, control, dir);
+							status.eor = QChar::DirON;
+							dir = QChar::DirAN;
+						} else {
+							eor = current; status.eor = dirCurrent;
+						}
+					}
+					[[fallthrough]];
+				default:
+					break;
+				}
+				break;
+			}
+			[[fallthrough]];
+		case QChar::DirAN:
+			hasBidi = true;
+			dirCurrent = QChar::DirAN;
+			if (dir == QChar::DirON) dir = QChar::DirAN;
+			switch (status.last)
+			{
+			case QChar::DirL:
+			case QChar::DirAN:
+				eor = current; status.eor = QChar::DirAN;
+				break;
+			case QChar::DirR:
+			case QChar::DirAL:
+			case QChar::DirEN:
+				if (eor >= 0) {
+					eAppendItems(analysis, sor, eor, control, dir);
+				} else {
+					eor = current;
+				}
+				dir = QChar::DirAN; status.eor = QChar::DirAN;
+				break;
+			case QChar::DirCS:
+				if (status.eor == QChar::DirAN) {
+					eor = current; break;
+				}
+				[[fallthrough]];
+			case QChar::DirES:
+			case QChar::DirET:
+			case QChar::DirBN:
+			case QChar::DirB:
+			case QChar::DirS:
+			case QChar::DirWS:
+			case QChar::DirON:
+				if (status.eor == QChar::DirR) {
+					// neutrals go to R
+					eor = current - 1;
+					eAppendItems(analysis, sor, eor, control, dir);
+					status.eor = QChar::DirAN;
+					dir = QChar::DirAN;
+				} else if (status.eor == QChar::DirL ||
+					(status.eor == QChar::DirEN && status.lastStrong == QChar::DirL)) {
+					eor = current; status.eor = dirCurrent;
+				} else {
+					// numbers on both sides, neutrals get right to left direction
+					if (dir != QChar::DirL) {
+						eAppendItems(analysis, sor, eor, control, dir);
+						status.eor = QChar::DirON;
+						eor = current - 1;
+						dir = QChar::DirR;
+						eAppendItems(analysis, sor, eor, control, dir);
+						status.eor = QChar::DirAN;
+						dir = QChar::DirAN;
+					} else {
+						eor = current; status.eor = dirCurrent;
+					}
+				}
+				[[fallthrough]];
+			default:
+				break;
+			}
+			break;
+		case QChar::DirES:
+		case QChar::DirCS:
+			break;
+		case QChar::DirET:
+			if (status.last == QChar::DirEN) {
+				dirCurrent = QChar::DirEN;
+				eor = current; status.eor = dirCurrent;
+			}
+			break;
+
+			// boundary neutrals should be ignored
+		case QChar::DirBN:
+			break;
+			// neutrals
+		case QChar::DirB:
+			// ### what do we do with newline and paragraph separators that come to here?
+			break;
+		case QChar::DirS:
+			// ### implement rule L1
+			break;
+		case QChar::DirWS:
+		case QChar::DirON:
+			break;
+		default:
+			break;
+		}
+
+		if (current >= (int)_parLength) break;
+
+		// set status.last as needed.
+		switch (dirCurrent) {
+		case QChar::DirET:
+		case QChar::DirES:
+		case QChar::DirCS:
+		case QChar::DirS:
+		case QChar::DirWS:
+		case QChar::DirON:
+			switch (status.last)
+			{
+			case QChar::DirL:
+			case QChar::DirR:
+			case QChar::DirAL:
+			case QChar::DirEN:
+			case QChar::DirAN:
+				status.last = dirCurrent;
+				break;
+			default:
+				status.last = QChar::DirON;
+			}
+			break;
+		case QChar::DirNSM:
+		case QChar::DirBN:
+			// ignore these
+			break;
+		case QChar::DirLRO:
+		case QChar::DirLRE:
+			status.last = QChar::DirL;
+			break;
+		case QChar::DirRLO:
+		case QChar::DirRLE:
+			status.last = QChar::DirR;
+			break;
+		case QChar::DirEN:
+			if (status.last == QChar::DirL) {
+				status.last = QChar::DirL;
+				break;
+			}
+			[[fallthrough]];
+		default:
+			status.last = dirCurrent;
+		}
+
+		++current;
+	}
+
+	eor = current - 1; // remove dummy char
+
+	if (sor <= eor)
+		eAppendItems(analysis, sor, eor, control, dir);
+
+	return hasBidi;
+}
+
+void Renderer::applyBlockProperties(const AbstractBlock *block) {
+	eSetFont(block);
+	if (_p) {
+		const auto isMono = IsMono(block->flags());
+		_background = {};
+		if (block->spoilerIndex() && _t->_spoiler) {
+			const auto handler
+				= _t->_spoiler->links.at(block->spoilerIndex() - 1);
+			const auto inBack = (handler && handler->shown());
+			_background.inFront = !inBack;
+			_background.color = inBack
+				? &_palette->spoilerActiveBg
+				: &_palette->spoilerBg;
+			_background.startMs = handler ? handler->startMs() : 0;
+			_background.spoilerIndex = block->spoilerIndex();
+		}
+		if (isMono && block->lnkIndex() && !_background.inFront) {
+			_background.selectActiveBlock = ClickHandler::showAsPressed(
+				_t->_links.at(block->lnkIndex() - 1));
+		}
+
+		if (isMono) {
+			_currentPen = &_palette->monoFg->p;
+			_currentPenSelected = &_palette->selectMonoFg->p;
+		} else if (block->lnkIndex()
+			|| (block->flags() & TextBlockFPlainLink)) {
+			_currentPen = &_palette->linkFg->p;
+			_currentPenSelected = &_palette->selectLinkFg->p;
+		} else {
+			_currentPen = &_originalPen;
+			_currentPenSelected = &_originalPenSelected;
+		}
+	}
+}
+
+} // namespace Ui::Text
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
new file mode 100644
index 0000000..9c4c77e
--- /dev/null
+++ b/ui/text/text_renderer.h
@@ -0,0 +1,158 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/text/text.h"
+
+#include <private/qtextengine_p.h>
+
+struct QScriptAnalysis;
+struct QScriptLine;
+
+namespace Ui::Text {
+
+class Renderer final {
+public:
+	explicit Renderer(const Ui::Text::String &t);
+	~Renderer();
+
+	void draw(QPainter &p, const PaintContext &context);
+	[[nodiscard]] StateResult getState(
+		QPoint point,
+		int w,
+		StateRequest request);
+	[[nodiscard]] StateResult getStateElided(
+		QPoint point,
+		int w,
+		StateRequestElided request);
+
+private:
+	struct BidiControl;
+
+	void enumerate();
+
+	[[nodiscard]] crl::time now() const;
+	void initNextParagraph(String::TextBlocks::const_iterator i);
+	void initParagraphBidi();
+	bool drawLine(
+		uint16 _lineEnd,
+		const String::TextBlocks::const_iterator &_endBlockIter,
+		const String::TextBlocks::const_iterator &_end);
+	void fillSelectRange(QFixed from, QFixed to);
+	[[nodiscard]] float64 fillSpoilerOpacity();
+	void fillSpoilerRange(
+		QFixed x,
+		QFixed width,
+		int currentBlockIndex,
+		int positionFrom,
+		int positionTill);
+	void elideSaveBlock(
+		int32 blockIndex,
+		const AbstractBlock *&_endBlock,
+		int32 elideStart,
+		int32 elideWidth);
+	void setElideBidi(int32 elideStart, int32 elideLen);
+	void prepareElidedLine(
+		QString &lineText,
+		int32 lineStart,
+		int32 &lineLength,
+		const AbstractBlock *&_endBlock,
+		int repeat = 0);
+	void restoreAfterElided();
+
+	// COPIED FROM qtextengine.cpp AND MODIFIED
+	static void eAppendItems(
+		QScriptAnalysis *analysis,
+		int &start,
+		int &stop,
+		const BidiControl &control,
+		QChar::Direction dir);
+	void eShapeLine(const QScriptLine &line);
+	[[nodiscard]] style::font applyFlags(int32 flags, const style::font &f);
+	void eSetFont(const AbstractBlock *block);
+	void eItemize();
+	QChar::Direction eSkipBoundryNeutrals(
+		QScriptAnalysis *analysis,
+		const ushort *unicode,
+		int &sor, int &eor, BidiControl &control,
+		String::TextBlocks::const_iterator i);
+
+	// creates the next QScript items.
+	bool eBidiItemize(QScriptAnalysis *analysis, BidiControl &control);
+
+	void applyBlockProperties(const AbstractBlock *block);
+
+	const String *_t = nullptr;
+	SpoilerMessCache *_spoilerCache = nullptr;
+	QPainter *_p = nullptr;
+	const style::TextPalette *_palette = nullptr;
+	bool _elideLast = false;
+	bool _breakEverywhere = false;
+	int _elideRemoveFromEnd = 0;
+	bool _paused = false;
+	style::align _align = style::al_topleft;
+	QPen _originalPen;
+	QPen _originalPenSelected;
+	const QPen *_currentPen = nullptr;
+	const QPen *_currentPenSelected = nullptr;
+	struct {
+		const style::color *color = nullptr;
+		bool inFront = false;
+		crl::time startMs = 0;
+		uint16 spoilerIndex = 0;
+
+		bool selectActiveBlock = false; // For monospace.
+	} _background;
+	int _yFrom = 0;
+	int _yTo = 0;
+	int _yToElide = 0;
+	TextSelection _selection = { 0, 0 };
+	bool _fullWidthSelection = true;
+	const QChar *_str = nullptr;
+	mutable crl::time _cachedNow = 0;
+
+	int _customEmojiSize = 0;
+	int _customEmojiSkip = 0;
+	int _indexOfElidedBlock = -1; // For spoilers.
+
+	// current paragraph data
+	String::TextBlocks::const_iterator _parStartBlock;
+	Qt::LayoutDirection _parDirection;
+	int _parStart = 0;
+	int _parLength = 0;
+	bool _parHasBidi = false;
+	QVarLengthArray<QScriptAnalysis, 4096> _parAnalysis;
+
+	// current line data
+	QTextEngine *_e = nullptr;
+	style::font _f;
+	QFixed _x, _w, _wLeft, _last_rPadding;
+	int _y = 0;
+	int _yDelta = 0;
+	int _lineHeight = 0;
+	int _fontHeight = 0;
+
+	// elided hack support
+	int _blocksSize = 0;
+	int _elideSavedIndex = 0;
+	std::optional<Block> _elideSavedBlock;
+
+	int _lineStart = 0;
+	int _localFrom = 0;
+	int _lineStartBlock = 0;
+
+	// link and symbol resolve
+	QFixed _lookupX = 0;
+	int _lookupY = 0;
+	bool _lookupSymbol = false;
+	bool _lookupLink = false;
+	StateRequest _lookupRequest;
+	StateResult _lookupResult;
+
+};
+
+} // namespace Ui::Text
diff --git a/ui/text/text_spoiler_data.h b/ui/text/text_spoiler_data.h
index fd68360..aae50f6 100644
--- a/ui/text/text_spoiler_data.h
+++ b/ui/text/text_spoiler_data.h
@@ -6,16 +6,18 @@
 //
 #pragma once
 
+#include "ui/effects/spoiler_mess.h"
+
 class SpoilerClickHandler;
 
 namespace Ui::Text {
 
 struct SpoilerData {
-	struct {
-		std::array<QImage, 4> corners;
-		QColor color;
-	} spoilerCache, spoilerShownCache;
+	explicit SpoilerData(Fn<void()> repaint)
+	: animation(std::move(repaint)) {
+	}
 
+	SpoilerAnimation animation;
 	QVector<std::shared_ptr<SpoilerClickHandler>> links;
 };
 
diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index 8978989..495d7f0 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -7,6 +7,7 @@
 #include "ui/toast/toast_widget.h"
 
 #include "ui/image/image_prepare.h"
+#include "ui/painter.h"
 #include "styles/palette.h"
 #include "styles/style_widgets.h"
 
diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index d2f5b4d..adcffdd 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -597,7 +597,7 @@ void CrossButton::animationCallback() {
 }
 
 void CrossButton::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	auto p = QPainter(this);
 
 	auto over = isOver();
 	auto shown = _showAnimation.value(_shown ? 1. : 0.);
diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 7338158..0836cdb 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -9,6 +9,7 @@
 #include "ui/effects/ripple_animation.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/ui_utility.h"
+#include "ui/painter.h"
 
 #include <QtGui/QtEvents>
 
@@ -96,7 +97,7 @@ void ToggleView::setStyle(const style::Toggle &st) {
 	_st = &st;
 }
 
-void ToggleView::paint(Painter &p, int left, int top, int outerWidth) {
+void ToggleView::paint(QPainter &p, int left, int top, int outerWidth) {
 	left += _st->border;
 	top += _st->border;
 
@@ -132,7 +133,7 @@ void ToggleView::paint(Painter &p, int left, int top, int outerWidth) {
 	}
 }
 
-void ToggleView::paintXV(Painter &p, int left, int top, int outerWidth, float64 toggled, const QBrush &brush) {
+void ToggleView::paintXV(QPainter &p, int left, int top, int outerWidth, float64 toggled, const QBrush &brush) {
 	Expects(_st->vsize > 0);
 	Expects(_st->stroke > 0);
 
@@ -247,7 +248,7 @@ void CheckView::setStyle(const style::Check &st) {
 	_st = &st;
 }
 
-void CheckView::paint(Painter &p, int left, int top, int outerWidth) {
+void CheckView::paint(QPainter &p, int left, int top, int outerWidth) {
 	auto toggled = currentAnimationValue();
 	auto pen = _untoggledOverride
 		? anim::pen(*_untoggledOverride, _st->toggledFg, toggled)
@@ -305,7 +306,7 @@ void RadioView::setStyle(const style::Radio &st) {
 	_st = &st;
 }
 
-void RadioView::paint(Painter &p, int left, int top, int outerWidth) {
+void RadioView::paint(QPainter &p, int left, int top, int outerWidth) {
 	PainterHighQualityEnabler hq(p);
 
 	auto toggled = currentAnimationValue();
diff --git a/ui/widgets/checkbox.h b/ui/widgets/checkbox.h
index a33f4c5..5ec517f 100644
--- a/ui/widgets/checkbox.h
+++ b/ui/widgets/checkbox.h
@@ -11,6 +11,7 @@
 #include "ui/text/text.h"
 #include "styles/style_widgets.h"
 
+class QPainter;
 class Painter;
 
 namespace Ui {
@@ -38,7 +39,7 @@ public:
 
 	virtual QSize getSize() const = 0;
 
-	virtual void paint(Painter &p, int left, int top, int outerWidth) = 0;
+	virtual void paint(QPainter &p, int left, int top, int outerWidth) = 0;
 	virtual QImage prepareRippleMask() const = 0;
 	virtual bool checkRippleStartPosition(QPoint position) const = 0;
 
@@ -67,7 +68,7 @@ public:
 	void setStyle(const style::Check &st);
 
 	QSize getSize() const override;
-	void paint(Painter &p, int left, int top, int outerWidth) override;
+	void paint(QPainter &p, int left, int top, int outerWidth) override;
 	QImage prepareRippleMask() const override;
 	bool checkRippleStartPosition(QPoint position) const override;
 
@@ -95,7 +96,7 @@ public:
 	void setUntoggledOverride(std::optional<QColor> untoggledOverride);
 
 	QSize getSize() const override;
-	void paint(Painter &p, int left, int top, int outerWidth) override;
+	void paint(QPainter &p, int left, int top, int outerWidth) override;
 	QImage prepareRippleMask() const override;
 	bool checkRippleStartPosition(QPoint position) const override;
 
@@ -118,13 +119,13 @@ public:
 	void setStyle(const style::Toggle &st);
 
 	QSize getSize() const override;
-	void paint(Painter &p, int left, int top, int outerWidth) override;
+	void paint(QPainter &p, int left, int top, int outerWidth) override;
 	QImage prepareRippleMask() const override;
 	bool checkRippleStartPosition(QPoint position) const override;
 	void setLocked(bool locked);
 
 private:
-	void paintXV(Painter &p, int left, int top, int outerWidth, float64 toggled, const QBrush &brush);
+	void paintXV(QPainter &p, int left, int top, int outerWidth, float64 toggled, const QBrush &brush);
 	QSize rippleSize() const;
 
 	not_null<const style::Toggle*> _st;
diff --git a/ui/widgets/icon_button_with_text.cpp b/ui/widgets/icon_button_with_text.cpp
index ec4b85a..608f705 100644
--- a/ui/widgets/icon_button_with_text.cpp
+++ b/ui/widgets/icon_button_with_text.cpp
@@ -21,7 +21,7 @@ void IconButtonWithText::paintEvent(QPaintEvent *e) {
 
 	const auto r = rect() - _st.textPadding;
 
-	Painter p(this);
+	auto p = QPainter(this);
 	p.setFont(_st.font);
 	p.setPen(_st.textFg);
 	p.drawText(r, _text, _st.textAlign);
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 490a025..0f5e2cb 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -10,6 +10,7 @@
 #include "ui/text/text.h"
 #include "ui/emoji_config.h"
 #include "ui/ui_utility.h"
+#include "ui/painter.h"
 #include "base/invoke_queued.h"
 #include "base/random.h"
 #include "base/platform/base_platform_info.h"
@@ -1199,7 +1200,7 @@ void FlatInput::finishAnimations() {
 }
 
 void FlatInput::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	auto p = QPainter(this);
 
 	auto placeholderFocused = _placeholderFocusedAnimation.value(_focused ? 1. : 0.);
 	auto pen = anim::pen(_st.borderColor, _st.borderActive, placeholderFocused);
@@ -1886,7 +1887,7 @@ void InputField::handleTouchEvent(QTouchEvent *e) {
 }
 
 void InputField::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	auto p = QPainter(this);
 
 	auto r = rect().intersected(e->rect());
 	if (_st.textBg->c.alphaF() > 0.) {
@@ -4205,7 +4206,7 @@ void MaskedInputField::touchEvent(QTouchEvent *e) {
 }
 
 void MaskedInputField::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	auto p = QPainter(this);
 
 	auto r = rect().intersected(e->rect());
 	p.fillRect(r, _st.textBg);
@@ -4421,7 +4422,7 @@ QRect MaskedInputField::placeholderRect() const {
 	return rect().marginsRemoved(_textMargins + _st.placeholderMargins);
 }
 
-void MaskedInputField::placeholderAdditionalPrepare(Painter &p) {
+void MaskedInputField::placeholderAdditionalPrepare(QPainter &p) {
 	p.setFont(_st.font);
 	p.setPen(_st.placeholderFg);
 }
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index cfd3440..5ab622a 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -698,14 +698,14 @@ protected:
 	}
 	void setCorrectedText(QString &now, int &nowCursor, const QString &newText, int newPos);
 
-	virtual void paintAdditionalPlaceholder(Painter &p) {
+	virtual void paintAdditionalPlaceholder(QPainter &p) {
 	}
 
 	style::font phFont() {
 		return _st.font;
 	}
 
-	void placeholderAdditionalPrepare(Painter &p);
+	void placeholderAdditionalPrepare(QPainter &p);
 	QRect placeholderRect() const;
 
 	void setTextMargins(const QMargins &mrg);
diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 034c75e..3225978 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -13,6 +13,7 @@
 #include "ui/widgets/box_content_divider.h"
 #include "ui/basic_click_handlers.h" // UrlClickHandler
 #include "ui/inactive_press.h"
+#include "ui/painter.h"
 #include "base/qt/qt_common_adapters.h"
 #include "styles/style_layers.h"
 #include "styles/palette.h"
diff --git a/ui/widgets/menu/menu.cpp b/ui/widgets/menu/menu.cpp
index 10197e1..e73d344 100644
--- a/ui/widgets/menu/menu.cpp
+++ b/ui/widgets/menu/menu.cpp
@@ -48,8 +48,7 @@ void Menu::init() {
 
 	paintRequest(
 	) | rpl::start_with_next([=](const QRect &clip) {
-		Painter p(this);
-		p.fillRect(clip, _st.itemBg);
+		QPainter(this).fillRect(clip, _st.itemBg);
 	}, lifetime());
 
 	positionValue(
diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index 8d7d9dd..1963eb5 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -82,7 +82,7 @@ void Action::paintEvent(QPaintEvent *e) {
 	paint(p);
 }
 
-void Action::paintBackground(Painter &p, bool selected) {
+void Action::paintBackground(QPainter &p, bool selected) {
 	if (selected && _st.itemBgOver->c.alpha() < 255) {
 		p.fillRect(0, 0, width(), _height, _st.itemBg);
 	}
diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h
index 482f289..2e92a1a 100644
--- a/ui/widgets/menu/menu_action.h
+++ b/ui/widgets/menu/menu_action.h
@@ -39,7 +39,7 @@ protected:
 
 	int contentHeight() const override;
 
-	void paintBackground(Painter &p, bool selected);
+	void paintBackground(QPainter &p, bool selected);
 	void paintText(Painter &p);
 
 private:
diff --git a/ui/widgets/menu/menu_toggle.cpp b/ui/widgets/menu/menu_toggle.cpp
index bc0da8c..93071ea 100644
--- a/ui/widgets/menu/menu_toggle.cpp
+++ b/ui/widgets/menu/menu_toggle.cpp
@@ -58,7 +58,7 @@ Toggle::~Toggle() = default;
 void Toggle::paintEvent(QPaintEvent *e) {
 	Action::paintEvent(e);
 	if (_toggle) {
-		Painter p(this);
+		auto p = QPainter(this);
 		const auto toggleSize = _toggle->getSize();
 		_toggle->paint(
 			p,
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 443faff..d2acf72 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/layers/layer_widget.h"
 #include "ui/layers/show.h"
+#include "ui/painter.h"
 #include "base/debug_log.h"
 #include "styles/style_widgets.h"
 #include "styles/style_layers.h"
@@ -311,7 +312,7 @@ void SeparatePanel::createBorderImage() {
 	cache.setDevicePixelRatio(style::DevicePixelRatio());
 	cache.fill(Qt::transparent);
 	{
-		Painter p(&cache);
+		auto p = QPainter(&cache);
 		auto inner = QRect(0, 0, cacheSize, cacheSize).marginsRemoved(
 			shadowPadding);
 		Ui::Shadow::paint(p, inner, cacheSize, st::callShadow);
@@ -572,7 +573,7 @@ void SeparatePanel::updateControlsGeometry() {
 }
 
 void SeparatePanel::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	auto p = QPainter(this);
 	if (!_animationCache.isNull()) {
 		auto opacity = _opacityAnimation.value(_visible ? 1. : 0.);
 		if (!_opacityAnimation.animating()) {
@@ -605,7 +606,7 @@ void SeparatePanel::paintEvent(QPaintEvent *e) {
 	}
 }
 
-void SeparatePanel::paintShadowBorder(Painter &p) const {
+void SeparatePanel::paintShadowBorder(QPainter &p) const {
 	const auto factor = style::DevicePixelRatio();
 	const auto size = st::separatePanelBorderCacheSize;
 	const auto part1 = size / 3;
@@ -685,7 +686,7 @@ void SeparatePanel::paintShadowBorder(Painter &p) const {
 		st::windowBg);
 }
 
-void SeparatePanel::paintOpaqueBorder(Painter &p) const {
+void SeparatePanel::paintOpaqueBorder(QPainter &p) const {
 	const auto border = st::windowShadowFgFallback;
 	p.fillRect(0, 0, width(), _padding.top(), border);
 	p.fillRect(
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 63cfbdd..f30077c 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -89,8 +89,8 @@ private:
 
 	void updateTitleGeometry(int newWidth);
 	void updateTitlePosition();
-	void paintShadowBorder(Painter &p) const;
-	void paintOpaqueBorder(Painter &p) const;
+	void paintShadowBorder(QPainter &p) const;
+	void paintOpaqueBorder(QPainter &p) const;
 
 	void toggleOpacityAnimation(bool visible);
 	void finishAnimating();
diff --git a/ui/widgets/side_bar_button.cpp b/ui/widgets/side_bar_button.cpp
index ba31527..c3d5d81 100644
--- a/ui/widgets/side_bar_button.cpp
+++ b/ui/widgets/side_bar_button.cpp
@@ -7,6 +7,7 @@
 #include "ui/widgets/side_bar_button.h"
 
 #include "ui/effects/ripple_animation.h"
+#include "ui/painter.h"
 #include "styles/style_widgets.h"
 
 #include <QtGui/QtEvents>
diff --git a/ui/widgets/time_input.cpp b/ui/widgets/time_input.cpp
index a848849..d51a77b 100644
--- a/ui/widgets/time_input.cpp
+++ b/ui/widgets/time_input.cpp
@@ -195,7 +195,7 @@ rpl::producer<> TimeInput::focuses() const {
 }
 
 void TimeInput::paintEvent(QPaintEvent *e) {
-	Painter p(this);
+	auto p = QPainter(this);
 
 	const auto &_st = _stDateField;
 	const auto height = _st.heightMin;
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index 135e30a..895bdde 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -7,10 +7,11 @@
 #include "ui/widgets/tooltip.h"
 
 #include "ui/ui_utility.h"
+#include "ui/painter.h"
 #include "ui/platform/ui_platform_utility.h"
 #include "base/invoke_queued.h"
-#include "styles/style_widgets.h"
 #include "base/platform/base_platform_info.h"
+#include "styles/style_widgets.h"
 
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>

From bd7098ef426886736a2bfde17bf114f5633aa339 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 17 Sep 2022 01:22:22 +0400
Subject: [PATCH 239/635] Fix new spoilers with elided text.

---
 ui/text/text_renderer.cpp | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 9735de6..50672b2 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -950,10 +950,29 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 				? fillSpoilerOpacity()
 				: 0.;
 			const auto opacity = _p->opacity();
-			const auto isElidedBlock = (!rtl)
+			const auto isElidedBlock = !rtl
 				&& (_indexOfElidedBlock == blockIndex);
+			const auto complexClipping = hasSpoiler
+				&& isElidedBlock
+				&& spoilerOpacity == 1.;
 			if ((spoilerOpacity < 1.) || isElidedBlock) {
-				if (hasSpoiler && !isElidedBlock) {
+				const auto complexClippingEnabled = complexClipping
+					&& _p->hasClipping();
+				const auto complexClippingRegion = complexClipping
+					? _p->clipRegion()
+					: QRegion();
+				if (complexClipping) {
+					const auto elided = (_indexOfElidedBlock == blockIndex)
+						? (_elideRemoveFromEnd + _f->elidew)
+						: 0;
+					_p->setClipRect(
+						QRect(
+							(x + itemWidth).toInt() - elided,
+							_y - _lineHeight,
+							elided,
+							_y + 2 * _lineHeight),
+						Qt::IntersectClip);
+				} else if (hasSpoiler && !isElidedBlock) {
 					_p->setOpacity(opacity * (1. - spoilerOpacity));
 				}
 				if (Q_UNLIKELY(hasSelected)) {
@@ -999,6 +1018,13 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					_p->setPen(*_currentPen);
 					_p->drawTextItem(QPointF(x.toReal(), textY), gf);
 				}
+				if (complexClipping) {
+					if (complexClippingEnabled) {
+						_p->setClipRegion(complexClippingRegion);
+					} else {
+						_p->setClipping(false);
+					}
+				}
 			}
 
 			if (hasSpoiler) {

From 4ff5bc5773d95b07fd34485a564d1aacc3fb9d1a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 17 Sep 2022 01:59:01 +0400
Subject: [PATCH 240/635] Provide correct colors for spoiler selection.

---
 ui/basic.style              | 24 ++++++++++++------------
 ui/text/text_renderer.cpp   | 13 ++++++-------
 ui/text/text_renderer.h     |  3 ++-
 ui/widgets/input_fields.cpp |  4 ++--
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index 9b36b57..ebc7413 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -9,15 +9,14 @@ using "ui/colors.palette";
 TextPalette {
 	linkFg: color;
 	monoFg: color;
+	spoilerFg: color;
 	selectBg: color;
 	selectFg: color;
 	selectLinkFg: color;
 	selectMonoFg: color;
+	selectSpoilerFg: color;
 	selectOverlay: color;
 	linkAlwaysActive: int;
-	spoilerBg: color;
-	spoilerActiveBg: color;
-	spoilerActiveFg: color;
 }
 
 TextStyle {
@@ -42,14 +41,13 @@ lineWidth: 1px;
 defaultTextPalette: TextPalette {
 	linkFg: windowActiveTextFg;
 	monoFg: msgInMonoFg;
+	spoilerFg: msgInDateFg;
 	selectBg: msgInBgSelected;
 	selectFg: transparent; // use painter current pen instead
 	selectLinkFg: historyLinkInFgSelected;
 	selectMonoFg: msgInMonoFgSelected;
+	selectSpoilerFg: msgInDateFgSelected;
 	selectOverlay: msgSelectOverlay;
-	spoilerBg: msgInDateFg;
-	spoilerActiveBg: msgInDateFg;
-	spoilerActiveFg: msgInBg;
 }
 defaultTextStyle: TextStyle {
 	font: normalFont;
@@ -126,10 +124,12 @@ msgDateTextStyle: defaultTextStyle;
 serviceTextPalette: TextPalette(defaultTextPalette) {
 	linkFg: msgServiceFg;
 	monoFg: msgServiceFg;
+	spoilerFg: msgServiceFg;
 	selectBg: msgServiceBgSelected;
 	selectFg: msgServiceFg;
 	selectLinkFg: msgServiceFg;
 	selectMonoFg: msgServiceFg;
+	selectSpoilerFg: msgServiceFg;
 	selectOverlay: msgServiceBgSelected;
 }
 serviceTextStyle: TextStyle(defaultTextStyle) {
@@ -140,34 +140,34 @@ serviceTextStyle: TextStyle(defaultTextStyle) {
 inTextPalette: TextPalette(defaultTextPalette) {
 	linkFg: historyLinkInFg;
 	monoFg: msgInMonoFg;
+	spoilerFg: msgInDateFg;
 	selectBg: msgInBgSelected;
 	selectFg: historyTextInFgSelected;
 	selectLinkFg: historyLinkInFgSelected;
 	selectMonoFg: msgInMonoFgSelected;
+	selectSpoilerFg: msgInDateFgSelected;
 	selectOverlay: msgSelectOverlay;
-	spoilerBg: msgInDateFg;
-	spoilerActiveBg: msgInDateFg;
-	spoilerActiveFg: msgInBg;
 }
 inTextPaletteSelected: TextPalette(inTextPalette) {
 	linkFg: historyLinkInFgSelected;
 	monoFg: msgInMonoFgSelected;
+	spoilerFg: msgInDateFgSelected;
 }
 outTextPalette: TextPalette(defaultTextPalette) {
 	linkFg: historyLinkOutFg;
 	monoFg: msgOutMonoFg;
+	spoilerFg: msgOutDateFg;
 	selectBg: msgOutBgSelected;
 	selectFg: historyTextOutFgSelected;
 	selectLinkFg: historyLinkOutFgSelected;
 	selectMonoFg: msgOutMonoFgSelected;
+	selectSpoilerFg: msgOutDateFgSelected;
 	selectOverlay: msgSelectOverlay;
-	spoilerBg: msgOutDateFg;
-	spoilerActiveBg: msgOutDateFg;
-	spoilerActiveFg: msgOutBg;
 }
 outTextPaletteSelected: TextPalette(outTextPalette) {
 	linkFg: historyLinkOutFgSelected;
 	monoFg: msgOutMonoFgSelected;
+	spoilerFg: msgOutDateFgSelected;
 }
 fwdTextStyle: TextStyle(semiboldTextStyle) {
 	linkFontOver: semiboldFont;
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 50672b2..c29e896 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -757,7 +757,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 						}
 					}
 				}
-				const auto hasSpoiler = _background.color &&
+				const auto hasSpoiler = _background.spoiler &&
 					(_background.inFront || _background.startMs);
 				if (hasSpoiler) {
 					fillSpoiler = { x, si.width };
@@ -789,7 +789,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 							_customEmojiSkip = (st::emojiSize - _customEmojiSize) / 2;
 						}
 						custom->paint(*_p, {
-							.preview = _palette->spoilerActiveBg->c,
+							.preview = _palette->spoilerFg->c,
 							.now = now(),
 							.position = { x + _customEmojiSkip, y + _customEmojiSkip },
 							.paused = _paused,
@@ -1072,7 +1072,7 @@ void Renderer::fillSpoilerRange(
 		int currentBlockIndex,
 		int positionFrom,
 		int positionTill) {
-	if (!_background.color || !_t->_spoiler) {
+	if (!_background.spoiler || !_t->_spoiler) {
 		return;
 	}
 	const auto elided = (_indexOfElidedBlock == currentBlockIndex)
@@ -1089,7 +1089,7 @@ void Renderer::fillSpoilerRange(
 		useWidth,
 		_fontHeight);
 	if (_spoilerCache) {
-		const auto mess = _spoilerCache->lookup((*_background.color)->c);
+		const auto mess = _spoilerCache->lookup((*_background.spoiler)->c);
 		const auto spoiler = _t->_spoiler.get();
 		const auto frame = mess->frame(
 			spoiler->animation.index(now(), _paused));
@@ -1920,9 +1920,8 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 				= _t->_spoiler->links.at(block->spoilerIndex() - 1);
 			const auto inBack = (handler && handler->shown());
 			_background.inFront = !inBack;
-			_background.color = inBack
-				? &_palette->spoilerActiveBg
-				: &_palette->spoilerBg;
+			_background.spoiler = &_palette->spoilerFg;
+			_background.spoilerSelected = &_palette->selectSpoilerFg;
 			_background.startMs = handler ? handler->startMs() : 0;
 			_background.spoilerIndex = block->spoilerIndex();
 		}
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 9c4c77e..48f4e30 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -100,7 +100,8 @@ private:
 	const QPen *_currentPen = nullptr;
 	const QPen *_currentPenSelected = nullptr;
 	struct {
-		const style::color *color = nullptr;
+		const style::color *spoiler = nullptr;
+		const style::color *spoilerSelected = nullptr;
 		bool inFront = false;
 		crl::time startMs = 0;
 		uint16 spoilerIndex = 0;
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 0f5e2cb..1f5c2bc 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -765,7 +765,7 @@ QTextCharFormat PrepareTagFormat(
 			color = st::defaultTextPalette.monoFg;
 			font = font->monospace();
 		} else if (tag == kTagSpoiler) {
-			bg = st::defaultTextPalette.spoilerActiveBg;
+			bg = st::msgInDateFg;
 		}
 	};
 	for (const auto &tag : TextUtilities::SplitTags(tag)) {
@@ -1426,7 +1426,7 @@ void CustomEmojiObject::drawObject(
 		return;
 	}
 	i->second->paint(*painter, {
-		.preview = st::defaultTextPalette.spoilerActiveBg->c,
+		.preview = st::windowBgRipple->c,
 		.now = _now,
 		.position = QPoint(
 			int(base::SafeRound(rect.x())) + st::emojiPadding + _skip,

From 2dcad89d3ca0ccefba9cf39534df4f31de88c3a1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 17 Sep 2022 16:42:19 +0400
Subject: [PATCH 241/635] Call xcb_set_input_focus rather than setting
 X11BypassWindowManagerHint

Setting the hint has some side effects, unfortunately...
---
 ui/delayed_activation.cpp | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/ui/delayed_activation.cpp b/ui/delayed_activation.cpp
index c20d18d..0b66b05 100644
--- a/ui/delayed_activation.cpp
+++ b/ui/delayed_activation.cpp
@@ -11,9 +11,12 @@
 #include "base/invoke_queued.h"
 #include "base/platform/base_platform_info.h"
 
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+#include "base/platform/linux/base_linux_xcb_utilities.h"
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+
 #include <QtCore/QPointer>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QWindow>
+#include <QtWidgets/QApplication>
 
 namespace Ui {
 namespace {
@@ -43,15 +46,11 @@ void ActivateWindowDelayed(not_null<QWidget*> widget) {
 		return;
 	}
 	const auto focusAncestor = [&] {
-		const auto focusWindow = QGuiApplication::focusWindow();
-		if (!focusWindow || !widget->window()) {
+		const auto focusWidget = QApplication::focusWidget();
+		if (!focusWidget || !widget->window()) {
 			return false;
 		}
-		const auto handle = widget->window()->windowHandle();
-		if (!handle) {
-			return false;
-		}
-		return handle->isAncestorOf(focusWindow);
+		return widget->window()->isAncestorOf(focusWidget);
 	}();
 	crl::on_main(Window, [=] {
 		const auto widget = base::take(Window);
@@ -62,21 +61,17 @@ void ActivateWindowDelayed(not_null<QWidget*> widget) {
 		if (!window || window->isHidden()) {
 			return;
 		}
-		const auto guard = [&] {
-			if (!::Platform::IsX11() || !focusAncestor) {
-				return gsl::finally(Fn<void()>([] {}));
-			}
-			const auto handle = window->windowHandle();
-			if (handle->flags() & Qt::X11BypassWindowManagerHint) {
-				return gsl::finally(Fn<void()>([] {}));
-			}
-			handle->setFlag(Qt::X11BypassWindowManagerHint);
-			return gsl::finally(Fn<void()>([handle] {
-				handle->setFlag(Qt::X11BypassWindowManagerHint, false);
-			}));
-		}();
 		window->raise();
 		window->activateWindow();
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+		if (::Platform::IsX11() && focusAncestor) {
+			xcb_set_input_focus(
+				base::Platform::XCB::GetConnectionFromQt(),
+				XCB_INPUT_FOCUS_PARENT,
+				window->winId(),
+				XCB_CURRENT_TIME);
+		}
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 	});
 }
 

From a60fe582ad9ab797ead0a18a9ed18e1892681c60 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 18 Sep 2022 15:17:19 +0400
Subject: [PATCH 242/635] Render correct spoiler selections.

---
 ui/text/text.cpp          |  13 +--
 ui/text/text.h            |   2 -
 ui/text/text_renderer.cpp | 214 +++++++++++++++++++++++++++-----------
 ui/text/text_renderer.h   |  46 ++++++--
 4 files changed, 190 insertions(+), 85 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 764d01b..6dd1d8d 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -95,24 +95,13 @@ SpoilerMessCache::SpoilerMessCache(int capacity) : _capacity(capacity) {
 not_null<SpoilerMessCached*> SpoilerMessCache::lookup(QColor color) {
 	for (auto &entry : _cache) {
 		if (entry.color == color) {
-			entry.generation = ++_generation;
 			return &entry.mess;
 		}
 	}
-	if (_cache.size() == _capacity) {
-		const auto i = ranges::min_element(
-			_cache,
-			ranges::less(),
-			&Entry::generation);
-		i->generation = ++_generation;
-		i->color = color;
-		i->mess = Ui::SpoilerMessCached(DefaultTextSpoilerMask(), color);
-		return &i->mess;
-	}
+	Assert(_cache.size() < _capacity);
 	_cache.push_back({
 		.mess = Ui::SpoilerMessCached(DefaultTextSpoilerMask(), color),
 		.color = color,
-		.generation = ++_generation,
 	});
 	return &_cache.back().mess;
 }
diff --git a/ui/text/text.h b/ui/text/text.h
index 47de231..090a39c 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -115,12 +115,10 @@ private:
 	struct Entry {
 		SpoilerMessCached mess;
 		QColor color;
-		int generation = 0;
 	};
 
 	std::vector<Entry> _cache;
 	const int _capacity = 0;
-	int _generation = 0;
 
 };
 
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index c29e896..7b5033b 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -61,8 +61,31 @@ void InitTextItemWithScriptItem(QTextItemInt &ti, const QScriptItem &si) {
 		ti.flags |= QTextItem::StrikeOut;
 }
 
-} // namespace
+void AppendRange(
+		QVarLengthArray<FixedRange> &ranges,
+		FixedRange range) {
+	for (auto i = ranges.begin(); i != ranges.end(); ++i) {
+		if (range.till < i->from) {
+			ranges.insert(i, range);
+			return;
+		} else if (!Distinct(range, *i)) {
+			*i = United(*i, range);
+			for (auto j = i + 1; j != ranges.end(); ++j) {
+				if (j->from > i->till) {
+					ranges.erase(i + 1, j);
+					return;
+				} else {
+					*i = United(*i, *j);
+				}
+			}
+			ranges.erase(i + 1, ranges.end());
+			return;
+		}
+	}
+	ranges.push_back(range);
+}
 
+} // namespace
 
 struct Renderer::BidiControl {
 	inline BidiControl(bool rtl)
@@ -109,6 +132,28 @@ struct Renderer::BidiControl {
 	bool override = false;
 };
 
+FixedRange Intersected(FixedRange a, FixedRange b) {
+	return {
+		.from = std::max(a.from, b.from),
+		.till = std::min(a.till, b.till),
+	};
+}
+
+bool Intersects(FixedRange a, FixedRange b) {
+	return (a.till > b.from) && (b.till > a.from);
+}
+
+FixedRange United(FixedRange a, FixedRange b) {
+	return {
+		.from = std::min(a.from, b.from),
+		.till = std::max(a.till, b.till),
+	};
+}
+
+bool Distinct(FixedRange a, FixedRange b) {
+	return (a.till < b.from) || (b.till < a.from);
+}
+
 Renderer::Renderer(const Ui::Text::String &t)
 : _t(&t) {
 }
@@ -194,6 +239,12 @@ void Renderer::enumerate() {
 	auto last_rBearing = QFixed(0);
 	_last_rPadding = QFixed(0);
 
+	const auto guard = gsl::finally([&] {
+		if (_p) {
+			paintSpoilerRects();
+		}
+	});
+
 	auto blockIndex = 0;
 	bool longWordLine = true;
 	auto e = _t->_blocks.cend();
@@ -572,13 +623,13 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 		if ((selectFromStart && _parDirection == Qt::LeftToRight)
 			|| (selectTillEnd && _parDirection == Qt::RightToLeft)) {
 			if (x > _x) {
-				fillSelectRange(_x, x);
+				fillSelectRange({ _x, x });
 			}
 		}
 		if ((selectTillEnd && _parDirection == Qt::LeftToRight)
 			|| (selectFromStart && _parDirection == Qt::RightToLeft)) {
 			if (x < _x + _wLeft) {
-				fillSelectRange(x + _w - _wLeft, _x + _w);
+				fillSelectRange({ x + _w - _wLeft, _x + _w });
 			}
 		}
 	}
@@ -730,14 +781,8 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 				if (rtl) {
 					glyphX += spacesWidth;
 				}
-				struct {
-					QFixed from;
-					QFixed to;
-				} fillSelect;
-				struct {
-					QFixed from;
-					QFixed width;
-				} fillSpoiler;
+				FixedRange fillSelect;
+				FixedRange fillSpoiler;
 				if (_background.selectActiveBlock) {
 					fillSelect = { x, x + si.width };
 				} else if (_localFrom + si.position < _selection.to) {
@@ -757,18 +802,15 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 						}
 					}
 				}
-				const auto hasSpoiler = _background.spoiler &&
-					(_background.inFront || _background.startMs);
+				const auto hasSpoiler = _background.inFront
+					|| _background.startMs;
 				if (hasSpoiler) {
-					fillSpoiler = { x, si.width };
+					fillSpoiler = { x, x + si.width };
 				}
 				const auto spoilerOpacity = hasSpoiler
 					? fillSpoilerOpacity()
 					: 0.;
-				const auto hasSelect = fillSelect.to != QFixed();
-				if (hasSelect) {
-					fillSelectRange(fillSelect.from, fillSelect.to);
-				}
+				fillSelectRange(fillSelect);
 				const auto opacity = _p->opacity();
 				if (spoilerOpacity < 1.) {
 					if (hasSpoiler) {
@@ -795,16 +837,12 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 							.paused = _paused,
 						});
 					}
+					if (hasSpoiler) {
+						_p->setOpacity(opacity);
+					}
 				}
 				if (hasSpoiler) {
-					_p->setOpacity(opacity * spoilerOpacity);
-					fillSpoilerRange(
-						fillSpoiler.from,
-						fillSpoiler.width,
-						blockIndex,
-						currentBlock->from(),
-						(nextBlock ? nextBlock->from() : _t->_text.size()));
-					_p->setOpacity(opacity);
+					pushSpoilerRange(fillSpoiler, fillSelect, blockIndex);
 				}
 			//} else if (_p && currentBlock->type() == TextBlockSkip) { // debug
 			//	_p->fillRect(QRect(x.toInt(), _y, currentBlock->width(), static_cast<SkipBlock*>(currentBlock)->height()), QColor(0, 0, 0, 32));
@@ -896,11 +934,14 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 			gf.justified = false;
 			InitTextItemWithScriptItem(gf, si);
 
+			auto itemRange = FixedRange{ x, x + itemWidth };
+			auto fillSelect = FixedRange();
 			auto hasSelected = false;
 			auto hasNotSelected = true;
 			auto selectedRect = QRect();
 			if (_background.selectActiveBlock) {
-				fillSelectRange(x, x + itemWidth);
+				fillSelect = itemRange;
+				fillSelectRange(fillSelect);
 			} else if (_localFrom + itemStart < _selection.to && _localFrom + itemEnd > _selection.from) {
 				hasSelected = true;
 				auto selX = x;
@@ -943,7 +984,8 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 				}
 				if (rtl) selX = x + itemWidth - (selX - x) - selWidth;
 				selectedRect = QRect(selX.toInt(), _y + _yDelta, (selX + selWidth).toInt() - selX.toInt(), _fontHeight);
-				fillSelectRange(selX, selX + selWidth);
+				fillSelect = { selX, selX + selWidth };
+				fillSelectRange(fillSelect);
 			}
 			const auto hasSpoiler = (_background.inFront || _background.startMs);
 			const auto spoilerOpacity = hasSpoiler
@@ -1024,29 +1066,28 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					} else {
 						_p->setClipping(false);
 					}
+				} else if (hasSpoiler && !isElidedBlock) {
+					_p->setOpacity(opacity);
 				}
 			}
 
 			if (hasSpoiler) {
-				_p->setOpacity(opacity * spoilerOpacity);
-				fillSpoilerRange(
-					x,
-					itemWidth,
-					blockIndex,
-					_localFrom + itemStart,
-					_localFrom + itemEnd);
-				_p->setOpacity(opacity);
+				pushSpoilerRange(itemRange, fillSelect, blockIndex);
 			}
 		}
 
 		x += itemWidth;
 	}
+	fillSpoilerRects();
 	return true;
 }
 
-void Renderer::fillSelectRange(QFixed from, QFixed to) {
-	auto left = from.toInt();
-	auto width = to.toInt() - left;
+void Renderer::fillSelectRange(FixedRange range) {
+	if (range.empty()) {
+		return;
+	}
+	const auto left = range.from.toInt();
+	const auto width = range.till.toInt() - left;
 	_p->fillRect(left, _y + _yDelta, width, _fontHeight, _palette->selectBg);
 }
 
@@ -1066,37 +1107,89 @@ float64 Renderer::fillSpoilerOpacity() {
 	return (1. - std::min(progress, 1.));
 }
 
-void Renderer::fillSpoilerRange(
-		QFixed x,
-		QFixed width,
-		int currentBlockIndex,
-		int positionFrom,
-		int positionTill) {
+void Renderer::pushSpoilerRange(
+		FixedRange range,
+		FixedRange selected,
+		int currentBlockIndex) {
 	if (!_background.spoiler || !_t->_spoiler) {
 		return;
 	}
 	const auto elided = (_indexOfElidedBlock == currentBlockIndex)
 		? (_elideRemoveFromEnd + _f->elidew)
 		: 0;
-	const auto left = x.toInt();
-	const auto useWidth = ((x + width).toInt() - left) - elided;
-	if (useWidth <= 0) {
+	range.till -= elided;
+	if (range.empty()) {
+		return;
+	} else if (selected.empty() || !Intersects(range, selected)) {
+		AppendRange(_spoilerRanges, range);
+	} else {
+		AppendRange(_spoilerRanges, { range.from, selected.from });
+		AppendRange(_spoilerSelectedRanges, Intersected(range, selected));
+		AppendRange(_spoilerRanges, { selected.till, range.till });
+	}
+}
+
+void Renderer::fillSpoilerRects() {
+	fillSpoilerRects(_spoilerRects, _spoilerRanges);
+	fillSpoilerRects(_spoilerSelectedRects, _spoilerSelectedRanges);
+}
+
+void Renderer::fillSpoilerRects(
+		QVarLengthArray<QRect, kSpoilersRectsSize> &rects,
+		QVarLengthArray<FixedRange> &ranges) {
+	if (ranges.empty()) {
 		return;
 	}
-	const auto rect = QRect(
-		left,
-		_y + _yDelta,
-		useWidth,
-		_fontHeight);
+	auto lastTill = ranges.front().from.toInt() - 1;
+	const auto y = _y + _yDelta;
+	for (const auto &range : ranges) {
+		auto from = range.from.toInt();
+		auto till = range.till.toInt();
+		if (from <= lastTill) {
+			auto &last = rects.back();
+			from = std::min(from, last.x());
+			till = std::max(till, last.x() + last.width());
+			last = { from, y, till - from, _fontHeight };
+		} else {
+			rects.push_back({ from, y, till - from, _fontHeight });
+		}
+		lastTill = till;
+	}
+	ranges.clear();
+}
+
+void Renderer::paintSpoilerRects() {
+	if (!_t->_spoiler) {
+		return;
+	}
+	const auto index = _t->_spoiler->animation.index(now(), _paused);
+	paintSpoilerRects(
+		_spoilerRects,
+		_palette->spoilerFg,
+		index);
+	paintSpoilerRects(
+		_spoilerSelectedRects,
+		_palette->selectSpoilerFg,
+		index);
+}
+
+void Renderer::paintSpoilerRects(
+		const QVarLengthArray<QRect, kSpoilersRectsSize> &rects,
+		const style::color &color,
+		int index) {
+	if (rects.empty()) {
+		return;
+	}
+	const auto frame = _spoilerCache->lookup(color->c)->frame(index);
 	if (_spoilerCache) {
-		const auto mess = _spoilerCache->lookup((*_background.spoiler)->c);
-		const auto spoiler = _t->_spoiler.get();
-		const auto frame = mess->frame(
-			spoiler->animation.index(now(), _paused));
-		Ui::FillSpoilerRect(*_p, rect, frame, -rect.topLeft());
+		for (const auto &rect : rects) {
+			Ui::FillSpoilerRect(*_p, rect, frame, -rect.topLeft());
+		}
 	} else {
 		// Show forgotten spoiler context part.
-		_p->fillRect(rect, Qt::red);
+		for (const auto &rect : rects) {
+			_p->fillRect(rect, Qt::red);
+		}
 	}
 }
 
@@ -1920,8 +2013,7 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 				= _t->_spoiler->links.at(block->spoilerIndex() - 1);
 			const auto inBack = (handler && handler->shown());
 			_background.inFront = !inBack;
-			_background.spoiler = &_palette->spoilerFg;
-			_background.spoilerSelected = &_palette->selectSpoilerFg;
+			_background.spoiler = true;
 			_background.startMs = handler ? handler->startMs() : 0;
 			_background.spoilerIndex = block->spoilerIndex();
 		}
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 48f4e30..e904c14 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -15,6 +15,20 @@ struct QScriptLine;
 
 namespace Ui::Text {
 
+struct FixedRange {
+	QFixed from;
+	QFixed till;
+
+	[[nodiscard]] bool empty() const {
+		return (till <= from);
+	}
+};
+
+[[nodiscard]] FixedRange Intersected(FixedRange a, FixedRange b);
+[[nodiscard]] bool Intersects(FixedRange a, FixedRange b);
+[[nodiscard]] FixedRange United(FixedRange a, FixedRange b);
+[[nodiscard]] bool Distinct(FixedRange a, FixedRange b);
+
 class Renderer final {
 public:
 	explicit Renderer(const Ui::Text::String &t);
@@ -31,6 +45,8 @@ public:
 		StateRequestElided request);
 
 private:
+	static constexpr int kSpoilersRectsSize = 512;
+
 	struct BidiControl;
 
 	void enumerate();
@@ -42,14 +58,21 @@ private:
 		uint16 _lineEnd,
 		const String::TextBlocks::const_iterator &_endBlockIter,
 		const String::TextBlocks::const_iterator &_end);
-	void fillSelectRange(QFixed from, QFixed to);
+	void fillSelectRange(FixedRange range);
 	[[nodiscard]] float64 fillSpoilerOpacity();
-	void fillSpoilerRange(
-		QFixed x,
-		QFixed width,
-		int currentBlockIndex,
-		int positionFrom,
-		int positionTill);
+	void pushSpoilerRange(
+		FixedRange range,
+		FixedRange selected,
+		int currentBlockIndex);
+	void fillSpoilerRects();
+	void fillSpoilerRects(
+		QVarLengthArray<QRect, kSpoilersRectsSize> &rects,
+		QVarLengthArray<FixedRange> &ranges);
+	void paintSpoilerRects();
+	void paintSpoilerRects(
+		const QVarLengthArray<QRect, kSpoilersRectsSize> &rects,
+		const style::color &color,
+		int index);
 	void elideSaveBlock(
 		int32 blockIndex,
 		const AbstractBlock *&_endBlock,
@@ -100,9 +123,8 @@ private:
 	const QPen *_currentPen = nullptr;
 	const QPen *_currentPenSelected = nullptr;
 	struct {
-		const style::color *spoiler = nullptr;
-		const style::color *spoilerSelected = nullptr;
 		bool inFront = false;
+		bool spoiler = true;
 		crl::time startMs = 0;
 		uint16 spoilerIndex = 0;
 
@@ -115,6 +137,10 @@ private:
 	bool _fullWidthSelection = true;
 	const QChar *_str = nullptr;
 	mutable crl::time _cachedNow = 0;
+	QVarLengthArray<FixedRange> _spoilerRanges;
+	QVarLengthArray<FixedRange> _spoilerSelectedRanges;
+	QVarLengthArray<QRect, kSpoilersRectsSize> _spoilerRects;
+	QVarLengthArray<QRect, kSpoilersRectsSize> _spoilerSelectedRects;
 
 	int _customEmojiSize = 0;
 	int _customEmojiSkip = 0;
@@ -122,7 +148,7 @@ private:
 
 	// current paragraph data
 	String::TextBlocks::const_iterator _parStartBlock;
-	Qt::LayoutDirection _parDirection;
+	Qt::LayoutDirection _parDirection = Qt::LayoutDirectionAuto;
 	int _parStart = 0;
 	int _parLength = 0;
 	bool _parHasBidi = false;

From bc76e4f601eb68ecff8f1d6442b9a57171ce0c05 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 18 Sep 2022 16:51:29 +0400
Subject: [PATCH 243/635] Optimize spoiler revealing.

---
 CMakeLists.txt               |  2 -
 ui/effects/spoiler_mess.cpp  |  4 ++
 ui/effects/spoiler_mess.h    |  4 +-
 ui/spoiler_click_handler.cpp | 40 ----------------
 ui/spoiler_click_handler.h   | 30 ------------
 ui/text/text.cpp             | 54 +++++++++++-----------
 ui/text/text.h               | 18 ++++----
 ui/text/text_parser.cpp      | 14 +-----
 ui/text/text_renderer.cpp    | 90 ++++++++++++++++--------------------
 ui/text/text_renderer.h      | 10 ++--
 ui/text/text_spoiler_data.h  |  5 +-
 11 files changed, 93 insertions(+), 178 deletions(-)
 delete mode 100644 ui/spoiler_click_handler.cpp
 delete mode 100644 ui/spoiler_click_handler.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efd551e..084ca64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,8 +271,6 @@ PRIVATE
     ui/rect_part.h
     ui/round_rect.cpp
     ui/round_rect.h
-    ui/spoiler_click_handler.cpp
-    ui/spoiler_click_handler.h
     ui/rp_widget.cpp
     ui/rp_widget.h
     ui/ui_utility.cpp
diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index a125bd5..b07f8ac 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -775,6 +775,10 @@ int SpoilerAnimation::index(crl::time now, bool paused) {
 	return absolute % kDefaultFramesCount;
 }
 
+Fn<void()> SpoilerAnimation::repaintCallback() const {
+	return _repaint;
+}
+
 bool SpoilerAnimation::repaint(crl::time now) {
 	if (!_scheduled) {
 		_scheduled = true;
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
index 0ca429f..1cf9102 100644
--- a/ui/effects/spoiler_mess.h
+++ b/ui/effects/spoiler_mess.h
@@ -96,7 +96,9 @@ public:
 	explicit SpoilerAnimation(Fn<void()> repaint);
 	~SpoilerAnimation();
 
-	int index(crl::time now, bool paused);
+	[[nodiscard]] int index(crl::time now, bool paused);
+
+	[[nodiscard]] Fn<void()> repaintCallback() const;
 
 private:
 	friend class SpoilerAnimationManager;
diff --git a/ui/spoiler_click_handler.cpp b/ui/spoiler_click_handler.cpp
deleted file mode 100644
index ccb16eb..0000000
--- a/ui/spoiler_click_handler.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file is part of Desktop App Toolkit,
-// a set of libraries for developing nice desktop applications.
-//
-// For license and copyright information please follow this link:
-// https://github.com/desktop-app/legal/blob/master/LEGAL
-//
-#include "ui/spoiler_click_handler.h"
-
-#include "ui/effects/animation_value.h"
-#include "ui/text/text_entity.h"
-
-ClickHandler::TextEntity SpoilerClickHandler::getTextEntity() const {
-	return { EntityType::Spoiler };
-}
-
-void SpoilerClickHandler::onClick(ClickContext context) const {
-	if (!_shown) {
-		const auto nonconst = const_cast<SpoilerClickHandler*>(this);
-		nonconst->_shown = true;
-	}
-}
-
-bool SpoilerClickHandler::shown() const {
-	return _shown;
-}
-
-crl::time SpoilerClickHandler::startMs() const {
-	return _startMs;
-}
-
-void SpoilerClickHandler::setStartMs(crl::time value) {
-	if (anim::Disabled()) {
-		return;
-	}
-	_startMs = value;
-}
-
-void SpoilerClickHandler::setShown(bool value) {
-	_shown = value;
-}
diff --git a/ui/spoiler_click_handler.h b/ui/spoiler_click_handler.h
deleted file mode 100644
index bacaf68..0000000
--- a/ui/spoiler_click_handler.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// This file is part of Desktop App Toolkit,
-// a set of libraries for developing nice desktop applications.
-//
-// For license and copyright information please follow this link:
-// https://github.com/desktop-app/legal/blob/master/LEGAL
-//
-#pragma once
-
-#include "ui/click_handler.h"
-
-enum class EntityType : uchar;
-
-class SpoilerClickHandler : public ClickHandler {
-public:
-	SpoilerClickHandler() = default;
-
-	TextEntity getTextEntity() const override;
-
-	void onClick(ClickContext context) const override;
-
-	[[nodiscard]] bool shown() const;
-	void setShown(bool value);
-	[[nodiscard]] crl::time startMs() const;
-	void setStartMs(crl::time value);
-
-private:
-	bool _shown = false;
-	crl::time _startMs = 0;
-
-};
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 6dd1d8d..1991f70 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -12,7 +12,6 @@
 #include "ui/text/text_spoiler_data.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/painter.h"
-#include "ui/spoiler_click_handler.h"
 #include "base/platform/base_platform_info.h"
 #include "styles/style_basic.h"
 
@@ -318,31 +317,40 @@ void String::setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk) {
 	_links[lnkIndex - 1] = lnk;
 }
 
-void String::setSpoiler(
-		uint16 lnkIndex,
-		const std::shared_ptr<SpoilerClickHandler> &lnk) {
-	if (!lnkIndex || !_spoiler || lnkIndex > _spoiler->links.size()) {
+void String::setSpoilerRevealed(bool revealed, anim::type animated) {
+	if (!_spoiler) {
+		return;
+	} else if (_spoiler->revealed == revealed) {
+		if (animated == anim::type::instant
+			&& _spoiler->revealAnimation.animating()) {
+			_spoiler->revealAnimation.stop();
+			_spoiler->animation.repaintCallback()();
+		}
 		return;
 	}
-	_spoiler->links[lnkIndex - 1] = lnk;
+	_spoiler->revealed = revealed;
+	if (animated == anim::type::instant) {
+		_spoiler->revealAnimation.stop();
+		_spoiler->animation.repaintCallback()();
+	} else {
+		_spoiler->revealAnimation.start(
+			_spoiler->animation.repaintCallback(),
+			revealed ? 0. : 1.,
+			revealed ? 1. : 0.,
+			st::fadeWrapDuration);
+	}
 }
 
-void String::setSpoilerShown(uint16 lnkIndex, bool shown) {
-	if (!lnkIndex
-		|| !_spoiler
-		|| (lnkIndex > _spoiler->links.size())
-		|| !_spoiler->links[lnkIndex - 1]) {
-		return;
-	}
-	_spoiler->links[lnkIndex - 1]->setShown(shown);
+void String::setSpoilerLink(const ClickHandlerPtr &lnk) {
+	_spoiler->link = lnk;
 }
 
 bool String::hasLinks() const {
 	return !_links.isEmpty();
 }
 
-int String::spoilersCount() const {
-	return !_spoiler ? 0 : int(_spoiler->links.size());
+bool String::hasSpoilers() const {
+	return (_spoiler != nullptr);
 }
 
 bool String::hasSkipBlock() const {
@@ -752,9 +760,11 @@ void String::enumerateText(
 				if (rangeTo > rangeFrom) { // handle click handler
 					const auto r = base::StringViewMid(_text, rangeFrom, rangeTo - rangeFrom);
 					// Ignore links that are partially copied.
-					const auto handler = (spoilerFrom != rangeFrom || blockFrom != rangeTo || !_spoiler)
+					const auto handler = (spoilerFrom != rangeFrom
+						|| blockFrom != rangeTo
+						|| !_spoiler)
 						? nullptr
-						: _spoiler->links.at(spoilerIndex - 1);
+						: _spoiler->link;
 					const auto type = EntityType::Spoiler;
 					clickHandlerFinishCallback(r, handler, type);
 				}
@@ -1040,14 +1050,6 @@ void String::clearFields() {
 	_startDir = Qt::LayoutDirectionAuto;
 }
 
-ClickHandlerPtr String::spoilerLink(uint16 spoilerIndex) const {
-	if (spoilerIndex && _spoiler) {
-		const auto &handler = _spoiler->links.at(spoilerIndex - 1);
-		return (handler && !handler->shown()) ? handler : nullptr;
-	}
-	return nullptr;
-}
-
 bool IsBad(QChar ch) {
 	return (ch == 0)
 		|| (ch >= 8232 && ch < 8237)
diff --git a/ui/text/text.h b/ui/text/text.h
index 090a39c..d99a32f 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -16,7 +16,10 @@
 #include <any>
 
 class Painter;
-class SpoilerClickHandler;
+
+namespace anim {
+enum class type : uchar;
+} // namespace anim
 
 namespace style {
 struct TextPalette;
@@ -162,13 +165,12 @@ public:
 	void setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options = kDefaultTextOptions);
 	void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options = kMarkupTextOptions, const std::any &context = {});
 
-	void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk);
 	[[nodiscard]] bool hasLinks() const;
-	void setSpoiler(
-		uint16 lnkIndex,
-		const std::shared_ptr<SpoilerClickHandler> &lnk);
-	void setSpoilerShown(uint16 lnkIndex, bool shown);
-	[[nodiscard]] int spoilersCount() const;
+	void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk);
+
+	[[nodiscard]] bool hasSpoilers() const;
+	void setSpoilerRevealed(bool revealed, anim::type animated);
+	void setSpoilerLink(const ClickHandlerPtr &lnk);
 
 	[[nodiscard]] bool hasSkipBlock() const;
 	bool updateSkipBlock(int width, int height);
@@ -254,8 +256,6 @@ private:
 	// it is also called from move constructor / assignment operator
 	void clearFields();
 
-	[[nodiscard]] ClickHandlerPtr spoilerLink(uint16 spoilerIndex) const;
-
 	TextForMimeData toText(
 		TextSelection selection,
 		bool composeExpanded,
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 0db97da..a435fe6 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -10,7 +10,6 @@
 #include "ui/integration.h"
 #include "ui/text/text_isolated_emoji.h"
 #include "ui/text/text_spoiler_data.h"
-#include "ui/spoiler_click_handler.h"
 #include "styles/style_basic.h"
 
 #include <QtCore/QUrl>
@@ -634,19 +633,11 @@ void Parser::finalize(const TextParseOptions &options) {
 				_t->_isIsolatedEmoji = false;
 			}
 		}
-		const auto spoilerIndex = block->spoilerIndex();
-		if (spoilerIndex) {
+		if (block->spoilerIndex()) {
 			if (!_t->_spoiler) {
 				_t->_spoiler = std::make_unique<SpoilerData>(
 					Integration::Instance().createSpoilerRepaint(_context));
 			}
-			if (_t->_spoiler->links.size() < spoilerIndex) {
-				_t->_spoiler->links.resize(spoilerIndex);
-				const auto handler = (options.flags & TextParseLinks)
-					? std::make_shared<SpoilerClickHandler>()
-					: nullptr;
-				_t->setSpoiler(spoilerIndex, std::move(handler));
-			}
 		}
 		const auto shiftedIndex = block->lnkIndex();
 		auto useCustomIndex = false;
@@ -712,9 +703,6 @@ void Parser::finalize(const TextParseOptions &options) {
 		_t->_isIsolatedEmoji = false;
 	}
 	_t->_links.squeeze();
-	if (_t->_spoiler) {
-		_t->_spoiler->links.squeeze();
-	}
 	_t->_blocks.shrink_to_fit();
 	_t->_text.squeeze();
 }
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 7b5033b..53e5648 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -7,7 +7,6 @@
 #include "ui/text/text_renderer.h"
 
 #include "ui/text/text_spoiler_data.h"
-#include "ui/spoiler_click_handler.h"
 #include "styles/style_basic.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -200,6 +199,10 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 	_align = context.align;
 	_cachedNow = context.now;
 	_paused = context.paused;
+	_spoilerOpacity = _t->_spoiler
+		? (1. - _t->_spoiler->revealAnimation.value(
+			_t->_spoiler->revealed ? 1. : 0.))
+		: 0.;
 	enumerate();
 }
 
@@ -720,12 +723,8 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 			if (!_p && _lookupX >= x && _lookupX < x + si.width) { // _lookupRequest
 				if (_lookupLink) {
 					if (_lookupY >= _y + _yDelta && _lookupY < _y + _yDelta + _fontHeight) {
-						const auto spoilerLink = _t->spoilerLink(currentBlock->spoilerIndex());
-						const auto resultLink = (spoilerLink || !currentBlock->lnkIndex())
-							? spoilerLink
-							: _t->_links.at(currentBlock->lnkIndex() - 1);
-						if (resultLink) {
-							_lookupResult.link = resultLink;
+						if (const auto link = lookupLink(currentBlock)) {
+							_lookupResult.link = link;
 						}
 					}
 				}
@@ -802,19 +801,16 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 						}
 					}
 				}
-				const auto hasSpoiler = _background.inFront
-					|| _background.startMs;
+				const auto hasSpoiler = _background.spoiler
+					&& (_spoilerOpacity > 0.);
 				if (hasSpoiler) {
 					fillSpoiler = { x, x + si.width };
 				}
-				const auto spoilerOpacity = hasSpoiler
-					? fillSpoilerOpacity()
-					: 0.;
 				fillSelectRange(fillSelect);
 				const auto opacity = _p->opacity();
-				if (spoilerOpacity < 1.) {
+				if (!hasSpoiler || _spoilerOpacity < 1.) {
 					if (hasSpoiler) {
-						_p->setOpacity(opacity * (1. - spoilerOpacity));
+						_p->setOpacity(opacity * (1. - _spoilerOpacity));
 					}
 					const auto x = (glyphX + st::emojiPadding).toInt();
 					const auto y = _y + _yDelta + emojiY;
@@ -872,12 +868,8 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 		if (!_p && _lookupX >= x && _lookupX < x + itemWidth) { // _lookupRequest
 			if (_lookupLink) {
 				if (_lookupY >= _y + _yDelta && _lookupY < _y + _yDelta + _fontHeight) {
-					const auto spoilerLink = _t->spoilerLink(currentBlock->spoilerIndex());
-					const auto resultLink = (spoilerLink || !currentBlock->lnkIndex())
-						? spoilerLink
-						: _t->_links.at(currentBlock->lnkIndex() - 1);
-					if (resultLink) {
-						_lookupResult.link = resultLink;
+					if (const auto link = lookupLink(currentBlock)) {
+						_lookupResult.link = link;
 					}
 				}
 			}
@@ -987,17 +979,15 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 				fillSelect = { selX, selX + selWidth };
 				fillSelectRange(fillSelect);
 			}
-			const auto hasSpoiler = (_background.inFront || _background.startMs);
-			const auto spoilerOpacity = hasSpoiler
-				? fillSpoilerOpacity()
-				: 0.;
+			const auto hasSpoiler = _background.spoiler
+				&& (_spoilerOpacity > 0.);
 			const auto opacity = _p->opacity();
 			const auto isElidedBlock = !rtl
 				&& (_indexOfElidedBlock == blockIndex);
 			const auto complexClipping = hasSpoiler
 				&& isElidedBlock
-				&& spoilerOpacity == 1.;
-			if ((spoilerOpacity < 1.) || isElidedBlock) {
+				&& (_spoilerOpacity == 1.);
+			if (!hasSpoiler || (_spoilerOpacity < 1.) || isElidedBlock) {
 				const auto complexClippingEnabled = complexClipping
 					&& _p->hasClipping();
 				const auto complexClippingRegion = complexClipping
@@ -1015,7 +1005,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 							_y + 2 * _lineHeight),
 						Qt::IntersectClip);
 				} else if (hasSpoiler && !isElidedBlock) {
-					_p->setOpacity(opacity * (1. - spoilerOpacity));
+					_p->setOpacity(opacity * (1. - _spoilerOpacity));
 				}
 				if (Q_UNLIKELY(hasSelected)) {
 					if (Q_UNLIKELY(hasNotSelected)) {
@@ -1091,22 +1081,6 @@ void Renderer::fillSelectRange(FixedRange range) {
 	_p->fillRect(left, _y + _yDelta, width, _fontHeight, _palette->selectBg);
 }
 
-float64 Renderer::fillSpoilerOpacity() {
-	if (!_background.startMs) {
-		return 1.;
-	}
-	const auto progress = float64(now() - _background.startMs)
-		/ st::fadeWrapDuration;
-	if ((progress > 1.) && _background.spoilerIndex && _t->_spoiler) {
-		const auto link = _t->_spoiler->links.at(
-			_background.spoilerIndex - 1);
-		if (link) {
-			link->setStartMs(0);
-		}
-	}
-	return (1. - std::min(progress, 1.));
-}
-
 void Renderer::pushSpoilerRange(
 		FixedRange range,
 		FixedRange selected,
@@ -1159,9 +1133,15 @@ void Renderer::fillSpoilerRects(
 }
 
 void Renderer::paintSpoilerRects() {
+	Expects(_p != nullptr);
+
 	if (!_t->_spoiler) {
 		return;
 	}
+	const auto opacity = _p->opacity();
+	if (_spoilerOpacity < 1.) {
+		_p->setOpacity(opacity * _spoilerOpacity);
+	}
 	const auto index = _t->_spoiler->animation.index(now(), _paused);
 	paintSpoilerRects(
 		_spoilerRects,
@@ -1171,6 +1151,9 @@ void Renderer::paintSpoilerRects() {
 		_spoilerSelectedRects,
 		_palette->selectSpoilerFg,
 		index);
+	if (_spoilerOpacity < 1.) {
+		_p->setOpacity(opacity);
+	}
 }
 
 void Renderer::paintSpoilerRects(
@@ -2009,15 +1992,11 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 		const auto isMono = IsMono(block->flags());
 		_background = {};
 		if (block->spoilerIndex() && _t->_spoiler) {
-			const auto handler
-				= _t->_spoiler->links.at(block->spoilerIndex() - 1);
-			const auto inBack = (handler && handler->shown());
-			_background.inFront = !inBack;
 			_background.spoiler = true;
-			_background.startMs = handler ? handler->startMs() : 0;
-			_background.spoilerIndex = block->spoilerIndex();
 		}
-		if (isMono && block->lnkIndex() && !_background.inFront) {
+		if (isMono
+			&& block->lnkIndex()
+			&& (!_background.spoiler || _t->_spoiler->revealed)) {
 			_background.selectActiveBlock = ClickHandler::showAsPressed(
 				_t->_links.at(block->lnkIndex() - 1));
 		}
@@ -2036,4 +2015,15 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 	}
 }
 
+ClickHandlerPtr Renderer::lookupLink(const AbstractBlock *block) const {
+	const auto spoilerLink = (_t->_spoiler
+		&& !_t->_spoiler->revealed
+		&& block->spoilerIndex())
+		? _t->_spoiler->link
+		: ClickHandlerPtr();
+	return (spoilerLink || !block->lnkIndex())
+		? spoilerLink
+		: _t->_links.at(block->lnkIndex() - 1);
+}
+
 } // namespace Ui::Text
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index e904c14..6bf4a6b 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -59,7 +59,6 @@ private:
 		const String::TextBlocks::const_iterator &_endBlockIter,
 		const String::TextBlocks::const_iterator &_end);
 	void fillSelectRange(FixedRange range);
-	[[nodiscard]] float64 fillSpoilerOpacity();
 	void pushSpoilerRange(
 		FixedRange range,
 		FixedRange selected,
@@ -108,6 +107,8 @@ private:
 	bool eBidiItemize(QScriptAnalysis *analysis, BidiControl &control);
 
 	void applyBlockProperties(const AbstractBlock *block);
+	[[nodiscard]] ClickHandlerPtr lookupLink(
+		const AbstractBlock *block) const;
 
 	const String *_t = nullptr;
 	SpoilerMessCache *_spoilerCache = nullptr;
@@ -123,11 +124,7 @@ private:
 	const QPen *_currentPen = nullptr;
 	const QPen *_currentPenSelected = nullptr;
 	struct {
-		bool inFront = false;
-		bool spoiler = true;
-		crl::time startMs = 0;
-		uint16 spoilerIndex = 0;
-
+		bool spoiler = false;
 		bool selectActiveBlock = false; // For monospace.
 	} _background;
 	int _yFrom = 0;
@@ -137,6 +134,7 @@ private:
 	bool _fullWidthSelection = true;
 	const QChar *_str = nullptr;
 	mutable crl::time _cachedNow = 0;
+	float64 _spoilerOpacity = 0.;
 	QVarLengthArray<FixedRange> _spoilerRanges;
 	QVarLengthArray<FixedRange> _spoilerSelectedRanges;
 	QVarLengthArray<QRect, kSpoilersRectsSize> _spoilerRects;
diff --git a/ui/text/text_spoiler_data.h b/ui/text/text_spoiler_data.h
index aae50f6..4b3943a 100644
--- a/ui/text/text_spoiler_data.h
+++ b/ui/text/text_spoiler_data.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "ui/effects/spoiler_mess.h"
+#include "ui/effects/animations.h"
 
 class SpoilerClickHandler;
 
@@ -18,7 +19,9 @@ struct SpoilerData {
 	}
 
 	SpoilerAnimation animation;
-	QVector<std::shared_ptr<SpoilerClickHandler>> links;
+	ClickHandlerPtr link;
+	Animations::Simple revealAnimation;
+	bool revealed = false;
 };
 
 } // namespace Ui::Text

From efdc82c823ac9e197c5342f78430d2b0368094de Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 18 Sep 2022 17:02:22 +0400
Subject: [PATCH 244/635] Add Cascadia Code as preferred monospace font

And switch macOS to system monospace font as Cascadia Code is more likely to be installed by the user
---
 ui/style/style_core_font.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index 3df73c8..c488a0a 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -98,6 +98,7 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
 
 [[nodiscard]] QString ManualMonospaceFont() {
 	const auto kTryFirst = std::initializer_list<QString>{
+		"Cascadia Code",
 		"Consolas",
 		"Liberation Mono",
 		"Menlo",
@@ -259,15 +260,15 @@ QString MonospaceFont() {
 		const auto manual = ManualMonospaceFont();
 		const auto system = SystemMonospaceFont();
 
-#if defined Q_OS_WIN || defined Q_OS_MAC
+#ifdef Q_OS_WIN
 		// Prefer our monospace font.
 		const auto useSystem = manual.isEmpty();
-#else // Q_OS_WIN || Q_OS_MAC
+#else // Q_OS_WIN
 		// Prefer system monospace font.
 		const auto metrics = QFontMetrics(QFont(system));
 		const auto useSystem = manual.isEmpty()
 			|| (metrics.horizontalAdvance(QChar('i')) == metrics.horizontalAdvance(QChar('W')));
-#endif // Q_OS_WIN || Q_OS_MAC
+#endif // Q_OS_WIN
 		return useSystem ? system : manual;
 	}();
 

From 367859c6844eae2b7057ec6faeb80abe83546e55 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 18 Sep 2022 17:19:02 +0400
Subject: [PATCH 245/635] Fix unused variable warning

---
 ui/delayed_activation.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/delayed_activation.cpp b/ui/delayed_activation.cpp
index 0b66b05..8f6b247 100644
--- a/ui/delayed_activation.cpp
+++ b/ui/delayed_activation.cpp
@@ -45,6 +45,7 @@ void ActivateWindowDelayed(not_null<QWidget*> widget) {
 	} else if (std::exchange(Window, widget.get())) {
 		return;
 	}
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 	const auto focusAncestor = [&] {
 		const auto focusWidget = QApplication::focusWidget();
 		if (!focusWidget || !widget->window()) {
@@ -52,6 +53,7 @@ void ActivateWindowDelayed(not_null<QWidget*> widget) {
 		}
 		return widget->window()->isAncestorOf(focusWidget);
 	}();
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 	crl::on_main(Window, [=] {
 		const auto widget = base::take(Window);
 		if (!widget) {

From 13e59e27ebd515da2baca8e4dd7ebba76f601643 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 19 Sep 2022 05:25:40 +0400
Subject: [PATCH 246/635] Remove unnecessary Q_OS_UNIX && !Q_OS_MAC check

Thanks to cmake_dependent_option
---
 ui/basic_click_handlers.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/basic_click_handlers.cpp b/ui/basic_click_handlers.cpp
index 33624ea..b7bf0b9 100644
--- a/ui/basic_click_handlers.cpp
+++ b/ui/basic_click_handlers.cpp
@@ -12,18 +12,18 @@
 #include "base/qthelp_url.h"
 #include "base/qt/qt_string_view.h"
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include "base/platform/linux/base_linux_app_launch_context.h"
-#endif // Q_OS_UNIX && !Q_OS_MAC && !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 #include <QtCore/QUrl>
 #include <QtCore/QRegularExpression>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QGuiApplication>
 
-#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include <giomm.h>
-#endif // Q_OS_UNIX && !Q_OS_MAC && !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 QString TextClickHandler::readable() const {
 	const auto result = url();
@@ -88,7 +88,7 @@ void UrlClickHandler::Open(QString url, QVariant context) {
 		if (IsEmail(url)) {
 			url = "mailto: " + url;
 		}
-#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 		// Desktop entry spec implementation,
 		// prefer it over QDesktopServices::openUrl since it just calls
 		// the xdg-open shell script that is known to be bugged:
@@ -106,7 +106,7 @@ void UrlClickHandler::Open(QString url, QVariant context) {
 			}
 		} catch (...) {
 		}
-#endif // Q_OS_UNIX && !Q_OS_MAC && !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 		QDesktopServices::openUrl(url);
 	}
 }

From e72b521618dce7b016f3f16d2f29ae930468ad32 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 19 Sep 2022 14:18:59 +0400
Subject: [PATCH 247/635] An attempt to improve input fields touch-screen
 support.

---
 ui/widgets/input_fields.cpp | 270 +++++++++++++++++++++++++++---------
 ui/widgets/input_fields.h   |  28 +++-
 2 files changed, 234 insertions(+), 64 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 1f5c2bc..4012a42 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -976,6 +976,16 @@ protected:
 		return outer()->paintEventInner(e);
 	}
 
+	void mousePressEvent(QMouseEvent *e) override {
+		return outer()->mousePressEventInner(e);
+	}
+	void mouseReleaseEvent(QMouseEvent *e) override {
+		return outer()->mouseReleaseEventInner(e);
+	}
+	void mouseMoveEvent(QMouseEvent *e) override {
+		return outer()->mouseMoveEventInner(e);
+	}
+
 	bool canInsertFromMimeData(const QMimeData *source) const override {
 		return outer()->canInsertFromMimeDataInner(source);
 	}
@@ -1147,41 +1157,27 @@ bool FlatInput::eventHook(QEvent *e) {
 void FlatInput::touchEvent(QTouchEvent *e) {
 	switch (e->type()) {
 	case QEvent::TouchBegin: {
-		if (_touchPress || e->touchPoints().isEmpty()) return;
+		if (_touchPress || e->touchPoints().isEmpty()) {
+			return;
+		}
 		_touchTimer.start(QApplication::startDragTime());
 		_touchPress = true;
-		_touchMove = _touchRightButton = false;
+		_touchMove = _touchRightButton = _mousePressedInTouch = false;
 		_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
 	} break;
 
 	case QEvent::TouchUpdate: {
-		if (!_touchPress || e->touchPoints().isEmpty()) return;
-		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
-			_touchMove = true;
+		if (!e->touchPoints().isEmpty()) {
+			touchUpdate(e->touchPoints().cbegin()->screenPos().toPoint());
 		}
 	} break;
 
 	case QEvent::TouchEnd: {
-		if (!_touchPress) return;
-		auto weak = MakeWeak(this);
-		if (!_touchMove && window()) {
-			QPoint mapped(mapFromGlobal(_touchStart));
-
-			if (_touchRightButton) {
-				QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, mapped, _touchStart);
-				contextMenuEvent(&contextEvent);
-			} else {
-				QGuiApplication::inputMethod()->show();
-			}
-		}
-		if (weak) {
-			_touchTimer.stop();
-			_touchPress = _touchMove = _touchRightButton = false;
-		}
+		touchFinish();
 	} break;
 
 	case QEvent::TouchCancel: {
-		_touchPress = false;
+		_touchPress = _mousePressedInTouch = false;
 		_touchTimer.stop();
 	} break;
 	}
@@ -1323,6 +1319,64 @@ void FlatInput::inputMethodEvent(QInputMethodEvent *e) {
 	}
 }
 
+void FlatInput::mousePressEvent(QMouseEvent *e) {
+	if (_touchPress && e->button() == Qt::LeftButton) {
+		_mousePressedInTouch = true;
+		_touchStart = e->globalPos();
+	}
+	return QLineEdit::mousePressEvent(e);
+}
+
+void FlatInput::mouseReleaseEvent(QMouseEvent *e) {
+	if (_mousePressedInTouch) {
+		touchFinish();
+	}
+	return QLineEdit::mouseReleaseEvent(e);
+}
+
+void FlatInput::mouseMoveEvent(QMouseEvent *e) {
+	if (_mousePressedInTouch) {
+		touchUpdate(e->globalPos());
+	}
+	return QLineEdit::mouseMoveEvent(e);
+}
+
+void FlatInput::touchUpdate(QPoint globalPosition) {
+	if (_touchPress
+		&& !_touchMove
+		&& ((globalPosition - _touchStart).manhattanLength()
+			>= QApplication::startDragDistance())) {
+		_touchMove = true;
+	}
+}
+
+void FlatInput::touchFinish() {
+	if (!_touchPress) {
+		return;
+	}
+	const auto weak = MakeWeak(this);
+	if (!_touchMove && window()) {
+		QPoint mapped(mapFromGlobal(_touchStart));
+
+		if (_touchRightButton) {
+			QContextMenuEvent contextEvent(
+				QContextMenuEvent::Mouse,
+				mapped,
+				_touchStart);
+			contextMenuEvent(&contextEvent);
+		} else {
+			QGuiApplication::inputMethod()->show();
+		}
+	}
+	if (weak) {
+		_touchTimer.stop();
+		_touchPress
+			= _touchMove
+			= _touchRightButton
+			= _mousePressedInTouch = false;
+	}
+}
+
 QRect FlatInput::placeholderRect() const {
 	return QRect(_textMrg.left() + _st.phPos.x(), _textMrg.top() + _st.phPos.y(), width() - _textMrg.left() - _textMrg.right(), height() - _textMrg.top() - _textMrg.bottom());
 }
@@ -1572,6 +1626,7 @@ bool InputField::viewportEventInner(QEvent *e) {
 		const auto ev = static_cast<QTouchEvent*>(e);
 		if (ev->device()->type() == base::TouchDevice::TouchScreen) {
 			handleTouchEvent(ev);
+			return false;
 		}
 	} else if (e->type() == QEvent::Paint && _customEmojiObject) {
 		_customEmojiObject->setNow(crl::now());
@@ -1846,7 +1901,9 @@ void InputField::checkContentHeight() {
 void InputField::handleTouchEvent(QTouchEvent *e) {
 	switch (e->type()) {
 	case QEvent::TouchBegin: {
-		if (_touchPress || e->touchPoints().isEmpty()) return;
+		if (_touchPress || e->touchPoints().isEmpty()) {
+			return;
+		}
 		_touchTimer.start(QApplication::startDragTime());
 		_touchPress = true;
 		_touchMove = _touchRightButton = false;
@@ -1854,29 +1911,13 @@ void InputField::handleTouchEvent(QTouchEvent *e) {
 	} break;
 
 	case QEvent::TouchUpdate: {
-		if (!_touchPress || e->touchPoints().isEmpty()) return;
-		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
-			_touchMove = true;
+		if (!e->touchPoints().isEmpty()) {
+			touchUpdate(e->touchPoints().cbegin()->screenPos().toPoint());
 		}
 	} break;
 
 	case QEvent::TouchEnd: {
-		if (!_touchPress) return;
-		auto weak = MakeWeak(this);
-		if (!_touchMove && window()) {
-			QPoint mapped(mapFromGlobal(_touchStart));
-
-			if (_touchRightButton) {
-				QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, mapped, _touchStart);
-				contextMenuEvent(&contextEvent);
-			} else {
-				QGuiApplication::inputMethod()->show();
-			}
-		}
-		if (weak) {
-			_touchTimer.stop();
-			_touchPress = _touchMove = _touchRightButton = false;
-		}
+		touchFinish();
 	} break;
 
 	case QEvent::TouchCancel: {
@@ -1886,6 +1927,42 @@ void InputField::handleTouchEvent(QTouchEvent *e) {
 	}
 }
 
+void InputField::touchUpdate(QPoint globalPosition) {
+	if (_touchPress
+		&& !_touchMove
+		&& ((globalPosition - _touchStart).manhattanLength()
+			>= QApplication::startDragDistance())) {
+		_touchMove = true;
+	}
+}
+
+void InputField::touchFinish() {
+	if (!_touchPress) {
+		return;
+	}
+	const auto weak = MakeWeak(this);
+	if (!_touchMove && window()) {
+		QPoint mapped(mapFromGlobal(_touchStart));
+
+		if (_touchRightButton) {
+			QContextMenuEvent contextEvent(
+				QContextMenuEvent::Mouse,
+				mapped,
+				_touchStart);
+			contextMenuEvent(&contextEvent);
+		} else {
+			QGuiApplication::inputMethod()->show();
+		}
+	}
+	if (weak) {
+		_touchTimer.stop();
+		_touchPress
+			= _touchMove
+			= _touchRightButton
+			= _mousePressedInTouch = false;
+	}
+}
+
 void InputField::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
@@ -2006,6 +2083,29 @@ void InputField::mousePressEvent(QMouseEvent *e) {
 	InvokeQueued(this, [=] { onFocusInner(); });
 }
 
+void InputField::mousePressEventInner(QMouseEvent *e) {
+	if (_touchPress && e->button() == Qt::LeftButton) {
+		_mousePressedInTouch = true;
+		_touchStart = e->globalPos();
+	}
+	_inner->QTextEdit::mousePressEvent(e);
+}
+
+void InputField::mouseReleaseEventInner(QMouseEvent *e) {
+	if (_mousePressedInTouch) {
+		touchFinish();
+	} else {
+		_inner->QTextEdit::mouseReleaseEvent(e);
+	}
+}
+
+void InputField::mouseMoveEventInner(QMouseEvent *e) {
+	if (_mousePressedInTouch) {
+		touchUpdate(e->globalPos());
+	}
+	_inner->QTextEdit::mouseMoveEvent(e);
+}
+
 void InputField::onFocusInner() {
 	auto borderStart = _borderAnimationStart;
 	_inner->setFocus();
@@ -4165,37 +4265,23 @@ bool MaskedInputField::eventHook(QEvent *e) {
 void MaskedInputField::touchEvent(QTouchEvent *e) {
 	switch (e->type()) {
 	case QEvent::TouchBegin: {
-		if (_touchPress || e->touchPoints().isEmpty()) return;
+		if (_touchPress || e->touchPoints().isEmpty()) {
+			return;
+		}
 		_touchTimer.start(QApplication::startDragTime());
 		_touchPress = true;
-		_touchMove = _touchRightButton = false;
+		_touchMove = _touchRightButton = _mousePressedInTouch = false;
 		_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
 	} break;
 
 	case QEvent::TouchUpdate: {
-		if (!_touchPress || e->touchPoints().isEmpty()) return;
-		if (!_touchMove && (e->touchPoints().cbegin()->screenPos().toPoint() - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
-			_touchMove = true;
+		if (!e->touchPoints().isEmpty()) {
+			touchUpdate(e->touchPoints().cbegin()->screenPos().toPoint());
 		}
 	} break;
 
 	case QEvent::TouchEnd: {
-		if (!_touchPress) return;
-		auto weak = MakeWeak(this);
-		if (!_touchMove && window()) {
-			QPoint mapped(mapFromGlobal(_touchStart));
-
-			if (_touchRightButton) {
-				QContextMenuEvent contextEvent(QContextMenuEvent::Mouse, mapped, _touchStart);
-				contextMenuEvent(&contextEvent);
-			} else {
-				QGuiApplication::inputMethod()->show();
-			}
-		}
-		if (weak) {
-			_touchTimer.stop();
-			_touchPress = _touchMove = _touchRightButton = false;
-		}
+		touchFinish();
 	} break;
 
 	case QEvent::TouchCancel: {
@@ -4205,6 +4291,42 @@ void MaskedInputField::touchEvent(QTouchEvent *e) {
 	}
 }
 
+void MaskedInputField::touchUpdate(QPoint globalPosition) {
+	if (_touchPress
+		&& !_touchMove
+		&& ((globalPosition - _touchStart).manhattanLength()
+			>= QApplication::startDragDistance())) {
+		_touchMove = true;
+	}
+}
+
+void MaskedInputField::touchFinish() {
+	if (!_touchPress) {
+		return;
+	}
+	const auto weak = MakeWeak(this);
+	if (!_touchMove && window()) {
+		QPoint mapped(mapFromGlobal(_touchStart));
+
+		if (_touchRightButton) {
+			QContextMenuEvent contextEvent(
+				QContextMenuEvent::Mouse,
+				mapped,
+				_touchStart);
+			contextMenuEvent(&contextEvent);
+		} else {
+			QGuiApplication::inputMethod()->show();
+		}
+	}
+	if (weak) {
+		_touchTimer.stop();
+		_touchPress
+			= _touchMove
+			= _touchRightButton
+			= _mousePressedInTouch = false;
+	}
+}
+
 void MaskedInputField::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
@@ -4279,6 +4401,28 @@ void MaskedInputField::paintEvent(QPaintEvent *e) {
 	QLineEdit::paintEvent(e);
 }
 
+void MaskedInputField::mousePressEvent(QMouseEvent *e) {
+	if (_touchPress && e->button() == Qt::LeftButton) {
+		_mousePressedInTouch = true;
+		_touchStart = e->globalPos();
+	}
+	return QLineEdit::mousePressEvent(e);
+}
+
+void MaskedInputField::mouseReleaseEvent(QMouseEvent *e) {
+	if (_mousePressedInTouch) {
+		touchFinish();
+	}
+	return QLineEdit::mouseReleaseEvent(e);
+}
+
+void MaskedInputField::mouseMoveEvent(QMouseEvent *e) {
+	if (_mousePressedInTouch) {
+		touchUpdate(e->globalPos());
+	}
+	return QLineEdit::mouseMoveEvent(e);
+}
+
 void MaskedInputField::startBorderAnimation() {
 	auto borderVisible = (_error || _focused);
 	if (_borderVisible != borderVisible) {
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 5ab622a..a513e19 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -118,6 +118,10 @@ protected:
 	void contextMenuEvent(QContextMenuEvent *e) override;
 	void inputMethodEvent(QInputMethodEvent *e) override;
 
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+
 	virtual void correctValue(const QString &was, QString &now);
 
 	style::font phFont() {
@@ -130,6 +134,9 @@ private:
 	void updatePalette();
 	void refreshPlaceholder(const QString &text);
 
+	void touchUpdate(QPoint globalPosition);
+	void touchFinish();
+
 	QString _oldtext;
 	rpl::variable<QString> _placeholderFull;
 	QString _placeholder;
@@ -146,7 +153,10 @@ private:
 	QMargins _textMrg;
 
 	QTimer _touchTimer;
-	bool _touchPress, _touchRightButton, _touchMove;
+	bool _touchPress = false;
+	bool _touchRightButton = false;
+	bool _touchMove = false;
+	bool _mousePressedInTouch = false;
 	QPoint _touchStart;
 
 	base::unique_qptr<PopupMenu> _contextMenu;
@@ -448,6 +458,10 @@ private:
 	void inputMethodEventInner(QInputMethodEvent *e);
 	void paintEventInner(QPaintEvent *e);
 
+	void mousePressEventInner(QMouseEvent *e);
+	void mouseReleaseEventInner(QMouseEvent *e);
+	void mouseMoveEventInner(QMouseEvent *e);
+
 	QMimeData *createMimeDataFromSelectionInner() const;
 	bool canInsertFromMimeDataInner(const QMimeData *source) const;
 	void insertFromMimeDataInner(const QMimeData *source);
@@ -522,6 +536,9 @@ private:
 	void customEmojiRepaint();
 	void highlightMarkdown();
 
+	void touchUpdate(QPoint globalPosition);
+	void touchFinish();
+
 	const style::InputField &_st;
 
 	Mode _mode = Mode::SingleLine;
@@ -594,6 +611,7 @@ private:
 	bool _touchPress = false;
 	bool _touchRightButton = false;
 	bool _touchMove = false;
+	bool _mousePressedInTouch = false;
 	QPoint _touchStart;
 
 	bool _correcting = false;
@@ -690,6 +708,10 @@ protected:
 	void contextMenuEvent(QContextMenuEvent *e) override;
 	void inputMethodEvent(QInputMethodEvent *e) override;
 
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+
 	virtual void correctValue(
 		const QString &was,
 		int wasCursor,
@@ -716,6 +738,9 @@ private:
 	void refreshPlaceholder(const QString &text);
 	void setErrorShown(bool error);
 
+	void touchUpdate(QPoint globalPosition);
+	void touchFinish();
+
 	void setFocused(bool focused);
 
 	int _maxLength = -1;
@@ -753,6 +778,7 @@ private:
 	bool _touchPress = false;
 	bool _touchRightButton = false;
 	bool _touchMove = false;
+	bool _mousePressedInTouch = false;
 	QPoint _touchStart;
 
 	base::unique_qptr<PopupMenu> _contextMenu;

From 18580e46a1206f4ba875ed6d4da553d60407288f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 19 Sep 2022 16:27:39 +0400
Subject: [PATCH 248/635] Handle touch events in PopupMenu.

---
 ui/style/style_core_font.cpp |  2 +-
 ui/widgets/popup_menu.cpp    | 36 ++++++++++++++++++++++++++++++++++++
 ui/widgets/popup_menu.h      |  2 ++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index c488a0a..76f71d8 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -98,7 +98,7 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
 
 [[nodiscard]] QString ManualMonospaceFont() {
 	const auto kTryFirst = std::initializer_list<QString>{
-		"Cascadia Code",
+		"Cascadia Mono",
 		"Consolas",
 		"Liberation Mono",
 		"Menlo",
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 8cae306..db6a97d 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -23,6 +23,7 @@
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
+#include <private/qapplication_p.h>
 
 namespace Ui {
 namespace {
@@ -203,6 +204,8 @@ void PopupMenu::init() {
 		hideMenu(true);
 	}, lifetime());
 
+	installEventFilter(this);
+
 	const auto paddingWrap = static_cast<PaddingWrap<Menu::Menu>*>(
 		_menu->parentWidget());
 	paddingWrap->paintRequest(
@@ -620,6 +623,37 @@ void PopupMenu::mousePressEvent(QMouseEvent *e) {
 	forwardMousePress(e->globalPos());
 }
 
+bool PopupMenu::eventFilter(QObject *o, QEvent *e) {
+	const auto type = e->type();
+	if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate
+		|| type == QEvent::TouchEnd) {
+		if (o == windowHandle() && isActiveWindow()) {
+			const auto event = static_cast<QTouchEvent*>(e);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+			e->setAccepted(
+				QApplicationPrivate::translateRawTouchEvent(
+					this,
+					event->device(),
+					event->touchPoints(),
+					event->timestamp()));
+#elif QT_VERSION < QT_VERSION_CHECK(6, 3, 0) // Qt < 6.0.0
+			e->setAccepted(
+				QApplicationPrivate::translateRawTouchEvent(
+					this,
+					event->pointingDevice(),
+					const_cast<QList<QEventPoint> &>(event->points()),
+					event->timestamp()));
+#else // Qt < 6.3.0
+			e->setAccepted(
+				QApplicationPrivate::translateRawTouchEvent(this, event));
+#endif
+			return e->isAccepted();
+		}
+	}
+	return false;
+}
+
 void PopupMenu::hideMenu(bool fast) {
 	if (isHidden()) {
 		return;
@@ -901,6 +935,8 @@ bool PopupMenu::prepareGeometryFor(const QPoint &p, PopupMenu *parent) {
 	_parent = parent;
 
 	createWinId();
+	windowHandle()->removeEventFilter(this);
+	windowHandle()->installEventFilter(this);
 	if (_parent) {
 		windowHandle()->setScreen(_parent->screen());
 	} else if (screen) {
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index e9d60e5..0eb0a7c 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -109,6 +109,8 @@ protected:
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
 
+	bool eventFilter(QObject *o, QEvent *e) override;
+
 private:
 	void paintBg(QPainter &p);
 	void hideFast();

From 1c5fd7e277efb2181935d08a36b63c178e09b144 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Sep 2022 12:48:27 +0400
Subject: [PATCH 249/635] Add some more assertions to debug a crash.

---
 ui/effects/animation_value.cpp | 86 ++++++++++++++++++++++++++++------
 1 file changed, 72 insertions(+), 14 deletions(-)

diff --git a/ui/effects/animation_value.cpp b/ui/effects/animation_value.cpp
index 934d9c8..c83c418 100644
--- a/ui/effects/animation_value.cpp
+++ b/ui/effects/animation_value.cpp
@@ -23,51 +23,109 @@ transition linear = [](const float64 &delta, const float64 &dt) {
 	Expects(!std::isnan(dt));
 
 	const auto result = delta * dt;
+
 	Ensures(!std::isnan(result));
 	return result;
 };
 
 transition sineInOut = [](const float64 &delta, const float64 &dt) {
-	return -(delta / 2) * (cos(M_PI * dt) - 1);
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
+	const auto result = -(delta / 2) * (cos(M_PI * dt) - 1);
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition halfSine = [](const float64 &delta, const float64 &dt) {
-	return delta * sin(M_PI * dt / 2);
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
+	const auto result = delta * sin(M_PI * dt / 2);
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition easeOutBack = [](const float64 &delta, const float64 &dt) {
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
 	static constexpr auto s = 1.70158;
 
-	const float64 t = dt - 1;
-	return delta * (t * t * ((s + 1) * t + s) + 1);
+	const auto t = dt - 1;
+	Assert(!std::isnan(t));
+	const auto result = delta * (t * t * ((s + 1) * t + s) + 1);
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition easeInCirc = [](const float64 &delta, const float64 &dt) {
-	return -delta * (sqrt(1 - dt * dt) - 1);
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
+	const auto result = -delta * (sqrt(1 - dt * dt) - 1);
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition easeOutCirc = [](const float64 &delta, const float64 &dt) {
-	const float64 t = dt - 1;
-	return delta * sqrt(1 - t * t);
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
+	const auto t = dt - 1;
+	Assert(!std::isnan(t));
+	const auto result = delta * sqrt(1 - t * t);
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition easeInCubic = [](const float64 &delta, const float64 &dt) {
-	return delta * dt * dt * dt;
+	const auto result = delta * dt * dt * dt;
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition easeOutCubic = [](const float64 &delta, const float64 &dt) {
-	const float64 t = dt - 1;
-	return delta * (t * t * t + 1);
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
+	const auto t = dt - 1;
+	Assert(!std::isnan(t));
+	const auto result = delta * (t * t * t + 1);
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition easeInQuint = [](const float64 &delta, const float64 &dt) {
-	const float64 t2 = dt * dt;
-	return delta * t2 * t2 * dt;
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
+	const auto t2 = dt * dt;
+	Assert(!std::isnan(t2));
+	const auto result = delta * t2 * t2 * dt;
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 transition easeOutQuint = [](const float64 &delta, const float64 &dt) {
-	const float64 t = dt - 1, t2 = t * t;
-	return delta * (t2 * t2 * t + 1);
+	Expects(!std::isnan(delta));
+	Expects(!std::isnan(dt));
+
+	const auto t = dt - 1, t2 = t * t;
+	Assert(!std::isnan(t));
+	Assert(!std::isnan(t2));
+	const auto result = delta * (t2 * t2 * t + 1);
+
+	Ensures(!std::isnan(result));
+	return result;
 };
 
 rpl::producer<bool> Disables() {

From 06f3c837f6b65868ec1ed048ba8843fbed247677 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Sep 2022 18:54:37 +0400
Subject: [PATCH 250/635] Add TextForMimeData::WithExpandedLinks method.

---
 ui/text/text.cpp        |  1 +
 ui/text/text_entity.cpp | 37 +++++++++++++++++++++++++++++++++++++
 ui/text/text_entity.h   |  1 +
 3 files changed, 39 insertions(+)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 1991f70..24185b1 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -932,6 +932,7 @@ TextForMimeData String::toText(
 		if (!handler || (!composeExpanded && !composeEntities)) {
 			return;
 		}
+		// This logic is duplicated in TextForMimeData::WithExpandedLinks.
 		const auto entity = handler->getTextEntity();
 		const auto plainUrl = (entity.type == EntityType::Url)
 			|| (entity.type == EntityType::Email);
diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index c4878de..fdb5c09 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -12,6 +12,7 @@
 #include "ui/text/text.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/emoji_config.h"
+#include "ui/basic_click_handlers.h"
 #include "base/qt/qt_common_adapters.h"
 
 #include <QtCore/QStack>
@@ -2262,6 +2263,42 @@ void SetClipboardText(
 
 } // namespace TextUtilities
 
+TextForMimeData TextForMimeData::WithExpandedLinks(
+		const TextWithEntities &text) {
+	auto result = TextForMimeData{ .rich = text };
+	if (!ranges::contains(
+			text.entities,
+			EntityType::CustomUrl,
+			&EntityInText::type)) {
+		result.expanded = text.text;
+	} else {
+		auto from = 0;
+		for (const auto &entity : text.entities) {
+			if (entity.type() != EntityType::CustomUrl) {
+				continue;
+			}
+			// This logic is duplicated in Ui::Text::String::toText.
+			const auto &data = entity.data();
+			if (!data.startsWith(qstr("internal:"))
+				&& (data != UrlClickHandler::EncodeForOpening(
+					text.text.mid(entity.offset(), entity.length())))) {
+				const auto till = entity.offset() + entity.length();
+				if (const auto add = till - from; add > 0) {
+					result.expanded.append(text.text.data() + from, add);
+					from = till;
+				}
+				result.expanded.append(qstr(" (")).append(data).append(')');
+			}
+		}
+		const auto till = text.text.size();
+		if (const auto add = till - from; add > 0) {
+			result.expanded.append(text.text.data() + from, add);
+			from = till;
+		}
+	}
+	return result;
+}
+
 EntityInText::EntityInText(
 	EntityType type,
 	int offset,
diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 0a18f83..1986dca 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -222,6 +222,7 @@ struct TextForMimeData {
 		return *this;
 	}
 
+	static TextForMimeData WithExpandedLinks(const TextWithEntities &text);
 	static TextForMimeData Rich(TextWithEntities &&rich) {
 		auto result = TextForMimeData();
 		result.expanded = rich.text;

From d57bf79ce0862fda1093d9b9acfeff94c80a96f8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Sep 2022 12:31:11 +0400
Subject: [PATCH 251/635] Fix extendd menu expanding on Retina screens.

---
 ui/effects/panel_animation.cpp | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/ui/effects/panel_animation.cpp b/ui/effects/panel_animation.cpp
index 1162214..51144b5 100644
--- a/ui/effects/panel_animation.cpp
+++ b/ui/effects/panel_animation.cpp
@@ -373,25 +373,20 @@ auto PanelAnimation::computeState(float64 dt, float64 opacity) const
 	const auto heightProgress = (_startHeight < 0 || dt >= _heightDuration)
 		? 1.
 		: transition(1., dt / _heightDuration);
-	auto frameWidth = (widthProgress < 1.)
+	const auto frameWidth = (widthProgress < 1.)
 		? anim::interpolate(_startWidth, _finalInnerWidth, widthProgress)
 		: _finalInnerWidth;
-	auto frameHeight = (heightProgress < 1.)
+	const auto frameHeight = (heightProgress < 1.)
 		? anim::interpolate(_startHeight, _finalInnerHeight, heightProgress)
 		: _finalInnerHeight;
-	if (auto decrease = (frameWidth % style::DevicePixelRatio())) {
-		frameWidth -= decrease;
-	}
-	if (auto decrease = (frameHeight % style::DevicePixelRatio())) {
-		frameHeight -= decrease;
-	}
+	const auto ratio = style::DevicePixelRatio();
 	return {
 		.opacity = opacity,
 		.widthProgress = widthProgress,
 		.heightProgress = heightProgress,
 		.fade = transition(1., dt),
-		.width = frameWidth,
-		.height = frameHeight,
+		.width = frameWidth / ratio,
+		.height = frameHeight / ratio,
 	};
 }
 
@@ -411,8 +406,8 @@ auto PanelAnimation::paintFrame(
 	const auto state = computeState(dt, opacity);
 	opacity = state.opacity;
 	_frameAlpha = anim::interpolate(1, 256, opacity);
-	const auto frameWidth = state.width;
-	const auto frameHeight = state.height;
+	const auto frameWidth = state.width * pixelRatio;
+	const auto frameHeight = state.height * pixelRatio;
 	auto frameLeft = (_origin == Origin::TopLeft || _origin == Origin::BottomLeft) ? _finalInnerLeft : (_finalInnerRight - frameWidth);
 	auto frameTop = (_origin == Origin::TopLeft || _origin == Origin::TopRight) ? _finalInnerTop : (_finalInnerBottom - frameHeight);
 	auto frameRight = frameLeft + frameWidth;

From 0f7714390552c4071ccdf3b1c34f8cd33f759b4d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Sep 2022 11:58:37 +0400
Subject: [PATCH 252/635] Fix spoiler open link after String moving.

---
 CMakeLists.txt                |  1 +
 ui/text/text.cpp              | 65 +++++++++++++++++++++++++----------
 ui/text/text.h                | 17 +++++++--
 ui/text/text_parser.cpp       | 16 +++------
 ui/text/text_parser.h         |  1 -
 ui/text/text_renderer.cpp     | 25 +++++++-------
 ui/text/text_renderer.h       |  1 +
 ui/text/text_spoiler_data.cpp | 36 +++++++++++++++++++
 ui/text/text_spoiler_data.h   | 24 +++++++++++--
 9 files changed, 138 insertions(+), 48 deletions(-)
 create mode 100644 ui/text/text_spoiler_data.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 084ca64..d94a186 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,6 +166,7 @@ PRIVATE
     ui/text/text_parser.h
     ui/text/text_renderer.cpp
     ui/text/text_renderer.h
+    ui/text/text_spoiler_data.cpp
     ui/text/text_spoiler_data.h
     ui/text/text_utilities.cpp
     ui/text/text_utilities.h
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 24185b1..9fd9a8e 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -125,6 +125,30 @@ not_null<SpoilerMessCache*> DefaultSpoilerCache() {
 	return &data.cache;
 }
 
+String::SpoilerDataWrap::SpoilerDataWrap() noexcept = default;
+
+String::SpoilerDataWrap::SpoilerDataWrap(SpoilerDataWrap &&other) noexcept
+: data(std::move(other.data)) {
+	adjustFrom(&other);
+}
+
+String::SpoilerDataWrap &String::SpoilerDataWrap::operator=(
+		SpoilerDataWrap &&other) noexcept {
+	data = std::move(other.data);
+	adjustFrom(&other);
+	return *this;
+}
+
+void String::SpoilerDataWrap::adjustFrom(const SpoilerDataWrap *other) {
+	if (data && data->link) {
+		const auto raw = [](auto pointer) {
+			return reinterpret_cast<quintptr>(pointer);
+		};
+		data->link->setText(reinterpret_cast<String*>(
+			raw(data->link->text().get()) + raw(this) - raw(other)));
+	}
+}
+
 String::String(int32 minResizeWidth)
 : _minResizeWidth(minResizeWidth) {
 }
@@ -318,31 +342,36 @@ void String::setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk) {
 }
 
 void String::setSpoilerRevealed(bool revealed, anim::type animated) {
-	if (!_spoiler) {
+	const auto data = _spoiler.data.get();
+	if (!data) {
 		return;
-	} else if (_spoiler->revealed == revealed) {
+	} else if (data->revealed == revealed) {
 		if (animated == anim::type::instant
-			&& _spoiler->revealAnimation.animating()) {
-			_spoiler->revealAnimation.stop();
-			_spoiler->animation.repaintCallback()();
+			&& data->revealAnimation.animating()) {
+			data->revealAnimation.stop();
+			data->animation.repaintCallback()();
 		}
 		return;
 	}
-	_spoiler->revealed = revealed;
+	data->revealed = revealed;
 	if (animated == anim::type::instant) {
-		_spoiler->revealAnimation.stop();
-		_spoiler->animation.repaintCallback()();
+		data->revealAnimation.stop();
+		data->animation.repaintCallback()();
 	} else {
-		_spoiler->revealAnimation.start(
-			_spoiler->animation.repaintCallback(),
+		data->revealAnimation.start(
+			data->animation.repaintCallback(),
 			revealed ? 0. : 1.,
 			revealed ? 1. : 0.,
 			st::fadeWrapDuration);
 	}
 }
 
-void String::setSpoilerLink(const ClickHandlerPtr &lnk) {
-	_spoiler->link = lnk;
+void String::setSpoilerLinkFilter(Fn<bool(const ClickContext&)> filter) {
+	Expects(_spoiler.data != nullptr);
+
+	_spoiler.data->link = std::make_shared<SpoilerClickHandler>(
+		this,
+		std::move(filter));
 }
 
 bool String::hasLinks() const {
@@ -350,7 +379,7 @@ bool String::hasLinks() const {
 }
 
 bool String::hasSpoilers() const {
-	return (_spoiler != nullptr);
+	return (_spoiler.data != nullptr);
 }
 
 bool String::hasSkipBlock() const {
@@ -762,9 +791,9 @@ void String::enumerateText(
 					// Ignore links that are partially copied.
 					const auto handler = (spoilerFrom != rangeFrom
 						|| blockFrom != rangeTo
-						|| !_spoiler)
+						|| !_spoiler.data)
 						? nullptr
-						: _spoiler->link;
+						: _spoiler.data->link;
 					const auto type = EntityType::Spoiler;
 					clickHandlerFinishCallback(r, handler, type);
 				}
@@ -805,7 +834,7 @@ void String::enumerateText(
 }
 
 bool String::hasPersistentAnimation() const {
-	return _hasCustomEmoji || _spoiler;
+	return _hasCustomEmoji || _spoiler.data;
 }
 
 void String::unloadPersistentAnimation() {
@@ -1018,7 +1047,7 @@ IsolatedEmoji String::toIsolatedEmoji() const {
 	auto result = IsolatedEmoji();
 	const auto skip = (_blocks.empty()
 		|| _blocks.back()->type() != TextBlockTSkip) ? 0 : 1;
-	if ((_blocks.size() > kIsolatedEmojiLimit + skip) || _spoiler) {
+	if ((_blocks.size() > kIsolatedEmojiLimit + skip) || hasSpoilers()) {
 		return {};
 	}
 	auto index = 0;
@@ -1046,7 +1075,7 @@ void String::clear() {
 void String::clearFields() {
 	_blocks.clear();
 	_links.clear();
-	_spoiler = nullptr;
+	_spoiler.data = nullptr;
 	_maxWidth = _minHeight = 0;
 	_startDir = Qt::LayoutDirectionAuto;
 }
diff --git a/ui/text/text.h b/ui/text/text.h
index d99a32f..40be2b5 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -170,7 +170,7 @@ public:
 
 	[[nodiscard]] bool hasSpoilers() const;
 	void setSpoilerRevealed(bool revealed, anim::type animated);
-	void setSpoilerLink(const ClickHandlerPtr &lnk);
+	void setSpoilerLinkFilter(Fn<bool(const ClickContext&)> filter);
 
 	[[nodiscard]] bool hasSkipBlock() const;
 	bool updateSkipBlock(int width, int height);
@@ -237,6 +237,19 @@ private:
 	using TextBlocks = std::vector<Block>;
 	using TextLinks = QVector<ClickHandlerPtr>;
 
+	class SpoilerDataWrap {
+	public:
+		SpoilerDataWrap() noexcept;
+		SpoilerDataWrap(SpoilerDataWrap &&other) noexcept;
+		SpoilerDataWrap &operator=(SpoilerDataWrap &&other) noexcept;
+
+		std::unique_ptr<SpoilerData> data;
+
+	private:
+		void adjustFrom(const SpoilerDataWrap *other);
+
+	};
+
 	uint16 countBlockEnd(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const;
 	uint16 countBlockLength(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const;
 
@@ -276,7 +289,7 @@ private:
 
 	Qt::LayoutDirection _startDir = Qt::LayoutDirectionAuto;
 
-	std::unique_ptr<SpoilerData> _spoiler;
+	SpoilerDataWrap _spoiler;
 
 	friend class Parser;
 	friend class Renderer;
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index a435fe6..b558054 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -207,14 +207,6 @@ void Parser::createBlock(int32 skipBack) {
 	}
 }
 
-// Unused.
-// void Parser::createSkipBlock(int32 w, int32 h) {
-// 	createBlock();
-// 	_t->_text.push_back('_');
-// 	_t->_blocks.push_back(Block::Skip(_t->_st->font, _t->_text, _blockStart++, w, h, _monoIndex ? _monoIndex : _lnkIndex, _spoilerIndex));
-// 	blockCreated();
-// }
-
 void Parser::createNewlineBlock() {
 	createBlock();
 	_t->_text.push_back(QChar::LineFeed);
@@ -634,8 +626,8 @@ void Parser::finalize(const TextParseOptions &options) {
 			}
 		}
 		if (block->spoilerIndex()) {
-			if (!_t->_spoiler) {
-				_t->_spoiler = std::make_unique<SpoilerData>(
+			if (!_t->_spoiler.data) {
+				_t->_spoiler.data = std::make_unique<SpoilerData>(
 					Integration::Instance().createSpoilerRepaint(_context));
 			}
 		}
@@ -696,10 +688,10 @@ void Parser::finalize(const TextParseOptions &options) {
 		}
 		lastHandlerIndex.lnk = realIndex;
 	}
-	if (!_t->_hasCustomEmoji || _t->_spoiler) {
+	if (!_t->_hasCustomEmoji || _t->_spoiler.data) {
 		_t->_isOnlyCustomEmoji = false;
 	}
-	if (_t->_blocks.empty() || _t->_spoiler) {
+	if (_t->_blocks.empty() || _t->_spoiler.data) {
 		_t->_isIsolatedEmoji = false;
 	}
 	_t->_links.squeeze();
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index f105a1c..e14595a 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -56,7 +56,6 @@ private:
 	void trimSourceRange();
 	void blockCreated();
 	void createBlock(int32 skipBack = 0);
-	// void createSkipBlock(int32 w, int32 h);
 	void createNewlineBlock();
 
 	// Returns true if at least one entity was parsed in the current position.
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 53e5648..7d1e7a5 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -154,7 +154,8 @@ bool Distinct(FixedRange a, FixedRange b) {
 }
 
 Renderer::Renderer(const Ui::Text::String &t)
-: _t(&t) {
+: _t(&t)
+, _spoiler(_t->_spoiler.data.get()) {
 }
 
 Renderer::~Renderer() {
@@ -199,9 +200,9 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 	_align = context.align;
 	_cachedNow = context.now;
 	_paused = context.paused;
-	_spoilerOpacity = _t->_spoiler
-		? (1. - _t->_spoiler->revealAnimation.value(
-			_t->_spoiler->revealed ? 1. : 0.))
+	_spoilerOpacity = _spoiler
+		? (1. - _spoiler->revealAnimation.value(
+			_spoiler->revealed ? 1. : 0.))
 		: 0.;
 	enumerate();
 }
@@ -1085,7 +1086,7 @@ void Renderer::pushSpoilerRange(
 		FixedRange range,
 		FixedRange selected,
 		int currentBlockIndex) {
-	if (!_background.spoiler || !_t->_spoiler) {
+	if (!_background.spoiler || !_spoiler) {
 		return;
 	}
 	const auto elided = (_indexOfElidedBlock == currentBlockIndex)
@@ -1135,14 +1136,14 @@ void Renderer::fillSpoilerRects(
 void Renderer::paintSpoilerRects() {
 	Expects(_p != nullptr);
 
-	if (!_t->_spoiler) {
+	if (!_spoiler) {
 		return;
 	}
 	const auto opacity = _p->opacity();
 	if (_spoilerOpacity < 1.) {
 		_p->setOpacity(opacity * _spoilerOpacity);
 	}
-	const auto index = _t->_spoiler->animation.index(now(), _paused);
+	const auto index = _spoiler->animation.index(now(), _paused);
 	paintSpoilerRects(
 		_spoilerRects,
 		_palette->spoilerFg,
@@ -1991,12 +1992,12 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 	if (_p) {
 		const auto isMono = IsMono(block->flags());
 		_background = {};
-		if (block->spoilerIndex() && _t->_spoiler) {
+		if (block->spoilerIndex() && _spoiler) {
 			_background.spoiler = true;
 		}
 		if (isMono
 			&& block->lnkIndex()
-			&& (!_background.spoiler || _t->_spoiler->revealed)) {
+			&& (!_background.spoiler || _spoiler->revealed)) {
 			_background.selectActiveBlock = ClickHandler::showAsPressed(
 				_t->_links.at(block->lnkIndex() - 1));
 		}
@@ -2016,10 +2017,10 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 }
 
 ClickHandlerPtr Renderer::lookupLink(const AbstractBlock *block) const {
-	const auto spoilerLink = (_t->_spoiler
-		&& !_t->_spoiler->revealed
+	const auto spoilerLink = (_spoiler
+		&& !_spoiler->revealed
 		&& block->spoilerIndex())
-		? _t->_spoiler->link
+		? _spoiler->link
 		: ClickHandlerPtr();
 	return (spoilerLink || !block->lnkIndex())
 		? spoilerLink
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 6bf4a6b..544ee55 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -111,6 +111,7 @@ private:
 		const AbstractBlock *block) const;
 
 	const String *_t = nullptr;
+	SpoilerData *_spoiler = nullptr;
 	SpoilerMessCache *_spoilerCache = nullptr;
 	QPainter *_p = nullptr;
 	const style::TextPalette *_palette = nullptr;
diff --git a/ui/text/text_spoiler_data.cpp b/ui/text/text_spoiler_data.cpp
new file mode 100644
index 0000000..57127bc
--- /dev/null
+++ b/ui/text/text_spoiler_data.cpp
@@ -0,0 +1,36 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/text/text_spoiler_data.h"
+
+#include "ui/text/text.h"
+
+namespace Ui::Text {
+
+SpoilerClickHandler::SpoilerClickHandler(
+	not_null<String*> text,
+	Fn<bool(const ClickContext&)> filter)
+: _text(text)
+, _filter(std::move(filter)) {
+}
+
+not_null<String*> SpoilerClickHandler::text() const {
+	return _text;
+}
+
+void SpoilerClickHandler::setText(not_null<String*> text) {
+	_text = text;
+}
+
+void SpoilerClickHandler::onClick(ClickContext context) const {
+	if (_filter && !_filter(context)) {
+		return;
+	}
+	_text->setSpoilerRevealed(true, anim::type::normal);
+}
+
+} // namespace Ui::Text
+
diff --git a/ui/text/text_spoiler_data.h b/ui/text/text_spoiler_data.h
index 4b3943a..5a20926 100644
--- a/ui/text/text_spoiler_data.h
+++ b/ui/text/text_spoiler_data.h
@@ -8,18 +8,36 @@
 
 #include "ui/effects/spoiler_mess.h"
 #include "ui/effects/animations.h"
-
-class SpoilerClickHandler;
+#include "ui/click_handler.h"
 
 namespace Ui::Text {
 
+class String;
+
+class SpoilerClickHandler final : public ClickHandler {
+public:
+	SpoilerClickHandler(
+		not_null<String*> text,
+		Fn<bool(const ClickContext&)> filter);
+
+	[[nodiscard]] not_null<String*> text() const;
+	void setText(not_null<String*> text);
+
+	void onClick(ClickContext context) const override;
+
+private:
+	not_null<String*> _text;
+	const Fn<bool(const ClickContext &)> _filter;
+
+};
+
 struct SpoilerData {
 	explicit SpoilerData(Fn<void()> repaint)
 	: animation(std::move(repaint)) {
 	}
 
 	SpoilerAnimation animation;
-	ClickHandlerPtr link;
+	std::shared_ptr<SpoilerClickHandler> link;
 	Animations::Simple revealAnimation;
 	bool revealed = false;
 };

From 1ceaa0bbcfccb83dbf7f51d7f80a733ff2aa8c22 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Sep 2022 20:45:39 +0400
Subject: [PATCH 253/635] Fix crash in empty text state resolving.

---
 ui/text/text_renderer.cpp | 76 ++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 7d1e7a5..ec3fc64 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -399,48 +399,52 @@ void Renderer::enumerate() {
 }
 
 StateResult Renderer::getState(QPoint point, int w, StateRequest request) {
-	if (!_t->isNull() && point.y() >= 0) {
-		_lookupRequest = request;
-		_lookupX = point.x();
-		_lookupY = point.y();
-
-		_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
-		_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
-		_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
-		if (_lookupSymbol || (_lookupX >= 0 && _lookupX < w)) {
-			_w = w;
-			_yFrom = _lookupY;
-			_yTo = _lookupY + 1;
-			_align = _lookupRequest.align;
-			enumerate();
-		}
+	if (_t->isEmpty() || point.y() < 0) {
+		return {};
 	}
+	_lookupRequest = request;
+	_lookupX = point.x();
+	_lookupY = point.y();
+
+	_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
+	_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
+	_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
+	if (!_lookupSymbol && (_lookupX < 0 || _lookupX >= w)) {
+		return {};
+	}
+	_w = w;
+	_yFrom = _lookupY;
+	_yTo = _lookupY + 1;
+	_align = _lookupRequest.align;
+	enumerate();
 	return _lookupResult;
 }
 
 StateResult Renderer::getStateElided(QPoint point, int w, StateRequestElided request) {
-	if (!_t->isNull() && point.y() >= 0 && request.lines > 0) {
-		_lookupRequest = request;
-		_lookupX = point.x();
-		_lookupY = point.y();
-
-		_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
-		_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
-		_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
-		if (_lookupSymbol || (_lookupX >= 0 && _lookupX < w)) {
-			int yTo = _lookupY + 1;
-			if (yTo < 0 || (request.lines - 1) * _t->_st->font->height < yTo) {
-				yTo = request.lines * _t->_st->font->height;
-				_elideLast = true;
-				_elideRemoveFromEnd = request.removeFromEnd;
-			}
-			_w = w;
-			_yFrom = _lookupY;
-			_yTo = _lookupY + 1;
-			_align = _lookupRequest.align;
-			enumerate();
-		}
+	if (_t->isEmpty() || point.y() < 0 || request.lines <= 0) {
+		return {};
 	}
+	_lookupRequest = request;
+	_lookupX = point.x();
+	_lookupY = point.y();
+
+	_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
+	_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
+	_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
+	if (!_lookupSymbol && (_lookupX < 0 || _lookupX >= w)) {
+		return {};
+	}
+	int yTo = _lookupY + 1;
+	if (yTo < 0 || (request.lines - 1) * _t->_st->font->height < yTo) {
+		yTo = request.lines * _t->_st->font->height;
+		_elideLast = true;
+		_elideRemoveFromEnd = request.removeFromEnd;
+	}
+	_w = w;
+	_yFrom = _lookupY;
+	_yTo = _lookupY + 1;
+	_align = _lookupRequest.align;
+	enumerate();
 	return _lookupResult;
 }
 

From 14cc3ff52b9611cbfde472fd8c12001a9a3ac6ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 25 Sep 2022 16:14:13 +0400
Subject: [PATCH 254/635] Set some layers crash annotations.

---
 ui/layers/layer_widget.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 4a67d03..924af6a 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -13,6 +13,7 @@
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "ui/round_rect.h"
+#include "base/integration.h"
 #include "styles/style_layers.h"
 #include "styles/style_widgets.h"
 #include "styles/palette.h"
@@ -678,16 +679,20 @@ void LayerStackWidget::prepareForAnimation() {
 }
 
 void LayerStackWidget::animationDone() {
+	auto &integration = base::Integration::Instance();
 	bool hidden = true;
 	if (_mainMenu) {
+		integration.setCrashAnnotation("ShowingWidget", u"MainMenu"_q);
 		_mainMenu->show();
 		hidden = false;
 	}
 	if (_specialLayer) {
+		integration.setCrashAnnotation("ShowingWidget", u"SpecialLayer"_q);
 		_specialLayer->show();
 		hidden = false;
 	}
 	if (auto layer = currentLayer()) {
+		integration.setCrashAnnotation("ShowingWidget", u"Box"_q);
 		layer->show();
 		hidden = false;
 	}
@@ -695,7 +700,9 @@ void LayerStackWidget::animationDone() {
 	if (hidden) {
 		_hideFinishStream.fire({});
 	} else {
+		integration.setCrashAnnotation("ShowingWidget", u"Finished"_q);
 		showFinished();
+		integration.setCrashAnnotation("ShowingWidget", QString());
 	}
 }
 

From d5ec7cc296a074e8e2247ffc825c6d5c8647ed48 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 28 Sep 2022 15:47:42 +0400
Subject: [PATCH 255/635] Fix possible stack overflow crash on Windows.

---
 ui/widgets/time_input.cpp | 35 +++++++++++++++++++++++++++++++++--
 ui/widgets/time_input.h   |  1 +
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/time_input.cpp b/ui/widgets/time_input.cpp
index d51a77b..d40aa26 100644
--- a/ui/widgets/time_input.cpp
+++ b/ui/widgets/time_input.cpp
@@ -7,6 +7,7 @@
 #include "ui/widgets/time_input.h"
 
 #include "ui/widgets/fields/time_part_input.h"
+#include "base/invoke_queued.h"
 
 #include <QtCore/QRegularExpression>
 #include <QTime>
@@ -146,7 +147,7 @@ void TimeInput::putNext(const object_ptr<TimePart> &field, QChar ch) {
 		field->setCursorPosition(1);
 	}
 	field->onTextEdited();
-	field->setFocus();
+	setFocusQueued(field);
 }
 
 void TimeInput::erasePrevious(const object_ptr<TimePart> &field) {
@@ -155,7 +156,37 @@ void TimeInput::erasePrevious(const object_ptr<TimePart> &field) {
 		field->setCursorPosition(text.size() - 1);
 		field->setText(text.mid(0, text.size() - 1));
 	}
-	field->setFocus();
+	setFocusQueued(field);
+}
+
+void TimeInput::setFocusQueued(const object_ptr<TimePart> &field) {
+	// There was a "Stack Overflow" crash in some input method handling.
+	//
+	// See https://github.com/telegramdesktop/tdesktop/issues/25129
+	//
+	// The stack is something like:
+	//
+	// ...
+	// QApplicationPrivate::sendMouseEvent
+	// ----
+	// QWidget::setFocus
+	// QWindow::focusObjectChanged
+	// QWindowsInputContext::setFocusObject
+	// QWindowsInputContext::reset
+	// QLineEdit::inputMethodEvent
+	// QWidgetLineControl::finishChange
+	// QLineEdit::textEdited
+	// MaskedInputField::onTextEdited
+	// TimePart::correctValue
+	// TimeInput::putNext
+	// ----
+	// QWidget::setFocus
+	// QWindow::focusObjectChanged
+	// ...
+	//
+	// So we try to break this loop by focusing the widget async.
+	const auto raw = field.data();
+	InvokeQueued(raw, [raw] { raw->setFocus(); });
 }
 
 bool TimeInput::setFocusFast() {
diff --git a/ui/widgets/time_input.h b/ui/widgets/time_input.h
index e8edd5a..3bd9aec 100644
--- a/ui/widgets/time_input.h
+++ b/ui/widgets/time_input.h
@@ -43,6 +43,7 @@ private:
 	void setInnerFocus();
 	void putNext(const object_ptr<TimePart> &field, QChar ch);
 	void erasePrevious(const object_ptr<TimePart> &field);
+	void setFocusQueued(const object_ptr<TimePart> &field);
 	void setErrorShown(bool error);
 	void setFocused(bool focused);
 	void startBorderAnimation();

From 80445f2bd3ebb377b990d2a471021e906e611240 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Sep 2022 11:19:59 +0400
Subject: [PATCH 256/635] Move some message styles from basic.style.

---
 ui/basic.style           | 141 ---------------------------------------
 ui/widgets/widgets.style |   2 +-
 2 files changed, 1 insertion(+), 142 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index ebc7413..95c786f 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -88,147 +88,6 @@ noContactsColor: windowSubTextFg;
 activeFadeInDuration: 500;
 activeFadeOutDuration: 3000;
 
-msgMaxWidth: 430px;
-msgFont: font(fsize);
-msgNameFont: semiboldFont;
-msgNameStyle: semiboldTextStyle;
-msgServiceFont: semiboldFont;
-msgServiceNameFont: semiboldFont;
-msgServicePhotoWidth: 100px;
-msgDateFont: font(13px);
-msgMinWidth: 160px;
-msgPhotoSize: 33px;
-msgPhotoSkip: 40px;
-msgPadding: margins(13px, 7px, 13px, 8px);
-msgMargin: margins(16px, 6px, 56px, 2px);
-msgMarginTopAttached: 1px;
-msgLnkPadding: 2px; // for media open / save links
-msgShadow: 2px;
-
-msgReplyPadding: margins(6px, 6px, 11px, 6px);
-msgReplyBarPos: point(1px, 0px);
-msgReplyBarSize: size(2px, 36px);
-msgReplyBarSkip: 10px;
-msgServicePadding: margins(12px, 3px, 12px, 4px);
-msgServiceMargin: margins(10px, 10px, 10px, 2px);
-
-msgDateSpace: 12px;
-msgDateDelta: point(2px, 5px);
-
-msgDateImgDelta: 4px;
-msgDateImgPadding: point(8px, 2px);
-msgDateImgCheckSpace: 4px;
-
-messageTextStyle: defaultTextStyle;
-msgDateTextStyle: defaultTextStyle;
-serviceTextPalette: TextPalette(defaultTextPalette) {
-	linkFg: msgServiceFg;
-	monoFg: msgServiceFg;
-	spoilerFg: msgServiceFg;
-	selectBg: msgServiceBgSelected;
-	selectFg: msgServiceFg;
-	selectLinkFg: msgServiceFg;
-	selectMonoFg: msgServiceFg;
-	selectSpoilerFg: msgServiceFg;
-	selectOverlay: msgServiceBgSelected;
-}
-serviceTextStyle: TextStyle(defaultTextStyle) {
-	font: msgServiceFont;
-	linkFont: msgServiceFont;
-	linkFontOver: font(fsize semibold underline);
-}
-inTextPalette: TextPalette(defaultTextPalette) {
-	linkFg: historyLinkInFg;
-	monoFg: msgInMonoFg;
-	spoilerFg: msgInDateFg;
-	selectBg: msgInBgSelected;
-	selectFg: historyTextInFgSelected;
-	selectLinkFg: historyLinkInFgSelected;
-	selectMonoFg: msgInMonoFgSelected;
-	selectSpoilerFg: msgInDateFgSelected;
-	selectOverlay: msgSelectOverlay;
-}
-inTextPaletteSelected: TextPalette(inTextPalette) {
-	linkFg: historyLinkInFgSelected;
-	monoFg: msgInMonoFgSelected;
-	spoilerFg: msgInDateFgSelected;
-}
-outTextPalette: TextPalette(defaultTextPalette) {
-	linkFg: historyLinkOutFg;
-	monoFg: msgOutMonoFg;
-	spoilerFg: msgOutDateFg;
-	selectBg: msgOutBgSelected;
-	selectFg: historyTextOutFgSelected;
-	selectLinkFg: historyLinkOutFgSelected;
-	selectMonoFg: msgOutMonoFgSelected;
-	selectSpoilerFg: msgOutDateFgSelected;
-	selectOverlay: msgSelectOverlay;
-}
-outTextPaletteSelected: TextPalette(outTextPalette) {
-	linkFg: historyLinkOutFgSelected;
-	monoFg: msgOutMonoFgSelected;
-	spoilerFg: msgOutDateFgSelected;
-}
-fwdTextStyle: TextStyle(semiboldTextStyle) {
-	linkFontOver: semiboldFont;
-}
-inFwdTextPalette: TextPalette(defaultTextPalette) {
-	linkFg: msgInServiceFg;
-}
-outFwdTextPalette: TextPalette(defaultTextPalette) {
-	linkFg: msgOutServiceFg;
-}
-inFwdTextPaletteSelected: TextPalette(defaultTextPalette) {
-	linkFg: msgInServiceFgSelected;
-}
-outFwdTextPaletteSelected: TextPalette(defaultTextPalette) {
-	linkFg: msgOutServiceFgSelected;
-}
-inReplyTextPalette: TextPalette(inTextPalette) {
-	linkFg: msgInDateFg;
-}
-inReplyTextPaletteSelected: TextPalette(inTextPaletteSelected) {
-	linkFg: msgInDateFgSelected;
-}
-outReplyTextPalette: TextPalette(outTextPalette) {
-	linkFg: msgOutDateFg;
-}
-outReplyTextPaletteSelected: TextPalette(outTextPaletteSelected) {
-	linkFg: msgOutDateFgSelected;
-}
-imgReplyTextPalette: TextPalette(defaultTextPalette) {
-	linkFg: msgImgReplyBarColor;
-}
-inSemiboldPalette: TextPalette(inTextPalette) {
-	linkFg: msgInServiceFg;
-	selectFg: msgInServiceFgSelected;
-	selectLinkFg: msgInServiceFgSelected;
-}
-outSemiboldPalette: TextPalette(outTextPalette) {
-	linkFg: msgOutServiceFg;
-	selectFg: msgOutServiceFgSelected;
-	selectLinkFg: msgOutServiceFgSelected;
-}
-historyComposeAreaPalette: TextPalette(defaultTextPalette) {
-	linkFg: historyComposeAreaFgService;
-}
-
-mediaCaptionSkip: 5px;
-mediaInBubbleSkip: 5px;
-mediaThumbSize: 48px;
-mediaNameTop: 3px;
-mediaDetailsShift: 3px;
-mediaUnreadSize: 7px;
-mediaUnreadSkip: 5px;
-mediaUnreadTop: 6px;
-
-mediaInPalette: TextPalette(defaultTextPalette) {
-	linkFg: mediaInFg;
-}
-mediaInPaletteSelected: TextPalette(defaultTextPalette) {
-	linkFg: mediaInFgSelected;
-}
-
 textRectMargins: margins(-2px, -1px, -2px, -1px);
 
 searchedBarHeight: 32px;
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 1744f14..0c0fbbc 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1453,7 +1453,7 @@ defaultToast: Toast {
 }
 
 defaultMultilineToast: Toast(defaultToast) {
-	minWidth: msgMinWidth;
+	minWidth: 160px;
 }
 
 shakeShift: 4px;

From f49ec866c11fc887d9b16435f67f756d523a9b5b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Sep 2022 18:42:14 +0400
Subject: [PATCH 257/635] Allow rounding with different radius per corner.

---
 ui/image/image_prepare.cpp | 68 +++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index e7c48e9..7eafb7d 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1017,13 +1017,8 @@ QImage Round(
 	} else {
 		Assert(QRect(QPoint(), image.size()).contains(target));
 	}
-	auto cornerWidth = cornerMasks[0].width();
-	auto cornerHeight = cornerMasks[0].height();
-	auto targetWidth = target.width();
-	auto targetHeight = target.height();
-	if (targetWidth < cornerWidth || targetHeight < cornerHeight) {
-		return std::move(image);
-	}
+	const auto targetWidth = target.width();
+	const auto targetHeight = target.height();
 
 	image = std::move(image).convertToFormat(
 		QImage::Format_ARGB32_Premultiplied);
@@ -1035,40 +1030,59 @@ QImage Round(
 	// Real image bytesPerLine is smaller than the one we use for offsets.
 	auto ints = reinterpret_cast<uint32*>(image.bits());
 
-	constexpr auto imageIntsPerPixel = 1;
-	auto imageIntsPerLine = (image.bytesPerLine() >> 2);
-	Assert(image.depth() == static_cast<int>((imageIntsPerPixel * sizeof(uint32)) << 3));
+	constexpr auto kImageIntsPerPixel = 1;
+	const auto imageIntsPerLine = (image.bytesPerLine() >> 2);
+	Assert(image.depth() == ((kImageIntsPerPixel * sizeof(uint32)) << 3));
 	Assert(image.bytesPerLine() == (imageIntsPerLine << 2));
-	auto intsTopLeft = ints + target.x() + target.y() * imageIntsPerLine;
-	auto intsTopRight = ints + target.x() + targetWidth - cornerWidth + target.y() * imageIntsPerLine;
-	auto intsBottomLeft = ints + target.x() + (target.y() + targetHeight - cornerHeight) * imageIntsPerLine;
-	auto intsBottomRight = ints + target.x() + targetWidth - cornerWidth + (target.y() + targetHeight - cornerHeight) * imageIntsPerLine;
-	auto maskCorner = [&](uint32 *imageInts, const QImage &mask) {
-		auto maskWidth = mask.width();
-		auto maskHeight = mask.height();
-		auto maskBytesPerPixel = (mask.depth() >> 3);
-		auto maskBytesPerLine = mask.bytesPerLine();
-		auto maskBytesAdded = maskBytesPerLine - maskWidth * maskBytesPerPixel;
-		auto maskBytes = mask.constBits();
+	const auto maskCorner = [&](
+			const QImage &mask,
+			bool right = false,
+			bool bottom = false) {
+		const auto maskWidth = mask.width();
+		const auto maskHeight = mask.height();
+		if (mask.isNull()
+			|| targetWidth < maskWidth
+			|| targetHeight < maskHeight) {
+			return;
+		}
+
+		const auto maskBytesPerPixel = (mask.depth() >> 3);
+		const auto maskBytesPerLine = mask.bytesPerLine();
+		const auto maskBytesAdded = maskBytesPerLine
+			- maskWidth * maskBytesPerPixel;
 		Assert(maskBytesAdded >= 0);
 		Assert(mask.depth() == (maskBytesPerPixel << 3));
-		auto imageIntsAdded = imageIntsPerLine - maskWidth * imageIntsPerPixel;
+		const auto imageIntsAdded = imageIntsPerLine
+			- maskWidth * kImageIntsPerPixel;
 		Assert(imageIntsAdded >= 0);
+		auto imageInts = ints + target.x() + target.y() * imageIntsPerLine;
+		if (right) {
+			imageInts += targetWidth - maskWidth;
+		}
+		if (bottom) {
+			imageInts += (targetHeight - maskHeight) * imageIntsPerLine;
+		}
+		auto maskBytes = mask.constBits();
 		for (auto y = 0; y != maskHeight; ++y) {
 			for (auto x = 0; x != maskWidth; ++x) {
 				auto opacity = static_cast<anim::ShiftedMultiplier>(*maskBytes) + 1;
 				*imageInts = anim::unshifted(anim::shifted(*imageInts) * opacity);
 				maskBytes += maskBytesPerPixel;
-				imageInts += imageIntsPerPixel;
+				imageInts += kImageIntsPerPixel;
 			}
 			maskBytes += maskBytesAdded;
 			imageInts += imageIntsAdded;
 		}
 	};
-	if (corners & RectPart::TopLeft) maskCorner(intsTopLeft, cornerMasks[0]);
-	if (corners & RectPart::TopRight) maskCorner(intsTopRight, cornerMasks[1]);
-	if (corners & RectPart::BottomLeft) maskCorner(intsBottomLeft, cornerMasks[2]);
-	if (corners & RectPart::BottomRight) maskCorner(intsBottomRight, cornerMasks[3]);
+
+	if (corners & RectPart::TopLeft) maskCorner(cornerMasks[0]);
+	if (corners & RectPart::TopRight) maskCorner(cornerMasks[1], true);
+	if (corners & RectPart::BottomLeft) {
+		maskCorner(cornerMasks[2], false, true);
+	}
+	if (corners & RectPart::BottomRight) {
+		maskCorner(cornerMasks[3], true, true);
+	}
 
 	return std::move(image);
 }

From cec09b0260ba19639bf9abc7df373569aa1509e7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Sep 2022 23:03:06 +0400
Subject: [PATCH 258/635] Support complex-rounded image spoilers.

---
 ui/effects/spoiler_mess.cpp | 141 ++++++++++++++++++++++++------------
 ui/effects/spoiler_mess.h   |  15 +---
 ui/image/image_prepare.cpp  |  45 +++++++-----
 ui/image/image_prepare.h    |  23 ++++++
 4 files changed, 150 insertions(+), 74 deletions(-)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index b07f8ac..dc0cb1a 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -501,48 +501,52 @@ void FillSpoilerRect(
 void FillSpoilerRect(
 		QPainter &p,
 		QRect rect,
-		ImageRoundRadius radius,
-		RectParts corners,
+		Images::CornersMaskRef mask,
 		const SpoilerMessFrame &frame,
 		QImage &cornerCache,
 		QPoint originShift) {
-	if (radius == ImageRoundRadius::None || !corners) {
-		FillSpoilerRect(p, rect, frame, originShift);
-		return;
-	}
-	const auto &mask = Images::CornersMask(radius);
-	const auto side = mask[0].width() / style::DevicePixelRatio();
-	const auto xFillFrom = (corners & RectPart::FullLeft) ? side : 0;
-	const auto xFillTo = rect.width()
-		- ((corners & RectPart::FullRight) ? side : 0);
-	const auto yFillFrom = (corners & RectPart::FullTop) ? side : 0;
-	const auto yFillTo = rect.height()
-		- ((corners & RectPart::FullBottom) ? side : 0);
-	const auto xFill = xFillTo - xFillFrom;
-	const auto yFill = yFillTo - yFillFrom;
-	if (xFill < 0 || yFill < 0) {
-		// Unexpected.. but maybe not fatal, just glitchy.
+	constexpr auto kTopLeft = 0;
+	constexpr auto kTopRight = 1;
+	constexpr auto kBottomLeft = 2;
+	constexpr auto kBottomRight = 3;
+
+	if ((!mask.p[kTopLeft] || mask.p[kTopLeft]->isNull())
+		&& (!mask.p[kTopRight] || mask.p[kTopRight]->isNull())
+		&& (!mask.p[kBottomLeft] || mask.p[kBottomLeft]->isNull())
+		&& (!mask.p[kBottomRight] || mask.p[kBottomRight]->isNull())) {
 		FillSpoilerRect(p, rect, frame, originShift);
 		return;
 	}
 	const auto ratio = style::DevicePixelRatio();
-	const auto paintPart = [&](int x, int y, int w, int h) {
+	const auto cornerSize = [&](int index) {
+		const auto corner = mask.p[index];
+		return (!corner || corner->isNull()) ? 0 : (corner->width() / ratio);
+	};
+	const auto verticalSkip = [&](int left, int right) {
+		return std::max(cornerSize(left), cornerSize(right));
+	};
+	const auto fillBg = [&](QRect part) {
 		FillSpoilerRect(
 			p,
-			{ rect.x() + x, rect.y() + y, w, h },
+			part.translated(rect.topLeft()),
 			frame,
-			originShift - QPoint(x, y));
+			originShift - part.topLeft());
 	};
-	const auto paintCorner = [&](QPoint position, const QImage &mask) {
-		if (cornerCache.width() < mask.width()
-			|| cornerCache.height() < mask.height()) {
+	const auto fillCorner = [&](int x, int y, int index) {
+		const auto position = QPoint(x, y);
+		const auto corner = mask.p[index];
+		if (!corner || corner->isNull()) {
+			return;
+		}
+		if (cornerCache.width() < corner->width()
+			|| cornerCache.height() < corner->height()) {
 			cornerCache = QImage(
-				std::max(cornerCache.width(), mask.width()),
-				std::max(cornerCache.height(), mask.height()),
+				std::max(cornerCache.width(), corner->width()),
+				std::max(cornerCache.height(), corner->height()),
 				QImage::Format_ARGB32_Premultiplied);
 			cornerCache.setDevicePixelRatio(ratio);
 		}
-		const auto size = mask.size() / ratio;
+		const auto size = corner->size() / ratio;
 		const auto target = QRect(QPoint(), size);
 		auto q = QPainter(&cornerCache);
 		q.setCompositionMode(QPainter::CompositionMode_Source);
@@ -552,36 +556,83 @@ void FillSpoilerRect(
 			frame,
 			originShift - rect.topLeft() - position);
 		q.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-		q.drawImage(target, mask);
+		q.drawImage(target, *corner);
 		q.end();
 		p.drawImage(
 			QRect(rect.topLeft() + position, size),
 			cornerCache,
-			QRect(QPoint(), mask.size()));
+			QRect(QPoint(), corner->size()));
 	};
-	if (yFillFrom > 0) {
-		if (xFillFrom > 0) {
-			paintCorner({}, mask[0]);
+	const auto top = verticalSkip(kTopLeft, kTopRight);
+	const auto bottom = verticalSkip(kBottomLeft, kBottomRight);
+		if (top) {
+		const auto left = cornerSize(kTopLeft);
+		const auto right = cornerSize(kTopRight);
+		if (left) {
+			fillCorner(rect.left(), rect.top(), kTopLeft);
+			if (const auto add = top - left) {
+				fillBg({ rect.left(), rect.top() + left, left, add });
+			}
 		}
-		if (xFill) {
-			paintPart(xFillFrom, 0, xFill, yFillFrom);
+		if (const auto fill = rect.width() - left - right; fill > 0) {
+			fillBg({ rect.left() + left, rect.top(), fill, top });
 		}
-		if (xFillTo < rect.width()) {
-			paintCorner({ xFillTo, 0 }, mask[1]);
+		if (right) {
+			fillCorner(
+				rect.left() + rect.width() - right,
+				rect.top(),
+				kTopRight);
+			if (const auto add = top - right) {
+				fillBg({
+					rect.left() + rect.width() - right,
+					rect.top() + right,
+					right,
+					add,
+				});
+			}
 		}
 	}
-	if (yFill) {
-		paintPart(0, yFillFrom, rect.width(), yFill);
+	if (const auto h = rect.height() - top - bottom; h > 0) {
+		fillBg({ rect.left(), rect.top() + top, rect.width(), h });
 	}
-	if (yFillTo < rect.height()) {
-		if (xFillFrom > 0) {
-			paintCorner({ 0, yFillTo }, mask[2]);
+	if (bottom) {
+		const auto left = cornerSize(kBottomLeft);
+		const auto right = cornerSize(kBottomRight);
+		if (left) {
+			fillCorner(
+				rect.left(),
+				rect.top() + rect.height() - left,
+				kBottomLeft);
+			if (const auto add = bottom - left) {
+				fillBg({
+					rect.left(),
+					rect.top() + rect.height() - bottom,
+					left,
+					add,
+				});
+			}
 		}
-		if (xFill) {
-			paintPart(xFillFrom, yFillTo, xFill, rect.height() - yFillTo);
+		if (const auto fill = rect.width() - left - right; fill > 0) {
+			fillBg({
+				rect.left() + left,
+				rect.top() + rect.height() - bottom,
+				fill,
+				bottom,
+			});
 		}
-		if (xFillTo < rect.width()) {
-			paintCorner({ xFillTo, yFillTo }, mask[3]);
+		if (right) {
+			fillCorner(
+				rect.left() + rect.width() - right,
+				rect.top() + rect.height() - right,
+				kBottomRight);
+			if (const auto add = bottom - right) {
+				fillBg({
+					rect.left() + rect.width() - right,
+					rect.top() + rect.height() - bottom,
+					right,
+					add,
+				});
+			}
 		}
 	}
 }
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
index 1cf9102..78772a9 100644
--- a/ui/effects/spoiler_mess.h
+++ b/ui/effects/spoiler_mess.h
@@ -8,15 +8,9 @@
 
 #include <crl/crl_time.h>
 
-enum class ImageRoundRadius;
-
-namespace base {
-template <typename EnumType>
-class flags;
-} // namespace base
-
-enum class RectPart;
-using RectParts = base::flags<RectPart>;
+namespace Images {
+struct CornersMaskRef;
+} // namespace Images
 
 namespace Ui {
 
@@ -49,8 +43,7 @@ void FillSpoilerRect(
 void FillSpoilerRect(
 	QPainter &p,
 	QRect rect,
-	ImageRoundRadius radius,
-	RectParts corners,
+	Images::CornersMaskRef mask,
 	const SpoilerMessFrame &frame,
 	QImage &cornerCache,
 	QPoint originShift = {});
diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 7eafb7d..013707c 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1009,8 +1009,7 @@ QImage Circle(QImage &&image, QRect target) {
 
 QImage Round(
 		QImage &&image,
-		gsl::span<const QImage, 4> cornerMasks,
-		RectParts corners,
+		CornersMaskRef mask,
 		QRect target) {
 	if (target.isNull()) {
 		target = QRect(QPoint(), image.size());
@@ -1035,23 +1034,24 @@ QImage Round(
 	Assert(image.depth() == ((kImageIntsPerPixel * sizeof(uint32)) << 3));
 	Assert(image.bytesPerLine() == (imageIntsPerLine << 2));
 	const auto maskCorner = [&](
-			const QImage &mask,
+			const QImage *mask,
 			bool right = false,
 			bool bottom = false) {
-		const auto maskWidth = mask.width();
-		const auto maskHeight = mask.height();
-		if (mask.isNull()
+		const auto maskWidth = mask ? mask->width() : 0;
+		const auto maskHeight = mask ? mask->height() : 0;
+		if (!maskWidth
+			|| !maskHeight
 			|| targetWidth < maskWidth
 			|| targetHeight < maskHeight) {
 			return;
 		}
 
-		const auto maskBytesPerPixel = (mask.depth() >> 3);
-		const auto maskBytesPerLine = mask.bytesPerLine();
+		const auto maskBytesPerPixel = (mask->depth() >> 3);
+		const auto maskBytesPerLine = mask->bytesPerLine();
 		const auto maskBytesAdded = maskBytesPerLine
 			- maskWidth * maskBytesPerPixel;
 		Assert(maskBytesAdded >= 0);
-		Assert(mask.depth() == (maskBytesPerPixel << 3));
+		Assert(mask->depth() == (maskBytesPerPixel << 3));
 		const auto imageIntsAdded = imageIntsPerLine
 			- maskWidth * kImageIntsPerPixel;
 		Assert(imageIntsAdded >= 0);
@@ -1062,7 +1062,7 @@ QImage Round(
 		if (bottom) {
 			imageInts += (targetHeight - maskHeight) * imageIntsPerLine;
 		}
-		auto maskBytes = mask.constBits();
+		auto maskBytes = mask->constBits();
 		for (auto y = 0; y != maskHeight; ++y) {
 			for (auto x = 0; x != maskWidth; ++x) {
 				auto opacity = static_cast<anim::ShiftedMultiplier>(*maskBytes) + 1;
@@ -1075,18 +1075,27 @@ QImage Round(
 		}
 	};
 
-	if (corners & RectPart::TopLeft) maskCorner(cornerMasks[0]);
-	if (corners & RectPart::TopRight) maskCorner(cornerMasks[1], true);
-	if (corners & RectPart::BottomLeft) {
-		maskCorner(cornerMasks[2], false, true);
-	}
-	if (corners & RectPart::BottomRight) {
-		maskCorner(cornerMasks[3], true, true);
-	}
+	maskCorner(mask.p[0]);
+	maskCorner(mask.p[1], true);
+	maskCorner(mask.p[2], false, true);
+	maskCorner(mask.p[3], true, true);
 
 	return std::move(image);
 }
 
+QImage Round(
+		QImage &&image,
+		gsl::span<const QImage, 4> cornerMasks,
+		RectParts corners,
+		QRect target) {
+	return Round(std::move(image), CornersMaskRef({
+		(corners & RectPart::TopLeft) ? &cornerMasks[0] : nullptr,
+		(corners & RectPart::TopRight) ? &cornerMasks[1] : nullptr,
+		(corners & RectPart::BottomLeft) ? &cornerMasks[2] : nullptr,
+		(corners & RectPart::BottomRight) ? &cornerMasks[3] : nullptr,
+	}), target);
+}
+
 QImage Round(
 		QImage &&image,
 		ImageRoundRadius radius,
diff --git a/ui/image/image_prepare.h b/ui/image/image_prepare.h
index b1a165d..42d34cf 100644
--- a/ui/image/image_prepare.h
+++ b/ui/image/image_prepare.h
@@ -46,6 +46,24 @@ namespace Images {
 	int bottomAlpha,
 	QColor color = QColor(0, 0, 0));
 
+struct CornersMaskRef {
+	CornersMaskRef() = default;
+	explicit CornersMaskRef(gsl::span<const QImage, 4> masks)
+	: p{ &masks[0], &masks[1], &masks[2], &masks[3] } {
+	}
+	explicit CornersMaskRef(std::array<const QImage, 4> masks)
+	: p{ &masks[0], &masks[1], &masks[2], &masks[3] } {
+	}
+	explicit CornersMaskRef(gsl::span<const QImage*, 4> masks)
+	: p{ masks[0], masks[1], masks[2], masks[3] } {
+	}
+	explicit CornersMaskRef(std::array<const QImage*, 4> masks)
+	: p{ masks[0], masks[1], masks[2], masks[3] } {
+	}
+
+	std::array<const QImage*, 4> p{};
+};
+
 [[nodiscard]] const std::array<QImage, 4> &CornersMask(
 	ImageRoundRadius radius);
 [[nodiscard]] std::array<QImage, 4> PrepareCorners(
@@ -100,6 +118,11 @@ inline constexpr auto is_flag_type(Option) { return true; };
 	ImageRoundRadius radius,
 	RectParts corners = RectPart::AllCorners);
 
+[[nodiscard]] QImage Round(
+	QImage &&image,
+	CornersMaskRef mask,
+	QRect target = QRect());
+
 [[nodiscard]] QImage Blur(QImage &&image, bool ignoreAlpha = false);
 [[nodiscard]] QImage Round(
 	QImage &&image,

From 2c2a7887e644dff7130d764c5a7b04aaa0463056 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Oct 2022 11:34:26 +0400
Subject: [PATCH 259/635] Add Images::EllipseMask method to the interface.

---
 ui/effects/spoiler_mess.cpp |  5 +----
 ui/image/image_prepare.cpp  | 36 ++++++++++++++++++++++--------------
 ui/image/image_prepare.h    | 27 +++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index dc0cb1a..a4d8b8d 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -505,10 +505,7 @@ void FillSpoilerRect(
 		const SpoilerMessFrame &frame,
 		QImage &cornerCache,
 		QPoint originShift) {
-	constexpr auto kTopLeft = 0;
-	constexpr auto kTopRight = 1;
-	constexpr auto kBottomLeft = 2;
-	constexpr auto kBottomRight = 3;
+	using namespace Images;
 
 	if ((!mask.p[kTopLeft] || mask.p[kTopLeft]->isNull())
 		&& (!mask.p[kTopRight] || mask.p[kTopRight]->isNull())
diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 013707c..2e8ea6b 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -51,7 +51,7 @@ TG_FORCE_INLINE uint64 BlurGetColors(const uchar *p) {
 		+ ((uint64)p[3] << 48);
 }
 
-const QImage &CircleMask(QSize size) {
+const QImage &EllipseMaskCached(QSize size) {
 	const auto key = (uint64(uint32(size.width())) << 32)
 		| uint64(uint32(size.height()));
 
@@ -64,17 +64,7 @@ const QImage &CircleMask(QSize size) {
 	}
 	lock.unlock();
 
-	auto mask = QImage(
-		size,
-		QImage::Format_ARGB32_Premultiplied);
-	mask.fill(Qt::transparent);
-	{
-		QPainter p(&mask);
-		PainterHighQualityEnabler hq(p);
-		p.setBrush(Qt::white);
-		p.setPen(Qt::NoPen);
-		p.drawEllipse(QRect(QPoint(), size));
-	}
+	auto mask = EllipseMask(size);
 
 	lock.relock();
 	return Masks.emplace(key, std::move(mask)).first->second;
@@ -345,6 +335,24 @@ std::array<QImage, 4> CornersMask(int radius) {
 	return PrepareCornersMask(radius);
 }
 
+QImage EllipseMask(QSize size) {
+	const auto ratio = style::DevicePixelRatio();
+
+	size *= ratio;
+	auto result = QImage(size, QImage::Format_ARGB32_Premultiplied);
+	result.fill(Qt::transparent);
+
+	QPainter p(&result);
+	PainterHighQualityEnabler hq(p);
+	p.setBrush(Qt::white);
+	p.setPen(Qt::NoPen);
+	p.drawEllipse(QRect(QPoint(), size));
+	p.end();
+
+	result.setDevicePixelRatio(ratio);
+	return result;
+}
+
 std::array<QImage, 4> PrepareCorners(
 		int radius,
 		const style::color &color) {
@@ -987,7 +995,7 @@ QImage Circle(QImage &&image, QRect target) {
 	Expects(!image.isNull());
 
 	if (target.isNull()) {
-		target = QRect(QPoint(), image.size());
+		target = QRect(QPoint( ), image.size());
 	} else {
 		Assert(QRect(QPoint(), image.size()).contains(target));
 	}
@@ -1001,7 +1009,7 @@ QImage Circle(QImage &&image, QRect target) {
 	p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
 	p.drawImage(
 		QRectF(target.topLeft() / ratio, target.size() / ratio),
-		CircleMask(target.size()));
+		EllipseMaskCached(target.size()));
 	p.end();
 
 	return std::move(image);
diff --git a/ui/image/image_prepare.h b/ui/image/image_prepare.h
index 42d34cf..3ede8dc 100644
--- a/ui/image/image_prepare.h
+++ b/ui/image/image_prepare.h
@@ -46,6 +46,11 @@ namespace Images {
 	int bottomAlpha,
 	QColor color = QColor(0, 0, 0));
 
+inline constexpr auto kTopLeft = 0;
+inline constexpr auto kTopRight = 1;
+inline constexpr auto kBottomLeft = 2;
+inline constexpr auto kBottomRight = 3;
+
 struct CornersMaskRef {
 	CornersMaskRef() = default;
 	explicit CornersMaskRef(gsl::span<const QImage, 4> masks)
@@ -61,7 +66,27 @@ struct CornersMaskRef {
 	: p{ masks[0], masks[1], masks[2], masks[3] } {
 	}
 
+	[[nodiscard]] bool empty() const {
+		return !p[0] && !p[1] && !p[2] && !p[3];
+	}
+
 	std::array<const QImage*, 4> p{};
+
+	friend inline constexpr std::strong_ordering operator<=>(
+			CornersMaskRef a,
+			CornersMaskRef b) noexcept {
+		for (auto i = 0; i != 4; ++i) {
+			if (a.p[i] < b.p[i]) {
+				return std::strong_ordering::less;
+			} else if (a.p[i] > b.p[i]) {
+				return std::strong_ordering::greater;
+			}
+		}
+		return std::strong_ordering::equal;
+	}
+	friend inline constexpr bool operator==(
+		CornersMaskRef a,
+		CornersMaskRef b) noexcept = default;
 };
 
 [[nodiscard]] const std::array<QImage, 4> &CornersMask(
@@ -71,6 +96,8 @@ struct CornersMaskRef {
 	const style::color &color);
 
 [[nodiscard]] std::array<QImage, 4> CornersMask(int radius);
+[[nodiscard]] QImage EllipseMask(QSize size);
+
 [[nodiscard]] std::array<QImage, 4> PrepareCorners(
 	int radius,
 	const style::color &color);

From 89ae115a878feb9e07fe7423fcf123397eba5966 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 3 Oct 2022 15:10:49 +0400
Subject: [PATCH 260/635] Add customized rounded ripple mask generators.

---
 ui/cached_special_layer_shadow_corners.cpp |   2 +-
 ui/effects/ripple_animation.cpp            | 104 +++++++++++++++++----
 ui/effects/ripple_animation.h              |  31 ++++--
 ui/widgets/buttons.cpp                     |   8 +-
 ui/widgets/call_button.cpp                 |   4 +-
 ui/widgets/checkbox.cpp                    |   6 +-
 ui/widgets/menu/menu_action.cpp            |   2 +-
 7 files changed, 120 insertions(+), 37 deletions(-)

diff --git a/ui/cached_special_layer_shadow_corners.cpp b/ui/cached_special_layer_shadow_corners.cpp
index c60c359..0d98360 100644
--- a/ui/cached_special_layer_shadow_corners.cpp
+++ b/ui/cached_special_layer_shadow_corners.cpp
@@ -18,7 +18,7 @@ namespace {
 	const auto s = QSize(
 		st::boxRadius * 2 + st.extend.left(),
 		st::boxRadius * 2 + st.extend.right());
-	const auto mask = Ui::RippleAnimation::maskByDrawer(s, false, [&](
+	const auto mask = Ui::RippleAnimation::MaskByDrawer(s, false, [&](
 			QPainter &p) {
 		p.drawRoundedRect(QRect(QPoint(), s), st::boxRadius, st::boxRadius);
 	});
diff --git a/ui/effects/ripple_animation.cpp b/ui/effects/ripple_animation.cpp
index 5fbb030..35cc5bc 100644
--- a/ui/effects/ripple_animation.cpp
+++ b/ui/effects/ripple_animation.cpp
@@ -9,15 +9,27 @@
 #include "ui/effects/animations.h"
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
+#include "ui/image/image_prepare.h"
 
 namespace Ui {
 
 class RippleAnimation::Ripple {
 public:
-	Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask, Fn<void()> update);
-	Ripple(const style::RippleAnimation &st, const QPixmap &mask, Fn<void()> update);
+	Ripple(
+		const style::RippleAnimation &st,
+		QPoint origin,
+		int startRadius,
+		const QPixmap &mask,
+		Fn<void()> update);
+	Ripple(
+		const style::RippleAnimation &st,
+		const QPixmap &mask,
+		Fn<void()> update);
 
-	void paint(QPainter &p, const QPixmap &mask, const QColor *colorOverride);
+	void paint(
+		QPainter &p,
+		const QPixmap &mask,
+		const QColor *colorOverride);
 
 	void stop();
 	void unstop();
@@ -43,7 +55,12 @@ private:
 
 };
 
-RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin, int startRadius, const QPixmap &mask, Fn<void()> update)
+RippleAnimation::Ripple::Ripple(
+	const style::RippleAnimation &st,
+	QPoint origin,
+	int startRadius,
+	const QPixmap &mask,
+	Fn<void()> update)
 : _st(st)
 , _update(update)
 , _origin(origin)
@@ -59,7 +76,9 @@ RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, QPoint origin,
 		{ 0, _frame.height() / pixelRatio },
 	};
 	for (auto point : points) {
-		accumulate_max(_radiusTo, style::point::dotProduct(_origin - point, _origin - point));
+		accumulate_max(
+			_radiusTo,
+			style::point::dotProduct(_origin - point, _origin - point));
 	}
 	_radiusTo = qRound(sqrt(_radiusTo));
 
@@ -79,7 +98,10 @@ RippleAnimation::Ripple::Ripple(const style::RippleAnimation &st, const QPixmap
 	_hide.start(_update, 0., 1., _st.hideDuration);
 }
 
-void RippleAnimation::Ripple::paint(QPainter &p, const QPixmap &mask, const QColor *colorOverride) {
+void RippleAnimation::Ripple::paint(
+		QPainter &p,
+		const QPixmap &mask,
+		const QColor *colorOverride) {
 	auto opacity = _hide.value(_hiding ? 0. : 1.);
 	if (opacity == 0.) {
 		return;
@@ -92,9 +114,11 @@ void RippleAnimation::Ripple::paint(QPainter &p, const QPixmap &mask, const QCol
 		Assert(!std::isnan(diff));
 		const auto mult = diff * shown;
 		Assert(!std::isnan(mult));
-		const auto interpolated = _radiusFrom + mult;//anim::interpolateF(_radiusFrom, _radiusTo, shown);
+		const auto interpolated = _radiusFrom + mult;
+		//anim::interpolateF(_radiusFrom, _radiusTo, shown);
 		Assert(!std::isnan(interpolated));
-		auto radius = int(base::SafeRound(interpolated));//anim::interpolate(_radiusFrom, _radiusTo, _show.value(1.));
+		auto radius = int(base::SafeRound(interpolated));
+		//anim::interpolate(_radiusFrom, _radiusTo, _show.value(1.));
 		_frame.fill(Qt::transparent);
 		{
 			QPainter p(&_frame);
@@ -151,7 +175,10 @@ void RippleAnimation::Ripple::clearCache() {
 	_cache = QPixmap();
 }
 
-RippleAnimation::RippleAnimation(const style::RippleAnimation &st, QImage mask, Fn<void()> callback)
+RippleAnimation::RippleAnimation(
+	const style::RippleAnimation &st,
+	QImage mask,
+	Fn<void()> callback)
 : _st(st)
 , _mask(PixmapFromImage(std::move(mask)))
 , _update(callback) {
@@ -160,7 +187,8 @@ RippleAnimation::RippleAnimation(const style::RippleAnimation &st, QImage mask,
 
 void RippleAnimation::add(QPoint origin, int startRadius) {
 	lastStop();
-	_ripples.push_back(std::make_unique<Ripple>(_st, origin, startRadius, _mask, _update));
+	_ripples.push_back(
+		std::make_unique<Ripple>(_st, origin, startRadius, _mask, _update));
 }
 
 void RippleAnimation::addFading() {
@@ -195,7 +223,12 @@ void RippleAnimation::forceRepaint() {
 	}
 }
 
-void RippleAnimation::paint(QPainter &p, int x, int y, int outerWidth, const QColor *colorOverride) {
+void RippleAnimation::paint(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		const QColor *colorOverride) {
 	if (_ripples.empty()) {
 		return;
 	}
@@ -211,8 +244,13 @@ void RippleAnimation::paint(QPainter &p, int x, int y, int outerWidth, const QCo
 	clearFinished();
 }
 
-QImage RippleAnimation::maskByDrawer(QSize size, bool filled, Fn<void(QPainter &p)> drawer) {
-	auto result = QImage(size * style::DevicePixelRatio(), QImage::Format_ARGB32_Premultiplied);
+QImage RippleAnimation::MaskByDrawer(
+		QSize size,
+		bool filled,
+		Fn<void(QPainter &p)> drawer) {
+	auto result = QImage(
+		size * style::DevicePixelRatio(),
+		QImage::Format_ARGB32_Premultiplied);
 	result.setDevicePixelRatio(style::DevicePixelRatio());
 	result.fill(filled ? QColor(255, 255, 255) : Qt::transparent);
 	if (drawer) {
@@ -226,18 +264,46 @@ QImage RippleAnimation::maskByDrawer(QSize size, bool filled, Fn<void(QPainter &
 	return result;
 }
 
-QImage RippleAnimation::rectMask(QSize size) {
-	return maskByDrawer(size, true, Fn<void(QPainter&)>());
+QImage RippleAnimation::RectMask(QSize size) {
+	return MaskByDrawer(size, true, nullptr);
 }
 
-QImage RippleAnimation::roundRectMask(QSize size, int radius) {
-	return maskByDrawer(size, false, [size, radius](QPainter &p) {
+QImage RippleAnimation::RoundRectMask(QSize size, int radius) {
+	return MaskByDrawer(size, false, [&](QPainter &p) {
 		p.drawRoundedRect(0, 0, size.width(), size.height(), radius, radius);
 	});
 }
 
-QImage RippleAnimation::ellipseMask(QSize size) {
-	return maskByDrawer(size, false, [size](QPainter &p) {
+QImage RippleAnimation::RoundRectMask(
+		QSize size,
+		Images::CornersMaskRef corners) {
+	return MaskByDrawer(size, true, [&](QPainter &p) {
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		const auto ratio = style::DevicePixelRatio();
+		const auto corner = [&](int index, bool right, bool bottom) {
+			if (const auto image = corners.p[index]) {
+				if (!image->isNull()) {
+					const auto width = image->width() / ratio;
+					const auto height = image->height() / ratio;
+					p.drawImage(
+						QRect(
+							right ? (size.width() - width) : 0,
+							bottom ? (size.height() - height) : 0,
+							width,
+							height),
+						*image);
+				}
+			}
+		};
+		corner(0, false, false);
+		corner(1, true, false);
+		corner(2, false, true);
+		corner(3, true, true);
+	});
+}
+
+QImage RippleAnimation::EllipseMask(QSize size) {
+	return MaskByDrawer(size, false, [&](QPainter &p) {
 		p.drawEllipse(0, 0, size.width(), size.height());
 	});
 }
diff --git a/ui/effects/ripple_animation.h b/ui/effects/ripple_animation.h
index 1ab6a89..94a9ca1 100644
--- a/ui/effects/ripple_animation.h
+++ b/ui/effects/ripple_animation.h
@@ -10,12 +10,20 @@
 
 #include <deque>
 
+namespace Images {
+struct CornersMaskRef;
+} // namespace Images
+
 namespace Ui {
 
 class RippleAnimation {
 public:
-	// White upon transparent mask, like colorizeImage(black-white-mask, white).
-	RippleAnimation(const style::RippleAnimation &st, QImage mask, Fn<void()> update);
+	// White upon transparent mask,
+	// like colorizeImage(black-white-mask, white).
+	RippleAnimation(
+		const style::RippleAnimation &st,
+		QImage mask,
+		Fn<void()> update);
 
 	void add(QPoint origin, int startRadius = 0);
 	void addFading();
@@ -24,16 +32,25 @@ public:
 	void lastFinish();
 	void forceRepaint();
 
-	void paint(QPainter &p, int x, int y, int outerWidth, const QColor *colorOverride = nullptr);
+	void paint(
+		QPainter &p,
+		int x,
+		int y,
+		int outerWidth,
+		const QColor *colorOverride = nullptr);
 
 	bool empty() const {
 		return _ripples.empty();
 	}
 
-	static QImage maskByDrawer(QSize size, bool filled, Fn<void(QPainter &p)> drawer);
-	static QImage rectMask(QSize size);
-	static QImage roundRectMask(QSize size, int radius);
-	static QImage ellipseMask(QSize size);
+	static QImage MaskByDrawer(
+		QSize size,
+		bool filled,
+		Fn<void(QPainter &p)> drawer);
+	static QImage RectMask(QSize size);
+	static QImage RoundRectMask(QSize size, int radius);
+	static QImage RoundRectMask(QSize size, Images::CornersMaskRef corners);
+	static QImage EllipseMask(QSize size);
 
 	~RippleAnimation();
 
diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index adcffdd..817e42c 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -165,7 +165,7 @@ void RippleButton::ensureRipple() {
 }
 
 QImage RippleButton::prepareRippleMask() const {
-	return RippleAnimation::rectMask(size());
+	return RippleAnimation::RectMask(size());
 }
 
 QPoint RippleButton::prepareRippleStartPosition() const {
@@ -449,7 +449,7 @@ QImage RoundButton::prepareRippleMask() const {
 	if (_fullWidthOverride < 0) {
 		rounded = QRect(0, rounded.top(), innerWidth - _fullWidthOverride, rounded.height());
 	}
-	return RippleAnimation::roundRectMask(
+	return RippleAnimation::RoundRectMask(
 		rounded.size(),
 		(_fullRadius
 			? (rounded.height() / 2)
@@ -551,7 +551,7 @@ QPoint IconButton::prepareRippleStartPosition() const {
 }
 
 QImage IconButton::prepareRippleMask() const {
-	return RippleAnimation::ellipseMask(QSize(_st.rippleAreaSize, _st.rippleAreaSize));
+	return RippleAnimation::EllipseMask(QSize(_st.rippleAreaSize, _st.rippleAreaSize));
 }
 
 CrossButton::CrossButton(QWidget *parent, const style::CrossButton &st) : RippleButton(parent, st.ripple)
@@ -684,7 +684,7 @@ QPoint CrossButton::prepareRippleStartPosition() const {
 }
 
 QImage CrossButton::prepareRippleMask() const {
-	return RippleAnimation::ellipseMask(QSize(_st.cross.size, _st.cross.size));
+	return RippleAnimation::EllipseMask(QSize(_st.cross.size, _st.cross.size));
 }
 
 SettingsButton::SettingsButton(
diff --git a/ui/widgets/call_button.cpp b/ui/widgets/call_button.cpp
index f1991d0..3048a8e 100644
--- a/ui/widgets/call_button.cpp
+++ b/ui/widgets/call_button.cpp
@@ -32,7 +32,7 @@ CallButton::CallButton(
 void CallButton::init() {
 	resize(_stFrom->button.width, _stFrom->button.height);
 
-	_bgMask = RippleAnimation::ellipseMask(QSize(_stFrom->bgSize, _stFrom->bgSize));
+	_bgMask = RippleAnimation::EllipseMask(QSize(_stFrom->bgSize, _stFrom->bgSize));
 	_bgFrom = Ui::PixmapFromImage(style::colorizeImage(_bgMask, _stFrom->bg));
 	if (_stTo) {
 		Assert(_stFrom->button.width == _stTo->button.width);
@@ -242,7 +242,7 @@ QPoint CallButton::prepareRippleStartPosition() const {
 }
 
 QImage CallButton::prepareRippleMask() const {
-	return RippleAnimation::ellipseMask(QSize(_stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
+	return RippleAnimation::EllipseMask(QSize(_stFrom->button.rippleAreaSize, _stFrom->button.rippleAreaSize));
 }
 
 } // namespace Ui
diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 0836cdb..cbd1cb3 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -222,7 +222,7 @@ QSize ToggleView::rippleSize() const {
 
 QImage ToggleView::prepareRippleMask() const {
 	auto size = rippleSize();
-	return RippleAnimation::roundRectMask(size, size.height() / 2);
+	return RippleAnimation::RoundRectMask(size, size.height() / 2);
 }
 
 bool ToggleView::checkRippleStartPosition(QPoint position) const {
@@ -277,7 +277,7 @@ QSize CheckView::rippleSize() const {
 }
 
 QImage CheckView::prepareRippleMask() const {
-	return RippleAnimation::ellipseMask(rippleSize());
+	return RippleAnimation::EllipseMask(rippleSize());
 }
 
 bool CheckView::checkRippleStartPosition(QPoint position) const {
@@ -356,7 +356,7 @@ QSize RadioView::rippleSize() const {
 }
 
 QImage RadioView::prepareRippleMask() const {
-	return RippleAnimation::ellipseMask(rippleSize());
+	return RippleAnimation::EllipseMask(rippleSize());
 }
 
 bool RadioView::checkRippleStartPosition(QPoint position) const {
diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index 1963eb5..cc723e4 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -188,7 +188,7 @@ QPoint Action::prepareRippleStartPosition() const {
 }
 
 QImage Action::prepareRippleMask() const {
-	return Ui::RippleAnimation::rectMask(size());
+	return Ui::RippleAnimation::RectMask(size());
 }
 
 int Action::contentHeight() const {

From eafd7dc818433ec435c2862bb91b7e3c7f65336b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Oct 2022 09:13:57 +0400
Subject: [PATCH 261/635] Allow spoilers and custom emoji in toasts.

---
 ui/toast/toast.h          |  1 +
 ui/toast/toast_widget.cpp | 34 +++++++++++++++++++---------------
 ui/toast/toast_widget.h   |  1 +
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ui/toast/toast.h b/ui/toast/toast.h
index 2c0a2d5..9c2f71f 100644
--- a/ui/toast/toast.h
+++ b/ui/toast/toast.h
@@ -37,6 +37,7 @@ struct Config {
 	bool dark = false;
 	RectPart slideSide = RectPart::None;
 	ClickHandlerFilter filter;
+	Fn<std::any(not_null<QWidget*>)> textContext;
 };
 
 void SetDefaultParent(not_null<QWidget*> parent);
diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index 495d7f0..9f9c861 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -38,9 +38,15 @@ Widget::Widget(QWidget *parent, const Config &config)
 	_text.setMarkedText(
 		_st->style,
 		_multiline ? config.text : TextUtilities::SingleLine(config.text),
-		toastOptions);
+		toastOptions,
+		config.textContext ? config.textContext(this) : std::any());
+	const auto weak = Ui::MakeWeak(this);
+	_text.setSpoilerLinkFilter([=](const ClickContext &context) {
+		return (weak != nullptr);
+	});
 
-	if (_text.hasLinks()) {
+	_processMouse = _text.hasLinks() || _text.hasSpoilers();
+	if (_processMouse) {
 		setMouseTracking(true);
 	} else {
 		setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -51,9 +57,7 @@ Widget::Widget(QWidget *parent, const Config &config)
 }
 
 void Widget::setInputUsed(bool used) {
-	setAttribute(
-		Qt::WA_TransparentForMouseEvents,
-		!used && !_text.hasLinks());
+	setAttribute(Qt::WA_TransparentForMouseEvents, !used && !_processMouse);
 }
 
 void Widget::onParentResized() {
@@ -147,16 +151,16 @@ void Widget::paintEvent(QPaintEvent *e) {
 
 	const auto lines = _maxTextHeight / _st->style.font->height;
 	p.setPen(st::toastFg);
-	_text.drawElided(
-		p,
-		_st->padding.left(),
-		_textTop,
-		_textWidth + 1,
-		lines);
+	_text.draw(p, {
+		.position = { _st->padding.left(), _textTop },
+		.availableWidth = _textWidth + 1,
+		.spoiler = Ui::Text::DefaultSpoilerCache(),
+		.elisionLines = lines,
+	});
 }
 
 void Widget::leaveEventHook(QEvent *e) {
-	if (!_text.hasLinks()) {
+	if (!_processMouse) {
 		return;
 	}
 	if (ClickHandler::getActive()) {
@@ -167,7 +171,7 @@ void Widget::leaveEventHook(QEvent *e) {
 }
 
 void Widget::mouseMoveEvent(QMouseEvent *e) {
-	if (!_text.hasLinks()) {
+	if (!_processMouse) {
 		return;
 	}
 	const auto point = e->pos()
@@ -184,14 +188,14 @@ void Widget::mouseMoveEvent(QMouseEvent *e) {
 }
 
 void Widget::mousePressEvent(QMouseEvent *e) {
-	if (!_text.hasLinks() || e->button() != Qt::LeftButton) {
+	if (!_processMouse || e->button() != Qt::LeftButton) {
 		return;
 	}
 	ClickHandler::pressed();
 }
 
 void Widget::mouseReleaseEvent(QMouseEvent *e) {
-	if (!_text.hasLinks() || e->button() != Qt::LeftButton) {
+	if (!_processMouse || e->button() != Qt::LeftButton) {
 		return;
 	}
 	if (const auto handler = ClickHandler::unpressed()) {
diff --git a/ui/toast/toast_widget.h b/ui/toast/toast_widget.h
index 493e5c5..1da5e19 100644
--- a/ui/toast/toast_widget.h
+++ b/ui/toast/toast_widget.h
@@ -44,6 +44,7 @@ private:
 	float64 _shownLevel = 0;
 	bool _multiline = false;
 	bool _dark = false;
+	bool _processMouse = false;
 
 	int _maxTextWidth = 0;
 	int _maxTextHeight = 0;

From 04e6428fec0f295df149ada3a6a51053a0884761 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Oct 2022 10:10:49 +0400
Subject: [PATCH 262/635] Remove accidentally added check.

---
 ui/text/text_renderer.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index ec3fc64..6c2b824 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -185,7 +185,6 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 		? -1
 		: (context.clip.y() + context.clip.height());
 	if (const auto lines = context.elisionLines) {
-		if (context.clip.isNull())
 		if (_yTo < 0 || (_y + (lines - 1) * _t->_st->font->height) < _yTo) {
 			_yTo = _y + (lines * _t->_st->font->height);
 			_elideLast = true;

From a755fa391edad68951142a0fcc034df695a007ca Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Oct 2022 19:34:10 +0400
Subject: [PATCH 263/635] Fix crash in toasts.

---
 ui/toast/toast_widget.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index 9f9c861..6d3981b 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -40,10 +40,12 @@ Widget::Widget(QWidget *parent, const Config &config)
 		_multiline ? config.text : TextUtilities::SingleLine(config.text),
 		toastOptions,
 		config.textContext ? config.textContext(this) : std::any());
-	const auto weak = Ui::MakeWeak(this);
-	_text.setSpoilerLinkFilter([=](const ClickContext &context) {
-		return (weak != nullptr);
-	});
+	if (_text.hasSpoilers()) {
+		const auto weak = Ui::MakeWeak(this);
+		_text.setSpoilerLinkFilter([=](const ClickContext &context) {
+			return (weak != nullptr);
+		});
+	}
 
 	_processMouse = _text.hasLinks() || _text.hasSpoilers();
 	if (_processMouse) {

From f450dcf2c5fa1dfa0ad1fda483421c6548ff4fbb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 6 Oct 2022 17:03:32 +0400
Subject: [PATCH 264/635] Support GenericBox max height / scroll style.

---
 ui/layers/box_content.cpp |  4 ----
 ui/layers/box_content.h   | 15 +++++++++------
 ui/layers/generic_box.cpp | 10 ++++++++--
 ui/layers/generic_box.h   |  9 +++++++++
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index e1a0423..bd06178 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -103,10 +103,6 @@ QPointer<IconButton> BoxContent::addTopButton(
 	return result;
 }
 
-void BoxContent::setInner(object_ptr<TWidget> inner) {
-	setInner(std::move(inner), st::boxScroll);
-}
-
 void BoxContent::setInner(
 		object_ptr<TWidget> inner,
 		const style::ScrollArea &st) {
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index fa275f5..deeb8af 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -31,6 +31,10 @@ struct ScrollArea;
 struct Box;
 } // namespace style
 
+namespace st {
+extern const style::ScrollArea &boxScroll;
+} // namespace st
+
 namespace Ui {
 class GenericBox;
 } // namespace Ui
@@ -242,11 +246,11 @@ protected:
 			object_ptr<Widget> inner,
 			int topSkip = 0,
 			int bottomSkip = 0) {
-		auto result = QPointer<Widget>(inner.data());
-		setInnerTopSkip(topSkip);
-		setInnerBottomSkip(bottomSkip);
-		setInner(std::move(inner));
-		return result;
+		return setInnerWidget(
+			std::move(inner),
+			st::boxScroll,
+			topSkip,
+			bottomSkip);
 	}
 
 	template <typename Widget>
@@ -265,7 +269,6 @@ protected:
 private:
 	void finishPrepare();
 	void finishScrollCreate();
-	void setInner(object_ptr<TWidget> inner);
 	void setInner(object_ptr<TWidget> inner, const style::ScrollArea &st);
 	void updateScrollAreaGeometry();
 	void updateInnerVisibleTopBottom();
diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index 9e85910..e61ea3f 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -29,10 +29,16 @@ void GenericBox::prepare() {
 		wrap->heightValue()
 	) | rpl::start_with_next([=](int top, int height) {
 		setInnerTopSkip(top);
-		setDimensions(currentWidth, top + height);
+		const auto desired = top + height;
+		setDimensions(
+			currentWidth,
+			_maxHeight ? std::min(desired, _maxHeight) : desired);
 	}, wrap->lifetime());
 
-	setInnerWidget(std::move(wrap), pinned ? pinned->height() : 0);
+	setInnerWidget(
+		std::move(wrap),
+		_scrollSt ? *_scrollSt : st::boxScroll,
+		pinned ? pinned->height() : 0);
 }
 
 void GenericBox::addSkip(int height) {
diff --git a/ui/layers/generic_box.h b/ui/layers/generic_box.h
index 60bf1ef..f1a441c 100644
--- a/ui/layers/generic_box.h
+++ b/ui/layers/generic_box.h
@@ -71,6 +71,13 @@ public:
 
 	void addSkip(int height);
 
+	void setMaxHeight(int maxHeight) {
+		_maxHeight = maxHeight;
+	}
+	void setScrollStyle(const style::ScrollArea &st) {
+		_scrollSt = &st;
+	}
+
 	void setInnerFocus() override {
 		if (_focus) {
 			_focus();
@@ -128,7 +135,9 @@ private:
 	Fn<void()> _showFinished;
 	object_ptr<Ui::VerticalLayout> _owned;
 	not_null<Ui::VerticalLayout*> _content;
+	const style::ScrollArea *_scrollSt = nullptr;
 	int _width = 0;
+	int _maxHeight = 0;
 
 	object_ptr<Ui::RpWidget> _pinnedToTopContent = { nullptr };
 

From 0c592310af086c528db16a362a5302c51521c5a2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 13 Oct 2022 02:16:56 +0300
Subject: [PATCH 265/635] Added ability to customize widget for events in
 VerticalLayoutReorder.

---
 ui/wrap/vertical_layout_reorder.cpp | 9 ++++++++-
 ui/wrap/vertical_layout_reorder.h   | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ui/wrap/vertical_layout_reorder.cpp b/ui/wrap/vertical_layout_reorder.cpp
index a4cc15f..b882ef6 100644
--- a/ui/wrap/vertical_layout_reorder.cpp
+++ b/ui/wrap/vertical_layout_reorder.cpp
@@ -50,7 +50,10 @@ void VerticalLayoutReorder::start() {
 	}
 	for (auto i = 0; i != count; ++i) {
 		const auto widget = _layout->widgetAt(i);
-		widget->events(
+		const auto eventsProducer = _proxyWidgetCallback
+			? _proxyWidgetCallback(i)
+			: widget;
+		eventsProducer->events(
 		) | rpl::start_with_next_done([=](not_null<QEvent*> e) {
 			switch (e->type()) {
 			case QEvent::MouseMove:
@@ -83,6 +86,10 @@ void VerticalLayoutReorder::clearPinnedIntervals() {
 	_pinnedIntervals.clear();
 }
 
+void VerticalLayoutReorder::setMouseEventProxy(ProxyCallback callback) {
+	_proxyWidgetCallback = std::move(callback);
+}
+
 bool VerticalLayoutReorder::Interval::isIn(int index) const {
 	return (index >= from) && (index < (from + length));
 }
diff --git a/ui/wrap/vertical_layout_reorder.h b/ui/wrap/vertical_layout_reorder.h
index 87875b6..a7fa078 100644
--- a/ui/wrap/vertical_layout_reorder.h
+++ b/ui/wrap/vertical_layout_reorder.h
@@ -16,6 +16,7 @@ class VerticalLayout;
 
 class VerticalLayoutReorder final {
 public:
+	using ProxyCallback = Fn<not_null<Ui::RpWidget*>(int)>;
 	enum class State : uchar {
 		Started,
 		Applied,
@@ -38,6 +39,7 @@ public:
 	void finishReordering();
 	void addPinnedInterval(int from, int length);
 	void clearPinnedIntervals();
+	void setMouseEventProxy(ProxyCallback callback);
 	[[nodiscard]] rpl::producer<Single> updates() const;
 
 private:
@@ -85,6 +87,8 @@ private:
 
 	std::vector<Interval> _pinnedIntervals;
 
+	ProxyCallback _proxyWidgetCallback = nullptr;
+
 	RpWidget *_currentWidget = nullptr;
 	int _currentStart = 0;
 	int _currentDesiredIndex = 0;

From 9ab11ccb36b7d03a3a24ebcd18d2f13b03fc3682 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Oct 2022 11:58:30 +0400
Subject: [PATCH 266/635] Add full-text-width accessor for SettingsButton.

---
 ui/widgets/buttons.cpp | 4 ++++
 ui/widgets/buttons.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index 817e42c..bd49ebe 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -765,6 +765,10 @@ const style::SettingsButton &SettingsButton::st() const {
 	return _st;
 }
 
+int SettingsButton::fullTextWidth() const {
+	return _text.maxWidth();
+}
+
 void SettingsButton::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index 89c32cf..bacae3d 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -274,6 +274,7 @@ public:
 	void setPaddingOverride(style::margins padding);
 
 	[[nodiscard]] const style::SettingsButton &st() const;
+	[[nodiscard]] int fullTextWidth() const;
 
 protected:
 	int resizeGetHeight(int newWidth) override;

From d8b1f46715e5fcaf781b76ecbc386cbe31492287 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Oct 2022 20:28:06 +0400
Subject: [PATCH 267/635] Fix MultiSlideTracker for empty widgets list.

---
 ui/wrap/slide_wrap.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/wrap/slide_wrap.cpp b/ui/wrap/slide_wrap.cpp
index 1dcd246..15da77b 100644
--- a/ui/wrap/slide_wrap.cpp
+++ b/ui/wrap/slide_wrap.cpp
@@ -151,6 +151,9 @@ void SlideWrap<RpWidget>::wrappedSizeUpdated(QSize size) {
 }
 
 rpl::producer<bool> MultiSlideTracker::atLeastOneShownValue() const {
+	if (_widgets.empty()) {
+		return rpl::single(false);
+	}
 	auto shown = std::vector<rpl::producer<bool>>();
 	shown.reserve(_widgets.size());
 	for (auto &widget : _widgets) {

From 4ba3000a288772752fcf9b41a618ce5df5a185a5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Oct 2022 17:41:57 +0400
Subject: [PATCH 268/635] Get rid of FlatInput class.

---
 ui/widgets/input_fields.cpp | 428 ++++++------------------------------
 ui/widgets/input_fields.h   | 115 ++--------
 ui/widgets/widgets.style    |  51 +----
 3 files changed, 84 insertions(+), 510 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 4012a42..a3ee55e 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1081,360 +1081,6 @@ const InstantReplaces &InstantReplaces::TextOnly() {
 	return result;
 }
 
-FlatInput::FlatInput(
-	QWidget *parent,
-	const style::FlatInput &st,
-	rpl::producer<QString> placeholder,
-	const QString &v)
-: Parent(v, parent)
-, _oldtext(v)
-, _placeholderFull(std::move(placeholder))
-, _placeholderVisible(!v.length())
-, _st(st)
-, _textMrg(_st.textMrg) {
-	setCursor(style::cur_text);
-	resize(_st.width, _st.height);
-
-	setFont(_st.font->f);
-	setAlignment(_st.align);
-
-	_placeholderFull.value(
-	) | rpl::start_with_next([=](const QString &text) {
-		refreshPlaceholder(text);
-	}, lifetime());
-
-	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
-		updatePalette();
-	}, lifetime());
-	updatePalette();
-
-	connect(this, SIGNAL(textChanged(const QString &)), this, SLOT(onTextChange(const QString &)));
-	connect(this, SIGNAL(textEdited(const QString &)), this, SLOT(onTextEdited()));
-	connect(this, &FlatInput::selectionChanged, [] {
-		Integration::Instance().textActionsUpdated();
-	});
-
-	setStyle(InputStyle::instance());
-	QLineEdit::setTextMargins(0, 0, 0, 0);
-	setContentsMargins(_textMrg + QMargins(-2, -1, -2, -1));
-	setFrame(false);
-
-	setAttribute(Qt::WA_AcceptTouchEvents);
-	_touchTimer.setSingleShot(true);
-	connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer()));
-}
-
-void FlatInput::updatePalette() {
-	auto p = palette();
-	p.setColor(QPalette::Text, _st.textColor->c);
-	p.setColor(QPalette::Highlight, st::msgInBgSelected->c);
-	p.setColor(QPalette::HighlightedText, st::historyTextInFgSelected->c);
-	setPalette(p);
-}
-
-void FlatInput::customUpDown(bool custom) {
-	_customUpDown = custom;
-}
-
-void FlatInput::onTouchTimer() {
-	_touchRightButton = true;
-}
-
-bool FlatInput::eventHook(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin
-		|| e->type() == QEvent::TouchUpdate
-		|| e->type() == QEvent::TouchEnd
-		|| e->type() == QEvent::TouchCancel) {
-		const auto ev = static_cast<QTouchEvent*>(e);
-		if (ev->device()->type() == base::TouchDevice::TouchScreen) {
-			touchEvent(ev);
-		}
-	}
-	return Parent::eventHook(e);
-}
-
-void FlatInput::touchEvent(QTouchEvent *e) {
-	switch (e->type()) {
-	case QEvent::TouchBegin: {
-		if (_touchPress || e->touchPoints().isEmpty()) {
-			return;
-		}
-		_touchTimer.start(QApplication::startDragTime());
-		_touchPress = true;
-		_touchMove = _touchRightButton = _mousePressedInTouch = false;
-		_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
-	} break;
-
-	case QEvent::TouchUpdate: {
-		if (!e->touchPoints().isEmpty()) {
-			touchUpdate(e->touchPoints().cbegin()->screenPos().toPoint());
-		}
-	} break;
-
-	case QEvent::TouchEnd: {
-		touchFinish();
-	} break;
-
-	case QEvent::TouchCancel: {
-		_touchPress = _mousePressedInTouch = false;
-		_touchTimer.stop();
-	} break;
-	}
-}
-
-void FlatInput::setTextMrg(const QMargins &textMrg) {
-	_textMrg = textMrg;
-	setContentsMargins(_textMrg + QMargins(-2, -1, -2, -1));
-	refreshPlaceholder(_placeholderFull.current());
-	update();
-}
-
-void FlatInput::finishAnimations() {
-	_placeholderFocusedAnimation.stop();
-	_placeholderVisibleAnimation.stop();
-}
-
-void FlatInput::paintEvent(QPaintEvent *e) {
-	auto p = QPainter(this);
-
-	auto placeholderFocused = _placeholderFocusedAnimation.value(_focused ? 1. : 0.);
-	auto pen = anim::pen(_st.borderColor, _st.borderActive, placeholderFocused);
-	pen.setWidth(_st.borderWidth);
-	p.setPen(pen);
-	p.setBrush(anim::brush(_st.bgColor, _st.bgActive, placeholderFocused));
-	{
-		PainterHighQualityEnabler hq(p);
-		p.drawRoundedRect(QRectF(0, 0, width(), height()).marginsRemoved(QMarginsF(_st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2.)), st::roundRadiusSmall - (_st.borderWidth / 2.), st::roundRadiusSmall - (_st.borderWidth / 2.));
-	}
-
-	if (!_st.icon.empty()) {
-		_st.icon.paint(p, 0, 0, width());
-	}
-
-	const auto placeholderOpacity = _placeholderVisibleAnimation.value(
-		_placeholderVisible ? 1. : 0.);
-	if (placeholderOpacity > 0.) {
-		p.setOpacity(placeholderOpacity);
-
-		auto left = anim::interpolate(_st.phShift, 0, placeholderOpacity);
-
-		p.save();
-		p.setClipRect(rect());
-		QRect phRect(placeholderRect());
-		phRect.moveLeft(phRect.left() + left);
-		phPrepare(p, placeholderFocused);
-		p.drawText(phRect, _placeholder, QTextOption(_st.phAlign));
-		p.restore();
-	}
-	QLineEdit::paintEvent(e);
-}
-
-void FlatInput::focusInEvent(QFocusEvent *e) {
-	if (!_focused) {
-		_focused = true;
-		_placeholderFocusedAnimation.start(
-			[=] { update(); },
-			0.,
-			1.,
-			_st.phDuration);
-		update();
-	}
-	QLineEdit::focusInEvent(e);
-	focused();
-}
-
-void FlatInput::focusOutEvent(QFocusEvent *e) {
-	if (_focused) {
-		_focused = false;
-		_placeholderFocusedAnimation.start(
-			[=] { update(); },
-			1.,
-			0.,
-			_st.phDuration);
-		update();
-	}
-	QLineEdit::focusOutEvent(e);
-	blurred();
-}
-
-void FlatInput::resizeEvent(QResizeEvent *e) {
-	refreshPlaceholder(_placeholderFull.current());
-	return QLineEdit::resizeEvent(e);
-}
-
-void FlatInput::setPlaceholder(rpl::producer<QString> placeholder) {
-	_placeholderFull = std::move(placeholder);
-}
-
-void FlatInput::refreshPlaceholder(const QString &text) {
-	const auto availw = width() - _textMrg.left() - _textMrg.right() - _st.phPos.x() - 1;
-	if (_st.font->width(text) > availw) {
-		_placeholder = _st.font->elided(text, availw);
-	} else {
-		_placeholder = text;
-	}
-	update();
-}
-
-void FlatInput::contextMenuEvent(QContextMenuEvent *e) {
-	if (const auto menu = createStandardContextMenu()) {
-		_contextMenu = base::make_unique_q<PopupMenu>(this, menu);
-		_contextMenu->popup(e->globalPos());
-	}
-}
-
-QSize FlatInput::sizeHint() const {
-	return geometry().size();
-}
-
-QSize FlatInput::minimumSizeHint() const {
-	return geometry().size();
-}
-
-void FlatInput::updatePlaceholder() {
-	auto hasText = !text().isEmpty();
-	if (!hasText) {
-		hasText = _lastPreEditTextNotEmpty;
-	} else {
-		_lastPreEditTextNotEmpty = false;
-	}
-	auto placeholderVisible = !hasText;
-	if (_placeholderVisible != placeholderVisible) {
-		_placeholderVisible = placeholderVisible;
-		_placeholderVisibleAnimation.start(
-			[=] { update(); },
-			_placeholderVisible ? 0. : 1.,
-			_placeholderVisible ? 1. : 0.,
-			_st.phDuration);
-	}
-}
-
-void FlatInput::inputMethodEvent(QInputMethodEvent *e) {
-	QLineEdit::inputMethodEvent(e);
-	auto lastPreEditTextNotEmpty = !e->preeditString().isEmpty();
-	if (_lastPreEditTextNotEmpty != lastPreEditTextNotEmpty) {
-		_lastPreEditTextNotEmpty = lastPreEditTextNotEmpty;
-		updatePlaceholder();
-	}
-}
-
-void FlatInput::mousePressEvent(QMouseEvent *e) {
-	if (_touchPress && e->button() == Qt::LeftButton) {
-		_mousePressedInTouch = true;
-		_touchStart = e->globalPos();
-	}
-	return QLineEdit::mousePressEvent(e);
-}
-
-void FlatInput::mouseReleaseEvent(QMouseEvent *e) {
-	if (_mousePressedInTouch) {
-		touchFinish();
-	}
-	return QLineEdit::mouseReleaseEvent(e);
-}
-
-void FlatInput::mouseMoveEvent(QMouseEvent *e) {
-	if (_mousePressedInTouch) {
-		touchUpdate(e->globalPos());
-	}
-	return QLineEdit::mouseMoveEvent(e);
-}
-
-void FlatInput::touchUpdate(QPoint globalPosition) {
-	if (_touchPress
-		&& !_touchMove
-		&& ((globalPosition - _touchStart).manhattanLength()
-			>= QApplication::startDragDistance())) {
-		_touchMove = true;
-	}
-}
-
-void FlatInput::touchFinish() {
-	if (!_touchPress) {
-		return;
-	}
-	const auto weak = MakeWeak(this);
-	if (!_touchMove && window()) {
-		QPoint mapped(mapFromGlobal(_touchStart));
-
-		if (_touchRightButton) {
-			QContextMenuEvent contextEvent(
-				QContextMenuEvent::Mouse,
-				mapped,
-				_touchStart);
-			contextMenuEvent(&contextEvent);
-		} else {
-			QGuiApplication::inputMethod()->show();
-		}
-	}
-	if (weak) {
-		_touchTimer.stop();
-		_touchPress
-			= _touchMove
-			= _touchRightButton
-			= _mousePressedInTouch = false;
-	}
-}
-
-QRect FlatInput::placeholderRect() const {
-	return QRect(_textMrg.left() + _st.phPos.x(), _textMrg.top() + _st.phPos.y(), width() - _textMrg.left() - _textMrg.right(), height() - _textMrg.top() - _textMrg.bottom());
-}
-
-void FlatInput::correctValue(const QString &was, QString &now) {
-}
-
-void FlatInput::phPrepare(QPainter &p, float64 placeholderFocused) {
-	p.setFont(_st.font);
-	p.setPen(anim::pen(_st.phColor, _st.phFocusColor, placeholderFocused));
-}
-
-void FlatInput::keyPressEvent(QKeyEvent *e) {
-	QString wasText(_oldtext);
-
-	if (_customUpDown && (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down || e->key() == Qt::Key_PageUp || e->key() == Qt::Key_PageDown)) {
-		e->ignore();
-	} else {
-		QLineEdit::keyPressEvent(e);
-	}
-
-	QString newText(text());
-	if (wasText == newText) { // call correct manually
-		correctValue(wasText, newText);
-		_oldtext = newText;
-		if (wasText != _oldtext) changed();
-		updatePlaceholder();
-	}
-	if (e->key() == Qt::Key_Escape) {
-		cancelled();
-	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
-		submitted(e->modifiers());
-#ifdef Q_OS_MAC
-	} else if (e->key() == Qt::Key_E && e->modifiers().testFlag(Qt::ControlModifier)) {
-		auto selected = selectedText();
-		if (!selected.isEmpty() && echoMode() == QLineEdit::Normal) {
-			QGuiApplication::clipboard()->setText(selected, QClipboard::FindBuffer);
-		}
-#endif // Q_OS_MAC
-	}
-}
-
-void FlatInput::onTextEdited() {
-	QString wasText(_oldtext), newText(text());
-
-	correctValue(wasText, newText);
-	_oldtext = newText;
-	if (wasText != _oldtext) changed();
-	updatePlaceholder();
-
-	Integration::Instance().textActionsUpdated();
-}
-
-void FlatInput::onTextChange(const QString &text) {
-	_oldtext = text;
-	Integration::Instance().textActionsUpdated();
-}
-
 CustomEmojiObject::CustomEmojiObject(Factory factory, Fn<bool()> paused)
 : _factory(std::move(factory))
 , _paused(std::move(paused))
@@ -1542,7 +1188,8 @@ InputField::InputField(
 	_inner->setAcceptRichText(false);
 	resize(_st.width, _minHeight);
 
-	if (_st.textBg->c.alphaF() >= 1.) {
+	if (_st.textBg->c.alphaF() >= 1.
+		&& !_st.borderRadius) {
 		setAttribute(Qt::WA_OpaquePaintEvent);
 	}
 
@@ -1754,7 +1401,11 @@ void InputField::paintEventInner(QPaintEvent *e) {
 }
 
 void InputField::setAdditionalMargin(int margin) {
-	_additionalMargin = margin;
+	setAdditionalMargins({ margin, margin, margin, margin });
+}
+
+void InputField::setAdditionalMargins(QMargins margins) {
+	_additionalMargins = margins;
 	QResizeEvent e(size(), size());
 	QCoreApplication::sendEvent(this, &e);
 }
@@ -1883,7 +1534,8 @@ bool InputField::heightAutoupdated() {
 	const auto contentHeight = int(std::ceil(document()->size().height()))
 		+ _st.textMargins.top()
 		+ _st.textMargins.bottom()
-		+ 2 * _additionalMargin;
+		+ _additionalMargins.top()
+		+ _additionalMargins.bottom();
 	const auto newHeight = std::clamp(contentHeight, _minHeight, _maxHeight);
 	if (height() != newHeight) {
 		resize(width(), newHeight);
@@ -1963,20 +1615,54 @@ void InputField::touchFinish() {
 	}
 }
 
-void InputField::paintEvent(QPaintEvent *e) {
-	auto p = QPainter(this);
+void InputField::paintSurrounding(
+		QPainter &p,
+		QRect clip,
+		float64 errorDegree,
+		float64 focusedDegree) {
+	if (_st.borderRadius > 0) {
+		paintRoundSurrounding(p, clip, errorDegree, focusedDegree);
+	} else {
+		paintFlatSurrounding(p, clip, errorDegree, focusedDegree);
+	}
+}
 
-	auto r = rect().intersected(e->rect());
+void InputField::paintRoundSurrounding(
+		QPainter &p,
+		QRect clip,
+		float64 errorDegree,
+		float64 focusedDegree) {
+	auto pen = anim::pen(_st.borderFg, _st.borderFgActive, focusedDegree);
+	pen.setWidth(_st.border);
+	p.setPen(pen);
+	p.setBrush(anim::brush(_st.textBg, _st.textBgActive, focusedDegree));
+
+	PainterHighQualityEnabler hq(p);
+	const auto radius = _st.borderRadius - (_st.border / 2.);
+	p.drawRoundedRect(
+		QRectF(0, 0, width(), height()).marginsRemoved(
+			QMarginsF(
+				_st.border / 2.,
+				_st.border / 2.,
+				_st.border / 2.,
+				_st.border / 2.)),
+		radius,
+		radius);
+}
+
+void InputField::paintFlatSurrounding(
+		QPainter &p,
+		QRect clip,
+		float64 errorDegree,
+		float64 focusedDegree) {
 	if (_st.textBg->c.alphaF() > 0.) {
-		p.fillRect(r, _st.textBg);
+		p.fillRect(clip, _st.textBg);
 	}
 	if (_st.border) {
 		p.fillRect(0, height() - _st.border, width(), _st.border, _st.borderFg);
 	}
-	auto errorDegree = _a_error.value(_error ? 1. : 0.);
-	auto focusedDegree = _a_focused.value(_focused ? 1. : 0.);
-	auto borderShownDegree = _a_borderShown.value(1.);
-	auto borderOpacity = _a_borderOpacity.value(_borderVisible ? 1. : 0.);
+	const auto borderShownDegree = _a_borderShown.value(1.);
+	const auto borderOpacity = _a_borderOpacity.value(_borderVisible ? 1. : 0.);
 	if (_st.borderActive && (borderOpacity > 0.)) {
 		auto borderStart = std::clamp(_borderAnimationStart, 0, width());
 		auto borderFrom = qRound(borderStart * (1. - borderShownDegree));
@@ -1988,6 +1674,15 @@ void InputField::paintEvent(QPaintEvent *e) {
 			p.setOpacity(1);
 		}
 	}
+}
+
+void InputField::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	const auto r = rect().intersected(e->rect());
+	const auto errorDegree = _a_error.value(_error ? 1. : 0.);
+	const auto focusedDegree = _a_focused.value(_focused ? 1. : 0.);
+	paintSurrounding(p, r, errorDegree, focusedDegree);
 
 	if (_st.placeholderScale > 0. && !_placeholderPath.isEmpty()) {
 		auto placeholderShiftDegree = _a_placeholderShifted.value(_placeholderShifted ? 1. : 0.);
@@ -4087,7 +3782,8 @@ void InputField::insertFromMimeDataInner(const QMimeData *source) {
 
 void InputField::resizeEvent(QResizeEvent *e) {
 	refreshPlaceholder(_placeholderFull.current());
-	_inner->setGeometry(rect().marginsRemoved(_st.textMargins + _additionalMargin));
+	_inner->setGeometry(rect().marginsRemoved(
+		_st.textMargins + _additionalMargins));
 	_borderAnimationStart = width() / 2;
 	RpWidget::resizeEvent(e);
 	checkContentHeight();
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index a513e19..1c592d8 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -67,102 +67,6 @@ enum class InputSubmitSettings {
 	None,
 };
 
-class FlatInput : public RpWidgetBase<QLineEdit> {
-	Q_OBJECT
-
-	using Parent = RpWidgetBase<QLineEdit>;
-public:
-	FlatInput(
-		QWidget *parent,
-		const style::FlatInput &st,
-		rpl::producer<QString> placeholder = nullptr,
-		const QString &val = QString());
-
-	void updatePlaceholder();
-	void setPlaceholder(rpl::producer<QString> placeholder);
-	QRect placeholderRect() const;
-
-	void finishAnimations();
-
-	void setTextMrg(const QMargins &textMrg);
-
-	QSize sizeHint() const override;
-	QSize minimumSizeHint() const override;
-
-	void customUpDown(bool isCustom);
-	const QString &getLastText() const {
-		return _oldtext;
-	}
-
-public Q_SLOTS:
-	void onTextChange(const QString &text);
-	void onTextEdited();
-
-	void onTouchTimer();
-
-Q_SIGNALS:
-	void changed();
-	void cancelled();
-	void submitted(Qt::KeyboardModifiers);
-	void focused();
-	void blurred();
-
-protected:
-	bool eventHook(QEvent *e) override;
-	void touchEvent(QTouchEvent *e);
-	void paintEvent(QPaintEvent *e) override;
-	void focusInEvent(QFocusEvent *e) override;
-	void focusOutEvent(QFocusEvent *e) override;
-	void keyPressEvent(QKeyEvent *e) override;
-	void resizeEvent(QResizeEvent *e) override;
-	void contextMenuEvent(QContextMenuEvent *e) override;
-	void inputMethodEvent(QInputMethodEvent *e) override;
-
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
-
-	virtual void correctValue(const QString &was, QString &now);
-
-	style::font phFont() {
-		return _st.font;
-	}
-
-	void phPrepare(QPainter &p, float64 placeholderFocused);
-
-private:
-	void updatePalette();
-	void refreshPlaceholder(const QString &text);
-
-	void touchUpdate(QPoint globalPosition);
-	void touchFinish();
-
-	QString _oldtext;
-	rpl::variable<QString> _placeholderFull;
-	QString _placeholder;
-
-	bool _customUpDown = false;
-
-	bool _focused = false;
-	bool _placeholderVisible = true;
-	Animations::Simple _placeholderFocusedAnimation;
-	Animations::Simple _placeholderVisibleAnimation;
-	bool _lastPreEditTextNotEmpty = false;
-
-	const style::FlatInput &_st;
-	QMargins _textMrg;
-
-	QTimer _touchTimer;
-	bool _touchPress = false;
-	bool _touchRightButton = false;
-	bool _touchMove = false;
-	bool _mousePressedInTouch = false;
-	QPoint _touchStart;
-
-	base::unique_qptr<PopupMenu> _contextMenu;
-
-};
-
 class CustomEmojiObject : public QObject, public QTextObjectInterface {
 	Q_OBJECT
 	Q_INTERFACES(QTextObjectInterface)
@@ -305,6 +209,7 @@ public:
 	};
 
 	void setAdditionalMargin(int margin);
+	void setAdditionalMargins(QMargins margins);
 
 	void setInstantReplaces(const InstantReplaces &replaces);
 	void setInstantReplacesEnabled(rpl::producer<bool> enabled);
@@ -533,6 +438,21 @@ private:
 
 	bool revertFormatReplace();
 
+	void paintSurrounding(
+		QPainter &p,
+		QRect clip,
+		float64 errorDegree,
+		float64 focusedDegree);
+	void paintRoundSurrounding(
+		QPainter &p,
+		QRect clip,
+		float64 errorDegree,
+		float64 focusedDegree);
+	void paintFlatSurrounding(
+		QPainter &p,
+		QRect clip,
+		float64 errorDegree,
+		float64 focusedDegree);
 	void customEmojiRepaint();
 	void highlightMarkdown();
 
@@ -558,6 +478,8 @@ private:
 	QString _lastPreEditText;
 	std::optional<QString> _inputMethodCommit;
 
+	QMargins _additionalMargins;
+
 	bool _forcePlaceholderHidden = false;
 	bool _reverseMarkdownReplacement = false;
 	bool _customEmojiRepaintScheduled = false;
@@ -584,7 +506,6 @@ private:
 	bool _redoAvailable = false;
 	bool _inDrop = false;
 	bool _inHeightCheck = false;
-	int _additionalMargin = 0;
 
 	bool _customUpDown = false;
 	bool _customTab = false;
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 0c0fbbc..515ea08 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -258,32 +258,9 @@ PopupMenu {
 	showDuration: int;
 }
 
-FlatInput {
-	textColor: color;
-	bgColor: color;
-	bgActive: color;
-	width: pixels;
-	height: pixels;
-	textMrg: margins;
-	align: align;
-	font: font;
-
-	icon: icon;
-
-	borderWidth: pixels;
-	borderColor: color;
-	borderActive: color;
-
-	phColor: color;
-	phFocusColor: color;
-	phPos: point;
-	phAlign: align;
-	phShift: pixels;
-	phDuration: int;
-}
-
 InputField {
 	textBg: color;
+	textBgActive: color; // Used only with borderRadius.
 	textFg: color;
 	textMargins: margins;
 	textAlign: align;
@@ -305,6 +282,7 @@ InputField {
 
 	border: pixels;
 	borderActive: pixels;
+	borderRadius: pixels;
 
 	font: font;
 	menu: PopupMenu;
@@ -731,29 +709,6 @@ defaultSolidScroll: ScrollArea(defaultScrollArea) {
 	hiding: 0;
 }
 
-defaultInputFont: font(17px);
-defaultFlatInput: FlatInput {
-	textColor: windowFg;
-	bgColor: filterInputInactiveBg;
-	bgActive: filterInputActiveBg;
-	width: 210px;
-	height: 40px;
-	align: align(left);
-	textMrg: margins(5px, 5px, 5px, 5px);
-	font: defaultInputFont;
-
-	borderWidth: 2px;
-	borderColor: filterInputInactiveBg;
-	borderActive: filterInputBorderFg;
-
-	phColor: placeholderFg;
-	phFocusColor: placeholderFgActive;
-	phAlign: align(left);
-	phPos: point(2px, 0px);
-	phShift: 50px;
-	phDuration: 100;
-}
-
 defaultCheckboxIcon: icon {{ "default_checkbox_check", overviewCheckFgActive, point(4px, 7px) }};
 
 defaultCheck: Check {
@@ -897,6 +852,7 @@ defaultPopupMenu: PopupMenu {
 
 defaultInputField: InputField {
 	textBg: windowBg;
+	textBgActive: windowBg;
 	textFg: windowFg;
 	textMargins: margins(0px, 28px, 0px, 4px);
 	textAlign: align(topleft);
@@ -917,6 +873,7 @@ defaultInputField: InputField {
 
 	border: 1px;
 	borderActive: 2px;
+	borderRadius: 0px;
 
 	font: boxTextFont;
 	menu: defaultPopupMenu;

From c199a1722fae72e254753f3095444a3c82a2a704 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Oct 2022 11:19:52 +0400
Subject: [PATCH 269/635] Add TextWithTags::empty method.

---
 ui/text/text_entity.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 1986dca..d5a770c 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -256,6 +256,10 @@ struct TextWithTags {
 
 	QString text;
 	Tags tags;
+
+	[[nodiscard]] bool empty() const {
+		return text.isEmpty();
+	}
 };
 
 inline bool operator==(const TextWithTags::Tag &a, const TextWithTags::Tag &b) {

From 7f1dd3c351f534d0564c41376176eb0cd1be4184 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Oct 2022 16:41:11 +0400
Subject: [PATCH 270/635] Add Ui::Text::Link(TextWithEntities, url/index).

---
 ui/text/text_utilities.cpp | 10 +++++++++-
 ui/text/text_utilities.h   |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ui/text/text_utilities.cpp b/ui/text/text_utilities.cpp
index 7e16fa1..59dfef0 100644
--- a/ui/text/text_utilities.cpp
+++ b/ui/text/text_utilities.cpp
@@ -43,7 +43,15 @@ TextWithEntities Link(const QString &text, const QString &url) {
 }
 
 TextWithEntities Link(const QString &text, int index) {
-	return Link(text, QString("internal:index") + QChar(index));
+	return Link(text, u"internal:index"_q + QChar(index));
+}
+
+TextWithEntities Link(TextWithEntities text, const QString &url) {
+	return Wrapped(std::move(text), EntityType::CustomUrl, url);
+}
+
+TextWithEntities Link(TextWithEntities text, int index) {
+	return Link(std::move(text), u"internal:index"_q + QChar(index));
 }
 
 TextWithEntities PlainLink(const QString &text) {
diff --git a/ui/text/text_utilities.h b/ui/text/text_utilities.h
index e41b9a8..61721ef 100644
--- a/ui/text/text_utilities.h
+++ b/ui/text/text_utilities.h
@@ -29,8 +29,12 @@ inline constexpr auto Upper = details::ToUpperType{};
 [[nodiscard]] TextWithEntities Italic(const QString &text);
 [[nodiscard]] TextWithEntities Link(
 	const QString &text,
-	const QString &url = "internal:action");
+	const QString &url = u"internal:action"_q);
 [[nodiscard]] TextWithEntities Link(const QString &text, int index);
+[[nodiscard]] TextWithEntities Link(
+	TextWithEntities text,
+	const QString &url = u"internal:action"_q);
+[[nodiscard]] TextWithEntities Link(TextWithEntities text, int index);
 [[nodiscard]] TextWithEntities PlainLink(const QString &text);
 [[nodiscard]] TextWithEntities Wrapped(
 	TextWithEntities text,

From 865056eec8986bfbdc7f1194ef16ea9db6243742 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Oct 2022 17:50:18 +0400
Subject: [PATCH 271/635] Allow locked toggles in SettingsButton.

---
 ui/widgets/buttons.cpp  | 6 ++++++
 ui/widgets/buttons.h    | 1 +
 ui/widgets/checkbox.cpp | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index bd49ebe..7a63bd4 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -736,6 +736,12 @@ bool SettingsButton::toggled() const {
 	return _toggle ? _toggle->checked() : false;
 }
 
+void SettingsButton::setToggleLocked(bool locked) {
+	if (_toggle) {
+		_toggle->setLocked(locked);
+	}
+}
+
 rpl::producer<bool> SettingsButton::toggledChanges() const {
 	if (_toggle) {
 		return _toggle->checkedChanges();
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index bacae3d..5f426d3 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -270,6 +270,7 @@ public:
 	rpl::producer<bool> toggledChanges() const;
 	rpl::producer<bool> toggledValue() const;
 
+	void setToggleLocked(bool locked);
 	void setColorOverride(std::optional<QColor> textColorOverride);
 	void setPaddingOverride(style::margins padding);
 
diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index cbd1cb3..1a22e28 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -121,7 +121,7 @@ void ToggleView::paint(QPainter &p, int left, int top, int outerWidth) {
 	p.setBrush(anim::brush(_st->untoggledBg, _st->toggledBg, toggled));
 	p.drawEllipse(fgRect);
 
-	if (_st->xsize > 0) {
+	if (_locked || _st->xsize > 0) {
 		p.setPen(Qt::NoPen);
 		p.setBrush(fgBrush);
 		if (_locked) {

From 09e8850dfd9a531449afbb730072a206a0784f6e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 3 Oct 2022 12:42:57 +0400
Subject: [PATCH 272/635] Adapt for target_prepare_qrc changes

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d94a186..63551ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,6 @@ generate_styles(lib_ui ${src_loc} "${style_files}" ui/colors.palette)
 generate_emoji(lib_ui emoji.txt emoji_suggestions/emoji_autocomplete.json)
 
 set_target_properties(lib_ui PROPERTIES AUTOMOC ON)
-target_prepare_qrc(lib_ui)
 
 target_precompile_headers(lib_ui PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/ui/ui_pch.h>)
 nice_target_sources(lib_ui ${src_loc}
@@ -319,3 +318,5 @@ PRIVATE
     desktop-app::external_lz4
     desktop-app::external_xxhash
 )
+
+target_prepare_qrc(lib_ui)

From c3616927ebfcbe98375189be87821bea202d9587 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Nov 2022 19:22:03 +0400
Subject: [PATCH 273/635] Add CreateAddActionCallback for non-owned menu.

---
 ui/widgets/menu/menu_add_action_callback_factory.cpp | 10 +++++++---
 ui/widgets/menu/menu_add_action_callback_factory.h   |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/menu/menu_add_action_callback_factory.cpp b/ui/widgets/menu/menu_add_action_callback_factory.cpp
index 2d1c73e..6b2ed64 100644
--- a/ui/widgets/menu/menu_add_action_callback_factory.cpp
+++ b/ui/widgets/menu/menu_add_action_callback_factory.cpp
@@ -14,9 +14,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui::Menu {
 
-MenuCallback CreateAddActionCallback(
-		const base::unique_qptr<Ui::PopupMenu> &menu) {
-	return MenuCallback([&](MenuCallback::Args a) {
+MenuCallback CreateAddActionCallback(not_null<Ui::PopupMenu*> menu) {
+	return MenuCallback([=](MenuCallback::Args a) {
 		if (a.fillSubmenu) {
 			const auto action = menu->addAction(
 				a.text,
@@ -43,4 +42,9 @@ MenuCallback CreateAddActionCallback(
 	});
 }
 
+MenuCallback CreateAddActionCallback(
+		const base::unique_qptr<Ui::PopupMenu> &menu) {
+	return CreateAddActionCallback(menu.get());
+}
+
 } // namespace Ui::Menu
diff --git a/ui/widgets/menu/menu_add_action_callback_factory.h b/ui/widgets/menu/menu_add_action_callback_factory.h
index 3d9b37a..5091845 100644
--- a/ui/widgets/menu/menu_add_action_callback_factory.h
+++ b/ui/widgets/menu/menu_add_action_callback_factory.h
@@ -17,6 +17,8 @@ namespace Ui::Menu {
 
 struct MenuCallback;
 
+[[nodiscard]] MenuCallback CreateAddActionCallback(
+	not_null<Ui::PopupMenu*> menu);
 [[nodiscard]] MenuCallback CreateAddActionCallback(
 	const base::unique_qptr<Ui::PopupMenu> &menu);
 

From 4539d0bab4ffc335de79b77ee9632f6a7b59d48b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 2 Nov 2022 16:38:17 +0400
Subject: [PATCH 274/635] Add PlainLink(TextWithEntities) and
 SingleCustomEmoji.

---
 ui/text/text_utilities.cpp | 11 +++++++++++
 ui/text/text_utilities.h   |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/ui/text/text_utilities.cpp b/ui/text/text_utilities.cpp
index 59dfef0..c2c5114 100644
--- a/ui/text/text_utilities.cpp
+++ b/ui/text/text_utilities.cpp
@@ -58,6 +58,10 @@ TextWithEntities PlainLink(const QString &text) {
 	return WithSingleEntity(text, EntityType::PlainLink);
 }
 
+TextWithEntities PlainLink(TextWithEntities text) {
+	return Wrapped(std::move(text), EntityType::PlainLink, QString());
+}
+
 TextWithEntities Wrapped(
 		TextWithEntities text,
 		EntityType type,
@@ -100,6 +104,13 @@ TextWithEntities RichLangValue(const QString &text) {
 	return result;
 }
 
+TextWithEntities SingleCustomEmoji(QString data) {
+	return {
+		u"@"_q,
+		{ EntityInText(EntityType::CustomEmoji, 0, 1, data) },
+	};
+}
+
 TextWithEntities Mid(const TextWithEntities &text, int position, int n) {
 	if (n == -1) {
 		n = int(text.text.size()) - position;
diff --git a/ui/text/text_utilities.h b/ui/text/text_utilities.h
index 61721ef..e493cec 100644
--- a/ui/text/text_utilities.h
+++ b/ui/text/text_utilities.h
@@ -36,6 +36,7 @@ inline constexpr auto Upper = details::ToUpperType{};
 	const QString &url = u"internal:action"_q);
 [[nodiscard]] TextWithEntities Link(TextWithEntities text, int index);
 [[nodiscard]] TextWithEntities PlainLink(const QString &text);
+[[nodiscard]] TextWithEntities PlainLink(TextWithEntities text);
 [[nodiscard]] TextWithEntities Wrapped(
 	TextWithEntities text,
 	EntityType type,
@@ -45,6 +46,8 @@ inline constexpr auto Upper = details::ToUpperType{};
 	return { text };
 }
 
+[[nodiscard]] TextWithEntities SingleCustomEmoji(QString data);
+
 [[nodiscard]] inline auto ToUpper() {
 	return rpl::map(Upper);
 }

From 3752e158e43a7aa8ca7641017de1abca01270fc6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Nov 2022 12:33:57 +0400
Subject: [PATCH 275/635] Fix spoilers with multi-item elision blocks.

---
 ui/text/text_renderer.cpp | 30 +++++++++++++++++-------------
 ui/text/text_renderer.h   |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 6c2b824..2ad871c 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -708,9 +708,10 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 
 	applyBlockProperties(currentBlock);
 	for (int i = 0; i < nItems; ++i) {
-		int item = firstItem + visualOrder[i];
-		const QScriptItem &si = engine.layoutData->items.at(item);
-		bool rtl = (si.analysis.bidiLevel % 2);
+		const auto item = firstItem + visualOrder[i];
+		const auto isLastItem = (item == lastItem);
+		const auto &si = engine.layoutData->items.at(item);
+		const auto rtl = (si.analysis.bidiLevel % 2);
 
 		while (blockIndex > _lineStartBlock + 1 && _t->_blocks[blockIndex - 1]->from() > _localFrom + si.position) {
 			nextBlock = currentBlock;
@@ -842,7 +843,10 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					}
 				}
 				if (hasSpoiler) {
-					pushSpoilerRange(fillSpoiler, fillSelect, blockIndex);
+					// Elided item should be a text item
+					// with '...' at the end, so this should not be it.
+					const auto isElidedItem = false;
+					pushSpoilerRange(fillSpoiler, fillSelect, isElidedItem);
 				}
 			//} else if (_p && currentBlock->type() == TextBlockSkip) { // debug
 			//	_p->fillRect(QRect(x.toInt(), _y, currentBlock->width(), static_cast<SkipBlock*>(currentBlock)->height()), QColor(0, 0, 0, 32));
@@ -986,12 +990,12 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 			const auto hasSpoiler = _background.spoiler
 				&& (_spoilerOpacity > 0.);
 			const auto opacity = _p->opacity();
-			const auto isElidedBlock = !rtl
-				&& (_indexOfElidedBlock == blockIndex);
+			const auto isElidedItem = (_indexOfElidedBlock == blockIndex)
+				&& isLastItem;
 			const auto complexClipping = hasSpoiler
-				&& isElidedBlock
+				&& isElidedItem
 				&& (_spoilerOpacity == 1.);
-			if (!hasSpoiler || (_spoilerOpacity < 1.) || isElidedBlock) {
+			if (!hasSpoiler || (_spoilerOpacity < 1.) || isElidedItem) {
 				const auto complexClippingEnabled = complexClipping
 					&& _p->hasClipping();
 				const auto complexClippingRegion = complexClipping
@@ -1008,7 +1012,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 							elided,
 							_y + 2 * _lineHeight),
 						Qt::IntersectClip);
-				} else if (hasSpoiler && !isElidedBlock) {
+				} else if (hasSpoiler && !isElidedItem) {
 					_p->setOpacity(opacity * (1. - _spoilerOpacity));
 				}
 				if (Q_UNLIKELY(hasSelected)) {
@@ -1060,13 +1064,13 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					} else {
 						_p->setClipping(false);
 					}
-				} else if (hasSpoiler && !isElidedBlock) {
+				} else if (hasSpoiler && !isElidedItem) {
 					_p->setOpacity(opacity);
 				}
 			}
 
 			if (hasSpoiler) {
-				pushSpoilerRange(itemRange, fillSelect, blockIndex);
+				pushSpoilerRange(itemRange, fillSelect, isElidedItem);
 			}
 		}
 
@@ -1088,11 +1092,11 @@ void Renderer::fillSelectRange(FixedRange range) {
 void Renderer::pushSpoilerRange(
 		FixedRange range,
 		FixedRange selected,
-		int currentBlockIndex) {
+		bool isElidedItem) {
 	if (!_background.spoiler || !_spoiler) {
 		return;
 	}
-	const auto elided = (_indexOfElidedBlock == currentBlockIndex)
+	const auto elided = isElidedItem
 		? (_elideRemoveFromEnd + _f->elidew)
 		: 0;
 	range.till -= elided;
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 544ee55..aa41bb5 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -62,7 +62,7 @@ private:
 	void pushSpoilerRange(
 		FixedRange range,
 		FixedRange selected,
-		int currentBlockIndex);
+		bool isElidedItem);
 	void fillSpoilerRects();
 	void fillSpoilerRects(
 		QVarLengthArray<QRect, kSpoilersRectsSize> &rects,

From 3f28dfa821a85debe162c39ab64d1967f6029126 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 11 Nov 2022 08:21:54 +0400
Subject: [PATCH 276/635] Replace custom waitForInterfaceAnnounce with
 wl_display_roundtrip

---
 .../linux/ui_linux_wayland_integration.cpp    | 40 +------------------
 .../linux/ui_linux_wayland_integration.h      |  1 -
 .../ui_linux_wayland_integration_dummy.cpp    |  3 --
 ui/platform/linux/ui_window_linux.cpp         |  6 +--
 4 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index aac886c..0ad5ff3 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -30,25 +30,15 @@ struct WlRegistryDeleter {
 	}
 };
 
-struct WlCallbackDeleter {
-	void operator()(wl_callback *value) {
-		wl_callback_destroy(value);
-	}
-};
-
 } // namespace
 
 struct WaylandIntegration::Private {
 	std::unique_ptr<wl_registry, WlRegistryDeleter> registry;
-	std::unique_ptr<wl_callback, WlCallbackDeleter> callback;
-	QEventLoop interfacesLoop;
-	bool interfacesAnnounced = false;
 	bool xdgDecorationSupported = false;
 	uint32_t xdgDecorationName = 0;
 	rpl::lifetime lifetime;
 
 	static const struct wl_registry_listener RegistryListener;
-	static const struct wl_callback_listener CallbackListener;
 };
 
 const struct wl_registry_listener WaylandIntegration::Private::RegistryListener = {
@@ -72,19 +62,6 @@ const struct wl_registry_listener WaylandIntegration::Private::RegistryListener
 	}),
 };
 
-const struct wl_callback_listener WaylandIntegration::Private::CallbackListener = {
-	decltype(wl_callback_listener::done)(+[](
-			Private *data,
-			wl_callback *callback,
-			uint32_t serial) {
-		data->interfacesAnnounced = true;
-		if (data->interfacesLoop.isRunning()) {
-			data->interfacesLoop.quit();
-		}
-		data->callback = nullptr;
-	}),
-};
-
 WaylandIntegration::WaylandIntegration()
 : _private(std::make_unique<Private>()) {
 	const auto native = QGuiApplication::platformNativeInterface();
@@ -100,26 +77,20 @@ WaylandIntegration::WaylandIntegration()
 	}
 
 	_private->registry.reset(wl_display_get_registry(display));
-	_private->callback.reset(wl_display_sync(display));
-
 	wl_registry_add_listener(
 		_private->registry.get(),
 		&Private::RegistryListener,
 		_private.get());
 
-	wl_callback_add_listener(
-		_private->callback.get(),
-		&Private::CallbackListener,
-		_private.get());
-
 	base::qt_signal_producer(
 		native,
 		&QObject::destroyed
 	) | rpl::start_with_next([=] {
 		// too late for standard destructors, just free
-		free(_private->callback.release());
 		free(_private->registry.release());
 	}, _private->lifetime);
+
+	wl_display_roundtrip(display);
 }
 
 WaylandIntegration::~WaylandIntegration() = default;
@@ -130,13 +101,6 @@ WaylandIntegration *WaylandIntegration::Instance() {
 	return &instance;
 }
 
-void WaylandIntegration::waitForInterfaceAnnounce() {
-	Expects(!_private->interfacesLoop.isRunning());
-	if (!_private->interfacesAnnounced) {
-		_private->interfacesLoop.exec();
-	}
-}
-
 bool WaylandIntegration::xdgDecorationSupported() {
 	return _private->xdgDecorationSupported;
 }
diff --git a/ui/platform/linux/ui_linux_wayland_integration.h b/ui/platform/linux/ui_linux_wayland_integration.h
index 543f871..ef089d2 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.h
+++ b/ui/platform/linux/ui_linux_wayland_integration.h
@@ -16,7 +16,6 @@ class WaylandIntegration {
 public:
 	[[nodiscard]] static WaylandIntegration *Instance();
 
-	void waitForInterfaceAnnounce();
 	[[nodiscard]] bool xdgDecorationSupported();
 	[[nodiscard]] bool windowExtentsSupported();
 	void setWindowExtents(not_null<QWidget*> widget, const QMargins &extents);
diff --git a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
index 626b689..87b6203 100644
--- a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
@@ -26,9 +26,6 @@ WaylandIntegration *WaylandIntegration::Instance() {
 	return &instance;
 }
 
-void WaylandIntegration::waitForInterfaceAnnounce() {
-}
-
 bool WaylandIntegration::xdgDecorationSupported() {
 	return false;
 }
diff --git a/ui/platform/linux/ui_window_linux.cpp b/ui/platform/linux/ui_window_linux.cpp
index 4023cc4..a0b9cad 100644
--- a/ui/platform/linux/ui_window_linux.cpp
+++ b/ui/platform/linux/ui_window_linux.cpp
@@ -17,10 +17,8 @@ std::unique_ptr<BasicWindowHelper> CreateSpecialWindowHelper(
 }
 
 bool NativeWindowFrameSupported() {
-	const auto waylandIntegration = WaylandIntegration::Instance();
-	if (waylandIntegration) {
-		waylandIntegration->waitForInterfaceAnnounce();
-		return waylandIntegration->xdgDecorationSupported();
+	if (const auto integration = WaylandIntegration::Instance()) {
+		return integration->xdgDecorationSupported();
 	}
 	return true;
 }

From 1ee4b34bf6859e10173a48e73fd504d451f8a94c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 12 Nov 2022 14:10:35 +0300
Subject: [PATCH 277/635] Added ability to set minimal height for slide wrap.

---
 ui/wrap/slide_wrap.cpp | 13 ++++++++++---
 ui/wrap/slide_wrap.h   |  2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ui/wrap/slide_wrap.cpp b/ui/wrap/slide_wrap.cpp
index 15da77b..94dc3f2 100644
--- a/ui/wrap/slide_wrap.cpp
+++ b/ui/wrap/slide_wrap.cpp
@@ -96,6 +96,10 @@ SlideWrap<RpWidget> *SlideWrap<RpWidget>::toggleOn(
 	return this;
 }
 
+void SlideWrap<RpWidget>::setMinimalHeight(int height) {
+	_minimalHeight = height;
+}
+
 void SlideWrap<RpWidget>::animationStep() {
 	const auto weak = wrapped();
 	if (weak && !_up) {
@@ -106,8 +110,11 @@ void SlideWrap<RpWidget>::animationStep() {
 	const auto current = _animation.value(_toggled ? 1. : 0.);
 	const auto newHeight = weak
 		? (_animation.animating()
-			? anim::interpolate(0, weak->heightNoMargins(), current)
-			: (_toggled ? weak->height() : 0))
+			? anim::interpolate(
+				_minimalHeight,
+				weak->heightNoMargins(),
+				current)
+			: (_toggled ? weak->height() : _minimalHeight))
 		: 0;
 	if (weak && _up) {
 		const auto margins = getMargins();
@@ -121,7 +128,7 @@ void SlideWrap<RpWidget>::animationStep() {
 	const auto shouldBeHidden = !_toggled && !_animation.animating();
 	if (shouldBeHidden != isHidden()) {
 		const auto guard = MakeWeak(this);
-		setVisible(!shouldBeHidden);
+		setVisible(!shouldBeHidden || _minimalHeight);
 		if (shouldBeHidden && guard) {
 			SendPendingMoveResizeEvents(this);
 		}
diff --git a/ui/wrap/slide_wrap.h b/ui/wrap/slide_wrap.h
index fcee961..8ce4006 100644
--- a/ui/wrap/slide_wrap.h
+++ b/ui/wrap/slide_wrap.h
@@ -53,6 +53,7 @@ public:
 	auto toggledValue() const {
 		return _toggledChanged.events_starting_with_copy(_toggled);
 	}
+	void setMinimalHeight(int height);
 
 	QMargins getMargins() const override;
 
@@ -68,6 +69,7 @@ private:
 	int _duration = 0;
 	bool _toggled = true;
 	bool _up = false;
+	int _minimalHeight = 0;
 
 };
 

From e6064719dfb885910b73e0e90da8a66afa98f75a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 12 Nov 2022 14:12:02 +0300
Subject: [PATCH 278/635] Changed behavior to always center generic boxes.

---
 ui/layers/generic_box.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index e61ea3f..016e424 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -32,7 +32,8 @@ void GenericBox::prepare() {
 		const auto desired = top + height;
 		setDimensions(
 			currentWidth,
-			_maxHeight ? std::min(desired, _maxHeight) : desired);
+			_maxHeight ? std::min(desired, _maxHeight) : desired,
+			true);
 	}, wrap->lifetime());
 
 	setInnerWidget(

From 0937ac0ad0feaf3cbccf009e0e1f2a04cc0ef9f8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Nov 2022 13:41:12 +0400
Subject: [PATCH 279/635] Allow custom context menus on labels.

---
 ui/widgets/labels.cpp | 74 +++++++++++++++++++++++++++----------------
 ui/widgets/labels.h   | 11 +++++++
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 3225978..7d44cae 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -403,6 +403,10 @@ void FlatLabel::overrideLinkClickHandler(Fn<void(QString url)> handler) {
 	});
 }
 
+void FlatLabel::setContextMenuHook(Fn<void(ContextMenuRequest)> hook) {
+	_contextMenuHook = std::move(hook);
+}
+
 void FlatLabel::mouseMoveEvent(QMouseEvent *e) {
 	_lastMousePos = e->globalPos();
 	dragActionUpdate();
@@ -579,7 +583,7 @@ void FlatLabel::keyPressEvent(QKeyEvent *e) {
 }
 
 void FlatLabel::contextMenuEvent(QContextMenuEvent *e) {
-	if (!_selectable && !_text.hasLinks()) {
+	if (!_contextMenuHook && !_selectable && !_text.hasLinks()) {
 		return;
 	}
 
@@ -661,42 +665,27 @@ void FlatLabel::showContextMenu(QContextMenuEvent *e, ContextMenuReason reason)
 	} else {
 		_lastMousePos = QCursor::pos();
 	}
-	auto state = dragActionUpdate();
-
+	const auto state = dragActionUpdate();
 	const auto hasSelection = _selectable && !_selection.empty();
 	const auto uponSelection = _selectable
 		&& ((reason == ContextMenuReason::FromTouch && hasSelection)
 			|| (state.uponSymbol
 				&& (state.symbol >= _selection.from)
 				&& (state.symbol < _selection.to)));
-	const auto fullSelection = _selectable
-		&& _text.isFullSelection(_selection);
 
 	_contextMenu = base::make_unique_q<PopupMenu>(this, _stMenu);
+	const auto request = ContextMenuRequest{
+		.menu = _contextMenu.get(),
+		.link = ClickHandler::getActive(),
+		.hasSelection = hasSelection,
+		.uponSelection = uponSelection,
+		.fullSelection = _selectable && _text.isFullSelection(_selection),
+	};
 
-	if (fullSelection && !_contextCopyText.isEmpty()) {
-		_contextMenu->addAction(
-			_contextCopyText,
-			[=] { copyContextText(); });
-	} else if (uponSelection && !fullSelection) {
-		_contextMenu->addAction(
-			Integration::Instance().phraseContextCopySelected(),
-			[=] { copySelectedText(); });
-	} else if (_selectable && !hasSelection && !_contextCopyText.isEmpty()) {
-		_contextMenu->addAction(
-			_contextCopyText,
-			[=] { copyContextText(); });
-	}
-
-	if (const auto link = ClickHandler::getActive()) {
-		const auto actionText = link->copyToClipboardContextItemText();
-		if (!actionText.isEmpty()) {
-			_contextMenu->addAction(
-				actionText,
-				[text = link->copyToClipboardText()] {
-					QGuiApplication::clipboard()->setText(text);
-				});
-		}
+	if (_contextMenuHook) {
+		_contextMenuHook(request);
+	} else {
+		fillContextMenu(request);
 	}
 
 	if (_contextMenu->empty()) {
@@ -707,6 +696,35 @@ void FlatLabel::showContextMenu(QContextMenuEvent *e, ContextMenuReason reason)
 	}
 }
 
+void FlatLabel::fillContextMenu(ContextMenuRequest request) {
+	if (request.fullSelection && !_contextCopyText.isEmpty()) {
+		request.menu->addAction(
+			_contextCopyText,
+			[=] { copyContextText(); });
+	} else if (request.uponSelection && !request.fullSelection) {
+		request.menu->addAction(
+			Integration::Instance().phraseContextCopySelected(),
+			[=] { copySelectedText(); });
+	} else if (_selectable
+		&& !request.hasSelection
+		&& !_contextCopyText.isEmpty()) {
+		request.menu->addAction(
+			_contextCopyText,
+			[=] { copyContextText(); });
+	}
+
+	if (request.link) {
+		const auto label = request.link->copyToClipboardContextItemText();
+		if (!label.isEmpty()) {
+			request.menu->addAction(
+				label,
+				[text = request.link->copyToClipboardText()] {
+					QGuiApplication::clipboard()->setText(text);
+				});
+		}
+	}
+}
+
 void FlatLabel::copySelectedText() {
 	const auto selection = _selection.empty() ? (_contextMenu ? _savedSelection : _selection) : _selection;
 	if (!selection.empty()) {
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index b7ab34d..62402d1 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -142,6 +142,15 @@ public:
 	void overrideLinkClickHandler(Fn<void()> handler);
 	void overrideLinkClickHandler(Fn<void(QString url)> handler);
 
+	struct ContextMenuRequest {
+		not_null<PopupMenu*> menu;
+		ClickHandlerPtr link;
+		bool hasSelection = false;
+		bool uponSelection = false;
+		bool fullSelection = false;
+	};
+	void setContextMenuHook(Fn<void(ContextMenuRequest)> hook);
+
 	// ClickHandlerHost interface
 	void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) override;
 	void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) override;
@@ -201,6 +210,7 @@ private:
 		FromTouch,
 	};
 	void showContextMenu(QContextMenuEvent *e, ContextMenuReason reason);
+	void fillContextMenu(ContextMenuRequest request);
 
 	Text::String _text;
 	const style::FlatLabel &_st;
@@ -237,6 +247,7 @@ private:
 	base::Timer _trippleClickTimer;
 
 	base::unique_qptr<PopupMenu> _contextMenu;
+	Fn<void(ContextMenuRequest)> _contextMenuHook;
 	QString _contextCopyText;
 
 	ClickHandlerFilter _clickHandlerFilter;

From 6d7cb504eebaf2afab103230d9760dfed47a1cc0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 26 Nov 2022 18:12:52 +0300
Subject: [PATCH 280/635] Fixed ability of manual resizing of popup menu on
 macOS.

---
 ui/widgets/popup_menu.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index db6a97d..1b6b66b 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -380,7 +380,16 @@ void PopupMenu::handleMenuResize() {
 	_scroll->resize(
 		newWidth - _padding.left() - _padding.right(),
 		scrollHeight);
-	resize(newWidth, _padding.top() + scrollHeight + _padding.bottom());
+	{
+		const auto newSize = QSize(
+			newWidth,
+			_padding.top() + scrollHeight + _padding.bottom());
+		if (::Platform::IsMac()) {
+			setMaximumSize(newSize);
+			setMinimumSize(newSize);
+		}
+		resize(newSize);
+	}
 	_inner = rect().marginsRemoved(_padding);
 }
 

From 4a0c3ead7a42caefbc145d212d9632921326c664 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 27 Nov 2022 14:30:41 +0300
Subject: [PATCH 281/635] Added initial implementation of FollowSlideWrap.

---
 CMakeLists.txt                |  2 ++
 ui/wrap/follow_slide_wrap.cpp | 47 ++++++++++++++++++++++++++++++
 ui/wrap/follow_slide_wrap.h   | 54 +++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 ui/wrap/follow_slide_wrap.cpp
 create mode 100644 ui/wrap/follow_slide_wrap.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63551ea..2a6be3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,6 +233,8 @@ PRIVATE
     ui/widgets/tooltip.h
     ui/wrap/fade_wrap.cpp
     ui/wrap/fade_wrap.h
+    ui/wrap/follow_slide_wrap.cpp
+    ui/wrap/follow_slide_wrap.h
     ui/wrap/padding_wrap.cpp
     ui/wrap/padding_wrap.h
     ui/wrap/slide_wrap.cpp
diff --git a/ui/wrap/follow_slide_wrap.cpp b/ui/wrap/follow_slide_wrap.cpp
new file mode 100644
index 0000000..8eedd74
--- /dev/null
+++ b/ui/wrap/follow_slide_wrap.cpp
@@ -0,0 +1,47 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/wrap/follow_slide_wrap.h"
+
+#include "styles/style_basic.h"
+
+namespace Ui {
+
+FollowSlideWrap<RpWidget>::FollowSlideWrap(
+	QWidget *parent,
+	object_ptr<RpWidget> &&child)
+: Parent(parent, std::move(child))
+, _duration(st::slideWrapDuration) {
+	if (const auto weak = wrapped()) {
+		wrappedSizeUpdated(weak->size());
+	}
+}
+
+FollowSlideWrap<RpWidget> *FollowSlideWrap<RpWidget>::setDuration(
+		crl::time duration) {
+	_duration = duration;
+	return this;
+}
+
+int FollowSlideWrap<RpWidget>::naturalWidth() const {
+	return -1;
+}
+
+void FollowSlideWrap<RpWidget>::wrappedSizeUpdated(QSize size) {
+	updateWrappedPosition(size.height());
+}
+
+void FollowSlideWrap<RpWidget>::updateWrappedPosition(int forHeight) {
+	_animation.stop();
+	_animation.start(
+		[=](float64 value) { resize(width(), value); },
+		height(),
+		forHeight,
+		_duration);
+}
+
+} // namespace Ui
+
diff --git a/ui/wrap/follow_slide_wrap.h b/ui/wrap/follow_slide_wrap.h
new file mode 100644
index 0000000..842ac85
--- /dev/null
+++ b/ui/wrap/follow_slide_wrap.h
@@ -0,0 +1,54 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/effects/animations.h"
+#include "ui/wrap/wrap.h"
+
+namespace Ui {
+
+template <typename Widget = RpWidget>
+class FollowSlideWrap;
+
+template <>
+class FollowSlideWrap<RpWidget> : public Wrap<RpWidget> {
+	using Parent = Wrap<RpWidget>;
+
+public:
+	FollowSlideWrap(
+		QWidget *parent,
+		object_ptr<RpWidget> &&child);
+
+	FollowSlideWrap *setDuration(crl::time duration);
+	int naturalWidth() const override;
+
+protected:
+	void wrappedSizeUpdated(QSize size) override;
+
+private:
+	void updateWrappedPosition(int forHeight);
+
+	Animations::Simple _animation;
+	crl::time _duration = 0;
+
+};
+
+template <typename Widget>
+class FollowSlideWrap : public Wrap<Widget, FollowSlideWrap<RpWidget>> {
+	using Parent = Wrap<Widget, FollowSlideWrap<RpWidget>>;
+
+public:
+	FollowSlideWrap(
+		QWidget *parent,
+		object_ptr<Widget> &&child)
+	: Parent(parent, std::move(child)) {
+	}
+
+};
+
+} // namespace Ui
+

From c197c1831d1af48cf769f271a126af2c2eaf8185 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 29 Nov 2022 14:10:47 +0300
Subject: [PATCH 282/635] Added ability to clear items in vertical layout.

---
 ui/wrap/vertical_layout.cpp | 6 ++++++
 ui/wrap/vertical_layout.h   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ui/wrap/vertical_layout.cpp b/ui/wrap/vertical_layout.cpp
index 37ec354..4ebdeb9 100644
--- a/ui/wrap/vertical_layout.cpp
+++ b/ui/wrap/vertical_layout.cpp
@@ -198,4 +198,10 @@ void VerticalLayout::removeChild(RpWidget *child) {
 	resize(width(), margins.top() + top + margins.bottom());
 }
 
+void VerticalLayout::clear() {
+	while (!_rows.empty()) {
+		removeChild(_rows.front().widget.data());
+	}
+}
+
 } // namespace Ui
diff --git a/ui/wrap/vertical_layout.h b/ui/wrap/vertical_layout.h
index 6df45c8..d736ba4 100644
--- a/ui/wrap/vertical_layout.h
+++ b/ui/wrap/vertical_layout.h
@@ -54,6 +54,8 @@ public:
 	void setVerticalShift(int index, int shift);
 	void reorderRows(int oldIndex, int newIndex);
 
+	void clear();
+
 protected:
 	int resizeGetHeight(int newWidth) override;
 	void visibleTopBottomUpdated(

From 6c345d2076e0b1997ef64b13f617bf5afbaf396b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 29 Nov 2022 15:09:50 +0300
Subject: [PATCH 283/635] Added ability to fill default context menu for
 FlatLabel from external.

---
 ui/widgets/labels.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index 62402d1..2da193e 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -150,6 +150,7 @@ public:
 		bool fullSelection = false;
 	};
 	void setContextMenuHook(Fn<void(ContextMenuRequest)> hook);
+	void fillContextMenu(ContextMenuRequest request);
 
 	// ClickHandlerHost interface
 	void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) override;
@@ -210,7 +211,6 @@ private:
 		FromTouch,
 	};
 	void showContextMenu(QContextMenuEvent *e, ContextMenuReason reason);
-	void fillContextMenu(ContextMenuRequest request);
 
 	Text::String _text;
 	const style::FlatLabel &_st;

From ff821bc3d79761a2b801bd067d38d2a4d7f766e3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 3 Dec 2022 17:09:05 +0300
Subject: [PATCH 284/635] Changed default behavior to trim last separator in
 popup menu.

---
 ui/widgets/menu/menu.cpp  | 18 ++++++++++++++++++
 ui/widgets/menu/menu.h    |  1 +
 ui/widgets/popup_menu.cpp | 10 ++++++++++
 ui/widgets/popup_menu.h   |  4 ++++
 4 files changed, 33 insertions(+)

diff --git a/ui/widgets/menu/menu.cpp b/ui/widgets/menu/menu.cpp
index e73d344..925abfa 100644
--- a/ui/widgets/menu/menu.cpp
+++ b/ui/widgets/menu/menu.cpp
@@ -218,6 +218,24 @@ void Menu::clearActions() {
 	resizeFromInner(_forceWidth ? _forceWidth : _st.widthMin, _st.skip * 2);
 }
 
+void Menu::clearLastSeparator() {
+	if (_actionWidgets.empty() || _actions.empty()) {
+		return;
+	}
+	if (_actionWidgets.back()->action() == _actions.back()) {
+		if (_actions.back()->isSeparator()) {
+			resizeFromInner(
+				width(),
+				height() - _actionWidgets.back()->height());
+			_actionWidgets.pop_back();
+			if (_actions.back()->parent() == this) {
+				delete _actions.back();
+				_actions.pop_back();
+			}
+		}
+	}
+}
+
 void Menu::finishAnimating() {
 	for (const auto &widget : _actionWidgets) {
 		widget->finishAnimating();
diff --git a/ui/widgets/menu/menu.h b/ui/widgets/menu/menu.h
index b4bb56d..c471ac9 100644
--- a/ui/widgets/menu/menu.h
+++ b/ui/widgets/menu/menu.h
@@ -57,6 +57,7 @@ public:
 		int position,
 		base::unique_qptr<ItemBase> widget);
 	void clearActions();
+	void clearLastSeparator();
 	void finishAnimating();
 
 	bool empty() const;
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 1b6b66b..0968190 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -888,6 +888,12 @@ void PopupMenu::deleteOnHide(bool del) {
 }
 
 void PopupMenu::popup(const QPoint &p) {
+	if (_clearLastSeparator) {
+		_menu->clearLastSeparator();
+		for (const auto &[action, submenu] : _submenus) {
+			submenu->menu()->clearLastSeparator();
+		}
+	}
 	if (prepareGeometryFor(p)) {
 		popupPrepared();
 		return;
@@ -1046,6 +1052,10 @@ void PopupMenu::showPrepared(TriggeredSource source) {
 	activateWindow();
 }
 
+void PopupMenu::setClearLastSeparator(bool clear) {
+	_clearLastSeparator = clear;
+}
+
 PopupMenu::~PopupMenu() {
 	for (const auto &[action, submenu] : base::take(_submenus)) {
 		delete submenu;
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 0eb0a7c..170c1de 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -101,6 +101,8 @@ public:
 	};
 	[[nodiscard]] rpl::producer<ShowState> showStateValue() const;
 
+	void setClearLastSeparator(bool clear);
+
 protected:
 	void paintEvent(QPaintEvent *e) override;
 	void focusOutEvent(QFocusEvent *e) override;
@@ -202,6 +204,8 @@ private:
 	bool _reactivateParent = true;
 	bool _grabbingForPanelAnimation = false;
 
+	bool _clearLastSeparator = true;
+
 	Fn<void()> _destroyedCallback;
 
 };

From eb285b14c70e0410cd155a58e7f3b1e4891820cd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 3 Dec 2022 17:09:12 +0300
Subject: [PATCH 285/635] Added new color keys for empty userpic backgrounds.

---
 ui/colors.palette | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ui/colors.palette b/ui/colors.palette
index c586c18..1b4bcbe 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -290,9 +290,9 @@ historyPeer1UserpicBg: #e17076; // red userpic background
 historyPeer2NameFg: #4fad2d; // green group member name
 historyPeer2NameFgSelected: historyPeer2NameFg; // green group member name in a selected message
 historyPeer2UserpicBg: #7bc862; // green userpic background
-historyPeer3NameFg: #d09306; // yellow group member name
-historyPeer3NameFgSelected: historyPeer3NameFg; // yellow group member name in a selected message
-historyPeer3UserpicBg: #e5ca77; // yellow userpic background
+historyPeer3NameFg: #d09306; // yellow group member name (actually unused)
+historyPeer3NameFgSelected: historyPeer3NameFg; // yellow group member name in a selected message (actually unused)
+historyPeer3UserpicBg: #e5ca77; // yellow userpic background (actually unused)
 historyPeer4NameFg: windowActiveTextFg; // blue group member name
 historyPeer4NameFgSelected: historyPeer4NameFg; // blue group member name in a selected message
 historyPeer4UserpicBg: #65aadd; // blue userpic background
@@ -312,6 +312,16 @@ historyPeerUserpicFg: windowFgActive; // default userpic initials
 historyPeerSavedMessagesBg: historyPeer4UserpicBg; // saved messages userpic background
 historyPeerArchiveUserpicBg: dialogsUnreadBgMuted; // archive folder userpic background
 
+historyPeer1UserpicBg2: #e17076 | historyPeer1UserpicBg; // the second red userpic background
+historyPeer2UserpicBg2: #7bc862 | historyPeer2UserpicBg; // the second green userpic background
+historyPeer3UserpicBg2: #e5ca77 | historyPeer3UserpicBg; // the second yellow userpic background (actually unused)
+historyPeer4UserpicBg2: #65aadd | historyPeer4UserpicBg; // the second blue userpic background
+historyPeer5UserpicBg2: #a695e7 | historyPeer5UserpicBg; // the second purple userpic background
+historyPeer6UserpicBg2: #ee7aae | historyPeer6UserpicBg; // the second pink userpic background
+historyPeer7UserpicBg2: #6ec9cb | historyPeer7UserpicBg; // the second sea userpic background
+historyPeer8UserpicBg2: #faa774 | historyPeer8UserpicBg; // the second orange userpic background
+historyPeerSavedMessagesBg2: historyPeer4UserpicBg2; // the second saved messages userpic background
+
 settingsIconBg1: #f06964; // red settings icon background
 settingsIconBg2: #6dc534; // green settings icon background
 settingsIconBg3: #ed9f20; // light-orange settings icon background

From 113b289f7fb689a9996622eafb20e6f0715f0ec5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 3 Dec 2022 17:13:11 +0300
Subject: [PATCH 286/635] Changed default color keys for empty userpic
 backgrounds.

---
 ui/colors.palette | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ui/colors.palette b/ui/colors.palette
index 1b4bcbe..781b8ae 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -286,40 +286,40 @@ historyForwardChooseFg: windowFgActive; // forwarding messages in a large window
 
 historyPeer1NameFg: #c03d33; // red group member name
 historyPeer1NameFgSelected: historyPeer1NameFg; // red group member name in a selected message
-historyPeer1UserpicBg: #e17076; // red userpic background
+historyPeer1UserpicBg: #ff845e; // red userpic background
 historyPeer2NameFg: #4fad2d; // green group member name
 historyPeer2NameFgSelected: historyPeer2NameFg; // green group member name in a selected message
-historyPeer2UserpicBg: #7bc862; // green userpic background
+historyPeer2UserpicBg: #9ad164; // green userpic background
 historyPeer3NameFg: #d09306; // yellow group member name (actually unused)
 historyPeer3NameFgSelected: historyPeer3NameFg; // yellow group member name in a selected message (actually unused)
 historyPeer3UserpicBg: #e5ca77; // yellow userpic background (actually unused)
 historyPeer4NameFg: windowActiveTextFg; // blue group member name
 historyPeer4NameFgSelected: historyPeer4NameFg; // blue group member name in a selected message
-historyPeer4UserpicBg: #65aadd; // blue userpic background
+historyPeer4UserpicBg: #5caffa; // blue userpic background
 historyPeer5NameFg: #8544d6; // purple group member name
 historyPeer5NameFgSelected: historyPeer5NameFg; // purple group member name in a selected message
-historyPeer5UserpicBg: #a695e7; // purple userpic background
+historyPeer5UserpicBg: #b694f9; // purple userpic background
 historyPeer6NameFg: #cd4073; // pink group member name
 historyPeer6NameFgSelected: historyPeer6NameFg; // pink group member name in a selected message
-historyPeer6UserpicBg: #ee7aae; // pink userpic background
+historyPeer6UserpicBg: #ff8aac; // pink userpic background
 historyPeer7NameFg: #2996ad; // sea group member name
 historyPeer7NameFgSelected: historyPeer7NameFg; // sea group member name in a selected message
-historyPeer7UserpicBg: #6ec9cb; // sea userpic background
+historyPeer7UserpicBg: #5bcbe3; // sea userpic background
 historyPeer8NameFg: #ce671b; // orange group member name
 historyPeer8NameFgSelected: historyPeer8NameFg; // orange group member name in a selected message
-historyPeer8UserpicBg: #faa774; // orange userpic background
+historyPeer8UserpicBg: #febb5b; // orange userpic background
 historyPeerUserpicFg: windowFgActive; // default userpic initials
 historyPeerSavedMessagesBg: historyPeer4UserpicBg; // saved messages userpic background
 historyPeerArchiveUserpicBg: dialogsUnreadBgMuted; // archive folder userpic background
 
-historyPeer1UserpicBg2: #e17076 | historyPeer1UserpicBg; // the second red userpic background
-historyPeer2UserpicBg2: #7bc862 | historyPeer2UserpicBg; // the second green userpic background
+historyPeer1UserpicBg2: #d45246 | historyPeer1UserpicBg; // the second red userpic background
+historyPeer2UserpicBg2: #46ba43 | historyPeer2UserpicBg; // the second green userpic background
 historyPeer3UserpicBg2: #e5ca77 | historyPeer3UserpicBg; // the second yellow userpic background (actually unused)
-historyPeer4UserpicBg2: #65aadd | historyPeer4UserpicBg; // the second blue userpic background
-historyPeer5UserpicBg2: #a695e7 | historyPeer5UserpicBg; // the second purple userpic background
-historyPeer6UserpicBg2: #ee7aae | historyPeer6UserpicBg; // the second pink userpic background
-historyPeer7UserpicBg2: #6ec9cb | historyPeer7UserpicBg; // the second sea userpic background
-historyPeer8UserpicBg2: #faa774 | historyPeer8UserpicBg; // the second orange userpic background
+historyPeer4UserpicBg2: #408acf | historyPeer4UserpicBg; // the second blue userpic background
+historyPeer5UserpicBg2: #6c61df | historyPeer5UserpicBg; // the second purple userpic background
+historyPeer6UserpicBg2: #d95574 | historyPeer6UserpicBg; // the second pink userpic background
+historyPeer7UserpicBg2: #359ad4 | historyPeer7UserpicBg; // the second sea userpic background
+historyPeer8UserpicBg2: #f68136 | historyPeer8UserpicBg; // the second orange userpic background
 historyPeerSavedMessagesBg2: historyPeer4UserpicBg2; // the second saved messages userpic background
 
 settingsIconBg1: #f06964; // red settings icon background

From 22ceaae4ed958d9711965fbe4c1385a7d8c60212 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 4 Dec 2022 18:47:00 +0300
Subject: [PATCH 287/635] Fixed drawing of long window titles on macOS.

---
 ui/platform/mac/ui_window_mac.mm       |  1 +
 ui/platform/mac/ui_window_title_mac.h  |  3 +++
 ui/platform/mac/ui_window_title_mac.mm | 17 ++++++++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index 365ffcc..6d1b182 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -320,6 +320,7 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 		updateCustomTitleVisibility();
 	}
 	init();
+	_title->setControlsRect(_private->controlsRect());
 }
 
 WindowHelper::~WindowHelper() {
diff --git a/ui/platform/mac/ui_window_title_mac.h b/ui/platform/mac/ui_window_title_mac.h
index 3aac917..1dd161d 100644
--- a/ui/platform/mac/ui_window_title_mac.h
+++ b/ui/platform/mac/ui_window_title_mac.h
@@ -28,6 +28,7 @@ public:
 
 	void setText(const QString &text);
 	void setStyle(const style::WindowTitle &st);
+	void setControlsRect(const QRect &rect);
 	[[nodiscard]] QString text() const;
 	[[nodiscard]] bool shouldBeHidden() const;
 
@@ -44,6 +45,8 @@ private:
 	not_null<const style::WindowTitle*> _st;
 	object_ptr<Ui::PlainShadow> _shadow;
 	QString _text;
+	int _textWidth = 0;
+	int _controlsRight = 0;
 	QFont _font;
 
 };
diff --git a/ui/platform/mac/ui_window_title_mac.mm b/ui/platform/mac/ui_window_title_mac.mm
index c660934..76e9c88 100644
--- a/ui/platform/mac/ui_window_title_mac.mm
+++ b/ui/platform/mac/ui_window_title_mac.mm
@@ -30,6 +30,7 @@ TitleWidget::TitleWidget(not_null<RpWidget*> parent, int height)
 void TitleWidget::setText(const QString &text) {
 	if (_text != text) {
 		_text = text;
+		_textWidth = QFontMetrics(_font).horizontalAdvance(_text);
 		update();
 	}
 }
@@ -39,6 +40,10 @@ void TitleWidget::setStyle(const style::WindowTitle &st) {
 	update();
 }
 
+void TitleWidget::setControlsRect(const QRect &rect) {
+	_controlsRight = rect.left() * 2 + rect.width();
+}
+
 bool TitleWidget::shouldBeHidden() const {
 	return !_st->height;
 }
@@ -94,7 +99,17 @@ void TitleWidget::paintEvent(QPaintEvent *e) {
 
 	p.setFont(_font);
 	p.setPen(active ? _st->fgActive : _st->fg);
-	p.drawText(rect(), _text, style::al_center);
+
+	if ((width() - _controlsRight * 2) < _textWidth) {
+		const auto elided = QFontMetrics(_font).elidedText(
+			_text,
+			Qt::ElideRight,
+			width() - _controlsRight);
+		const auto padding = QMargins(_controlsRight, 0, 0, 0);
+		p.drawText(rect() - padding, elided, style::al_left);
+	} else {
+		p.drawText(rect(), _text, style::al_center);
+	}
 }
 
 void TitleWidget::resizeEvent(QResizeEvent *e) {

From 59a7b94ef4bb4d4cf6597d53bdacccbf5720e694 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 5 Dec 2022 16:17:31 +0400
Subject: [PATCH 288/635] Track palette version.

---
 ui/style/style_core.cpp | 6 ++++++
 ui/style/style_core.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ui/style/style_core.cpp b/ui/style/style_core.cpp
index 48d1dd4..5764612 100644
--- a/ui/style/style_core.cpp
+++ b/ui/style/style_core.cpp
@@ -25,6 +25,7 @@ constexpr auto kMinContrastDistance = 64 * 64 * 4;
 constexpr auto kContrastDeltaL = 64;
 
 auto PaletteChanges = rpl::event_stream<>();
+auto PaletteVersion = 0;
 auto ShortAnimationRunning = rpl::variable<bool>(false);
 auto RunningShortAnimations = 0;
 
@@ -73,7 +74,12 @@ rpl::producer<> PaletteChanged() {
 	return internal::PaletteChanges.events();
 }
 
+int PaletteVersion() {
+	return internal::PaletteVersion;
+}
+
 void NotifyPaletteChanged() {
+	++internal::PaletteVersion;
 	internal::PaletteChanges.fire({});
 }
 
diff --git a/ui/style/style_core.h b/ui/style/style_core.h
index cd9324f..035c20f 100644
--- a/ui/style/style_core.h
+++ b/ui/style/style_core.h
@@ -39,6 +39,7 @@ void startManager(int scale);
 void stopManager();
 
 [[nodiscard]] rpl::producer<> PaletteChanged();
+[[nodiscard]] int PaletteVersion();
 void NotifyPaletteChanged();
 
 [[nodiscard]] rpl::producer<bool> ShortAnimationPlaying();

From d5921e742fa9f17f65a25091a184f5a8a72ea779 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 7 Dec 2022 10:59:27 +0400
Subject: [PATCH 289/635] Request LTCG on Windows 32 bit build.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a6be3a..9e60a59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 add_library(lib_ui STATIC)
 add_library(desktop-app::lib_ui ALIAS lib_ui)
-init_target(lib_ui)
+init_target(lib_ui ltcg)
 
 include(cmake/generate_palette.cmake)
 include(cmake/generate_styles.cmake)

From 580e6a561f7d252a94888b54c206e06ac0237c38 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 7 Dec 2022 13:02:48 +0400
Subject: [PATCH 290/635] Don't check box visibility in BoxShow.

---
 ui/layers/box_content.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index bd06178..484dffa 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -327,14 +327,14 @@ BoxShow::~BoxShow() = default;
 void BoxShow::showBox(
 		object_ptr<BoxContent> content,
 		LayerOptions options) const {
-	if (_weak && _weak->isBoxShown()) {
-		_weak->getDelegate()->show(std::move(content), options);
+	if (const auto strong = _weak.data()) {
+		strong->getDelegate()->show(std::move(content), options);
 	}
 }
 
 void BoxShow::hideLayer() const {
-	if (_weak && _weak->isBoxShown()) {
-		_weak->getDelegate()->hideLayer();
+	if (const auto strong = _weak.data()) {
+		strong->getDelegate()->hideLayer();
 	}
 }
 

From 49d9a020a3ce197e6fbf1867519b659d8b87c07d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 12 Dec 2022 18:16:06 +0300
Subject: [PATCH 291/635] Added access to toggle rect for inheritors of
 Ui::SettingsButton.

---
 ui/widgets/buttons.cpp | 4 ++++
 ui/widgets/buttons.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index 7a63bd4..35d6669 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -832,6 +832,10 @@ QRect SettingsButton::toggleRect() const {
 	return { QPoint(left, top), size };
 }
 
+QRect SettingsButton::maybeToggleRect() const {
+	return _toggle ? toggleRect() : QRect(0, 0, 0, 0);
+}
+
 int SettingsButton::resizeGetHeight(int newWidth) {
 	return _padding.top() + _st.height + _padding.bottom();
 }
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index 5f426d3..1885292 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -289,6 +289,8 @@ protected:
 	void paintText(Painter &p, bool over, int outerw) const;
 	void paintToggle(Painter &p, int outerw) const;
 
+	[[nodiscard]] QRect maybeToggleRect() const;
+
 private:
 	void setText(QString &&text);
 	QRect toggleRect() const;

From f339dd377100beaef79af8512c67a3c16f950c3f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 12 Dec 2022 18:16:56 +0300
Subject: [PATCH 292/635] Added support of min height to Ui::GenericBox.

---
 ui/layers/generic_box.cpp | 5 ++++-
 ui/layers/generic_box.h   | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index 016e424..e6ff6af 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -32,7 +32,10 @@ void GenericBox::prepare() {
 		const auto desired = top + height;
 		setDimensions(
 			currentWidth,
-			_maxHeight ? std::min(desired, _maxHeight) : desired,
+			std::clamp(
+				desired,
+				_minHeight ? _minHeight : desired,
+				_maxHeight ? _maxHeight : desired),
 			true);
 	}, wrap->lifetime());
 
diff --git a/ui/layers/generic_box.h b/ui/layers/generic_box.h
index f1a441c..9df6dae 100644
--- a/ui/layers/generic_box.h
+++ b/ui/layers/generic_box.h
@@ -74,6 +74,9 @@ public:
 	void setMaxHeight(int maxHeight) {
 		_maxHeight = maxHeight;
 	}
+	void setMinHeight(int minHeight) {
+		_minHeight = minHeight;
+	}
 	void setScrollStyle(const style::ScrollArea &st) {
 		_scrollSt = &st;
 	}
@@ -137,6 +140,7 @@ private:
 	not_null<Ui::VerticalLayout*> _content;
 	const style::ScrollArea *_scrollSt = nullptr;
 	int _width = 0;
+	int _minHeight = 0;
 	int _maxHeight = 0;
 
 	object_ptr<Ui::RpWidget> _pinnedToTopContent = { nullptr };

From 64d277891403ba3275b47d6ccab849322670cf99 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Dec 2022 22:44:25 +0400
Subject: [PATCH 293/635] Fix rounded image spoiler filling.

---
 ui/effects/spoiler_mess.cpp | 70 +++++++++++++++----------------------
 1 file changed, 28 insertions(+), 42 deletions(-)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index a4d8b8d..e834dbc 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -136,8 +136,12 @@ struct Particle {
 		+ descriptor.particleFadeOutDuration;
 	const auto max = int(std::ceil(speedMax * lifetime));
 	const auto k = speed / lifetime;
-	const auto x = (RandomIndex(2 * max + 1, random) - max) / float64(max);
-	const auto y = sqrt(1 - x * x) * (negative ? -1 : 1);
+	const auto x = (speedMax > 0)
+		? ((RandomIndex(2 * max + 1, random) - max) / float64(max))
+		: 0.;
+	const auto y = (speedMax > 0)
+		? (sqrt(1 - x * x) * (negative ? -1 : 1))
+		: 0.;
 	return { k * x, k * y };
 }
 
@@ -370,10 +374,13 @@ SpoilerMessCached GenerateSpoilerMess(
 		if (now <= 0 || now >= singleDuration) {
 			return;
 		}
-		const auto x = (particle.x + int(base::SafeRound(now * particle.dx)))
-			% size;
-		const auto y = (particle.y + int(base::SafeRound(now * particle.dy)))
-			% size;
+		const auto clamp = [&](int value) {
+			return ((value % size) + size) % size;
+		};
+		const auto x = clamp(
+			particle.x + int(base::SafeRound(now * particle.dx)));
+		const auto y = clamp(
+			particle.y + int(base::SafeRound(now * particle.dy)));
 		const auto opacity = (now < descriptor.particleFadeInDuration)
 			? (now / float64(descriptor.particleFadeInDuration))
 			: (now > singleDuration - descriptor.particleFadeOutDuration)
@@ -527,7 +534,7 @@ void FillSpoilerRect(
 			p,
 			part.translated(rect.topLeft()),
 			frame,
-			originShift - part.topLeft());
+			originShift - rect.topLeft() - part.topLeft());
 	};
 	const auto fillCorner = [&](int x, int y, int index) {
 		const auto position = QPoint(x, y);
@@ -562,70 +569,49 @@ void FillSpoilerRect(
 	};
 	const auto top = verticalSkip(kTopLeft, kTopRight);
 	const auto bottom = verticalSkip(kBottomLeft, kBottomRight);
-		if (top) {
+	if (top) {
 		const auto left = cornerSize(kTopLeft);
 		const auto right = cornerSize(kTopRight);
 		if (left) {
-			fillCorner(rect.left(), rect.top(), kTopLeft);
+			fillCorner(0, 0, kTopLeft);
 			if (const auto add = top - left) {
-				fillBg({ rect.left(), rect.top() + left, left, add });
+				fillBg({ 0, left, left, add });
 			}
 		}
 		if (const auto fill = rect.width() - left - right; fill > 0) {
-			fillBg({ rect.left() + left, rect.top(), fill, top });
+			fillBg({ left, 0, fill, top });
 		}
 		if (right) {
-			fillCorner(
-				rect.left() + rect.width() - right,
-				rect.top(),
-				kTopRight);
+			fillCorner(rect.width() - right, 0, kTopRight);
 			if (const auto add = top - right) {
-				fillBg({
-					rect.left() + rect.width() - right,
-					rect.top() + right,
-					right,
-					add,
-				});
+				fillBg({ rect.width() - right, right, right, add });
 			}
 		}
 	}
 	if (const auto h = rect.height() - top - bottom; h > 0) {
-		fillBg({ rect.left(), rect.top() + top, rect.width(), h });
+		fillBg({ 0, top, rect.width(), h });
 	}
 	if (bottom) {
 		const auto left = cornerSize(kBottomLeft);
 		const auto right = cornerSize(kBottomRight);
 		if (left) {
-			fillCorner(
-				rect.left(),
-				rect.top() + rect.height() - left,
-				kBottomLeft);
+			fillCorner(0, rect.height() - left, kBottomLeft);
 			if (const auto add = bottom - left) {
-				fillBg({
-					rect.left(),
-					rect.top() + rect.height() - bottom,
-					left,
-					add,
-				});
+				fillBg({ 0, rect.height() - bottom, left, add });
 			}
 		}
 		if (const auto fill = rect.width() - left - right; fill > 0) {
-			fillBg({
-				rect.left() + left,
-				rect.top() + rect.height() - bottom,
-				fill,
-				bottom,
-			});
+			fillBg({ left, rect.height() - bottom, fill, bottom });
 		}
 		if (right) {
 			fillCorner(
-				rect.left() + rect.width() - right,
-				rect.top() + rect.height() - right,
+				rect.width() - right,
+				rect.height() - right,
 				kBottomRight);
 			if (const auto add = bottom - right) {
 				fillBg({
-					rect.left() + rect.width() - right,
-					rect.top() + rect.height() - bottom,
+					rect.width() - right,
+					rect.height() - bottom,
 					right,
 					add,
 				});

From 4ec3aced2e735f879c0f5ddcea0bbc32212ccb85 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 15 Dec 2022 17:24:36 +0400
Subject: [PATCH 294/635] Support colored emoji more widely.

---
 ui/style/style_core.cpp           | 24 ++++++++++++++++++------
 ui/style/style_core.h             | 30 +++++++++++++++++++++++-------
 ui/text/custom_emoji_instance.cpp | 29 +++++++++++++++--------------
 ui/text/text_custom_emoji.cpp     | 13 +++++++------
 ui/text/text_custom_emoji.h       | 14 ++++++--------
 ui/text/text_renderer.cpp         | 23 +++++++++++++++++------
 ui/text/text_renderer.h           |  1 +
 ui/widgets/input_fields.cpp       |  2 +-
 8 files changed, 88 insertions(+), 48 deletions(-)

diff --git a/ui/style/style_core.cpp b/ui/style/style_core.cpp
index 5764612..040313c 100644
--- a/ui/style/style_core.cpp
+++ b/ui/style/style_core.cpp
@@ -87,7 +87,13 @@ rpl::producer<bool> ShortAnimationPlaying() {
 	return internal::ShortAnimationRunning.value();
 }
 
-void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect, QPoint dstPoint) {
+void colorizeImage(
+		const QImage &src,
+		const QColor &color,
+		not_null<QImage*> outResult,
+		QRect srcRect,
+		QPoint dstPoint,
+		bool useAlpha) {
 	// In background_box ColorizePattern we use the fact that
 	// colorizeImage takes only first byte of the mask, so it
 	// could be used for wallpaper patterns, which have values
@@ -99,22 +105,28 @@ void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect
 	}
 	auto width = srcRect.width();
 	auto height = srcRect.height();
-	Assert(outResult && outResult->rect().contains(QRect(dstPoint, srcRect.size())));
+	Assert(outResult->rect().contains(QRect(dstPoint, srcRect.size())));
 
-	auto pattern = anim::shifted(c);
+	auto pattern = anim::shifted(color);
 
 	constexpr auto resultIntsPerPixel = 1;
 	auto resultIntsPerLine = (outResult->bytesPerLine() >> 2);
 	auto resultIntsAdded = resultIntsPerLine - width * resultIntsPerPixel;
-	auto resultInts = reinterpret_cast<uint32*>(outResult->bits()) + dstPoint.y() * resultIntsPerLine + dstPoint.x() * resultIntsPerPixel;
+	auto resultInts = reinterpret_cast<uint32*>(outResult->bits())
+		+ (dstPoint.y() * resultIntsPerLine)
+		+ (dstPoint.x() * resultIntsPerPixel);
 	Assert(resultIntsAdded >= 0);
-	Assert(outResult->depth() == static_cast<int>((resultIntsPerPixel * sizeof(uint32)) << 3));
+	Assert(outResult->depth()
+		== static_cast<int>((resultIntsPerPixel * sizeof(uint32)) << 3));
 	Assert(outResult->bytesPerLine() == (resultIntsPerLine << 2));
 
 	auto maskBytesPerPixel = (src.depth() >> 3);
 	auto maskBytesPerLine = src.bytesPerLine();
 	auto maskBytesAdded = maskBytesPerLine - width * maskBytesPerPixel;
-	auto maskBytes = src.constBits() + srcRect.y() * maskBytesPerLine + srcRect.x() * maskBytesPerPixel;
+	auto maskBytes = src.constBits()
+		+ (srcRect.y() * maskBytesPerLine)
+		+ (srcRect.x() * maskBytesPerPixel)
+		+ (useAlpha ? 3 : 0);
 	Assert(maskBytesAdded >= 0);
 	Assert(src.depth() == (maskBytesPerPixel << 3));
 	for (int y = 0; y != height; ++y) {
diff --git a/ui/style/style_core.h b/ui/style/style_core.h
index 035c20f..0d517f9 100644
--- a/ui/style/style_core.h
+++ b/ui/style/style_core.h
@@ -46,17 +46,33 @@ void NotifyPaletteChanged();
 
 // *outResult must be r.width() x r.height(), ARGB32_Premultiplied.
 // QRect(0, 0, src.width(), src.height()) must contain r.
-void colorizeImage(const QImage &src, QColor c, QImage *outResult, QRect srcRect = QRect(), QPoint dstPoint = QPoint(0, 0));
+void colorizeImage(
+	const QImage &src,
+	const QColor &color,
+	not_null<QImage*> outResult,
+	QRect srcRect = QRect(),
+	QPoint dstPoint = QPoint(0, 0),
+	bool useAlpha = false);
 
-inline QImage colorizeImage(const QImage &src, QColor c, QRect srcRect = QRect()) {
-	if (srcRect.isNull()) srcRect = src.rect();
-	auto result = QImage(srcRect.size(), QImage::Format_ARGB32_Premultiplied);
-	colorizeImage(src, c, &result, srcRect);
+[[nodiscard]] inline QImage colorizeImage(
+		const QImage &src,
+		const QColor &color,
+		QRect srcRect = QRect()) {
+	if (srcRect.isNull()) {
+		srcRect = src.rect();
+	}
+	auto result = QImage(
+		srcRect.size(),
+		QImage::Format_ARGB32_Premultiplied);
+	colorizeImage(src, color, &result, srcRect);
 	return result;
 }
 
-inline QImage colorizeImage(const QImage &src, const color &c, QRect srcRect = QRect()) {
-	return colorizeImage(src, c->c, srcRect);
+[[nodiscard]] inline QImage colorizeImage(
+		const QImage &src,
+		const color &color,
+		QRect srcRect = QRect()) {
+	return colorizeImage(src, color->c, srcRect);
 }
 
 [[nodiscard]] QImage TransparentPlaceholder();
diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index aa567ab..2b25cbc 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -37,14 +37,14 @@ void PaintScaledImage(
 		const QRect &target,
 		const Cache::Frame &frame,
 		const Context &context) {
-	const auto colored = context.colored;
-	const auto cache = colored ? &colored->cache : nullptr;
+	static QImage PaintCache;
+	const auto cache = context.internal.colorized ? &PaintCache : nullptr;
 	auto q = std::optional<QPainter>();
-	if (colored) {
+	if (cache) {
 		const auto ratio = style::DevicePixelRatio();
 		if (cache->width() < target.width() * ratio
 			|| cache->height() < target.height() * ratio) {
-			colored->cache = QImage(
+			*cache = QImage(
 				std::max(cache->width(), target.width() * ratio),
 				std::max(cache->height(), target.height() * ratio),
 				QImage::Format_ARGB32_Premultiplied);
@@ -52,7 +52,9 @@ void PaintScaledImage(
 		}
 		q.emplace(cache);
 		q->setCompositionMode(QPainter::CompositionMode_Source);
-		q->fillRect(QRect(QPoint(), target.size()), Qt::transparent);
+		if (context.scaled) {
+			q->fillRect(QRect(QPoint(), target.size()), Qt::transparent);
+		}
 		q->translate(-target.topLeft());
 	}
 	const auto to = q ? &*q : &p;
@@ -79,7 +81,8 @@ void PaintScaledImage(
 		q.reset();
 		const auto ratio = style::DevicePixelRatio();
 		const auto source = QRect(QPoint(), target.size() * ratio);
-		style::colorizeImage(*cache, colored->color, cache, source);
+		const auto &color = context.textColor;
+		style::colorizeImage(*cache, color, cache, source, {}, true);
 		p.drawImage(target, *cache, source);
 	}
 }
@@ -128,7 +131,9 @@ void Preview::paintPath(
 		const Context &context,
 		const ScaledPath &path) {
 	auto hq = PainterHighQualityEnabler(p);
-	p.setBrush(context.preview);
+	auto copy = context.textColor.value();
+	copy.setAlpha((copy.alpha() + 1) / 8);
+	p.setBrush(copy);
 	p.setPen(Qt::NoPen);
 	const auto scale = path.scale;
 	const auto required = (scale != 1.) || context.scaled;
@@ -374,7 +379,7 @@ PaintFrameResult Cache::paintCurrentFrame(
 	if (!_frames) {
 		return {};
 	}
-	const auto first = context.firstFrameOnly;
+	const auto first = context.internal.forceFirstFrame;
 	if (!first) {
 		const auto now = context.paused ? 0 : context.now;
 		const auto finishes = now ? currentFrameFinishes() : 0;
@@ -657,9 +662,8 @@ QString Instance::entityData() const {
 }
 
 void Instance::paint(QPainter &p, const Context &context) {
-	const auto colored = (context.colored && !_colored)
-		? base::take(context.colored)
-		: nullptr;
+	context.internal.colorized = _colored;
+
 	v::match(_state, [&](Loading &state) {
 		state.paint(p, context);
 		load(state);
@@ -684,9 +688,6 @@ void Instance::paint(QPainter &p, const Context &context) {
 			_repaintLater(this, { result.next, result.duration });
 		}
 	});
-	if (colored) {
-		context.colored = colored;
-	}
 }
 
 bool Instance::ready() {
diff --git a/ui/text/text_custom_emoji.cpp b/ui/text/text_custom_emoji.cpp
index 4eb1919..f0da6fd 100644
--- a/ui/text/text_custom_emoji.cpp
+++ b/ui/text/text_custom_emoji.cpp
@@ -50,9 +50,10 @@ QString FirstFrameEmoji::entityData() {
 }
 
 void FirstFrameEmoji::paint(QPainter &p, const Context &context) {
-	auto copy = context;
-	copy.firstFrameOnly = true;
-	_wrapped->paint(p, copy);
+	const auto was = context.internal.forceFirstFrame;
+	context.internal.forceFirstFrame = true;
+	_wrapped->paint(p, context);
+	context.internal.forceFirstFrame = was;
 }
 
 void FirstFrameEmoji::unload() {
@@ -90,10 +91,10 @@ void LimitedLoopsEmoji::paint(QPainter &p, const Context &context) {
 		}
 	}
 	if (_played == _limit) {
-		const auto was = context.firstFrameOnly;
-		context.firstFrameOnly = true;
+		const auto was = context.internal.forceFirstFrame;
+		context.internal.forceFirstFrame = true;
 		_wrapped->paint(p, context);
-		context.firstFrameOnly = was;
+		context.internal.forceFirstFrame = was;
 	} else {
 		_wrapped->paint(p, context);
 	}
diff --git a/ui/text/text_custom_emoji.h b/ui/text/text_custom_emoji.h
index a972e8b..fb65685 100644
--- a/ui/text/text_custom_emoji.h
+++ b/ui/text/text_custom_emoji.h
@@ -19,21 +19,19 @@ namespace Ui::Text {
 
 [[nodiscard]] int AdjustCustomEmojiSize(int emojiSize);
 
-struct CustomEmojiColored {
-	QColor color;
-	QImage cache;
-};
-
 struct CustomEmojiPaintContext {
-	QColor preview;
-	mutable CustomEmojiColored *colored = nullptr;
+	required<QColor> textColor;
 	QSize size; // Required only when scaled = true, for path scaling.
 	crl::time now = 0;
 	float64 scale = 0.;
 	QPoint position;
-	mutable bool firstFrameOnly = false;
 	bool paused = false;
 	bool scaled = false;
+
+	mutable struct {
+		bool colorized = false;
+		bool forceFirstFrame = false;
+	} internal;
 };
 
 class CustomEmoji {
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 2ad871c..756269b 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -827,16 +827,27 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 							x,
 							y);
 					} else if (const auto custom = static_cast<const CustomEmojiBlock*>(currentBlock)->_custom.get()) {
+						const auto selected = (fillSelect.from <= glyphX)
+							&& (fillSelect.till > glyphX);
+						const auto color = (selected
+							? _currentPenSelected
+							: _currentPen)->color();
 						if (!_customEmojiSize) {
 							_customEmojiSize = AdjustCustomEmojiSize(st::emojiSize);
 							_customEmojiSkip = (st::emojiSize - _customEmojiSize) / 2;
+							_customEmojiContext = CustomEmoji::Context{
+								.textColor = color,
+								.now = now(),
+								.paused = _paused,
+							};
+						} else {
+							_customEmojiContext->textColor = color;
 						}
-						custom->paint(*_p, {
-							.preview = _palette->spoilerFg->c,
-							.now = now(),
-							.position = { x + _customEmojiSkip, y + _customEmojiSkip },
-							.paused = _paused,
-						});
+						_customEmojiContext->position = {
+							x + _customEmojiSkip,
+							y + _customEmojiSkip,
+						};
+						custom->paint(*_p, *_customEmojiContext);
 					}
 					if (hasSpoiler) {
 						_p->setOpacity(opacity);
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index aa41bb5..4ba28ce 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -141,6 +141,7 @@ private:
 	QVarLengthArray<QRect, kSpoilersRectsSize> _spoilerRects;
 	QVarLengthArray<QRect, kSpoilersRectsSize> _spoilerSelectedRects;
 
+	std::optional<CustomEmoji::Context> _customEmojiContext;
 	int _customEmojiSize = 0;
 	int _customEmojiSkip = 0;
 	int _indexOfElidedBlock = -1; // For spoilers.
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index a3ee55e..7654d7a 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1126,7 +1126,7 @@ void CustomEmojiObject::drawObject(
 		return;
 	}
 	i->second->paint(*painter, {
-		.preview = st::windowBgRipple->c,
+		.textColor = format.foreground().color(),
 		.now = _now,
 		.position = QPoint(
 			int(base::SafeRound(rect.x())) + st::emojiPadding + _skip,

From 8649a557270fefc491dc2a76709acd54ace2fb75 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 15 Dec 2022 19:07:50 +0400
Subject: [PATCH 295/635] Simplify coloring of semi-transparent images.

---
 ui/image/image_prepare.cpp | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 2e8ea6b..cb37c53 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1155,25 +1155,21 @@ QImage Colored(QImage &&image, QColor add) {
 	}
 
 	if (const auto pix = image.bits()) {
-		const auto ca = int(add.alphaF() * 0xFF);
-		const auto cr = int(add.redF() * 0xFF);
-		const auto cg = int(add.greenF() * 0xFF);
-		const auto cb = int(add.blueF() * 0xFF);
+		const auto ca = add.alpha();
+		const auto cr = add.red() * (ca + 1);
+		const auto cg = add.green() * (ca + 1);
+		const auto cb = add.blue() * (ca + 1);
+		const auto ra = (0x100 - ca) * 0x100;
 		const auto w = image.width();
 		const auto h = image.height();
 		const auto add = image.bytesPerLine() - (w * 4);
 		auto i = index_type();
 		for (auto y = 0; y != h; ++y) {
 			for (auto to = i + (w * 4); i != to; i += 4) {
-				const auto b = pix[i];
-				const auto g = pix[i + 1];
-				const auto r = pix[i + 2];
-				const auto a = pix[i + 3];
-				const auto aca = a * ca;
-				pix[i + 0] = uchar(b + ((aca * (cb - b)) >> 16));
-				pix[i + 1] = uchar(g + ((aca * (cg - g)) >> 16));
-				pix[i + 2] = uchar(r + ((aca * (cr - r)) >> 16));
-				pix[i + 3] = uchar(a + ((aca * (0xFF - a)) >> 16));
+				const auto a = pix[i + 3] + 1;
+				pix[i + 0] = (ra * pix[i + 0] + a * cb) >> 16;
+				pix[i + 1] = (ra * pix[i + 1] + a * cg) >> 16;
+				pix[i + 2] = (ra * pix[i + 2] + a * cr) >> 16;
 			}
 			i += add;
 		}

From 770b5d0e59ab6d428e234b3773679de8261477ee Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 15 Dec 2022 19:10:04 +0400
Subject: [PATCH 296/635] Allow using text color -> preview color algo outside.

---
 ui/text/custom_emoji_instance.cpp | 9 ++++++---
 ui/text/custom_emoji_instance.h   | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index 2b25cbc..bac989b 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -89,6 +89,11 @@ void PaintScaledImage(
 
 } // namespace
 
+QColor PreviewColorFromTextColor(QColor color) {
+	color.setAlpha((color.alpha() + 1) / 8);
+	return color;
+}
+
 Preview::Preview(QPainterPath path, float64 scale)
 : _data(ScaledPath{ std::move(path), scale }) {
 }
@@ -131,9 +136,7 @@ void Preview::paintPath(
 		const Context &context,
 		const ScaledPath &path) {
 	auto hq = PainterHighQualityEnabler(p);
-	auto copy = context.textColor.value();
-	copy.setAlpha((copy.alpha() + 1) / 8);
-	p.setBrush(copy);
+	p.setBrush(PreviewColorFromTextColor(context.textColor));
 	p.setPen(Qt::NoPen);
 	const auto scale = path.scale;
 	const auto required = (scale != 1.) || context.scaled;
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
index 4d65ec0..c86010e 100644
--- a/ui/text/custom_emoji_instance.h
+++ b/ui/text/custom_emoji_instance.h
@@ -25,6 +25,8 @@ namespace Ui::CustomEmoji {
 
 using Context = Ui::Text::CustomEmoji::Context;
 
+[[nodiscard]] QColor PreviewColorFromTextColor(QColor color);
+
 class Preview final {
 public:
 	Preview() = default;

From 4befce5a29d247fb17da3faafebb03578c5a989b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 15 Dec 2022 19:10:35 +0400
Subject: [PATCH 297/635] Fix colored custom emoji in field.

---
 ui/widgets/input_fields.cpp | 13 +++++++++++--
 ui/widgets/input_fields.h   |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 7654d7a..ed7df91 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -822,8 +822,12 @@ void ApplyTagFormat(QTextCharFormat &to, const QTextCharFormat &from) {
 	}
 	to.setProperty(kReplaceTagId, from.property(kReplaceTagId));
 	to.setFont(from.font());
-	to.setForeground(from.foreground());
-	to.setBackground(from.background());
+	if (from.hasProperty(QTextFormat::ForegroundBrush)) {
+		to.setForeground(from.brushProperty(QTextFormat::ForegroundBrush));
+	}
+	if (from.hasProperty(QTextFormat::BackgroundBrush)) {
+		to.setBackground(from.brushProperty(QTextFormat::BackgroundBrush));
+	}
 }
 
 // Returns the position of the first inserted tag or "changedEnd" value if none found.
@@ -1012,6 +1016,7 @@ void InsertEmojiAtCursor(QTextCursor cursor, EmojiPtr emoji) {
 }
 
 void InsertCustomEmojiAtCursor(
+		not_null<InputField*> field,
 		QTextCursor cursor,
 		const QString &text,
 		const QString &link) {
@@ -1023,6 +1028,9 @@ void InsertCustomEmojiAtCursor(
 	format.setProperty(kCustomEmojiLink, unique);
 	format.setProperty(kCustomEmojiId, CustomEmojiIdFromLink(link));
 	format.setVerticalAlignment(QTextCharFormat::AlignBottom);
+	format.setFont(field->st().font);
+	format.setForeground(field->st().textFg);
+	format.setBackground(QBrush());
 	ApplyTagFormat(format, currentFormat);
 	format.setProperty(kTagProperty, TextUtilities::TagWithAdded(
 		format.property(kTagProperty).toString(),
@@ -2239,6 +2247,7 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 					InsertEmojiAtCursor(cursor, action.emoji);
 				} else {
 					InsertCustomEmojiAtCursor(
+						this,
 						cursor,
 						action.customEmojiText,
 						action.customEmojiLink);
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 1c592d8..8d7de73 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -37,9 +37,11 @@ const auto kEditLinkSequence = QKeySequence("ctrl+k");
 const auto kSpoilerSequence = QKeySequence("ctrl+shift+p");
 
 class PopupMenu;
+class InputField;
 
 void InsertEmojiAtCursor(QTextCursor cursor, EmojiPtr emoji);
 void InsertCustomEmojiAtCursor(
+	not_null<InputField*> field,
 	QTextCursor cursor,
 	const QString &text,
 	const QString &link);
@@ -152,6 +154,10 @@ public:
 		rpl::producer<QString> placeholder = nullptr,
 		const TextWithTags &value = TextWithTags());
 
+	[[nodiscard]] const style::InputField &st() const {
+		return _st;
+	}
+
 	void showError();
 	void showErrorNoFocus();
 	void hideError();

From b178a5d15f4e422f4497e9c0334fe340df9d6046 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 16 Dec 2022 00:45:22 +0300
Subject: [PATCH 298/635] Fixed color of text when IconButtonWithText is over.

---
 ui/widgets/icon_button_with_text.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/icon_button_with_text.cpp b/ui/widgets/icon_button_with_text.cpp
index 608f705..bdf0bf1 100644
--- a/ui/widgets/icon_button_with_text.cpp
+++ b/ui/widgets/icon_button_with_text.cpp
@@ -20,13 +20,13 @@ void IconButtonWithText::paintEvent(QPaintEvent *e) {
 	IconButton::paintEvent(e);
 
 	const auto r = rect() - _st.textPadding;
+	const auto overIconOpacity = IconButton::iconOverOpacity();
 
 	auto p = QPainter(this);
 	p.setFont(_st.font);
-	p.setPen(_st.textFg);
+	p.setPen((overIconOpacity == 1.) ? _st.textFgOver : _st.textFg);
 	p.drawText(r, _text, _st.textAlign);
 
-	const auto overIconOpacity = IconButton::iconOverOpacity();
 	if (overIconOpacity > 0. && overIconOpacity < 1.) {
 		p.setPen(_st.textFgOver);
 		p.setOpacity(overIconOpacity);

From 07d9420c19c008f9b49faaabde3e7d2139255961 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Dec 2022 14:48:44 +0400
Subject: [PATCH 299/635] Move LayerWidget::closeLayer to the public interface.

---
 ui/layers/layer_widget.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/layers/layer_widget.h b/ui/layers/layer_widget.h
index 7d7e337..6c76b9e 100644
--- a/ui/layers/layer_widget.h
+++ b/ui/layers/layer_widget.h
@@ -69,12 +69,13 @@ public:
 		return true;
 	}
 
-protected:
 	void closeLayer() {
 		if (const auto callback = base::take(_closedCallback)) {
 			callback();
 		}
 	}
+
+protected:
 	void mousePressEvent(QMouseEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 	virtual void doSetInnerFocus() {

From 9f5ddf3d8aaa95e0c32c187f7e8b6c3239953991 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 21 Dec 2022 18:04:00 +0300
Subject: [PATCH 300/635] Added missed call of LayerWidget::showFinished to
 main menu.

---
 ui/layers/layer_widget.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 924af6a..0dac7f4 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -717,6 +717,9 @@ void LayerStackWidget::showFinished() {
 	if (_specialLayer) {
 		_specialLayer->showFinished();
 	}
+	if (_mainMenu) {
+		_mainMenu->showFinished();
+	}
 	if (auto layer = currentLayer()) {
 		layer->showFinished();
 	}

From fbdc6ed5ac791890d87ca7f22b668ceca47d7684 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 21 Dec 2022 18:04:12 +0300
Subject: [PATCH 301/635] Added third color to premium icons.

---
 ui/colors.palette | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/colors.palette b/ui/colors.palette
index 781b8ae..c354fba 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -674,3 +674,4 @@ premiumButtonFg: #ffffff; // upgrade to premium button text
 
 premiumIconBg1: #f38926; // icon in premium settings gradient 1
 premiumIconBg2: #e44456; // icon in premium settings gradient 2
+premiumIconBg3: #4acd43; // icon in premium settings gradient 3

From d079108e2949db26cd2d83108559a71f70fe52e2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 22 Dec 2022 21:45:42 +0400
Subject: [PATCH 302/635] Fix toast label palette.

Regression was introduced in eafd7dc818.
---
 ui/toast/toast_widget.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index 6d3981b..9640f88 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -149,13 +149,12 @@ void Widget::paintEvent(QPaintEvent *e) {
 			width());
 	}
 
-	p.setTextPalette(_st->palette);
-
 	const auto lines = _maxTextHeight / _st->style.font->height;
 	p.setPen(st::toastFg);
 	_text.draw(p, {
 		.position = { _st->padding.left(), _textTop },
 		.availableWidth = _textWidth + 1,
+		.palette = &_st->palette,
 		.spoiler = Ui::Text::DefaultSpoilerCache(),
 		.elisionLines = lines,
 	});

From 97d4f62970ed6e3678b7c8bad609825ed1010c87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Dec 2022 10:47:01 +0400
Subject: [PATCH 303/635] Always force spoiler initialization.

---
 ui/effects/spoiler_mess.cpp | 12 ++++++++++--
 ui/effects/spoiler_mess.h   |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index e834dbc..2e02ccf 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -824,7 +824,7 @@ bool SpoilerAnimation::repaint(crl::time now) {
 	return true;
 }
 
-void PrepareTextSpoilerMask() {
+void PreloadTextSpoilerMask() {
 	PrepareDefaultSpoiler(
 		DefaultTextMask,
 		"text",
@@ -833,10 +833,14 @@ void PrepareTextSpoilerMask() {
 }
 
 const SpoilerMessCached &DefaultTextSpoilerMask() {
+	static const auto once = [&] {
+		PreloadTextSpoilerMask();
+		return 0;
+	}();
 	return WaitDefaultSpoiler(DefaultTextMask);
 }
 
-void PrepareImageSpoiler() {
+void PreloadImageSpoiler() {
 	const auto postprocess = [](std::unique_ptr<SpoilerMessCached> cached) {
 		Expects(cached != nullptr);
 
@@ -862,6 +866,10 @@ void PrepareImageSpoiler() {
 }
 
 const SpoilerMessCached &DefaultImageSpoiler() {
+	static const auto once = [&] {
+		PreloadImageSpoiler();
+		return 0;
+	}();
 	return WaitDefaultSpoiler(DefaultImageCached);
 }
 
diff --git a/ui/effects/spoiler_mess.h b/ui/effects/spoiler_mess.h
index 78772a9..759f3fe 100644
--- a/ui/effects/spoiler_mess.h
+++ b/ui/effects/spoiler_mess.h
@@ -109,9 +109,9 @@ private:
 [[nodiscard]] SpoilerMessCached GenerateSpoilerMess(
 	const SpoilerMessDescriptor &descriptor);
 
-void PrepareTextSpoilerMask();
+void PreloadTextSpoilerMask();
 [[nodiscard]] const SpoilerMessCached &DefaultTextSpoilerMask();
-void PrepareImageSpoiler();
+void PreloadImageSpoiler();
 [[nodiscard]] const SpoilerMessCached &DefaultImageSpoiler();
 
 } // namespace Ui

From c5f09bbf695e1dff80f378bb5907581f65547f9f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Dec 2022 13:53:44 +0400
Subject: [PATCH 304/635] Fix assertion violation in GenericBox.

---
 ui/layers/generic_box.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index e6ff6af..380f172 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -28,14 +28,17 @@ void GenericBox::prepare() {
 		pinned ? pinned->heightValue() : rpl::single(0),
 		wrap->heightValue()
 	) | rpl::start_with_next([=](int top, int height) {
+		Expects(_minHeight >= 0);
+		Expects(!_maxHeight || _minHeight <= _maxHeight);
+
 		setInnerTopSkip(top);
 		const auto desired = top + height;
 		setDimensions(
 			currentWidth,
 			std::clamp(
 				desired,
-				_minHeight ? _minHeight : desired,
-				_maxHeight ? _maxHeight : desired),
+				_minHeight,
+				_maxHeight ? _maxHeight : std::max(_minHeight, desired)),
 			true);
 	}, wrap->lifetime());
 

From 6c33f9218e2f2c4fcf91f0042400cd89c00dc3ed Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 15 Dec 2022 13:46:17 +0400
Subject: [PATCH 305/635] Get rid of Ui::Integration::timeFormat

Enum values are used now instead
---
 ui/integration.cpp | 4 ----
 ui/integration.h   | 1 -
 2 files changed, 5 deletions(-)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index 99ab7c4..495e17a 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -47,10 +47,6 @@ bool Integration::screenIsLocked() {
 	return false;
 }
 
-QString Integration::timeFormat() {
-	return u"hh:mm"_q;
-}
-
 std::shared_ptr<ClickHandler> Integration::createLinkHandler(
 		const EntityLinkData &data,
 		const std::any &context) {
diff --git a/ui/integration.h b/ui/integration.h
index db065d5..09b4da0 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -49,7 +49,6 @@ public:
 	virtual void activationFromTopPanel();
 
 	[[nodiscard]] virtual bool screenIsLocked();
-	[[nodiscard]] virtual QString timeFormat();
 
 	[[nodiscard]] virtual std::shared_ptr<ClickHandler> createLinkHandler(
 		const EntityLinkData &data,

From 28fd4eea95f4012f1b864d385259ee2de2284ff9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 28 Dec 2022 17:39:03 +0400
Subject: [PATCH 306/635] Fix build with GCC.

---
 ui/effects/spoiler_mess.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index 2e02ccf..a98bbc3 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -833,7 +833,7 @@ void PreloadTextSpoilerMask() {
 }
 
 const SpoilerMessCached &DefaultTextSpoilerMask() {
-	static const auto once = [&] {
+	[[maybe_unused]] static const auto once = [&] {
 		PreloadTextSpoilerMask();
 		return 0;
 	}();
@@ -866,7 +866,7 @@ void PreloadImageSpoiler() {
 }
 
 const SpoilerMessCached &DefaultImageSpoiler() {
-	static const auto once = [&] {
+	[[maybe_unused]] static const auto once = [&] {
 		PreloadImageSpoiler();
 		return 0;
 	}();

From 3fea35ff19b52da94fa3ed17695f00b79bfb1917 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 29 Dec 2022 12:37:58 +0300
Subject: [PATCH 307/635] Added regexp for excluding digits.

---
 ui/text/text_entity.cpp | 4 ++++
 ui/text/text_entity.h   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index fdb5c09..4844392 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -1236,6 +1236,10 @@ const QRegularExpression &RegExpBotCommand() {
 	return result;
 }
 
+QRegularExpression RegExpDigitsExclude() {
+	return QRegularExpression("[^\\d]");
+}
+
 QString MarkdownBoldGoodBefore() {
 	return SeparatorsBold();
 }
diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index d5a770c..3756539 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -288,6 +288,7 @@ const QRegularExpression &RegExpHashtag();
 const QRegularExpression &RegExpHashtagExclude();
 const QRegularExpression &RegExpMention();
 const QRegularExpression &RegExpBotCommand();
+QRegularExpression RegExpDigitsExclude();
 QString MarkdownBoldGoodBefore();
 QString MarkdownBoldBadAfter();
 QString MarkdownItalicGoodBefore();

From 2cd253208d55e4374d0104b13bfa0ffeffbb1ce6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 2 Jan 2023 07:56:27 +0400
Subject: [PATCH 308/635] Fix a possible leak when IsProgressiveJpeg gets
 invalid data

---
 ui/image/image_prepare.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index cb37c53..3b7848e 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1277,6 +1277,10 @@ bool IsProgressiveJpeg(const QByteArray &bytes) {
 	}
 
 	jpeg_create_decompress(&info);
+	const auto guard = gsl::finally([&] {
+		jpeg_destroy_decompress(&info);
+	});
+
 	jpeg_mem_src(
 		&info,
 		reinterpret_cast<const unsigned char*>(bytes.data()),
@@ -1285,10 +1289,7 @@ bool IsProgressiveJpeg(const QByteArray &bytes) {
 		return false;
 	}
 
-	const auto result = (info.progressive_mode > 0);
-	jpeg_destroy_decompress(&info);
-
-	return result;
+	return (info.progressive_mode > 0);
 }
 
 } // namespace Images

From 7882604a29acc5d4c7deca51133180d74fb36f87 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 3 Jan 2023 11:06:05 +0400
Subject: [PATCH 309/635] Fix checkbox text width counting.

---
 ui/widgets/checkbox.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 1a22e28..dc5d50f 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -636,12 +636,13 @@ void Checkbox::paintEvent(QPaintEvent *e) {
 
 	const auto alignLeft = (_checkAlignment & Qt::AlignLeft);
 	const auto alignRight = (_checkAlignment & Qt::AlignRight);
+	const auto centered = ((_checkAlignment & Qt::AlignHCenter) != 0);
 	const auto textSkip = _st.checkPosition.x()
 		+ check.width()
 		+ _st.textPosition.x();
-	const auto availableTextWidth = (alignLeft || alignRight)
-		? std::max(width() - textSkip, 1)
-		: std::max(width() - _st.margin.left() - _st.margin.right(), 1);
+	const auto availableTextWidth = centered
+		? std::max(width() - _st.margin.left() - _st.margin.right(), 1)
+		: std::max(width() - textSkip, 1);
 	const auto textTop = _st.margin.top() + _st.textPosition.y();
 
 	p.setPen(anim::pen(_st.textFg, _st.textFgActive, active));
@@ -822,12 +823,13 @@ int Checkbox::resizeGetHeight(int newWidth) {
 	if (!centered && _allowTextLines == 1) {
 		return result;
 	}
-	const auto leftSkip = _st.checkPosition.x()
+	const auto textSkip = _st.checkPosition.x()
 		+ checkRect().width()
 		+ _st.textPosition.x();
+	const auto fullWidth = _st.margin.left() + newWidth + _st.margin.right();
 	const auto availableTextWidth = centered
-		? (newWidth - _st.margin.left() - _st.margin.right())
-		: std::max(width() - leftSkip, 1);
+		? std::max(newWidth, 1)
+		: std::max(fullWidth - textSkip, 1);
 	const auto textHeight = _text.countHeight(availableTextWidth);
 	const auto textBottom = _st.textPosition.y()
 		+ (_allowTextLines

From 28a51f1ec70cc095e606f8c432d809fd5a99ee9e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Jan 2023 14:43:34 +0400
Subject: [PATCH 310/635] Clear stale emoji after every caching.

---
 ui/emoji_config.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/emoji_config.cpp b/ui/emoji_config.cpp
index 88ae330..1106e0d 100644
--- a/ui/emoji_config.cpp
+++ b/ui/emoji_config.cpp
@@ -363,11 +363,13 @@ std::vector<QImage> LoadAndValidateSprites(int id) {
 void ClearUniversalChecked() {
 	Expects(InstanceNormal != nullptr && InstanceLarge != nullptr);
 
-	if (CanClearUniversal
-		&& Universal
+	if (Universal
 		&& InstanceNormal->cached()
 		&& InstanceLarge->cached()) {
-		Universal->clear();
+		if (CanClearUniversal) {
+			Universal->clear();
+		}
+		ClearIrrelevantCache();
 	}
 }
 

From 3cb645f50704b67537167e14623840a25fbdda7a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 6 Jan 2023 17:05:24 +0400
Subject: [PATCH 311/635] Allow fully custom QImage shadows.

---
 ui/layers/layer_widget.cpp |   2 +-
 ui/widgets/shadow.cpp      | 107 ++++++++++++++++++++++++++-----------
 ui/widgets/shadow.h        |  10 +++-
 3 files changed, 85 insertions(+), 34 deletions(-)

diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 0dac7f4..18aa85d 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -259,7 +259,7 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) {
 		if (topCorners || bottomCorners) {
 			p.setClipRegion(QRegion(rect()) - specialLayerBox.marginsRemoved(QMargins(st::boxRadius, 0, st::boxRadius, 0)) - specialLayerBox.marginsRemoved(QMargins(0, st::boxRadius, 0, st::boxRadius)));
 		}
-		Ui::Shadow::paint(p, specialLayerBox, width(), st::boxRoundShadow, sides, Ui::SpecialLayerShadowCorners());
+		Ui::Shadow::paint(p, specialLayerBox, width(), st::boxRoundShadow, Ui::SpecialLayerShadowCorners(), sides);
 		if (topCorners || bottomCorners) {
 			p.setClipping(false);
 		}
diff --git a/ui/widgets/shadow.cpp b/ui/widgets/shadow.cpp
index 6d790ec..efbedf9 100644
--- a/ui/widgets/shadow.cpp
+++ b/ui/widgets/shadow.cpp
@@ -16,35 +16,53 @@
 namespace Ui {
 namespace {
 
+struct CustomImage {
+public:
+	explicit CustomImage(const QImage &image)
+	: _image(image) {
+	}
+	void paint(QPainter &p, int x, int y, int outerw) const {
+		p.drawImage(x, y, _image);
+	}
+	void fill(QPainter &p, QRect rect) const {
+		p.drawImage(rect, _image);
+	}
+	[[nodiscard]] bool empty() const {
+		return _image.isNull();
+	}
+	[[nodiscard]] int width() const {
+		return _image.width() / style::DevicePixelRatio();
+	}
+	[[nodiscard]] int height() const {
+		return _image.height() / style::DevicePixelRatio();
+	}
+
+private:
+	const QImage &_image;
+
+};
+
 struct CustomShadowCorners {
-	struct Image {
-	public:
-		Image(const QImage &image)
-		: _image(image) {
-		}
-		void paint(QPainter &p, int x, int y, int outerw) const {
-			p.drawImage(x, y, _image);
-		}
-		[[nodiscard]] bool empty() const {
-			return _image.isNull();
-		}
-		[[nodiscard]] int width() const {
-			return _image.width() / style::DevicePixelRatio();
-		}
-		[[nodiscard]] int height() const {
-			return _image.height() / style::DevicePixelRatio();
-		}
-	private:
-		const QImage &_image;
-	};
 	const style::icon &left;
-	Image topLeft;
+	CustomImage topLeft;
 	const style::icon &top;
-	Image topRight;
+	CustomImage topRight;
 	const style::icon &right;
-	Image bottomRight;
+	CustomImage bottomRight;
 	const style::icon &bottom;
-	Image bottomLeft;
+	CustomImage bottomLeft;
+	const style::margins &extend;
+};
+
+struct CustomShadow {
+	CustomImage left;
+	CustomImage topLeft;
+	CustomImage top;
+	CustomImage topRight;
+	CustomImage right;
+	CustomImage bottomRight;
+	CustomImage bottom;
+	CustomImage bottomLeft;
 	const style::margins &extend;
 };
 
@@ -121,7 +139,7 @@ void PlainShadow::paintEvent(QPaintEvent *e) {
 }
 
 void Shadow::paint(QPainter &p, const QRect &box, int outerWidth, const style::Shadow &st, RectParts sides) {
-	ShadowPaint<style::Shadow>(p, box, outerWidth, st, std::move(sides));
+	ShadowPaint<style::Shadow>(p, box, outerWidth, st, sides);
 }
 
 void Shadow::paint(
@@ -129,20 +147,45 @@ void Shadow::paint(
 		const QRect &box,
 		int outerWidth,
 		const style::Shadow &st,
-		RectParts sides,
-		const std::array<QImage, 4> &corners) {
+		const std::array<QImage, 4> &corners,
+		RectParts sides) {
 	const auto shadow = CustomShadowCorners{
 		.left = st.left,
-		.topLeft = CustomShadowCorners::Image(corners[0]),
+		.topLeft = CustomImage(corners[0]),
 		.top = st.top,
-		.topRight = CustomShadowCorners::Image(corners[2]),
+		.topRight = CustomImage(corners[2]),
 		.right = st.right,
-		.bottomRight = CustomShadowCorners::Image(corners[3]),
+		.bottomRight = CustomImage(corners[3]),
 		.bottom = st.bottom,
-		.bottomLeft = CustomShadowCorners::Image(corners[1]),
+		.bottomLeft = CustomImage(corners[1]),
 		.extend = st.extend,
 	};
-	ShadowPaint<CustomShadowCorners>(p, box, outerWidth, shadow, std::move(sides));
+	ShadowPaint<CustomShadowCorners>(p, box, outerWidth, shadow, sides);
+}
+
+void Shadow::paint(
+		QPainter &p,
+		const QRect &box,
+		int outerWidth,
+		const style::Shadow &st,
+		const std::array<QImage, 4> &sides,
+		const std::array<QImage, 4> &corners) {
+	const auto shadow = CustomShadow{
+		.left = CustomImage(sides[0]),
+		.topLeft = CustomImage(corners[0]),
+		.top = CustomImage(sides[1]),
+		.topRight = CustomImage(corners[2]),
+		.right = CustomImage(sides[2]),
+		.bottomRight = CustomImage(corners[3]),
+		.bottom = CustomImage(sides[3]),
+		.bottomLeft = CustomImage(corners[1]),
+		.extend = st.extend,
+	};
+	ShadowPaint<CustomShadow>(p, box, outerWidth, shadow, RectPart()
+		| (sides[0].isNull() ? RectPart() : RectPart::Left)
+		| (sides[1].isNull() ? RectPart() : RectPart::Top)
+		| (sides[2].isNull() ? RectPart() : RectPart::Right)
+		| (sides[3].isNull() ? RectPart() : RectPart::Bottom));
 }
 
 QPixmap Shadow::grab(
diff --git a/ui/widgets/shadow.h b/ui/widgets/shadow.h
index b2ee435..0eebab0 100644
--- a/ui/widgets/shadow.h
+++ b/ui/widgets/shadow.h
@@ -51,7 +51,15 @@ public:
 		const QRect &box,
 		int outerWidth,
 		const style::Shadow &st,
-		RectParts sides,
+		const std::array<QImage, 4> &corners,
+		RectParts sides = RectPart::AllSides);
+
+	static void paint(
+		QPainter &p,
+		const QRect &box,
+		int outerWidth,
+		const style::Shadow &st,
+		const std::array<QImage, 4> &sides,
 		const std::array<QImage, 4> &corners);
 
 	static QPixmap grab(

From b67cff089c54e06f9612b58055da25191cd629cf Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 9 Jan 2023 06:22:42 +0400
Subject: [PATCH 312/635] Output error message when dealing with jpeg errors

---
 ui/image/image_prepare.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 3b7848e..164db6b 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -32,6 +32,7 @@ struct my_error_mgr : public jpeg_error_mgr {
 extern "C" {
 
 static void my_error_exit(j_common_ptr cinfo) {
+	(*cinfo->err->output_message)(cinfo);
 	my_error_mgr* myerr = (my_error_mgr*)cinfo->err;
 	longjmp(myerr->setjmp_buffer, 1);
 }

From 3c261d254e8e0c04b2350c0c74d9e5c38db449db Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 9 Jan 2023 04:19:18 +0400
Subject: [PATCH 313/635] Implement lossless jpeg progression

---
 ui/image/image_prepare.cpp | 84 ++++++++++++++++++++++++++++++++++++++
 ui/image/image_prepare.h   |  1 +
 2 files changed, 85 insertions(+)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 164db6b..69bf818 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1293,4 +1293,88 @@ bool IsProgressiveJpeg(const QByteArray &bytes) {
 	return (info.progressive_mode > 0);
 }
 
+QByteArray MakeProgressiveJpeg(const QByteArray &bytes) {
+	struct jpeg_decompress_struct srcinfo;
+	struct jpeg_compress_struct dstinfo;
+	struct my_error_mgr jerr;
+
+	srcinfo.err = jpeg_std_error(&jerr);
+	dstinfo.err = jpeg_std_error(&jerr);
+	jerr.error_exit = my_error_exit;
+	if (setjmp(jerr.setjmp_buffer)) {
+		return {};
+	}
+
+	jpeg_create_decompress(&srcinfo);
+	const auto srcguard = gsl::finally([&] {
+		jpeg_abort_decompress(&srcinfo);
+		jpeg_destroy_decompress(&srcinfo);
+	});
+
+	jpeg_create_compress(&dstinfo);
+	const auto dstguard = gsl::finally([&] {
+		jpeg_abort_compress(&dstinfo);
+		jpeg_destroy_compress(&dstinfo);
+	});
+
+	jpeg_mem_src(
+		&srcinfo,
+		reinterpret_cast<const unsigned char*>(bytes.data()),
+		bytes.size());
+
+	jpeg_save_markers(&srcinfo, JPEG_COM, 0xFFFF);
+	for (int m = 0; m < 16; m++) {
+		jpeg_save_markers(&srcinfo, JPEG_APP0 + m, 0xFFFF);
+	}
+
+	jpeg_read_header(&srcinfo, true);
+	const auto coefArrays = jpeg_read_coefficients(&srcinfo);
+	jpeg_copy_critical_parameters(&srcinfo, &dstinfo);
+	jpeg_simple_progression(&dstinfo);
+
+	unsigned char* outbuffer = nullptr;
+	long unsigned int outsize = 0;
+	jpeg_mem_dest(&dstinfo, &outbuffer, &outsize);
+	const auto outbufferGuard = gsl::finally([&] {
+		free(outbuffer);
+	});
+
+	jpeg_write_coefficients(&dstinfo, coefArrays);
+
+	for (jpeg_saved_marker_ptr marker = srcinfo.marker_list
+		; marker != nullptr
+		; marker = marker->next) {
+		if (dstinfo.write_JFIF_header
+			&& marker->marker == JPEG_APP0
+			&& marker->data_length >= 5
+			&& marker->data[0] == 0x4A
+			&& marker->data[1] == 0x46
+			&& marker->data[2] == 0x49
+			&& marker->data[3] == 0x46
+			&& marker->data[4] == 0)
+			continue; // reject duplicate JFIF
+		if (dstinfo.write_Adobe_marker
+			&& marker->marker == JPEG_APP0 + 14
+			&& marker->data_length >= 5
+			&& marker->data[0] == 0x41
+			&& marker->data[1] == 0x64
+			&& marker->data[2] == 0x6F
+			&& marker->data[3] == 0x62
+			&& marker->data[4] == 0x65)
+			continue; // reject duplicate Adobe
+		jpeg_write_marker(
+			&dstinfo,
+			marker->marker,
+			marker->data,
+			marker->data_length);
+	}
+
+	jpeg_finish_compress(&dstinfo);
+	jpeg_finish_decompress(&srcinfo);
+
+	return QByteArray::fromRawData(
+		reinterpret_cast<char*>(outbuffer),
+		outsize);
+}
+
 } // namespace Images
diff --git a/ui/image/image_prepare.h b/ui/image/image_prepare.h
index 3ede8dc..da0b7cb 100644
--- a/ui/image/image_prepare.h
+++ b/ui/image/image_prepare.h
@@ -204,5 +204,6 @@ struct PrepareArgs {
 }
 
 [[nodiscard]] bool IsProgressiveJpeg(const QByteArray &bytes);
+[[nodiscard]] QByteArray MakeProgressiveJpeg(const QByteArray &bytes);
 
 } // namespace Images

From 6cd13e1057ee18f3c0e5168232e007dcaeee34b2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 9 Jan 2023 14:29:24 +0400
Subject: [PATCH 314/635] Handle jpeg errors with exceptions

---
 ui/image/image_prepare.cpp | 219 ++++++++++++++++++-------------------
 1 file changed, 106 insertions(+), 113 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 69bf818..da9bb09 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -23,21 +23,6 @@
 #include <QtSvg/QSvgRenderer>
 
 #include <jpeglib.h>
-#include <setjmp.h>
-
-struct my_error_mgr : public jpeg_error_mgr {
-	jmp_buf setjmp_buffer;
-};
-
-extern "C" {
-
-static void my_error_exit(j_common_ptr cinfo) {
-	(*cinfo->err->output_message)(cinfo);
-	my_error_mgr* myerr = (my_error_mgr*)cinfo->err;
-	longjmp(myerr->setjmp_buffer, 1);
-}
-
-} // extern "C"
 
 namespace Images {
 namespace {
@@ -1268,113 +1253,121 @@ QImage Prepare(QImage image, int w, int h, const PrepareArgs &args) {
 }
 
 bool IsProgressiveJpeg(const QByteArray &bytes) {
-	struct jpeg_decompress_struct info;
-	struct my_error_mgr jerr;
+	try {
+		struct jpeg_decompress_struct info;
+		struct jpeg_error_mgr jerr;
 
-	info.err = jpeg_std_error(&jerr);
-	jerr.error_exit = my_error_exit;
-	if (setjmp(jerr.setjmp_buffer)) {
+		info.err = jpeg_std_error(&jerr);
+		jerr.error_exit = [](j_common_ptr cinfo) {
+			(*cinfo->err->output_message)(cinfo);
+			throw new std::exception;
+		};
+
+		jpeg_create_decompress(&info);
+		const auto guard = gsl::finally([&] {
+			jpeg_destroy_decompress(&info);
+		});
+
+		jpeg_mem_src(
+			&info,
+			reinterpret_cast<const unsigned char*>(bytes.data()),
+			bytes.size());
+		if (jpeg_read_header(&info, TRUE) != 1) {
+			return false;
+		}
+
+		return (info.progressive_mode > 0);
+	} catch (...) {
 		return false;
 	}
-
-	jpeg_create_decompress(&info);
-	const auto guard = gsl::finally([&] {
-		jpeg_destroy_decompress(&info);
-	});
-
-	jpeg_mem_src(
-		&info,
-		reinterpret_cast<const unsigned char*>(bytes.data()),
-		bytes.size());
-	if (jpeg_read_header(&info, TRUE) != 1) {
-		return false;
-	}
-
-	return (info.progressive_mode > 0);
 }
 
 QByteArray MakeProgressiveJpeg(const QByteArray &bytes) {
-	struct jpeg_decompress_struct srcinfo;
-	struct jpeg_compress_struct dstinfo;
-	struct my_error_mgr jerr;
+	try {
+		struct jpeg_decompress_struct srcinfo;
+		struct jpeg_compress_struct dstinfo;
+		struct jpeg_error_mgr jerr;
 
-	srcinfo.err = jpeg_std_error(&jerr);
-	dstinfo.err = jpeg_std_error(&jerr);
-	jerr.error_exit = my_error_exit;
-	if (setjmp(jerr.setjmp_buffer)) {
+		srcinfo.err = jpeg_std_error(&jerr);
+		dstinfo.err = jpeg_std_error(&jerr);
+		jerr.error_exit = [](j_common_ptr cinfo) {
+			(*cinfo->err->output_message)(cinfo);
+			throw new std::exception;
+		};
+
+		jpeg_create_decompress(&srcinfo);
+		const auto srcguard = gsl::finally([&] {
+			jpeg_abort_decompress(&srcinfo);
+			jpeg_destroy_decompress(&srcinfo);
+		});
+
+		jpeg_create_compress(&dstinfo);
+		const auto dstguard = gsl::finally([&] {
+			jpeg_abort_compress(&dstinfo);
+			jpeg_destroy_compress(&dstinfo);
+		});
+
+		jpeg_mem_src(
+			&srcinfo,
+			reinterpret_cast<const unsigned char*>(bytes.data()),
+			bytes.size());
+
+		jpeg_save_markers(&srcinfo, JPEG_COM, 0xFFFF);
+		for (int m = 0; m < 16; m++) {
+			jpeg_save_markers(&srcinfo, JPEG_APP0 + m, 0xFFFF);
+		}
+
+		jpeg_read_header(&srcinfo, true);
+		const auto coefArrays = jpeg_read_coefficients(&srcinfo);
+		jpeg_copy_critical_parameters(&srcinfo, &dstinfo);
+		jpeg_simple_progression(&dstinfo);
+
+		unsigned char* outbuffer = nullptr;
+		long unsigned int outsize = 0;
+		jpeg_mem_dest(&dstinfo, &outbuffer, &outsize);
+		const auto outbufferGuard = gsl::finally([&] {
+			free(outbuffer);
+		});
+
+		jpeg_write_coefficients(&dstinfo, coefArrays);
+
+		for (jpeg_saved_marker_ptr marker = srcinfo.marker_list
+			; marker != nullptr
+			; marker = marker->next) {
+			if (dstinfo.write_JFIF_header
+				&& marker->marker == JPEG_APP0
+				&& marker->data_length >= 5
+				&& marker->data[0] == 0x4A
+				&& marker->data[1] == 0x46
+				&& marker->data[2] == 0x49
+				&& marker->data[3] == 0x46
+				&& marker->data[4] == 0)
+				continue; // reject duplicate JFIF
+			if (dstinfo.write_Adobe_marker
+				&& marker->marker == JPEG_APP0 + 14
+				&& marker->data_length >= 5
+				&& marker->data[0] == 0x41
+				&& marker->data[1] == 0x64
+				&& marker->data[2] == 0x6F
+				&& marker->data[3] == 0x62
+				&& marker->data[4] == 0x65)
+				continue; // reject duplicate Adobe
+			jpeg_write_marker(
+				&dstinfo,
+				marker->marker,
+				marker->data,
+				marker->data_length);
+		}
+
+		jpeg_finish_compress(&dstinfo);
+		jpeg_finish_decompress(&srcinfo);
+
+		return QByteArray::fromRawData(
+			reinterpret_cast<char*>(outbuffer),
+			outsize);
+	} catch (...) {
 		return {};
 	}
-
-	jpeg_create_decompress(&srcinfo);
-	const auto srcguard = gsl::finally([&] {
-		jpeg_abort_decompress(&srcinfo);
-		jpeg_destroy_decompress(&srcinfo);
-	});
-
-	jpeg_create_compress(&dstinfo);
-	const auto dstguard = gsl::finally([&] {
-		jpeg_abort_compress(&dstinfo);
-		jpeg_destroy_compress(&dstinfo);
-	});
-
-	jpeg_mem_src(
-		&srcinfo,
-		reinterpret_cast<const unsigned char*>(bytes.data()),
-		bytes.size());
-
-	jpeg_save_markers(&srcinfo, JPEG_COM, 0xFFFF);
-	for (int m = 0; m < 16; m++) {
-		jpeg_save_markers(&srcinfo, JPEG_APP0 + m, 0xFFFF);
-	}
-
-	jpeg_read_header(&srcinfo, true);
-	const auto coefArrays = jpeg_read_coefficients(&srcinfo);
-	jpeg_copy_critical_parameters(&srcinfo, &dstinfo);
-	jpeg_simple_progression(&dstinfo);
-
-	unsigned char* outbuffer = nullptr;
-	long unsigned int outsize = 0;
-	jpeg_mem_dest(&dstinfo, &outbuffer, &outsize);
-	const auto outbufferGuard = gsl::finally([&] {
-		free(outbuffer);
-	});
-
-	jpeg_write_coefficients(&dstinfo, coefArrays);
-
-	for (jpeg_saved_marker_ptr marker = srcinfo.marker_list
-		; marker != nullptr
-		; marker = marker->next) {
-		if (dstinfo.write_JFIF_header
-			&& marker->marker == JPEG_APP0
-			&& marker->data_length >= 5
-			&& marker->data[0] == 0x4A
-			&& marker->data[1] == 0x46
-			&& marker->data[2] == 0x49
-			&& marker->data[3] == 0x46
-			&& marker->data[4] == 0)
-			continue; // reject duplicate JFIF
-		if (dstinfo.write_Adobe_marker
-			&& marker->marker == JPEG_APP0 + 14
-			&& marker->data_length >= 5
-			&& marker->data[0] == 0x41
-			&& marker->data[1] == 0x64
-			&& marker->data[2] == 0x6F
-			&& marker->data[3] == 0x62
-			&& marker->data[4] == 0x65)
-			continue; // reject duplicate Adobe
-		jpeg_write_marker(
-			&dstinfo,
-			marker->marker,
-			marker->data,
-			marker->data_length);
-	}
-
-	jpeg_finish_compress(&dstinfo);
-	jpeg_finish_decompress(&srcinfo);
-
-	return QByteArray::fromRawData(
-		reinterpret_cast<char*>(outbuffer),
-		outsize);
 }
 
 } // namespace Images

From c72beeeb7c9a02dcfd9b0f3cd23d88100d33225b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 12 Jan 2023 10:10:21 +0400
Subject: [PATCH 315/635] Fix escaping QByteArray construction.

---
 ui/image/image_prepare.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index da9bb09..a729254 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1362,9 +1362,7 @@ QByteArray MakeProgressiveJpeg(const QByteArray &bytes) {
 		jpeg_finish_compress(&dstinfo);
 		jpeg_finish_decompress(&srcinfo);
 
-		return QByteArray::fromRawData(
-			reinterpret_cast<char*>(outbuffer),
-			outsize);
+		return QByteArray(reinterpret_cast<char*>(outbuffer), outsize);
 	} catch (...) {
 		return {};
 	}

From a113e500503dd4f91211254b74b4b090b64ead34 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 12 Jan 2023 11:23:02 +0400
Subject: [PATCH 316/635] Separate ClickHandler::url from dragText.

---
 ui/basic_click_handlers.h | 1 -
 ui/click_handler.h        | 5 +++++
 ui/widgets/labels.cpp     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/basic_click_handlers.h b/ui/basic_click_handlers.h
index 89d5773..178e68c 100644
--- a/ui/basic_click_handlers.h
+++ b/ui/basic_click_handlers.h
@@ -28,7 +28,6 @@ public:
 	}
 
 protected:
-	virtual QString url() const = 0;
 	virtual QString readable() const;
 
 	bool _fullDisplayed;
diff --git a/ui/click_handler.h b/ui/click_handler.h
index 9e1b0b9..b22576e 100644
--- a/ui/click_handler.h
+++ b/ui/click_handler.h
@@ -38,6 +38,11 @@ public:
 
 	virtual void onClick(ClickContext context) const = 0;
 
+	// Some sort of `id`, for text links contains urls.
+	virtual QString url() const {
+		return QString();
+	}
+
 	// What text to show in a tooltip when mouse is over that click handler as a link in Text.
 	virtual QString tooltip() const {
 		return QString();
diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 7d44cae..0cdadf5 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -398,7 +398,7 @@ void FlatLabel::overrideLinkClickHandler(Fn<void(QString url)> handler) {
 		if (button != Qt::LeftButton) {
 			return true;
 		}
-		handler(link->dragText());
+		handler(link->url());
 		return false;
 	});
 }

From 2404225e09b4b35d657724027d5835d71857a5e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 13 Jan 2023 12:43:50 +0400
Subject: [PATCH 317/635] Allow window to receive WM_DPICHANGED in Qt.

---
 ui/platform/win/ui_window_win.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 995c8d5..73572ce 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -581,12 +581,9 @@ bool WindowHelper::handleNativeEvent(
 		_systemButtonOver.fire(systemButtonHitTest(*result));
 	} return true;
 
-	// should return true for Qt not to change window size
-	// when moving the window between screens
-	// change to false once runtime scale change would be supported
 	case WM_DPICHANGED: {
 		_dpi = LOWORD(wParam);
-	} return true;
+	} return false;
 
 	}
 	return false;

From 0662809cd218b23c28733642147b2d20baed4141 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 15 Jan 2023 06:34:23 +0300
Subject: [PATCH 318/635] Added some convenient overload methods to RpWidget.

---
 ui/rp_widget.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/rp_widget.h b/ui/rp_widget.h
index f1260b9..4095c2d 100644
--- a/ui/rp_widget.h
+++ b/ui/rp_widget.h
@@ -54,6 +54,9 @@ public:
 		y -= margins.top();
 		Base::move(style::RightToLeft() ? x : ((outerw > 0 ? outerw : Base::parentWidget()->width()) - x - Base::width()), y);
 	}
+	void setGeometryToLeft(const QRect &r, int outerw = 0) {
+		setGeometryToLeft(r.x(), r.y(), r.width(), r.height(), outerw);
+	}
 	void setGeometryToLeft(int x, int y, int w, int h, int outerw = 0) {
 		auto margins = getMargins();
 		x -= margins.left();
@@ -62,6 +65,9 @@ public:
 		h -= margins.top() - margins.bottom();
 		Base::setGeometry(style::RightToLeft() ? ((outerw > 0 ? outerw : Base::parentWidget()->width()) - x - w) : x, y, w, h);
 	}
+	void setGeometryToRight(const QRect &r, int outerw = 0) {
+		setGeometryToRight(r.x(), r.y(), r.width(), r.height(), outerw);
+	}
 	void setGeometryToRight(int x, int y, int w, int h, int outerw = 0) {
 		auto margins = getMargins();
 		x -= margins.right();

From 3bfd1797e4b484d657ed19cf263d10c06a8829bd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 15 Jan 2023 06:54:07 +0300
Subject: [PATCH 319/635] Added initial list of functions for geometry
 calculations.

---
 CMakeLists.txt |   1 +
 ui/rect.h      | 107 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 ui/rect.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e60a59..034941a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -270,6 +270,7 @@ PRIVATE
     ui/painter.h
     ui/ph.cpp
     ui/ph.h
+    ui/rect.h
     ui/rect_part.h
     ui/round_rect.cpp
     ui/round_rect.h
diff --git a/ui/rect.h b/ui/rect.h
new file mode 100644
index 0000000..8564b3b
--- /dev/null
+++ b/ui/rect.h
@@ -0,0 +1,107 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include <QtCore/QRect>
+
+namespace rect {
+
+// Margins.
+namespace m {
+namespace sum {
+
+/*
+	Horizontal.
+	rect::m::sum::h(mypadding);
+*/
+[[nodiscard]] int h(const QMargins &margins) {
+	return margins.left() + margins.right();
+}
+
+[[nodiscard]] float64 h(const QMarginsF &margins) {
+	return margins.left() + margins.right();
+}
+
+/*
+	Vertical.
+	rect::m::sum::v(mypadding);
+*/
+[[nodiscard]] int v(const QMargins &margins) {
+	return margins.top() + margins.bottom();
+}
+
+[[nodiscard]] float64 v(const QMarginsF &margins) {
+	return margins.top() + margins.bottom();
+}
+
+} // namespace sum
+} // namespace m
+
+/*
+	rect::right(mywidget);
+*/
+[[nodiscard]] int right(const QRect &r) {
+	return r.left() + r.width();
+}
+
+[[nodiscard]] float64 right(const QRectF &r) {
+	return r.left() + r.width();
+}
+
+[[nodiscard]] int right(not_null<QWidget*> w) {
+	return w->x() + w->width();
+}
+
+/*
+	rect::bottom(mywidget);
+*/
+[[nodiscard]] int bottom(const QRect &r) {
+	return r.top() + r.height();
+}
+
+[[nodiscard]] float64 bottom(const QRectF &r) {
+	return r.top() + r.height();
+}
+
+[[nodiscard]] int bottom(not_null<const QWidget*> w) {
+	return w->y() + w->height();
+}
+
+} // namespace rect
+
+/*
+	Rect(mysize);
+*/
+[[nodiscard]] QRect Rect(const QSize &s) {
+	return QRect(QPoint(), s);
+}
+
+[[nodiscard]] QRectF Rect(const QSizeF &s) {
+	return QRectF(QPointF(), s);
+}
+
+/*
+	Size(myside);
+*/
+[[nodiscard]] QSize Size(int side) {
+	return QSize(side, side);
+}
+
+[[nodiscard]] QSizeF Size(float64 side) {
+	return QSizeF(side, side);
+}
+
+/*
+	Margins(myvalue);
+*/
+[[nodiscard]] QMargins Margins(int side) {
+	return QMargins{ side, side, side, side };
+}
+
+[[nodiscard]] QMarginsF Margins(float64 side) {
+	return QMarginsF{ side, side, side, side };
+}

From e00ae912ad7bc7a378b411aeb9f853f7cdbef82d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 19 Jan 2023 10:41:56 +0300
Subject: [PATCH 320/635] Fixed missed inline of functions for geometry
 calculations.

---
 ui/rect.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ui/rect.h b/ui/rect.h
index 8564b3b..3a104c6 100644
--- a/ui/rect.h
+++ b/ui/rect.h
@@ -18,11 +18,11 @@ namespace sum {
 	Horizontal.
 	rect::m::sum::h(mypadding);
 */
-[[nodiscard]] int h(const QMargins &margins) {
+[[nodiscard]] inline int h(const QMargins &margins) {
 	return margins.left() + margins.right();
 }
 
-[[nodiscard]] float64 h(const QMarginsF &margins) {
+[[nodiscard]] inline float64 h(const QMarginsF &margins) {
 	return margins.left() + margins.right();
 }
 
@@ -30,11 +30,11 @@ namespace sum {
 	Vertical.
 	rect::m::sum::v(mypadding);
 */
-[[nodiscard]] int v(const QMargins &margins) {
+[[nodiscard]] inline int v(const QMargins &margins) {
 	return margins.top() + margins.bottom();
 }
 
-[[nodiscard]] float64 v(const QMarginsF &margins) {
+[[nodiscard]] inline float64 v(const QMarginsF &margins) {
 	return margins.top() + margins.bottom();
 }
 
@@ -44,30 +44,30 @@ namespace sum {
 /*
 	rect::right(mywidget);
 */
-[[nodiscard]] int right(const QRect &r) {
+[[nodiscard]] inline int right(const QRect &r) {
 	return r.left() + r.width();
 }
 
-[[nodiscard]] float64 right(const QRectF &r) {
+[[nodiscard]] inline float64 right(const QRectF &r) {
 	return r.left() + r.width();
 }
 
-[[nodiscard]] int right(not_null<QWidget*> w) {
+[[nodiscard]] inline int right(not_null<QWidget*> w) {
 	return w->x() + w->width();
 }
 
 /*
 	rect::bottom(mywidget);
 */
-[[nodiscard]] int bottom(const QRect &r) {
+[[nodiscard]] inline int bottom(const QRect &r) {
 	return r.top() + r.height();
 }
 
-[[nodiscard]] float64 bottom(const QRectF &r) {
+[[nodiscard]] inline float64 bottom(const QRectF &r) {
 	return r.top() + r.height();
 }
 
-[[nodiscard]] int bottom(not_null<const QWidget*> w) {
+[[nodiscard]] inline int bottom(not_null<const QWidget*> w) {
 	return w->y() + w->height();
 }
 
@@ -76,32 +76,32 @@ namespace sum {
 /*
 	Rect(mysize);
 */
-[[nodiscard]] QRect Rect(const QSize &s) {
+[[nodiscard]] inline QRect Rect(const QSize &s) {
 	return QRect(QPoint(), s);
 }
 
-[[nodiscard]] QRectF Rect(const QSizeF &s) {
+[[nodiscard]] inline QRectF Rect(const QSizeF &s) {
 	return QRectF(QPointF(), s);
 }
 
 /*
 	Size(myside);
 */
-[[nodiscard]] QSize Size(int side) {
+[[nodiscard]] inline QSize Size(int side) {
 	return QSize(side, side);
 }
 
-[[nodiscard]] QSizeF Size(float64 side) {
+[[nodiscard]] inline QSizeF Size(float64 side) {
 	return QSizeF(side, side);
 }
 
 /*
 	Margins(myvalue);
 */
-[[nodiscard]] QMargins Margins(int side) {
+[[nodiscard]] inline QMargins Margins(int side) {
 	return QMargins{ side, side, side, side };
 }
 
-[[nodiscard]] QMarginsF Margins(float64 side) {
+[[nodiscard]] inline QMarginsF Margins(float64 side) {
 	return QMarginsF{ side, side, side, side };
 }

From 6e3cc8c769fcc424e2e798ca90847bf6d89688d0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Jan 2023 12:16:19 +0400
Subject: [PATCH 321/635] Fix child geometry for mega-rich popup menus.

---
 ui/widgets/popup_menu.cpp | 14 +++++++++-----
 ui/widgets/popup_menu.h   |  3 +++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 0968190..1459f4a 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -545,7 +545,10 @@ void PopupMenu::popupSubmenu(
 		currentSubmenu->hideMenu(true);
 	}
 	if (submenu) {
-		QPoint p(_inner.x() + (style::RightToLeft() ? _padding.right() : (_inner.width() - _padding.left())), _inner.y() + actionTop);
+		const auto padding = _useTransparency
+			? _st.shadow.extend
+			: QMargins(st::lineWidth, 0, st::lineWidth, 0);
+		QPoint p(_inner.x() + (style::RightToLeft() ? padding.right() : (_inner.width() - padding.left())), _inner.y() + actionTop);
 		_activeSubmenu = submenu;
 		if (_activeSubmenu->prepareGeometryFor(geometry().topLeft() + p, this)) {
 			_activeSubmenu->showPrepared(source);
@@ -983,11 +986,12 @@ bool PopupMenu::prepareGeometryFor(const QPoint &p, PopupMenu *parent) {
 			0),
 		_padding.top());
 	auto r = screen ? screen->availableGeometry() : QRect();
+	const auto parentWidth = _parent ? _parent->inner().width() : 0;
 	if (style::RightToLeft()) {
 		const auto badLeft = !r.isNull() && w.x() - width() < r.x() - _extents.left();
 		if (forceRight || (badLeft && !forceLeft)) {
-			if (_parent && (r.isNull() || w.x() + _parent->width() - _extents.left() - _extents.right() + width() - _extents.right() <= r.x() + r.width())) {
-				w.setX(w.x() + _parent->width() - _extents.left() - _extents.right());
+			if (_parent && (r.isNull() || w.x() + parentWidth - _extents.left() - _extents.right() + width() - _extents.right() <= r.x() + r.width())) {
+				w.setX(w.x() + parentWidth - _extents.left() - _extents.right());
 			} else {
 				w.setX(r.x() - _extents.left());
 			}
@@ -997,8 +1001,8 @@ bool PopupMenu::prepareGeometryFor(const QPoint &p, PopupMenu *parent) {
 	} else {
 		const auto badLeft = !r.isNull() && w.x() + width() - _extents.right() > r.x() + r.width();
 		if (forceRight || (badLeft && !forceLeft)) {
-			if (_parent && (r.isNull() || w.x() - _parent->width() + _extents.left() + _extents.right() - width() + _extents.right() >= r.x() - _extents.left())) {
-				w.setX(w.x() + _extents.left() + _extents.right() - _parent->width() - width() + _extents.left() + _extents.right());
+			if (_parent && (r.isNull() || w.x() - parentWidth + _extents.left() + _extents.right() - width() + _extents.right() >= r.x() - _extents.left())) {
+				w.setX(w.x() + _extents.left() + _extents.right() - parentWidth - width() + _extents.left() + _extents.right());
 			} else {
 				w.setX(p.x() - width() + std::max(
 					_additionalMenuPadding.right() - _st.shadow.extend.right(),
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 170c1de..a535219 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -37,6 +37,9 @@ public:
 	[[nodiscard]] const style::PopupMenu &st() const {
 		return _st;
 	}
+	[[nodiscard]] QRect inner() const {
+		return _inner;
+	}
 
 	not_null<QAction*> addAction(base::unique_qptr<Menu::ItemBase> widget);
 	not_null<QAction*> addAction(

From 335f8050d9e81fc3e5d5357eac37fa8a326d8f72 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 20 Jan 2023 20:43:30 +0400
Subject: [PATCH 322/635] Allow stopping LimitedLoopsEmoji on last frame.

---
 ui/text/custom_emoji_instance.cpp | 12 ++++++++++--
 ui/text/text_custom_emoji.cpp     | 20 +++++++++++++++-----
 ui/text/text_custom_emoji.h       |  8 +++++++-
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index bac989b..96b8395 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -383,20 +383,28 @@ PaintFrameResult Cache::paintCurrentFrame(
 		return {};
 	}
 	const auto first = context.internal.forceFirstFrame;
-	if (!first) {
+	auto last = context.internal.forceLastFrame;
+	if (!first && !last) {
 		const auto now = context.paused ? 0 : context.now;
 		const auto finishes = now ? currentFrameFinishes() : 0;
 		if (finishes && now >= finishes) {
 			++_frame;
 			if (_finished && _frame == _frames) {
 				_frame = 0;
+				if (context.internal.overrideFirstWithLastFrame) {
+					last = true;
+				}
 			}
 			_shown = now;
 		} else if (!_shown) {
 			_shown = now;
 		}
 	}
-	const auto index = first ? 0 : std::min(_frame, _frames - 1);
+	const auto index = first
+		? 0
+		: last
+		? (_frames - 1)
+		: std::min(_frame, _frames - 1);
 	const auto info = frame(index);
 	const auto size = _size / style::DevicePixelRatio();
 	const auto rect = QRect(context.position, QSize(size, size));
diff --git a/ui/text/text_custom_emoji.cpp b/ui/text/text_custom_emoji.cpp
index f0da6fd..f767f65 100644
--- a/ui/text/text_custom_emoji.cpp
+++ b/ui/text/text_custom_emoji.cpp
@@ -70,9 +70,11 @@ bool FirstFrameEmoji::readyInDefaultState() {
 
 LimitedLoopsEmoji::LimitedLoopsEmoji(
 	std::unique_ptr<CustomEmoji> wrapped,
-	int limit)
+	int limit,
+	bool stopOnLast)
 : _wrapped(std::move(wrapped))
-, _limit(limit) {
+, _limit(limit)
+, _stopOnLast(stopOnLast) {
 }
 
 QString LimitedLoopsEmoji::entityData() {
@@ -91,10 +93,18 @@ void LimitedLoopsEmoji::paint(QPainter &p, const Context &context) {
 		}
 	}
 	if (_played == _limit) {
-		const auto was = context.internal.forceFirstFrame;
-		context.internal.forceFirstFrame = true;
+		const auto wasFirst = context.internal.forceFirstFrame;
+		const auto wasLast = context.internal.forceLastFrame;
+		(_stopOnLast
+			? context.internal.forceLastFrame
+			: context.internal.forceFirstFrame) = true;
 		_wrapped->paint(p, context);
-		context.internal.forceFirstFrame = was;
+		context.internal.forceFirstFrame = wasFirst;
+		context.internal.forceLastFrame = wasLast;
+	} else if (_played + 1 == _limit && _inLoop && _stopOnLast) {
+		const auto wasLast = context.internal.overrideFirstWithLastFrame;
+		_wrapped->paint(p, context);
+		context.internal.overrideFirstWithLastFrame = wasLast;
 	} else {
 		_wrapped->paint(p, context);
 	}
diff --git a/ui/text/text_custom_emoji.h b/ui/text/text_custom_emoji.h
index fb65685..76d525b 100644
--- a/ui/text/text_custom_emoji.h
+++ b/ui/text/text_custom_emoji.h
@@ -31,6 +31,8 @@ struct CustomEmojiPaintContext {
 	mutable struct {
 		bool colorized = false;
 		bool forceFirstFrame = false;
+		bool forceLastFrame = false;
+		bool overrideFirstWithLastFrame = false;
 	} internal;
 };
 
@@ -85,7 +87,10 @@ private:
 
 class LimitedLoopsEmoji final : public CustomEmoji {
 public:
-	LimitedLoopsEmoji(std::unique_ptr<CustomEmoji> wrapped, int limit);
+	LimitedLoopsEmoji(
+		std::unique_ptr<CustomEmoji> wrapped,
+		int limit,
+		bool stopOnLast = false);
 
 	QString entityData() override;
 	void paint(QPainter &p, const Context &context) override;
@@ -98,6 +103,7 @@ private:
 	const int _limit = 0;
 	int _played = 0;
 	bool _inLoop = false;
+	bool _stopOnLast = false;
 
 };
 

From 28d01d023bd76310520a895bdb7f66a2e70a2043 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 21 Jan 2023 19:34:26 +0300
Subject: [PATCH 323/635] Replaced multiple static constants for square root of
 2 with Qt define.

---
 ui/effects/cross_animation.cpp | 5 ++---
 ui/widgets/checkbox.cpp        | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/effects/cross_animation.cpp b/ui/effects/cross_animation.cpp
index 865bc8a..18a9cd4 100644
--- a/ui/effects/cross_animation.cpp
+++ b/ui/effects/cross_animation.cpp
@@ -122,7 +122,6 @@ void CrossAnimation::paint(
 
 	const auto stroke = style::ConvertScaleExact(st.stroke);
 
-	const auto sqrt2 = sqrt(2.);
 	const auto deleteScale = shown + st.minScale * (1. - shown);
 	const auto deleteSkip = (deleteScale * st.skip)
 		+ (1. - deleteScale) * (st.size / 2);
@@ -131,7 +130,7 @@ void CrossAnimation::paint(
 	const auto deleteTop = y + deleteSkip + 0.;
 	const auto deleteWidth = st.size - 2 * deleteSkip;
 	const auto deleteHeight = st.size - 2 * deleteSkip;
-	const auto deleteStroke = stroke / sqrt2;
+	const auto deleteStroke = stroke / M_SQRT2;
 	std::array<QPointF, kPointCount> pathDelete = { {
 		{ deleteLeft, deleteTop + deleteStroke },
 		{ deleteLeft + deleteStroke, deleteTop },
@@ -180,7 +179,7 @@ void CrossAnimation::paint(
 		p.fillPath(path, color);
 	}
 	if (loadingArcLength != 0) {
-		auto roundSkip = (st.size * (1 - sqrt2) + 2 * sqrt2 * deleteSkip + stroke) / 2;
+		auto roundSkip = (st.size * (1 - M_SQRT2) + 2 * M_SQRT2 * deleteSkip + stroke) / 2;
 		auto roundPart = QRectF(x + roundSkip, y + roundSkip, st.size - 2 * roundSkip, st.size - 2 * roundSkip);
 		if (staticLoading) {
 			anim::DrawStaticLoading(p, roundPart, stroke, color);
diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index dc5d50f..7cc28a8 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -137,8 +137,7 @@ void ToggleView::paintXV(QPainter &p, int left, int top, int outerWidth, float64
 	Expects(_st->vsize > 0);
 	Expects(_st->stroke > 0);
 
-	static const auto sqrt2 = sqrt(2.);
-	const auto stroke = (0. + _st->stroke) / sqrt2;
+	const auto stroke = (0. + _st->stroke) / M_SQRT2;
 	if (toggled < 1) {
 		// Just X or X->V.
 		const auto xSize = 0. + _st->xsize;

From 77cd7f642c13ce215ff7bc4764670e9149202b06 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 21 Jan 2023 21:12:31 +0400
Subject: [PATCH 324/635] Add QtMath #include for M_SQRT2.

---
 ui/widgets/checkbox.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 7cc28a8..450810a 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -12,6 +12,7 @@
 #include "ui/painter.h"
 
 #include <QtGui/QtEvents>
+#include <QtCore/QtMath>
 
 namespace Ui {
 namespace {

From c006f8c30451cfd182d7f618f2d754a8f50d01cd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 23 Jan 2023 09:28:14 +0300
Subject: [PATCH 325/635] Moved out styles of ripples with shadowFg color to
 single place.

---
 ui/widgets/widgets.style | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 515ea08..98d3502 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1557,3 +1557,7 @@ dropdownMenuWithIcons: DropdownMenu(defaultDropdownMenu) {
 	}
 	menu: menuWithIcons;
 }
+
+universalRippleAnimation: RippleAnimation(defaultRippleAnimation) {
+	color: shadowFg;
+}

From 395795e37a5f9195f3f67ba7c3a4c53718961f8f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 23 Jan 2023 12:21:31 +0400
Subject: [PATCH 326/635] Fix stopping LimitedLoopsEmoji on last frame.

---
 ui/text/text_custom_emoji.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/text/text_custom_emoji.cpp b/ui/text/text_custom_emoji.cpp
index f767f65..3faa371 100644
--- a/ui/text/text_custom_emoji.cpp
+++ b/ui/text/text_custom_emoji.cpp
@@ -103,6 +103,7 @@ void LimitedLoopsEmoji::paint(QPainter &p, const Context &context) {
 		context.internal.forceLastFrame = wasLast;
 	} else if (_played + 1 == _limit && _inLoop && _stopOnLast) {
 		const auto wasLast = context.internal.overrideFirstWithLastFrame;
+		context.internal.overrideFirstWithLastFrame = true;
 		_wrapped->paint(p, context);
 		context.internal.overrideFirstWithLastFrame = wasLast;
 	} else {

From 133acab68f3a300f8627a75901f1e93109419b04 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 23 Jan 2023 12:29:45 +0300
Subject: [PATCH 327/635] Fixed updating of CenterWrap after postponed resize
 of wrapped widget.

---
 ui/wrap/padding_wrap.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/wrap/padding_wrap.cpp b/ui/wrap/padding_wrap.cpp
index a0e70e9..19ad522 100644
--- a/ui/wrap/padding_wrap.cpp
+++ b/ui/wrap/padding_wrap.cpp
@@ -85,6 +85,7 @@ int CenterWrap<RpWidget>::resizeGetHeight(int newWidth) {
 }
 
 void CenterWrap<RpWidget>::wrappedSizeUpdated(QSize size) {
+	resize(width(), size.height());
 	updateWrappedPosition(width());
 }
 

From 9cb928b7c41f0f1eb36a4d26ce31d053ea12466d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 23 Jan 2023 21:57:14 +0400
Subject: [PATCH 328/635] Add some helpers for exact dpi painting.

---
 CMakeLists.txt      |  3 +++
 ui/dpr/dpr_icon.cpp | 32 +++++++++++++++++++++++++++++
 ui/dpr/dpr_icon.h   | 20 ++++++++++++++++++
 ui/dpr/dpr_image.h  | 50 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 105 insertions(+)
 create mode 100644 ui/dpr/dpr_icon.cpp
 create mode 100644 ui/dpr/dpr_icon.h
 create mode 100644 ui/dpr/dpr_image.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 034941a..a8d90fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,9 @@ PRIVATE
 
     qt_conf/win.qrc
 
+    ui/dpr/dpr_icon.cpp
+    ui/dpr/dpr_icon.h
+    ui/dpr/dpr_image.h
     ui/effects/animation_value.cpp
     ui/effects/animation_value.h
     ui/effects/animation_value_f.h
diff --git a/ui/dpr/dpr_icon.cpp b/ui/dpr/dpr_icon.cpp
new file mode 100644
index 0000000..6515cd3
--- /dev/null
+++ b/ui/dpr/dpr_icon.cpp
@@ -0,0 +1,32 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/dpr/dpr_icon.h"
+
+namespace dpr {
+
+QImage IconFrame(
+		const style::icon &icon,
+		const QColor &color,
+		double ratio) {
+	const auto scale = style::Scale() * ratio;
+	const auto use = (scale > 200. || style::DevicePixelRatio() > 2)
+		? (300 / style::DevicePixelRatio())
+		: (scale > 100.)
+		? (200 / style::DevicePixelRatio())
+		: (100 / style::DevicePixelRatio());
+	auto image = icon.instance(color, use);
+	image.setDevicePixelRatio(1.);
+	const auto desired = icon.size() * ratio;
+	return (image.size() == desired)
+		? image
+		: image.scaled(
+			desired,
+			Qt::IgnoreAspectRatio,
+			Qt::SmoothTransformation);
+}
+
+} // namespace dpr
diff --git a/ui/dpr/dpr_icon.h b/ui/dpr/dpr_icon.h
new file mode 100644
index 0000000..4b37793
--- /dev/null
+++ b/ui/dpr/dpr_icon.h
@@ -0,0 +1,20 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/style/style_core.h"
+
+class QImage;
+
+namespace dpr {
+
+[[nodiscard]] QImage IconFrame(
+	const style::icon &icon,
+	const QColor &color,
+	double ratio);
+
+} // namespace dpr
diff --git a/ui/dpr/dpr_image.h b/ui/dpr/dpr_image.h
new file mode 100644
index 0000000..34efd5f
--- /dev/null
+++ b/ui/dpr/dpr_image.h
@@ -0,0 +1,50 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include <rpl/details/callable.h>
+
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
+
+namespace dpr {
+
+// Validate(_cache, devicePixelRatioF(), size, [&](QPainter &p, QSize size) {
+//	... paint using p ...
+// }, (_cacheKey != cacheKey()), Qt::transparent);
+
+template <typename Generator>
+void Validate(
+		QImage &image,
+		double ratio,
+		QSize size,
+		Generator &&generator,
+		bool force,
+		std::optional<QColor> fill = {},
+		bool setResultRatio = true) {
+	size *= ratio;
+	const auto sizeChanged = (image.size() != size);
+	if (sizeChanged || force) {
+		if (sizeChanged) {
+			image = QImage(size, QImage::Format_ARGB32_Premultiplied);
+		}
+		if (fill) {
+			image.fill(*fill);
+		}
+		image.setDevicePixelRatio(1.);
+		auto p = QPainter(&image);
+		using namespace rpl::details;
+		if constexpr (is_callable_plain_v<Generator, QPainter&, QSize>) {
+			generator(p, size);
+		} else {
+			generator(p);
+		}
+	}
+	image.setDevicePixelRatio(setResultRatio ? ratio : 1.);
+}
+
+} // namespace dpr

From 41ee2fb0f05908112c0cd132c7ab7168ba87fe0c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 24 Jan 2023 12:10:48 +0400
Subject: [PATCH 329/635] Use QFontMetricsF and ceil() the width() results.

---
 ui/effects/numbers_animation.cpp | 10 +++++-----
 ui/style/style_core_font.cpp     | 25 ++++++++++++++---------
 ui/style/style_core_font.h       | 34 +++++++++++++++++---------------
 ui/widgets/input_fields.cpp      |  2 +-
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/ui/effects/numbers_animation.cpp b/ui/effects/numbers_animation.cpp
index cbe0230..e71b260 100644
--- a/ui/effects/numbers_animation.cpp
+++ b/ui/effects/numbers_animation.cpp
@@ -20,7 +20,7 @@ NumbersAnimation::NumbersAnimation(
 , _duration(st::slideWrapDuration)
 , _animationCallback(std::move(animationCallback)) {
 	for (auto ch = '0'; ch != '9'; ++ch) {
-		accumulate_max(_digitWidth, _font->m.horizontalAdvance(ch));
+		accumulate_max(_digitWidth, _font->width(ch));
 	}
 }
 
@@ -76,7 +76,7 @@ void NumbersAnimation::realSetText(QString text, int value) {
 		digit.from = digit.to;
 		digit.fromWidth = digit.toWidth;
 		digit.to = (newSize + i < size) ? QChar(0) : text[newSize + i - size];
-		digit.toWidth = digit.to.unicode() ? _font->m.horizontalAdvance(digit.to) : 0;
+		digit.toWidth = digit.to.unicode() ? _font->width(digit.to) : 0;
 		if (digit.from != digit.to) {
 			animating = true;
 		}
@@ -86,7 +86,7 @@ void NumbersAnimation::realSetText(QString text, int value) {
 	}
 	if (_disabledMonospace) {
 		_fromWidth = _toWidth;
-		_toWidth = _font->m.horizontalAdvance(text);
+		_toWidth = _font->width(text);
 	} else {
 		_fromWidth = oldSize * _digitWidth;
 		_toWidth = newSize * _digitWidth;
@@ -141,10 +141,10 @@ void NumbersAnimation::paint(QPainter &p, int x, int y, int outerWidth) {
 		auto to = digit.to;
 		const auto toCharWidth = (!_disabledMonospace || to.isDigit())
 			? _digitWidth
-			: _font->m.horizontalAdvance(to);
+			: _font->width(to);
 		const auto fromCharWidth = (!_disabledMonospace || from.isDigit())
 			? _digitWidth
-			: _font->m.horizontalAdvance(from);
+			: _font->width(from);
 		if (from == to) {
 			p.setOpacity(1.);
 			singleChar[0] = from;
diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index 76f71d8..d87de63 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -17,6 +17,7 @@
 #include <QtGui/QFontInfo>
 #include <QtGui/QFontDatabase>
 #include <QtWidgets/QApplication>
+#include <private/qfontengine_p.h>
 
 void style_InitFontsResource() {
 #ifdef Q_OS_MAC // Use resources from the .app bundle on macOS.
@@ -292,20 +293,26 @@ int registerFontFamily(const QString &family) {
 	return result;
 }
 
+int CeilTextWidth(const QFont &font, const QString &text) {
+	return text.isEmpty()
+		? 0
+		: QStackTextEngine(text, font).width(0, text.size()).ceil().toInt();
+}
+
 FontData::FontData(int size, uint32 flags, int family, Font *other)
 : f(ResolveFont(flags, size))
-, m(f)
+, _m(f)
 , _size(size)
 , _flags(flags)
 , _family(family) {
 	if (other) {
-		memcpy(modified, other, sizeof(modified));
+		memcpy(_modified, other, sizeof(_modified));
 	}
-	modified[_flags] = Font(this);
+	_modified[_flags] = Font(this);
 
-	height = m.height();
-	ascent = m.ascent();
-	descent = m.descent();
+	height = int(base::SafeRound(_m.height()));
+	ascent = int(base::SafeRound(_m.ascent()));
+	descent = int(base::SafeRound(_m.descent()));
 	spacew = width(QLatin1Char(' '));
 	elidew = width("...");
 }
@@ -348,10 +355,10 @@ int FontData::family() const {
 
 Font FontData::otherFlagsFont(uint32 flag, bool set) const {
 	int32 newFlags = set ? (_flags | flag) : (_flags & ~flag);
-	if (!modified[newFlags].v()) {
-		modified[newFlags] = Font(_size, newFlags, _family, modified);
+	if (!_modified[newFlags].v()) {
+		_modified[newFlags] = Font(_size, newFlags, _family, _modified);
 	}
-	return modified[newFlags];
+	return _modified[newFlags];
 }
 
 Font::Font(int size, uint32 flags, const QString &family) {
diff --git a/ui/style/style_core_font.h b/ui/style/style_core_font.h
index df98408..e0c85aa 100644
--- a/ui/style/style_core_font.h
+++ b/ui/style/style_core_font.h
@@ -66,46 +66,48 @@ enum FontFlags {
 	FontDifferentFlags = 0x40,
 };
 
+[[nodiscard]] int CeilTextWidth(const QFont &font, const QString &text);
+
 class FontData {
 public:
-	int width(const QString &str) const {
-		return m.horizontalAdvance(str);
+	[[nodiscard]] int width(const QString &text) const {
+		return CeilTextWidth(f, text);
 	}
-	int width(const QString &str, int32 from, int32 to) const {
-		return width(str.mid(from, to));
+	[[nodiscard]] int width(const QString &text, int from, int to) const {
+		return width(text.mid(from, to));
 	}
-	int width(QChar ch) const {
-		return m.horizontalAdvance(ch);
+	[[nodiscard]] int width(QChar ch) const {
+		return int(std::ceil(_m.horizontalAdvance(ch)));
 	}
-	QString elided(
+	[[nodiscard]] QString elided(
 			const QString &str,
 			int width,
 			Qt::TextElideMode mode = Qt::ElideRight) const {
-		return m.elidedText(str, mode, width);
+		return _m.elidedText(str, mode, width);
 	}
 
-	Font bold(bool set = true) const;
-	Font italic(bool set = true) const;
-	Font underline(bool set = true) const;
-	Font strikeout(bool set = true) const;
-	Font semibold(bool set = true) const;
-	Font monospace(bool set = true) const;
+	[[nodiscard]] Font bold(bool set = true) const;
+	[[nodiscard]] Font italic(bool set = true) const;
+	[[nodiscard]] Font underline(bool set = true) const;
+	[[nodiscard]] Font strikeout(bool set = true) const;
+	[[nodiscard]] Font semibold(bool set = true) const;
+	[[nodiscard]] Font monospace(bool set = true) const;
 
 	int size() const;
 	uint32 flags() const;
 	int family() const;
 
 	QFont f;
-	QFontMetrics m;
 	int32 height, ascent, descent, spacew, elidew;
 
 private:
-	mutable Font modified[FontDifferentFlags];
+	mutable Font _modified[FontDifferentFlags];
 
 	Font otherFlagsFont(uint32 flag, bool set) const;
 	FontData(int size, uint32 flags, int family, Font *other);
 
 	friend class Font;
+	QFontMetricsF _m;
 	int _size;
 	uint32 _flags;
 	int _family;
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index ed7df91..640efdf 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -3799,7 +3799,7 @@ void InputField::resizeEvent(QResizeEvent *e) {
 }
 
 void InputField::refreshPlaceholder(const QString &text) {
-	const auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() - _st.placeholderMargins.right() - 1;
+	const auto availableWidth = width() - _st.textMargins.left() - _st.textMargins.right() - _st.placeholderMargins.left() - _st.placeholderMargins.right();
 	if (_st.placeholderScale > 0.) {
 		auto placeholderFont = _st.placeholderFont->f;
 		placeholderFont.setStyleStrategy(QFont::PreferMatch);

From 43e9128014c5239a6732ae34bdfe007efb9692c8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 25 Jan 2023 11:22:56 +0400
Subject: [PATCH 330/635] Report animate phases from PopupMenu.

---
 ui/widgets/popup_menu.cpp  | 11 ++++++++++-
 ui/widgets/popup_menu.h    | 11 +++++++++++
 ui/widgets/scroll_area.cpp | 12 ++++++++----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 1459f4a..7321e84 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -484,7 +484,10 @@ void PopupMenu::paintEvent(QPaintEvent *e) {
 		_showAnimation->paintFrame(p, 0, 0, width(), 1., 1.);
 		_showAnimation.reset();
 		_showStateChanges.fire({});
-		PostponeCall(this, [=] { showChildren(); });
+		PostponeCall(this, [=] {
+			showChildren();
+			_animatePhase = AnimatePhase::Shown;
+		});
 	} else {
 		paintBg(p);
 	}
@@ -750,6 +753,7 @@ void PopupMenu::hideFinished() {
 	_hiding = false;
 	_a_show.stop();
 	_cache = QPixmap();
+	_animatePhase = AnimatePhase::Hidden;
 	if (!isHidden()) {
 		hide();
 	}
@@ -790,6 +794,9 @@ void PopupMenu::startOpacityAnimation(bool hiding) {
 	_hiding = false;
 	prepareCache();
 	_hiding = hiding;
+	_animatePhase = hiding
+		? AnimatePhase::StartHide
+		: AnimatePhase::StartShow;
 	hideChildren();
 	_a_opacity.start(
 		[=] { opacityAnimationCallback(); },
@@ -832,6 +839,7 @@ void PopupMenu::startShowAnimation() {
 		}
 		_showAnimation->start();
 	}
+	_animatePhase = AnimatePhase::StartShow;
 	hideChildren();
 	_a_show.start([this] { showAnimationCallback(); }, 0., 1., _st.showDuration);
 	fireCurrentShowState();
@@ -858,6 +866,7 @@ void PopupMenu::opacityAnimationCallback() {
 			hideFinished();
 		} else {
 			showChildren();
+			_animatePhase = AnimatePhase::Shown;
 		}
 	}
 }
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index a535219..87bd105 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -30,6 +30,13 @@ public:
 		Bottom,
 	};
 
+	enum class AnimatePhase {
+		Hidden,
+		StartShow,
+		Shown,
+		StartHide,
+	};
+
 	PopupMenu(QWidget *parent, const style::PopupMenu &st = st::defaultPopupMenu);
 	PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st = st::defaultPopupMenu);
 	~PopupMenu();
@@ -40,6 +47,9 @@ public:
 	[[nodiscard]] QRect inner() const {
 		return _inner;
 	}
+	[[nodiscard]] rpl::producer<AnimatePhase> animatePhaseValue() const {
+		return _animatePhase.value();
+	}
 
 	not_null<QAction*> addAction(base::unique_qptr<Menu::ItemBase> widget);
 	not_null<QAction*> addAction(
@@ -195,6 +205,7 @@ private:
 	std::unique_ptr<PanelAnimation> _showAnimation;
 	Animations::Simple _a_show;
 	rpl::event_stream<ShowState> _showStateChanges;
+	rpl::variable<AnimatePhase> _animatePhase = AnimatePhase::Hidden;
 
 	bool _useTransparency = true;
 	bool _hiding = false;
diff --git a/ui/widgets/scroll_area.cpp b/ui/widgets/scroll_area.cpp
index 706bc14..bb63b0c 100644
--- a/ui/widgets/scroll_area.cpp
+++ b/ui/widgets/scroll_area.cpp
@@ -198,14 +198,18 @@ void ScrollBar::paintEvent(QPaintEvent *e) {
 	bg.setAlpha(anim::interpolate(0, bg.alpha(), opacity));
 	auto bar = anim::color(_st->barBg, _st->barBgOver, _a_barOver.value((_overbar || _moving) ? 1. : 0.));
 	bar.setAlpha(anim::interpolate(0, bar.alpha(), opacity));
-	if (_st->round) {
+	const auto outer = QRect(deltal, deltat, width() - deltal - deltar, height() - deltat - deltab);
+	const auto radius = (_st->round < 0)
+		? (std::min(outer.width(), outer.height()) / 2.)
+		: _st->round;
+	if (radius) {
 		PainterHighQualityEnabler hq(p);
 		p.setBrush(bg);
-		p.drawRoundedRect(QRect(deltal, deltat, width() - deltal - deltar, height() - deltat - deltab), _st->round, _st->round);
+		p.drawRoundedRect(outer, radius, radius);
 		p.setBrush(bar);
-		p.drawRoundedRect(_bar, _st->round, _st->round);
+		p.drawRoundedRect(_bar, radius, radius);
 	} else {
-		p.fillRect(QRect(deltal, deltat, width() - deltal - deltar, height() - deltat - deltab), bg);
+		p.fillRect(outer, bg);
 		p.fillRect(_bar, bar);
 	}
 }

From 7ec9e05510a24811c945b765bb6c03e38dbd42f9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 27 Jan 2023 14:37:01 +0400
Subject: [PATCH 331/635] Allow appending TextWithEntnties by const-ref.

---
 ui/text/text_entity.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 3756539..07e281c 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -152,6 +152,16 @@ struct TextWithEntities {
 		entities.append(other.entities);
 		return *this;
 	}
+	TextWithEntities &append(const TextWithEntities &other) {
+		const auto shift = text.size();
+		text.append(other.text);
+		entities.reserve(entities.size() + other.entities.size());
+		for (auto entity : other.entities) {
+			entity.shiftRight(shift);
+			entities.append(entity);
+		}
+		return *this;
+	}
 	TextWithEntities &append(const QString &other) {
 		text.append(other);
 		return *this;

From f2e698f2209a86c133261196275ca98273c7a4dc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 27 Jan 2023 19:00:30 +0400
Subject: [PATCH 332/635] Track isOnlyEmojiAndSpaces in Ui::Text::String.

---
 ui/text/text.cpp        |  4 ++++
 ui/text/text.h          |  3 +++
 ui/text/text_parser.cpp | 30 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 9fd9a8e..8904f3b 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -872,6 +872,10 @@ OnlyCustomEmoji String::toOnlyCustomEmoji() const {
 	return result;
 }
 
+bool String::isOnlyEmojiAndSpaces() const {
+	return _isOnlyEmojiAndSpaces;
+}
+
 QString String::toString(TextSelection selection) const {
 	return toText(selection, false, false).rich.text;
 }
diff --git a/ui/text/text.h b/ui/text/text.h
index 40be2b5..5cd02a4 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -227,6 +227,8 @@ public:
 	[[nodiscard]] bool isOnlyCustomEmoji() const;
 	[[nodiscard]] OnlyCustomEmoji toOnlyCustomEmoji() const;
 
+	[[nodiscard]] bool isOnlyEmojiAndSpaces() const;
+
 	[[nodiscard]] const style::TextStyle *style() const {
 		return _st;
 	}
@@ -280,6 +282,7 @@ private:
 	bool _hasCustomEmoji : 1 = false;
 	bool _isIsolatedEmoji : 1 = false;
 	bool _isOnlyCustomEmoji : 1 = false;
+	bool _isOnlyEmojiAndSpaces : 1 = false;
 
 	QString _text;
 	const style::TextStyle *_st = nullptr;
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index b558054..89eb878 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -606,6 +606,9 @@ void Parser::finalize(const TextParseOptions &options) {
 	_t->_hasCustomEmoji = false;
 	_t->_isIsolatedEmoji = true;
 	_t->_isOnlyCustomEmoji = true;
+	_t->_isOnlyEmojiAndSpaces = true;
+	auto spacesCheckFrom = uint16(-1);
+	const auto length = int(_t->_text.size());
 	for (auto &block : _t->_blocks) {
 		if (block->type() == TextBlockTCustomEmoji) {
 			_t->_hasCustomEmoji = true;
@@ -615,6 +618,23 @@ void Parser::finalize(const TextParseOptions &options) {
 		} else if (block->lnkIndex()) {
 			_t->_isOnlyCustomEmoji = _t->_isIsolatedEmoji = false;
 		}
+		if (_t->_isOnlyEmojiAndSpaces) {
+			if (block->type() == TextBlockTText) {
+				if (spacesCheckFrom == uint16(-1)) {
+					spacesCheckFrom = block->from();
+				}
+			} else if (spacesCheckFrom != uint16(-1)) {
+				const auto checkTill = block->from();
+				for (auto i = spacesCheckFrom; i != checkTill; ++i) {
+					Assert(i < length);
+					if (!_t->_text[i].isSpace()) {
+						_t->_isOnlyEmojiAndSpaces = false;
+						break;
+					}
+				}
+				spacesCheckFrom = uint16(-1);
+			}
+		}
 		if (_t->_isIsolatedEmoji) {
 			if (block->type() == TextBlockTCustomEmoji
 				|| block->type() == TextBlockTEmoji) {
@@ -694,6 +714,16 @@ void Parser::finalize(const TextParseOptions &options) {
 	if (_t->_blocks.empty() || _t->_spoiler.data) {
 		_t->_isIsolatedEmoji = false;
 	}
+	if (_t->_isOnlyEmojiAndSpaces && spacesCheckFrom != uint16(-1)) {
+		Assert(spacesCheckFrom < length);
+		for (auto i = spacesCheckFrom; i != length; ++i) {
+			Assert(i < length);
+			if (!_t->_text[i].isSpace()) {
+				_t->_isOnlyEmojiAndSpaces = false;
+				break;
+			}
+		}
+	}
 	_t->_links.squeeze();
 	_t->_blocks.shrink_to_fit();
 	_t->_text.squeeze();

From 7bcca23bfe9f95bf9fd10a2e803734baccc517b4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Jan 2023 14:10:11 +0400
Subject: [PATCH 333/635] Fix Text::String::isOnlyEmojiAndSpaces for empty
 string.

---
 ui/text/text.cpp        |  4 ++--
 ui/text/text.h          |  4 ++--
 ui/text/text_parser.cpp | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 8904f3b..f2f6a69 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -872,8 +872,8 @@ OnlyCustomEmoji String::toOnlyCustomEmoji() const {
 	return result;
 }
 
-bool String::isOnlyEmojiAndSpaces() const {
-	return _isOnlyEmojiAndSpaces;
+bool String::hasNotEmojiAndSpaces() const {
+	return _hasNotEmojiAndSpaces;
 }
 
 QString String::toString(TextSelection selection) const {
diff --git a/ui/text/text.h b/ui/text/text.h
index 5cd02a4..1f03b46 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -227,7 +227,7 @@ public:
 	[[nodiscard]] bool isOnlyCustomEmoji() const;
 	[[nodiscard]] OnlyCustomEmoji toOnlyCustomEmoji() const;
 
-	[[nodiscard]] bool isOnlyEmojiAndSpaces() const;
+	[[nodiscard]] bool hasNotEmojiAndSpaces() const;
 
 	[[nodiscard]] const style::TextStyle *style() const {
 		return _st;
@@ -282,7 +282,7 @@ private:
 	bool _hasCustomEmoji : 1 = false;
 	bool _isIsolatedEmoji : 1 = false;
 	bool _isOnlyCustomEmoji : 1 = false;
-	bool _isOnlyEmojiAndSpaces : 1 = false;
+	bool _hasNotEmojiAndSpaces : 1 = false;
 
 	QString _text;
 	const style::TextStyle *_st = nullptr;
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 89eb878..c711437 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -606,7 +606,7 @@ void Parser::finalize(const TextParseOptions &options) {
 	_t->_hasCustomEmoji = false;
 	_t->_isIsolatedEmoji = true;
 	_t->_isOnlyCustomEmoji = true;
-	_t->_isOnlyEmojiAndSpaces = true;
+	_t->_hasNotEmojiAndSpaces = false;
 	auto spacesCheckFrom = uint16(-1);
 	const auto length = int(_t->_text.size());
 	for (auto &block : _t->_blocks) {
@@ -618,7 +618,7 @@ void Parser::finalize(const TextParseOptions &options) {
 		} else if (block->lnkIndex()) {
 			_t->_isOnlyCustomEmoji = _t->_isIsolatedEmoji = false;
 		}
-		if (_t->_isOnlyEmojiAndSpaces) {
+		if (!_t->_hasNotEmojiAndSpaces) {
 			if (block->type() == TextBlockTText) {
 				if (spacesCheckFrom == uint16(-1)) {
 					spacesCheckFrom = block->from();
@@ -628,7 +628,7 @@ void Parser::finalize(const TextParseOptions &options) {
 				for (auto i = spacesCheckFrom; i != checkTill; ++i) {
 					Assert(i < length);
 					if (!_t->_text[i].isSpace()) {
-						_t->_isOnlyEmojiAndSpaces = false;
+						_t->_hasNotEmojiAndSpaces = true;
 						break;
 					}
 				}
@@ -714,12 +714,12 @@ void Parser::finalize(const TextParseOptions &options) {
 	if (_t->_blocks.empty() || _t->_spoiler.data) {
 		_t->_isIsolatedEmoji = false;
 	}
-	if (_t->_isOnlyEmojiAndSpaces && spacesCheckFrom != uint16(-1)) {
+	if (!_t->_hasNotEmojiAndSpaces && spacesCheckFrom != uint16(-1)) {
 		Assert(spacesCheckFrom < length);
 		for (auto i = spacesCheckFrom; i != length; ++i) {
 			Assert(i < length);
 			if (!_t->_text[i].isSpace()) {
-				_t->_isOnlyEmojiAndSpaces = false;
+				_t->_hasNotEmojiAndSpaces = true;
 				break;
 			}
 		}

From a5020ac5bc2752319c10a9749fc973d9fb58c710 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 31 Jan 2023 14:46:19 +0400
Subject: [PATCH 334/635] Fix a diacritic after a char after an emoji.

---
 ui/text/text_parser.cpp | 16 ++++++++++------
 ui/text/text_parser.h   |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index c711437..61c7ab9 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -182,7 +182,6 @@ void Parser::createBlock(int32 skipBack) {
 				createBlock(skipBack - len);
 			}
 		}
-		_lastSkipped = false;
 		const auto lnkIndex = _monoIndex ? _monoIndex : _lnkIndex;
 		auto custom = _customEmojiData.isEmpty()
 			? nullptr
@@ -191,15 +190,15 @@ void Parser::createBlock(int32 skipBack) {
 				_context);
 		if (custom) {
 			_t->_blocks.push_back(Block::CustomEmoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, std::move(custom)));
-			_lastSkipped = true;
 		} else if (_emoji) {
 			_t->_blocks.push_back(Block::Emoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, _emoji));
-			_lastSkipped = true;
 		} else if (newline) {
 			_t->_blocks.push_back(Block::Newline(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
 		} else {
 			_t->_blocks.push_back(Block::Text(_t->_st->font, _t->_text, _t->_minResizeWidth, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
 		}
+		// Diacritic can't attach from the next block to this one.
+		_allowDiacritic = false;
 		_blockStart += len;
 		_customEmojiData = QByteArray();
 		_emoji = nullptr;
@@ -210,6 +209,7 @@ void Parser::createBlock(int32 skipBack) {
 void Parser::createNewlineBlock() {
 	createBlock();
 	_t->_text.push_back(QChar::LineFeed);
+	_allowDiacritic = false;
 	createBlock();
 }
 
@@ -432,7 +432,7 @@ void Parser::parseCurrentChar() {
 			// Some sequences like 0x0E53 0xFE0F crash OS X harfbuzz text processing :(
 			return true;
 		} else if (isDiac) {
-			if (_lastSkipped || _emoji || ++_diacs > kMaxDiacAfterSymbol) {
+			if (!_allowDiacritic || _emoji || ++_diacs > kMaxDiacAfterSymbol) {
 				return true;
 			}
 		} else if (_ch.isHighSurrogate()) {
@@ -470,9 +470,9 @@ void Parser::parseCurrentChar() {
 		_emojiLookback = 1;
 	}
 
-	_lastSkipped = skip;
 	if (skip) {
 		_ch = 0;
+		_allowDiacritic = false;
 	} else {
 		if (isTilde) { // tilde fix in OpenSans
 			if (!(_flags & TextBlockFTilde)) {
@@ -489,13 +489,17 @@ void Parser::parseCurrentChar() {
 			createNewlineBlock();
 		} else if (isSpace) {
 			_t->_text.push_back(QChar::Space);
+			_allowDiacritic = false;
 		} else {
 			if (_emoji) {
 				createBlock(-_emojiLookback);
 			}
 			_t->_text.push_back(_ch);
+			_allowDiacritic = true;
+		}
+		if (!isDiac) {
+			_diacs = 0;
 		}
-		if (!isDiac) _diacs = 0;
 	}
 }
 
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index e14595a..528fc5a 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -120,7 +120,7 @@ private:
 	// current char data
 	QChar _ch; // current char (low surrogate, if current char is surrogate pair)
 	int32 _emojiLookback = 0; // how far behind the current ptr to look for current emoji
-	bool _lastSkipped = false; // did we skip current char
+	bool _allowDiacritic = false; // did we add last char to the current block
 
 };
 

From 35cc61cb485a0606aea42a4713f9d91c23bd55c8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 31 Jan 2023 18:32:02 +0300
Subject: [PATCH 335/635] Added ability to finish animation of toggle in
 SettingsButton.

---
 ui/widgets/buttons.cpp | 7 +++++++
 ui/widgets/buttons.h   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index 35d6669..fc5e1aa 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -709,6 +709,13 @@ SettingsButton::SettingsButton(
 
 SettingsButton::~SettingsButton() = default;
 
+void SettingsButton::finishAnimating() {
+	if (_toggle) {
+		_toggle->finishAnimating();
+	}
+	Ui::RippleButton::finishAnimating();
+}
+
 SettingsButton *SettingsButton::toggleOn(
 		rpl::producer<bool> &&toggled,
 		bool ignoreClick) {
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index 1885292..cdc9040 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -277,6 +277,8 @@ public:
 	[[nodiscard]] const style::SettingsButton &st() const;
 	[[nodiscard]] int fullTextWidth() const;
 
+	void finishAnimating();
+
 protected:
 	int resizeGetHeight(int newWidth) override;
 	void onStateChanged(

From 5535a3fe5720272015dea2ff608bb759634ba7e5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 31 Jan 2023 19:04:28 +0300
Subject: [PATCH 336/635] Removed unused keys from style files.

---
 ui/basic.style           | 14 --------------
 ui/layers/layers.style   |  1 -
 ui/widgets/widgets.style |  3 ---
 3 files changed, 18 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index 95c786f..9bcbd90 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -32,7 +32,6 @@ semiboldFont: font(fsize semibold);
 boxFontSize: 14px;
 boxTextFont: font(boxFontSize);
 
-emojiImgSize: 18px; // exceptional value for retina
 emojiSize: 18px;
 emojiPadding: 1px;
 
@@ -61,8 +60,6 @@ semiboldTextStyle: TextStyle(defaultTextStyle) {
 	linkFontOver: font(fsize semibold underline);
 }
 
-shadowToggleDuration: 200;
-
 slideDuration: 240;
 slideShift: 100px;
 slideShadow: icon {{ "slide_shadow", slideFadeOutShadowFg }};
@@ -79,8 +76,6 @@ roundRadiusSmall: 3px;
 
 dateRadius: roundRadiusLarge;
 
-setLittleSkip: 9px;
-
 noContactsHeight: 100px;
 noContactsFont: font(fsize);
 noContactsColor: windowSubTextFg;
@@ -88,21 +83,12 @@ noContactsColor: windowSubTextFg;
 activeFadeInDuration: 500;
 activeFadeOutDuration: 3000;
 
-textRectMargins: margins(-2px, -1px, -2px, -1px);
-
 searchedBarHeight: 32px;
 searchedBarFont: normalFont;
 searchedBarPosition: point(17px, 7px);
 
 smallCloseIcon: icon {{ "simple_close", smallCloseIconFg }};
 smallCloseIconOver: icon {{ "simple_close", smallCloseIconFgOver }};
-dialogsForwardCancelIcon: icon {{ "simple_close", dialogsForwardFg }};
-
-emojiTextFont: font(15px);
-emojiReplaceWidth: 52px;
-emojiReplaceHeight: 56px;
-emojiReplaceInnerHeight: 42px;
-emojiReplacePadding: 14px;
 
 dragFont: font(27px semibold);
 dragSubfont: font(19px semibold);
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index a1e1f53..4f487ef 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -116,7 +116,6 @@ boxLinkButton: LinkButton(defaultLinkButton) {
 
 boxOptionListPadding: margins(0px, 0px, 0px, 0px);
 boxOptionListSkip: 20px;
-boxOptionInputSkip: 6px;
 
 boxWidth: 320px;
 boxWideWidth: 364px;
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 98d3502..b251073 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -925,7 +925,6 @@ defaultMultiSelectSearchField: InputField(defaultInputField) {
 	font: normalFont;
 }
 
-fieldSearchIcon: icon {{ "box_search", menuIconFg, point(9px, 8px) }};
 boxFieldSearchIcon: icon {{ "box_search", menuIconFg, point(10px, 9px) }};
 
 defaultMultiSelectSearchCancel: CrossButton {
@@ -973,7 +972,6 @@ defaultMultiSelect: MultiSelect {
 	fieldCancelSkip: 40px;
 }
 
-widgetSlideDuration: 200;
 widgetFadeDuration: 200;
 
 SettingsSlider {
@@ -1528,7 +1526,6 @@ sideBarButtonLockArcOffset: 2px;
 sideBarButtonLockSize: size(9px, 10px);
 sideBarButtonLockArcHeight: 3px;
 sideBarButtonLockBlockHeight: 5px;
-sideBarButtonLockLineHeight: 1px;
 sideBarButtonLockPenWidth: 3px;
 sideBarButtonLockPenWidthDivider: 2;
 

From 51fd4a0509e8a2aaa4cc7875fdb7afb0b52989de Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 1 Feb 2023 07:37:12 +0300
Subject: [PATCH 337/635] Removed some unused keys from colors palette.

---
 ui/colors.palette | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/ui/colors.palette b/ui/colors.palette
index c354fba..e392465 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -161,7 +161,6 @@ callArrowMissedFg: #dd5b4a | boxTextFgError; // missed phone call arrow (in call
 introBg: windowBg; // login background
 introTitleFg: windowBoldFg; // login title text
 introDescriptionFg: windowSubTextFg; // login description text
-introErrorFg: windowSubTextFg; // login error text (like when providing a wrong log in code)
 
 introCoverTopBg: #0f89d0; // intro gradient top (from)
 introCoverBottomBg: #39b0f0; // intro gradient bottom (to)
@@ -230,9 +229,6 @@ dialogsScamFgActive: dialogsDraftFgActive; // chat list scam label for current (
 dialogsRippleBg: windowBgRipple; // chat list background ripple effect
 dialogsRippleBgActive: activeButtonBgRipple; // chat list background ripple effect for current (active) chat
 
-dialogsForwardBg: dialogsBgActive; // forwarding panel background (when forwarding messages in the smallest window size)
-dialogsForwardFg: dialogsNameFgActive; // forwarding panel text (when forwarding messages in the smallest window size)
-
 searchedBarBg: windowBgOver; // search results bar background (in chats list, contacts box..)
 searchedBarFg: windowSubTextFgOver; // search results bar text (in chats list, contacts box..)
 
@@ -244,7 +240,6 @@ emojiPanCategories: #f7f7f7 | windowBg; // emoji panel categories background
 emojiPanHeaderFg: windowSubTextFg; // emoji panel section header text
 emojiPanHeaderBg: #fffffff2 | emojiPanBg; // emoji panel section header background
 emojiIconFg: #999999; // emoji category icon
-emojiIconFgActive: windowBgActive; // active emoji category icon
 emojiSubIconFgActive: #666666 | windowBoldFg; // active emoji subcategory icon
 stickerPanDeleteBg: #000000ff; // delete X button background for custom sent stickers in stickers panel (legacy)
 stickerPanDeleteFg: windowFgActive; // delete X button icon for custom sent stickers in stickers panel (legacy)
@@ -384,7 +379,6 @@ msgFileInBg: windowBgActive; // inbox audio file download circle background
 msgFileInBgOver: #4eade3; // inbox audio file download circle background with mouse over
 msgFileInBgSelected: #51a3d3; // inbox selected audio file download circle background
 msgFileOutBg: #5fbe67; // outbox audio file download circle background
-msgFileOutBgOver: #5ab15f; // outbox audio file download circle background with mouse over
 msgFileOutBgSelected: #50ac9b; // outbox selected audio file download circle background
 
 msgFile1Bg: #72b1df; // blue shared links / files without image square thumbnail
@@ -444,9 +438,6 @@ videoPlayIconFg: #ffffff; // other video play icon arrow (like when a link to a
 toastBg: #000000b2; // toast notification background (like when you click on your t.me link when editing your username)
 toastFg: windowFgActive; // toast notification text (like when you click on your t.me link when editing your username)
 
-reportSpamBg: emojiPanHeaderBg; // report spam panel background (like a non contact user writes your for the first time)
-reportSpamFg: windowFg; // report spam panel text (when you send a report from that panel)
-
 historyToDownBg: windowBg; // arrow button background (to scroll to the end of the viewed chat)
 historyToDownBgOver: windowBgOver; // arrow button background with mouse over
 historyToDownBgRipple: windowBgRipple; // arrow button ripple effect
@@ -478,7 +469,6 @@ mapPointDot: #ffffff; // geo location marker point
 overviewCheckBg: #00000040; // shared media / files / links checkbox background for not selected rows when some rows are selected
 overviewCheckBgActive: windowBgActive; // shared media / files / links checkbox background for selected rows
 overviewCheckBorder: windowBg; // shared media round checkbox border
-overviewCheckFg: windowBg; // shared files / links checkbox icon for not selected rows when some rows are selected
 overviewCheckFgActive: windowBg; // shared files / links checkbox icon for selected rows
 overviewPhotoSelectOverlay: #40ace333; // shared photos / videos / links fill for selected rows
 
@@ -487,9 +477,6 @@ profileStatusFgOver: #7c99b2; // group members list in group profile user last s
 profileVerifiedCheckBg: windowBgActive; // profile verified check icon background
 profileVerifiedCheckFg: windowFgActive; // profile verified check icon tick
 profileAdminStartFg: windowBgActive; // group members list creator star icon
-profileAdminStarFgOver: profileAdminStartFg; // group members list creator star icon with mouse over
-profileOtherAdminStarFg: windowSubTextFg; // group members list admin star icon
-profileOtherAdminStarFgOver: profileStatusFgOver; // group members list admin star icon with mouse over
 
 // settings
 notificationsBoxMonitorFg: windowFg; // custom notifications settings box monitor color
@@ -500,12 +487,8 @@ notificationSampleCloseFg: #d7d7d7 | windowSubTextFg; // custom notifications se
 notificationSampleTextFg: #d7d7d7 | windowSubTextFg; // custom notifications settings box small sample text placeholder
 notificationSampleNameFg: #939393 | windowSubTextFg; // custom notifications settings box small sample name placeholder
 
-changePhoneSimcardFrom: notificationSampleTextFg; // change phone number box left simcard icon
-changePhoneSimcardTo: notificationSampleNameFg; // change phone number box right simcard and plane icons
-
 mainMenuBg: windowBg; // main menu background
 mainMenuCoverBg: dialogsBgActive; // main menu top cover background
-mainMenuCoverFg: windowFgActive; // main menu top cover text
 mainMenuCloudFg: activeButtonFg; // main menu top cover saved messages / archive button icon
 mainMenuCloudBg: #2785bf | activeButtonBgRipple; // main menu top cover saved messages / archive button background
 
@@ -550,7 +533,6 @@ mediaviewPlaybackIconRipple: #ffffff14; // video playback controls ripple effect
 
 mediaviewPipControlsFg: #ffffffd9; // picture-in-picture controls
 mediaviewPipControlsFgOver: #ffffff; // picture-in-picture controls with mouse over
-mediaviewPipFade: #00000095; // picture-in-picture gradient fade controls background
 mediaviewPipPlaybackActive: #ffffffda; // picture-in-picture playback progress already played part
 mediaviewPipPlaybackInactive: #ffffff26; // picture-in-picture playback progress upcoming (not played yet) part
 
@@ -612,7 +594,6 @@ groupCallVideoSubTextFg: #ffffffc0; // group call additional text over video
 callBarBg: dialogsBgActive; // active phone call bar background
 callBarMuteRipple: dialogsRippleBgActive; // active phone call bar mute and hangup button ripple effect
 callBarBgMuted: #8f8f8f | dialogsUnreadBgMuted; // phone call bar with muted mic background
-callBarUnmuteRipple: #7f7f7f | shadowFg; // phone call bar with muted mic mute and hangup button ripple effect
 callBarFg: dialogsNameFgActive; // phone call bar text and icons
 
 importantTooltipBg: toastBg; // group call important tooltip background color
@@ -664,7 +645,6 @@ sideBarBadgeFg: #ffffff; // filters side bar badge text
 
 songCoverOverlayFg: #00000066; // song cover overlay
 
-photoEditorBg: boxTitleAdditionalFg; // photo editor background
 photoEditorItemBaseHandleFg: #3ccaef; // photo editor handle circle
 
 premiumButtonBg1: #55a5ff; // upgrade to premium button gradient 1

From 30e765785946f3e4aa89d1b1b7fa2118b612a8a0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 Feb 2023 11:27:19 +0400
Subject: [PATCH 338/635] Set system window title text on macOS.

---
 ui/platform/mac/ui_window_mac.mm | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index 6d1b182..4d8bf20 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -130,6 +130,7 @@ public:
 	[[nodiscard]] bool checkNativeMove(void *nswindow) const;
 	void activateBeforeNativeMove();
 	void setStaysOnTop(bool enabled);
+	void setNativeTitleVisibility(bool visible);
 	void close();
 
 private:
@@ -220,6 +221,15 @@ void WindowHelper::Private::setStaysOnTop(bool enabled) {
 	_owner->BasicWindowHelper::setStaysOnTop(enabled);
 	resolveWeakPointers();
 	initCustomTitle();
+	_owner->updateCustomTitleVisibility(true);
+}
+
+void WindowHelper::Private::setNativeTitleVisibility(bool visible) {
+	if (!_nativeWindow) {
+		return;
+	}
+	const auto value = visible ? NSWindowTitleVisible : NSWindowTitleHidden;
+	[_nativeWindow setTitleVisibility:value];
 }
 
 void WindowHelper::Private::close() {
@@ -316,9 +326,6 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 	window.get(),
 	_private->customTitleHeight()))
 , _body(Ui::CreateChild<RpWidget>(window.get())) {
-	if (_title->shouldBeHidden()) {
-		updateCustomTitleVisibility();
-	}
 	init();
 	_title->setControlsRect(_private->controlsRect());
 }
@@ -337,14 +344,12 @@ QMargins WindowHelper::frameMargins() {
 
 void WindowHelper::setTitle(const QString &title) {
 	_title->setText(title);
-	window()->setWindowTitle(_titleVisible ? QString() : title);
+	window()->setWindowTitle(title);
 }
 
 void WindowHelper::setTitleStyle(const style::WindowTitle &st) {
 	_title->setStyle(st);
-	if (_title->shouldBeHidden()) {
-		updateCustomTitleVisibility();
-	}
+	updateCustomTitleVisibility();
 }
 
 void WindowHelper::updateCustomTitleVisibility(bool force) {
@@ -353,7 +358,7 @@ void WindowHelper::updateCustomTitleVisibility(bool force) {
 		return;
 	}
 	_title->setVisible(visible);
-	window()->setWindowTitle(_titleVisible ? QString() : _title->text());
+	_private->setNativeTitleVisibility(!_titleVisible);
 }
 
 void WindowHelper::setMinimumSize(QSize size) {
@@ -395,6 +400,8 @@ void WindowHelper::close() {
 }
 
 void WindowHelper::init() {
+	updateCustomTitleVisibility(true);
+
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
 		Ui::ForceFullRepaint(window());

From 6c01a81900e587afacc8de4ab4a36f2e29a03e62 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 Feb 2023 19:31:57 +0400
Subject: [PATCH 339/635] Allow opening popup menu shifted to the cursor.

---
 ui/widgets/menu/menu_action.cpp                      | 11 ++++++-----
 ui/widgets/menu/menu_add_action_callback.h           |  1 +
 ui/widgets/menu/menu_add_action_callback_factory.cpp |  7 +++++--
 ui/widgets/popup_menu.cpp                            |  6 +++++-
 ui/widgets/popup_menu.h                              |  2 ++
 ui/widgets/widgets.style                             |  2 ++
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index cc723e4..f74a484 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -113,7 +113,8 @@ void Action::paint(Painter &p) {
 	p.setPen(selected ? _st.itemFgOver : (enabled ? _st.itemFg : _st.itemFgDisabled));
 	paintText(p);
 	if (hasSubmenu()) {
-		const auto left = width() - _st.itemPadding.right() - _st.arrow.width();
+		const auto skip = _st.itemRightSkip;
+		const auto left = width() - skip - _st.arrow.width();
 		const auto top = (_height - _st.arrow.height()) / 2;
 		if (enabled) {
 			_st.arrow.paint(p, left, top, width());
@@ -159,14 +160,14 @@ void Action::processAction() {
 	const auto &padding = _st.itemPadding;
 
 	const auto additionalWidth = hasSubmenu()
-		? padding.right() + _st.arrow.width()
+		? (_st.itemRightSkip + _st.arrow.width())
 		: (!actionShortcut.isEmpty())
-		? (padding.right() + _st.itemStyle.font->width(actionShortcut))
+		? (_st.itemRightSkip + _st.itemStyle.font->width(actionShortcut))
 		: 0;
 	const auto goodWidth = padding.left()
 		+ textWidth
-		+ padding.right()
-		+ additionalWidth;
+		+ additionalWidth
+		+ padding.right();
 
 	const auto w = std::clamp(goodWidth, _st.widthMin, _st.widthMax);
 	_textWidth = w - (goodWidth - textWidth);
diff --git a/ui/widgets/menu/menu_add_action_callback.h b/ui/widgets/menu/menu_add_action_callback.h
index 368c066..8f9eff8 100644
--- a/ui/widgets/menu/menu_add_action_callback.h
+++ b/ui/widgets/menu/menu_add_action_callback.h
@@ -22,6 +22,7 @@ public:
 		Fn<void()> handler;
 		const style::icon *icon;
 		Fn<void(not_null<Ui::PopupMenu*>)> fillSubmenu;
+		int addTopShift = 0;
 		bool isSeparator = false;
 		bool isAttention = false;
 	};
diff --git a/ui/widgets/menu/menu_add_action_callback_factory.cpp b/ui/widgets/menu/menu_add_action_callback_factory.cpp
index 6b2ed64..6e1f231 100644
--- a/ui/widgets/menu/menu_add_action_callback_factory.cpp
+++ b/ui/widgets/menu/menu_add_action_callback_factory.cpp
@@ -15,8 +15,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui::Menu {
 
 MenuCallback CreateAddActionCallback(not_null<Ui::PopupMenu*> menu) {
-	return MenuCallback([=](MenuCallback::Args a) {
-		if (a.fillSubmenu) {
+	return MenuCallback([=](MenuCallback::Args a) -> QAction* {
+		if (a.addTopShift) {
+			menu->setTopShift(a.addTopShift);
+			return nullptr;
+		} else if (a.fillSubmenu) {
 			const auto action = menu->addAction(
 				a.text,
 				std::move(a.handler),
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 7321e84..9f5709d 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -440,6 +440,10 @@ void PopupMenu::clearActions() {
 	return _menu->clearActions();
 }
 
+void PopupMenu::setTopShift(int topShift) {
+	_topShift = topShift;
+}
+
 void PopupMenu::setForceWidth(int forceWidth) {
 	_menu->setForceWidth(forceWidth);
 }
@@ -993,7 +997,7 @@ bool PopupMenu::prepareGeometryFor(const QPoint &p, PopupMenu *parent) {
 		std::max(
 			_additionalMenuPadding.left() - _st.shadow.extend.left(),
 			0),
-		_padding.top());
+		_padding.top() - _topShift);
 	auto r = screen ? screen->availableGeometry() : QRect();
 	const auto parentWidth = _parent ? _parent->inner().width() : 0;
 	if (style::RightToLeft()) {
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 87bd105..751b20f 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -82,6 +82,7 @@ public:
 	bool prepareGeometryFor(const QPoint &p);
 	void popupPrepared();
 	void hideMenu(bool fast = false);
+	void setTopShift(int topShift);
 	void setForceWidth(int forceWidth);
 	void setForcedOrigin(PanelAnimation::Origin origin);
 	void setForcedVerticalOrigin(VerticalOrigin origin);
@@ -218,6 +219,7 @@ private:
 	bool _reactivateParent = true;
 	bool _grabbingForPanelAnimation = false;
 
+	int _topShift = 0;
 	bool _clearLastSeparator = true;
 
 	Fn<void()> _destroyedCallback;
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index b251073..5790f12 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -230,6 +230,7 @@ Menu {
 	itemFgShortcutOver: color;
 	itemFgShortcutDisabled: color;
 	itemPadding: margins;
+	itemRightSkip: pixels;
 	itemIconPosition: point;
 	itemStyle: TextStyle;
 	itemToggle: Toggle;
@@ -823,6 +824,7 @@ defaultMenu: Menu {
 	itemFgShortcutDisabled: menuFgDisabled;
 	itemIconPosition: point(0px, 0px);
 	itemPadding: margins(17px, 8px, 17px, 7px);
+	itemRightSkip: 6px;
 	itemStyle: defaultTextStyle;
 	itemToggle: defaultMenuToggle;
 	itemToggleOver: defaultMenuToggleOver;

From 98fa93787a13d8ad9427facb465500fe3179860e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 Feb 2023 20:46:55 +0400
Subject: [PATCH 340/635] Use new dropdown arrow everywhere.

---
 icons/dropdown_submenu_arrow.png    | Bin 119 -> 0 bytes
 icons/dropdown_submenu_arrow@2x.png | Bin 166 -> 0 bytes
 icons/dropdown_submenu_arrow@3x.png | Bin 293 -> 0 bytes
 ui/widgets/widgets.style            |   4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 icons/dropdown_submenu_arrow.png
 delete mode 100644 icons/dropdown_submenu_arrow@2x.png
 delete mode 100644 icons/dropdown_submenu_arrow@3x.png

diff --git a/icons/dropdown_submenu_arrow.png b/icons/dropdown_submenu_arrow.png
deleted file mode 100644
index d7015e7e525e7c5e1eedceef349850c7fa1cb388..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^EI`c8!3HGtQ{P+wQg)s$jv*W~Q+qdZG8pnOixxcB
z-Lw37;bU2w+e<wjJX8)S?wD*OZ0vkV)1mzFJ9&l~l1fdi3udpnw7Ej||8(9cK^w;v
Tdos#^CNX%r`njxgN@xNAanB{A

diff --git a/icons/dropdown_submenu_arrow@2x.png b/icons/dropdown_submenu_arrow@2x.png
deleted file mode 100644
index 49ca1c393645f6f4f754558c504392093a9fbd59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^96-#+!3HFS!eXZZsa#JN#}J9BQzts|9#9Zq+5R_y
zfwRJaE$Tv}NQwdzr^EwKqgwNa8M{vI%bRrjcCaR^=QhTywHD8F7#3`8`+kp&q3V5$
zKn_Dfk7Lh8Hil<&mQ0y&gmpphwWw2;ukZ23|BCvk|K#JD<iO*r_RssuuwdRJ-CM0U
R+<_J|c)I$ztaD0e0sxF3K2!hz

diff --git a/icons/dropdown_submenu_arrow@3x.png b/icons/dropdown_submenu_arrow@3x.png
deleted file mode 100644
index 68130c224ac9c5df503f3b78f0b6655e43990df2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 293
zcmV+=0owkFP)<h;3K|Lk000e1NJLTq000aC000#T0ssI2{mz)<0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy$4Nv%RCwBilA#TTFc3zm07HVnA&@ml
z9F74<Izqz?ge}Sv2u48FS5~1(P#8o-gP?)`{sr!yYx2_ezWbtSniyjd&i8%GvLs1D
zNPyNl%Q8X&thGf^5E8KOJLjB`fb%@-x+WyRIoGx=Ap!S&3n2&z2qE-+Pe{P~zT-H8
z!{C6Yo##1m(=ZI!bI<cgDX~9!@4K$Urn|1IX&Nl2<2b6S!V=%Mtt?AycgC3iv`7oq
rbxqS0>(e~XaU5fTDy7Jd{{$ESh7e67RL<RL00000NkvXXu0mjf7>juE

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 5790f12..136aad3 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -799,7 +799,7 @@ defaultPanelAnimation: PanelAnimation {
 	shadow: defaultRoundShadow;
 }
 
-defaultMenuArrow: icon {{ "dropdown_submenu_arrow", menuSubmenuArrowFg }};
+defaultMenuArrow: icon {{ "menu/submenu_arrow", windowBoldFg }};
 defaultMenuToggle: Toggle(defaultToggle) {
 	untoggledFg: menuIconFg;
 }
@@ -1534,7 +1534,7 @@ sideBarButtonLockPenWidthDivider: 2;
 menuIconColor: windowBoldFg;
 menuIconAttentionColor: attentionButtonFg;
 
-menuIconSubmenuArrow: icon {{ "menu/submenu_arrow", menuIconColor }};
+menuIconSubmenuArrow: defaultMenuArrow;
 
 menuWithIcons: Menu(defaultMenu) {
 	itemIconPosition: point(15px, 5px);

From 6e81116513175870788671e172a3c608747ed171 Mon Sep 17 00:00:00 2001
From: Joe Kappus <joe@wt.gd>
Date: Sat, 4 Feb 2023 04:49:25 -0500
Subject: [PATCH 341/635] Add missing include to fix GCC12 build

Signed-off-by: Joe Kappus <joe@wt.gd>
---
 ui/style/style_core_font.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/style/style_core_font.h b/ui/style/style_core_font.h
index e0c85aa..152357b 100644
--- a/ui/style/style_core_font.h
+++ b/ui/style/style_core_font.h
@@ -11,6 +11,8 @@
 #include <QtGui/QFont>
 #include <QtGui/QFontMetrics>
 
+#include <cmath>
+
 namespace style {
 namespace internal {
 

From e053e04607653c8a304c72ff901a8e628dd94dbf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Feb 2023 12:40:06 +0400
Subject: [PATCH 342/635] Always round down point coords inside the window.

Or 3839 rounds to 1920 and the point falls outside of Qt window.
---
 ui/platform/win/ui_window_win.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 73572ce..563e12c 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -548,8 +548,10 @@ bool WindowHelper::handleNativeEvent(
 
 		POINT p{ GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 		ScreenToClient(_handle, &p);
-		const auto mapped = QPoint(p.x, p.y)
-			/ window()->windowHandle()->devicePixelRatio();
+		const auto ratio = window()->windowHandle()->devicePixelRatio();
+		const auto mapped = QPoint(
+			int(std::floor(p.x / ratio)),
+			int(std::floor(p.y / ratio)));
 		*result = [&] {
 			if (!window()->rect().contains(mapped)) {
 				return HTTRANSPARENT;

From 1b9b1739649ddf942937a6b9a1a22933070e5ecc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 Feb 2023 20:05:34 +0400
Subject: [PATCH 343/635] Support spoilers in FlatLabel.

---
 ui/widgets/labels.cpp | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 0cdadf5..291539a 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -262,6 +262,12 @@ void FlatLabel::init() {
 void FlatLabel::textUpdated() {
 	refreshSize();
 	setMouseTracking(_selectable || _text.hasLinks());
+	if (_text.hasSpoilers()) {
+		_text.setSpoilerLinkFilter([weak = Ui::MakeWeak(this)](
+				const ClickContext &context) {
+			return (context.button == Qt::LeftButton) && weak;
+		});
+	}
 	update();
 }
 
@@ -942,16 +948,32 @@ void FlatLabel::paintEvent(QPaintEvent *e) {
 			? ((width() - _textWidth) / 2)
 			: (width() - _st.margin.right() - _textWidth))
 		: _st.margin.left();
-	auto selection = _selection.empty() ? (_contextMenu ? _savedSelection : _selection) : _selection;
-	bool heightExceeded = _st.maxHeight && (_st.maxHeight < _fullTextHeight || textWidth < _text.maxWidth());
-	bool renderElided = _breakEverywhere || heightExceeded;
-	if (renderElided) {
-		auto lineHeight = qMax(_st.style.lineHeight, _st.style.font->height);
-		auto lines = _st.maxHeight ? qMax(_st.maxHeight / lineHeight, 1) : ((height() / lineHeight) + 2);
-		_text.drawElided(p, textLeft, _st.margin.top(), textWidth, lines, _st.align, e->rect().y(), e->rect().bottom(), 0, _breakEverywhere, selection);
-	} else {
-		_text.draw(p, textLeft, _st.margin.top(), textWidth, _st.align, e->rect().y(), e->rect().bottom(), selection);
-	}
+	const auto selection = !_selection.empty()
+		? _selection
+		: _contextMenu
+		? _savedSelection
+		: _selection;
+	const auto heightExceeded = _st.maxHeight
+		&& (_st.maxHeight < _fullTextHeight || textWidth < _text.maxWidth());
+	const auto renderElided = _breakEverywhere || heightExceeded;
+	const auto lineHeight = qMax(_st.style.lineHeight, _st.style.font->height);
+	const auto lines = !renderElided
+		? 0
+		: _st.maxHeight
+		? qMax(_st.maxHeight / lineHeight, 1)
+		: ((height() / lineHeight) + 2);
+	_text.draw(p, {
+		.position = { textLeft, _st.margin.top() },
+		.availableWidth = textWidth,
+		.align = _st.align,
+		.clip = e->rect(),
+		.palette = &_st.palette,
+		.spoiler = Text::DefaultSpoilerCache(),
+		.now = crl::now(),
+		.selection = selection,
+		.elisionLines = lines,
+		.elisionBreakEverywhere = renderElided && _breakEverywhere,
+	});
 }
 
 DividerLabel::DividerLabel(

From 66e47a0240251b50242b2a68413645b61fa28a95 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 8 Feb 2023 13:18:20 +0400
Subject: [PATCH 344/635] Re-enable global /LTCG on Windows.

With /LTCGOUT: empty path it should not try generating .iobj file,
and work on both 32 bit and 64 bit build with all static libs.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8d90fe..a0a53d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 add_library(lib_ui STATIC)
 add_library(desktop-app::lib_ui ALIAS lib_ui)
-init_target(lib_ui ltcg)
+init_target(lib_ui)
 
 include(cmake/generate_palette.cmake)
 include(cmake/generate_styles.cmake)

From 30dba7a215053ac7a6cf42f4cd0d56fc398c58a5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 Feb 2023 16:42:55 +0400
Subject: [PATCH 345/635] Fix system buttons padding on Windows.

---
 ui/platform/win/ui_window_title_win.cpp | 1 +
 ui/platform/win/ui_window_win.cpp       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index fdb8b89..bce7acc 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -225,6 +225,7 @@ rpl::producer<int> TitleWidget::additionalPaddingValue() const {
 void TitleWidget::setAdditionalPadding(int padding) {
 	Expects(_paddingHelper != nullptr);
 
+	padding /= window()->devicePixelRatio();
 	if (_paddingHelper->padding.current() == padding) {
 		return;
 	}
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 563e12c..da05e37 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -13,6 +13,7 @@
 #include "base/platform/win/base_windows_safe_library.h"
 #include "base/platform/base_platform_info.h"
 #include "base/integration.h"
+#include "base/invoke_queued.h"
 #include "base/debug_log.h"
 #include "styles/palette.h"
 #include "styles/style_widgets.h"
@@ -585,6 +586,9 @@ bool WindowHelper::handleNativeEvent(
 
 	case WM_DPICHANGED: {
 		_dpi = LOWORD(wParam);
+		InvokeQueued(_title, [=] {
+			_title->refreshAdditionalPaddings(_handle);
+		});
 	} return false;
 
 	}

From 8e6811aef0fde0f950a7a588130874cb1bbd74d4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 Feb 2023 20:10:42 +0400
Subject: [PATCH 346/635] Allow custom ChooseBackend hook in RpWindow.

---
 ui/gl/gl_window.cpp | 49 ++++++++++++++++++++++-----------------------
 ui/gl/gl_window.h   |  8 ++++++--
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/ui/gl/gl_window.cpp b/ui/gl/gl_window.cpp
index f2cc816..b866d4e 100644
--- a/ui/gl/gl_window.cpp
+++ b/ui/gl/gl_window.cpp
@@ -24,11 +24,24 @@ namespace {
 
 constexpr auto kUseNativeChild = false;// ::Platform::IsWindows();
 
+[[nodiscard]] Backend DefaultChooseBackend(Capabilities capabilities) {
+	const auto use = ::Platform::IsMac()
+		? true
+		: ::Platform::IsWindows()
+		? capabilities.supported
+		: capabilities.transparency;
+	LOG(("OpenGL: %1 (Window)").arg(use ? "[TRUE]" : "[FALSE]"));
+	return use ? Backend::OpenGL : Backend::Raster;
+}
+
 } // namespace
 
-Window::Window()
-: _window(createWindow())
-, _bodyNativeWrap(createNativeBodyWrap())
+Window::Window() : Window(DefaultChooseBackend) {
+}
+
+Window::Window(Fn<Backend(Capabilities)> chooseBackend)
+: _window(createWindow(chooseBackend))
+, _bodyNativeWrap(createNativeBodyWrap(chooseBackend))
 , _body(_bodyNativeWrap ? _bodyNativeWrap.get() : _window->body().get()) {
 }
 
@@ -46,19 +59,12 @@ not_null<RpWidget*> Window::widget() const {
 	return _body.get();
 }
 
-std::unique_ptr<RpWindow> Window::createWindow() {
+std::unique_ptr<RpWindow> Window::createWindow(
+		const Fn<Backend(Capabilities)> &chooseBackend) {
 	auto result = std::make_unique<RpWindow>();
 	if constexpr (!kUseNativeChild) {
-		const auto capabilities = CheckCapabilities(result.get());
-		const auto use = ::Platform::IsMac()
-			? true
-			: ::Platform::IsWindows()
-			? capabilities.supported
-			: capabilities.transparency;
-		LOG(("OpenGL: %1 (Window)").arg(use ? "[TRUE]" : "[FALSE]"));
-		_backend = use ? Backend::OpenGL : Backend::Raster;
-
-		if (!use) {
+		_backend = chooseBackend(CheckCapabilities(result.get()));
+		if (_backend != Backend::OpenGL) {
 			// We have to create a new window, if OpenGL initialization failed.
 			result = std::make_unique<RpWindow>();
 		}
@@ -66,7 +72,8 @@ std::unique_ptr<RpWindow> Window::createWindow() {
 	return result;
 }
 
-std::unique_ptr<RpWidget> Window::createNativeBodyWrap() {
+std::unique_ptr<RpWidget> Window::createNativeBodyWrap(
+		const Fn<Backend(Capabilities)> &chooseBackend) {
 	if constexpr (!kUseNativeChild) {
 		return nullptr;
 	}
@@ -81,16 +88,8 @@ std::unique_ptr<RpWidget> Window::createNativeBodyWrap() {
 	};
 
 	auto result = create();
-	const auto capabilities = CheckCapabilities(result.get());
-	const auto use = ::Platform::IsMac()
-		? true
-		: ::Platform::IsWindows()
-		? capabilities.supported
-		: capabilities.transparency;
-	LOG(("OpenGL: %1 (WindowBody)").arg(use ? "[TRUE]" : "[FALSE]"));
-	_backend = use ? Backend::OpenGL : Backend::Raster;
-
-	if (!use) {
+	_backend = chooseBackend(CheckCapabilities(result.get()));
+	if (_backend != Backend::OpenGL) {
 		// We have to create a new window, if OpenGL initialization failed.
 		result = create();
 	}
diff --git a/ui/gl/gl_window.h b/ui/gl/gl_window.h
index 797fcdf..65bbc72 100644
--- a/ui/gl/gl_window.h
+++ b/ui/gl/gl_window.h
@@ -15,10 +15,12 @@ class RpWidget;
 namespace Ui::GL {
 
 enum class Backend;
+struct Capabilities;
 
 class Window final {
 public:
 	Window();
+	explicit Window(Fn<Backend(Capabilities)> chooseBackend);
 	~Window();
 
 	[[nodiscard]] Backend backend() const;
@@ -26,8 +28,10 @@ public:
 	[[nodiscard]] not_null<RpWidget*> widget() const;
 
 private:
-	[[nodiscard]] std::unique_ptr<RpWindow> createWindow();
-	[[nodiscard]] std::unique_ptr<RpWidget> createNativeBodyWrap();
+	[[nodiscard]] std::unique_ptr<RpWindow> createWindow(
+		const Fn<Backend(Capabilities)> &chooseBackend);
+	[[nodiscard]] std::unique_ptr<RpWidget> createNativeBodyWrap(
+		const Fn<Backend(Capabilities)> &chooseBackend);
 
 	Backend _backend = Backend();
 	const std::unique_ptr<RpWindow> _window;

From a3bcd2fac415dba704f787df5523da7400c74b42 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 Feb 2023 20:32:06 +0400
Subject: [PATCH 347/635] Fix rounding for maximized translucent windows.

---
 ui/platform/win/ui_window_win.cpp | 12 +++++++++++-
 ui/platform/win/ui_window_win.h   |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index da05e37..3206df8 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -274,7 +274,9 @@ void WindowHelper::updateCornersRounding() {
 	if (!::Platform::IsWindows11OrGreater()) {
 		return;
 	}
-	auto preference = _isFullScreen ? kDWMWCP_DONOTROUND : kDWMWCP_ROUND;
+	const auto preference = (_isFullScreen || _isMaximizedAndTranslucent)
+		? kDWMWCP_DONOTROUND
+		: kDWMWCP_ROUND;
 	DwmSetWindowAttribute(
 		_handle,
 		kDWMWA_WINDOW_CORNER_PREFERENCE,
@@ -372,6 +374,14 @@ void WindowHelper::init() {
 					window()->windowState() & ~Qt::WindowMaximized);
 			});
 		}
+		if (state != Qt::WindowMinimized) {
+			const auto is = (state == Qt::WindowMaximized)
+				&& window()->testAttribute(Qt::WA_TranslucentBackground);
+			if (_isMaximizedAndTranslucent != is) {
+				_isMaximizedAndTranslucent = is;
+				updateCornersRounding();
+			}
+		}
 	};
 	Ui::Connect(
 		window()->windowHandle(),
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index d3ec58d..d29fc11 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -83,6 +83,7 @@ private:
 	QMargins _marginsDelta;
 	bool _updatingMargins = false;
 	bool _isFullScreen = false;
+	bool _isMaximizedAndTranslucent = false;
 
 };
 

From a56831e8d00c58108a6b4ea6caf1c4e9cfe7f838 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 10 Feb 2023 23:55:25 +0400
Subject: [PATCH 348/635] Fix deprecated declarations warnings on macOS

---
 ui/platform/mac/ui_utility_mac.mm | 2 +-
 ui/platform/mac/ui_window_mac.mm  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 09147a7..2b188d4 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -72,7 +72,7 @@ void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 	NSWindow *wnd = [reinterpret_cast<NSView*>(widget->winId()) window];
 	[wnd setLevel:NSPopUpMenuWindowLevel];
 	if (!canFocus) {
-		[wnd setStyleMask:NSUtilityWindowMask | NSNonactivatingPanelMask];
+		[wnd setStyleMask:NSWindowStyleMaskUtilityWindow | NSWindowStyleMaskNonactivatingPanel];
 		[wnd setCollectionBehavior:NSWindowCollectionBehaviorMoveToActiveSpace|NSWindowCollectionBehaviorStationary|NSWindowCollectionBehaviorFullScreenAuxiliary|NSWindowCollectionBehaviorIgnoresCycle];
 	}
 }
diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index 4d8bf20..a436206 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -202,7 +202,7 @@ QRect WindowHelper::Private::controlsRect() const {
 
 bool WindowHelper::Private::checkNativeMove(void *nswindow) const {
 	if (_nativeWindow != nswindow
-		|| ([_nativeWindow styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) {
+		|| ([_nativeWindow styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen) {
 		return false;
 	}
 	const auto cgReal = [NSEvent mouseLocation];
@@ -254,7 +254,7 @@ Fn<void()> WindowHelper::Private::enforceStyleCallback() {
 
 void WindowHelper::Private::enforceStyle() {
 	if (_nativeWindow && _customTitleHeight > 0) {
-		[_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSFullSizeContentViewWindowMask];
+		[_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSWindowStyleMaskFullSizeContentView];
 	}
 }
 
@@ -292,7 +292,7 @@ void WindowHelper::Private::initCustomTitle() {
 	// Emulate custom title instead (code below).
 	//
 	// Tried to backport a fix, testing.
-	[_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSFullSizeContentViewWindowMask];
+	[_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSWindowStyleMaskFullSizeContentView];
 	auto inner = [_nativeWindow contentLayoutRect];
 	auto full = [_nativeView frame];
 	_customTitleHeight = qMax(qRound(full.size.height - inner.size.height), 0);

From c4838f589905fde2d43e3c3d37700523acf2ab9d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 Feb 2023 19:39:24 +0400
Subject: [PATCH 349/635] Fix native pointers staleness in macOS RpWindow.

---
 ui/platform/linux/ui_utility_linux.h |  3 ---
 ui/platform/mac/ui_utility_mac.mm    |  5 -----
 ui/platform/mac/ui_window_mac.mm     | 25 +++++++++++++++++++++++--
 ui/platform/ui_platform_utility.h    |  1 -
 ui/platform/win/ui_utility_win.h     |  3 ---
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.h b/ui/platform/linux/ui_utility_linux.h
index d03c657..ce28a8e 100644
--- a/ui/platform/linux/ui_utility_linux.h
+++ b/ui/platform/linux/ui_utility_linux.h
@@ -29,9 +29,6 @@ inline void UpdateOverlayed(not_null<QWidget*> widget) {
 inline void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 }
 
-inline void BringToBack(not_null<QWidget*> widget) {
-}
-
 inline void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio) {
 }
 
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 2b188d4..8ada998 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -77,11 +77,6 @@ void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 	}
 }
 
-void BringToBack(not_null<QWidget*> widget) {
-	NSWindow *wnd = [reinterpret_cast<NSView*>(widget->winId()) window];
-	[wnd setLevel:NSModalPanelWindowLevel];
-}
-
 void DrainMainQueue() {
 #ifndef OS_MAC_STORE
 	_dispatch_main_queue_callback_4CF(nullptr);
diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index a436206..557d623 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -137,6 +137,7 @@ private:
 	void init();
 	void initOpenGL();
 	void resolveWeakPointers();
+	void revalidateWeakPointers() const;
 	void initCustomTitle();
 
 	[[nodiscard]] Fn<void(bool)> toggleCustomTitleCallback();
@@ -148,6 +149,7 @@ private:
 
 	NSWindow * __weak _nativeWindow = nil;
 	NSView * __weak _nativeView = nil;
+	bool _hadNativeValues = false;
 
 	std::unique_ptr<LayerCreationChecker> _layerCreationChecker;
 
@@ -171,6 +173,7 @@ int WindowHelper::Private::customTitleHeight() const {
 }
 
 QRect WindowHelper::Private::controlsRect() const {
+	revalidateWeakPointers();
 	const auto button = [&](NSWindowButton type) {
 		auto view = [_nativeWindow standardWindowButton:type];
 		if (!view) {
@@ -201,6 +204,7 @@ QRect WindowHelper::Private::controlsRect() const {
 }
 
 bool WindowHelper::Private::checkNativeMove(void *nswindow) const {
+	revalidateWeakPointers();
 	if (_nativeWindow != nswindow
 		|| ([_nativeWindow styleMask] & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen) {
 		return false;
@@ -214,6 +218,7 @@ bool WindowHelper::Private::checkNativeMove(void *nswindow) const {
 }
 
 void WindowHelper::Private::activateBeforeNativeMove() {
+	revalidateWeakPointers();
 	[_nativeWindow makeKeyAndOrderFront:_nativeWindow];
 }
 
@@ -225,6 +230,7 @@ void WindowHelper::Private::setStaysOnTop(bool enabled) {
 }
 
 void WindowHelper::Private::setNativeTitleVisibility(bool visible) {
+	revalidateWeakPointers();
 	if (!_nativeWindow) {
 		return;
 	}
@@ -236,7 +242,11 @@ void WindowHelper::Private::close() {
 	const auto weak = Ui::MakeWeak(_owner->window());
 	QCloseEvent e;
 	qApp->sendEvent(_owner->window(), &e);
-	if (e.isAccepted() && weak && _nativeWindow) {
+	if (!e.isAccepted() || !weak) {
+		return;
+	}
+	revalidateWeakPointers();
+	if (_nativeWindow) {
 		[_nativeWindow close];
 	}
 }
@@ -253,6 +263,7 @@ Fn<void()> WindowHelper::Private::enforceStyleCallback() {
 }
 
 void WindowHelper::Private::enforceStyle() {
+	revalidateWeakPointers();
 	if (_nativeWindow && _customTitleHeight > 0) {
 		[_nativeWindow setStyleMask:[_nativeWindow styleMask] | NSWindowStyleMaskFullSizeContentView];
 	}
@@ -263,14 +274,24 @@ void WindowHelper::Private::initOpenGL() {
 }
 
 void WindowHelper::Private::resolveWeakPointers() {
-	_owner->window()->createWinId();
+	if (!_owner->window()->winId()) {
+		_owner->window()->createWinId();
+	}
 
 	_nativeView = reinterpret_cast<NSView*>(_owner->window()->winId());
 	_nativeWindow = _nativeView ? [_nativeView window] : nullptr;
+	_hadNativeValues = true;
 
 	Ensures(_nativeWindow != nullptr);
 }
 
+void WindowHelper::Private::revalidateWeakPointers() const {
+	if (_nativeWindow || !_hadNativeValues) {
+		return;
+	}
+	const_cast<Private*>(this)->resolveWeakPointers();
+}
+
 void WindowHelper::Private::initCustomTitle() {
 	if (![_nativeWindow respondsToSelector:@selector(contentLayoutRect)]
 		|| ![_nativeWindow respondsToSelector:@selector(setTitlebarAppearsTransparent:)]) {
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 0bc0fd4..2d10077 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -25,7 +25,6 @@ void ReInitOnTopPanel(not_null<QWidget*> panel);
 
 void UpdateOverlayed(not_null<QWidget*> widget);
 void ShowOverAll(not_null<QWidget*> widget, bool canFocus = true);
-void BringToBack(not_null<QWidget*> widget);
 void IgnoreAllActivation(not_null<QWidget*> widget);
 void ClearTransientParent(not_null<QWidget*> widget);
 
diff --git a/ui/platform/win/ui_utility_win.h b/ui/platform/win/ui_utility_win.h
index 391acf2..b03df5c 100644
--- a/ui/platform/win/ui_utility_win.h
+++ b/ui/platform/win/ui_utility_win.h
@@ -32,9 +32,6 @@ inline void ReInitOnTopPanel(not_null<QWidget*> panel) {
 inline void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 }
 
-inline void BringToBack(not_null<QWidget*> widget) {
-}
-
 inline void ClearTransientParent(not_null<QWidget*> widget) {
 }
 

From eb4d44ecd37815dc9465ec46b86f94191531b0c7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 17 Feb 2023 10:35:02 +0400
Subject: [PATCH 350/635] Fix window shadow on Linux for translucent windows.

---
 ui/platform/ui_platform_window.cpp | 88 +++++++++++++++++++++++++++++-
 ui/platform/ui_platform_window.h   |  2 +
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 30903bb..d71056a 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -31,6 +31,86 @@ namespace {
 	return st::callRadius;
 }
 
+[[nodiscard]] std::array<QImage, 4> PrepareSides(
+		const style::Shadow &shadow) {
+	auto result = std::array<QImage, 4>();
+	const auto extend = shadow.extend;
+	const auto make = [&](
+			int index,
+			const style::icon &icon,
+			auto &&postprocess) {
+		result[index] = icon.instance(st::windowShadowFg->c);
+		auto p = QPainter(&result[index]);
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		postprocess(p, icon.width(), icon.height());
+	};
+	make(0, shadow.left, [&](QPainter &p, int width, int height) {
+		const auto skip = extend.left();
+		p.fillRect(skip, 0, width - skip, height, Qt::transparent);
+	});
+	make(1, shadow.top, [&](QPainter &p, int width, int height) {
+		const auto skip = extend.top();
+		p.fillRect(0, skip, width, height - skip, Qt::transparent);
+	});
+	make(2, shadow.right, [&](QPainter &p, int width, int height) {
+		const auto skip = extend.right();
+		p.fillRect(0, 0, width - skip, height, Qt::transparent);
+	});
+	make(3, shadow.bottom, [&](QPainter &p, int width, int height) {
+		const auto skip = extend.bottom();
+		p.fillRect(0, 0, width, height - skip, Qt::transparent);
+	});
+	return result;
+}
+
+[[nodiscard]] std::array<QImage, 4> PrepareCorners(
+		const style::Shadow &shadow,
+		int radius) {
+	auto result = std::array<QImage, 4>();
+	const auto extend = shadow.extend;
+	const auto make = [&](
+			int index,
+			const style::icon &icon,
+			auto &&postprocess) {
+		result[index] = icon.instance(st::windowShadowFg->c);
+		auto p = QPainter(&result[index]);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		p.setBrush(Qt::transparent);
+		p.setPen(Qt::NoPen);
+		postprocess(p, icon.width(), icon.height());
+	};
+	make(0, shadow.topLeft, [&](QPainter &p, int width, int height) {
+		const auto skipx = extend.left();
+		const auto skipy = extend.top();
+		width += 2 * radius;
+		height += 2 * radius;
+		p.drawRoundedRect(skipx, skipy, width, height, radius, radius);
+	});
+	make(1, shadow.bottomLeft, [&](QPainter &p, int width, int height) {
+		const auto skipx = extend.left();
+		const auto skipy = extend.bottom() + 2 * radius;
+		width += 2 * radius;
+		height += 2 * radius;
+		p.drawRoundedRect(skipx, -skipy, width, height, radius, radius);
+	});
+	make(2, shadow.topRight, [&](QPainter &p, int width, int height) {
+		const auto skipx = extend.right() + 2 * radius;
+		const auto skipy = extend.top();
+		width += 2 * radius;
+		height += 2 * radius;
+		p.drawRoundedRect(-skipx, skipy, width, height, radius, radius);
+	});
+	make(3, shadow.bottomRight, [&](QPainter &p, int width, int height) {
+		const auto skipx = extend.right() + 2 * radius;
+		const auto skipy = extend.bottom() + 2 * radius;
+		width += 2 * radius;
+		height += 2 * radius;
+		p.drawRoundedRect(-skipx, -skipy, width, height, radius, radius);
+	});
+	return result;
+}
+
 } // namespace
 
 BasicWindowHelper::BasicWindowHelper(not_null<RpWidget*> window)
@@ -187,7 +267,9 @@ DefaultWindowHelper::DefaultWindowHelper(not_null<RpWidget*> window)
 : BasicWindowHelper(window)
 , _title(Ui::CreateChild<DefaultTitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
-, _roundRect(Radius(), st::windowBg) {
+, _roundRect(Radius(), st::windowBg)
+, _sides(PrepareSides(Shadow()))
+, _corners(PrepareCorners(Shadow(), Radius())) {
 	init();
 }
 
@@ -323,8 +405,8 @@ void DefaultWindowHelper::updateRoundingOverlay() {
 		const auto rect = window()->rect().marginsRemoved(resizeArea());
 		p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
 		_roundRect.paint(p, rect, RectPart::AllCorners);
-		p.setCompositionMode(QPainter::CompositionMode_DestinationOver);
-		Shadow::paint(p, rect, window()->width(), Shadow());
+		p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+		Shadow::paint(p, rect, window()->width(), Shadow(), _sides, _corners);
 	}, _roundingOverlay->lifetime());
 }
 
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index e34f1d7..a157d2c 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -110,6 +110,8 @@ private:
 	const not_null<DefaultTitleWidget*> _title;
 	const not_null<RpWidget*> _body;
 	RoundRect _roundRect;
+	std::array<QImage, 4> _sides;
+	std::array<QImage, 4> _corners;
 	object_ptr<RpWidget> _roundingOverlay = { nullptr };
 	bool _extentsSet = false;
 	rpl::variable<Qt::WindowStates> _windowState = Qt::WindowNoState;

From 3b69ec499ccc7f4208a6413fbeb6f5ebe84f3f55 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 17 Feb 2023 12:10:00 +0400
Subject: [PATCH 351/635] Allow querying manual rounding radius of RpWindow.

---
 ui/platform/ui_platform_window.cpp | 8 ++++++++
 ui/platform/ui_platform_window.h   | 2 ++
 ui/widgets/rp_window.cpp           | 4 ++++
 ui/widgets/rp_window.h             | 1 +
 4 files changed, 15 insertions(+)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index d71056a..f08b233 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -188,6 +188,10 @@ void BasicWindowHelper::close() {
 	_window->close();
 }
 
+int BasicWindowHelper::manualRoundingRadius() const {
+	return 0;
+}
+
 void BasicWindowHelper::setBodyTitleArea(
 		Fn<WindowTitleHitTestFlags(QPoint)> testMethod) {
 	Expects(!_bodyTitleAreaTestMethod || testMethod);
@@ -524,6 +528,10 @@ void DefaultWindowHelper::setGeometry(QRect rect) {
 	window()->setGeometry(rect.marginsAdded(bodyPadding()));
 }
 
+int DefaultWindowHelper::manualRoundingRadius() const {
+	return _roundingOverlay ? Radius() : 0;
+}
+
 void DefaultWindowHelper::paintBorders(QPainter &p) {
 	const auto titleBackground = window()->isActiveWindow()
 		? _title->st()->bgActive
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index a157d2c..2d52e7b 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -59,6 +59,7 @@ public:
 	virtual void showNormal();
 	virtual void close();
 
+	virtual int manualRoundingRadius() const;
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
 protected:
@@ -91,6 +92,7 @@ public:
 	void setMinimumSize(QSize size) override;
 	void setFixedSize(QSize size) override;
 	void setGeometry(QRect rect) override;
+	int manualRoundingRadius() const override;
 
 protected:
 	bool eventFilter(QObject *obj, QEvent *e) override;
diff --git a/ui/widgets/rp_window.cpp b/ui/widgets/rp_window.cpp
index d1c38a6..0226774 100644
--- a/ui/widgets/rp_window.cpp
+++ b/ui/widgets/rp_window.cpp
@@ -99,4 +99,8 @@ void RpWindow::setBodyTitleArea(
 	_helper->setBodyTitleArea(std::move(testMethod));
 }
 
+int RpWindow::manualRoundingRadius() const {
+	return _helper->manualRoundingRadius();
+}
+
 } // namespace Ui
diff --git a/ui/widgets/rp_window.h b/ui/widgets/rp_window.h
index 04b4d99..57d1335 100644
--- a/ui/widgets/rp_window.h
+++ b/ui/widgets/rp_window.h
@@ -65,6 +65,7 @@ public:
 	void showFullScreen();
 	void showNormal();
 	void close();
+	[[nodiscard]] int manualRoundingRadius() const;
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
 private:

From 74ab66cfa9c05745ca513504940e59f6fd68eff3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 17 Feb 2023 20:12:09 +0400
Subject: [PATCH 352/635] Ignore native state updates for fullscreen.

---
 ui/platform/win/ui_window_win.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 3206df8..3507140 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -511,8 +511,10 @@ bool WindowHelper::handleNativeEvent(
 		if (wParam == SIZE_MAXIMIZED
 			|| wParam == SIZE_RESTORED
 			|| wParam == SIZE_MINIMIZED) {
+			const auto now = window()->windowState();
 			if (wParam != SIZE_RESTORED
-				|| window()->windowState() != Qt::WindowNoState) {
+				|| (now != Qt::WindowNoState
+					&& now != Qt::WindowFullScreen)) {
 				Qt::WindowState state = Qt::WindowNoState;
 				if (wParam == SIZE_MAXIMIZED) {
 					state = Qt::WindowMaximized;

From a110c6ea53b48496447ff6d2f371bda6f6283878 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 Feb 2023 16:30:59 +0400
Subject: [PATCH 353/635] Allow pausing emoji and spoilers separately.

---
 ui/text/text.h            | 2 ++
 ui/text/text_renderer.cpp | 7 ++++---
 ui/text/text_renderer.h   | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui/text/text.h b/ui/text/text.h
index 1f03b46..ab39c25 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -138,6 +138,8 @@ struct PaintContext {
 	SpoilerMessCache *spoiler = nullptr;
 	crl::time now = 0;
 	bool paused = false;
+	bool pausedEmoji = false;
+	bool pausedSpoiler = false;
 
 	TextSelection selection;
 	bool fullWidthSelection = true;
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 756269b..89074df 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -198,7 +198,8 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 	_w = context.availableWidth;
 	_align = context.align;
 	_cachedNow = context.now;
-	_paused = context.paused;
+	_pausedEmoji = context.paused || context.pausedEmoji;
+	_pausedSpoiler = context.paused || context.pausedSpoiler;
 	_spoilerOpacity = _spoiler
 		? (1. - _spoiler->revealAnimation.value(
 			_spoiler->revealed ? 1. : 0.))
@@ -838,7 +839,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 							_customEmojiContext = CustomEmoji::Context{
 								.textColor = color,
 								.now = now(),
-								.paused = _paused,
+								.paused = _pausedEmoji,
 							};
 						} else {
 							_customEmojiContext->textColor = color;
@@ -1161,7 +1162,7 @@ void Renderer::paintSpoilerRects() {
 	if (_spoilerOpacity < 1.) {
 		_p->setOpacity(opacity * _spoilerOpacity);
 	}
-	const auto index = _spoiler->animation.index(now(), _paused);
+	const auto index = _spoiler->animation.index(now(), _pausedSpoiler);
 	paintSpoilerRects(
 		_spoilerRects,
 		_palette->spoilerFg,
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 4ba28ce..b89254b 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -118,7 +118,8 @@ private:
 	bool _elideLast = false;
 	bool _breakEverywhere = false;
 	int _elideRemoveFromEnd = 0;
-	bool _paused = false;
+	bool _pausedEmoji = false;
+	bool _pausedSpoiler = false;
 	style::align _align = style::al_topleft;
 	QPen _originalPen;
 	QPen _originalPenSelected;

From 2aa929dc918091f8e06b8eaf9521dfcc8058ede7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 23 Feb 2023 17:06:12 +0400
Subject: [PATCH 354/635] Support custom semi-native title buttons on Windows.

---
 ui/abstract_button.cpp                   |  21 ++-
 ui/abstract_button.h                     |  18 ++-
 ui/platform/ui_platform_window_title.cpp | 183 +++++++++++++++--------
 ui/platform/ui_platform_window_title.h   |  76 ++++++++--
 4 files changed, 210 insertions(+), 88 deletions(-)

diff --git a/ui/abstract_button.cpp b/ui/abstract_button.cpp
index 61eac90..8767ce1 100644
--- a/ui/abstract_button.cpp
+++ b/ui/abstract_button.cpp
@@ -104,18 +104,20 @@ void AbstractButton::setPointerCursor(bool enablePointerCursor) {
 }
 
 void AbstractButton::setOver(bool over, StateChangeSource source) {
-	if (over && !(_state & StateFlag::Over)) {
-		auto was = _state;
+	if (over == isOver()) {
+		return;
+	}
+	const auto was = _state;
+	if (over) {
 		_state |= StateFlag::Over;
 		Integration::Instance().registerLeaveSubscription(this);
-		onStateChanged(was, source);
-	} else if (!over && (_state & StateFlag::Over)) {
-		auto was = _state;
+	} else {
 		_state &= ~State(StateFlag::Over);
 		Integration::Instance().unregisterLeaveSubscription(this);
-		onStateChanged(was, source);
 	}
+	onStateChanged(was, source);
 	updateCursor();
+	update();
 }
 
 bool AbstractButton::setDown(
@@ -149,8 +151,11 @@ bool AbstractButton::setDown(
 }
 
 void AbstractButton::updateCursor() {
-	auto pointerCursor = _enablePointerCursor && (_state & StateFlag::Over);
-	setCursor(pointerCursor ? style::cur_pointer : style::cur_default);
+	const auto pointerCursor = _enablePointerCursor && isOver();
+	if (_pointerCursor != pointerCursor) {
+		_pointerCursor = pointerCursor;
+		setCursor(_pointerCursor ? style::cur_pointer : style::cur_default);
+	}
 }
 
 void AbstractButton::setDisabled(bool disabled) {
diff --git a/ui/abstract_button.h b/ui/abstract_button.h
index 2710de9..7673827 100644
--- a/ui/abstract_button.h
+++ b/ui/abstract_button.h
@@ -16,22 +16,29 @@ class AbstractButton : public RpWidget {
 public:
 	AbstractButton(QWidget *parent);
 
-	Qt::KeyboardModifiers clickModifiers() const {
+	[[nodiscard]] Qt::KeyboardModifiers clickModifiers() const {
 		return _modifiers;
 	}
 
 	void setDisabled(bool disabled = true);
 	virtual void clearState();
-	bool isOver() const {
+	[[nodiscard]] bool isOver() const {
 		return _state & StateFlag::Over;
 	}
-	bool isDown() const {
+	[[nodiscard]] bool isDown() const {
 		return _state & StateFlag::Down;
 	}
-	bool isDisabled() const {
+	[[nodiscard]] bool isDisabled() const {
 		return _state & StateFlag::Disabled;
 	}
 
+	void setSynteticOver(bool over) {
+		setOver(over, StateChangeSource::ByPress);
+	}
+	void setSynteticDown(bool down, Qt::MouseButton button = Qt::LeftButton) {
+		setDown(down, StateChangeSource::ByPress, {}, button);
+	}
+
 	void setPointerCursor(bool enablePointerCursor);
 
 	void setAcceptBoth(bool acceptBoth = true);
@@ -95,9 +102,10 @@ private:
 
 	State _state = StateFlag::None;
 
-	bool _acceptBoth = false;
 	Qt::KeyboardModifiers _modifiers;
 	bool _enablePointerCursor = true;
+	bool _pointerCursor = false;
+	bool _acceptBoth = false;
 
 	Fn<void()> _clickedCallback;
 
diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index 4e826c1..af4bbb6 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -65,30 +65,94 @@ void SetupSemiNativeSystemButtons(
 	}, lifetime);
 }
 
-class TitleControls::Button final : public IconButton {
-public:
-	using IconButton::IconButton;
+object_ptr<AbstractButton> IconTitleButtons::create(
+		not_null<QWidget*> parent,
+		TitleControl control,
+		const style::WindowTitle &st) {
+	const auto make = [&](
+			QPointer<IconButton> &my,
+			const style::IconButton &st) {
+		Expects(!my);
 
-	void setOver(bool over) {
-		IconButton::setOver(over, StateChangeSource::ByPress);
+		auto result = object_ptr<IconButton>(parent, st);
+		my = result.data();
+		return result;
+	};
+	switch (control) {
+	case TitleControl::Minimize:
+		return make(_minimize, st.minimize);
+	case TitleControl::Maximize:
+		return make(_maximizeRestore, st.maximize);
+	case TitleControl::Close:
+		return make(_close, st.close);
 	}
-	void setDown(bool down) {
-		IconButton::setDown(
-			down,
-			StateChangeSource::ByPress,
-			{},
-			Qt::LeftButton);
+	Unexpected("Control in IconTitleButtons::create.");
+}
+
+void IconTitleButtons::updateState(
+		bool active,
+		bool maximized,
+		const style::WindowTitle &st) {
+	if (_minimize) {
+		const auto minimize = active
+			? &st.minimizeIconActive
+			: &st.minimize.icon;
+		const auto minimizeOver = active
+			? &st.minimizeIconActiveOver
+			: &st.minimize.iconOver;
+		_minimize->setIconOverride(minimize, minimizeOver);
 	}
-};
+	if (_maximizeRestore) {
+		if (maximized) {
+			const auto restore = active
+				? &st.restoreIconActive
+				: &st.restoreIcon;
+			const auto restoreOver = active
+				? &st.restoreIconActiveOver
+				: &st.restoreIconOver;
+			_maximizeRestore->setIconOverride(restore, restoreOver);
+		} else {
+			const auto maximize = active
+				? &st.maximizeIconActive
+				: &st.maximize.icon;
+			const auto maximizeOver = active
+				? &st.maximizeIconActiveOver
+				: &st.maximize.iconOver;
+			_maximizeRestore->setIconOverride(maximize, maximizeOver);
+		}
+	}
+	if (_close) {
+		const auto close = active
+			? &st.closeIconActive
+			: &st.close.icon;
+		const auto closeOver = active
+			? &st.closeIconActiveOver
+			: &st.close.iconOver;
+		_close->setIconOverride(close, closeOver);
+	}
+}
 
 TitleControls::TitleControls(
 	not_null<RpWidget*> parent,
 	const style::WindowTitle &st,
 	Fn<void(bool maximized)> maximize)
+: TitleControls(
+	parent,
+	st,
+	std::make_unique<IconTitleButtons>(),
+	std::move(maximize)) {
+}
+
+TitleControls::TitleControls(
+	not_null<RpWidget*> parent,
+	const style::WindowTitle &st,
+	std::unique_ptr<AbstractTitleButtons> buttons,
+	Fn<void(bool maximized)> maximize)
 : _st(&st)
-, _minimize(parent, _st->minimize)
-, _maximizeRestore(parent, _st->maximize)
-, _close(parent, _st->close)
+, _buttons(std::move(buttons))
+, _minimize(_buttons->create(parent, Control::Minimize, st))
+, _maximizeRestore(_buttons->create(parent, Control::Maximize, st))
+, _close(_buttons->create(parent, Control::Close, st))
 , _maximizedState(parent->windowState()
 	& (Qt::WindowMaximized | Qt::WindowFullScreen))
 , _activeState(parent->isActiveWindow()) {
@@ -216,7 +280,9 @@ void TitleControls::raise() {
 }
 
 HitTestResult TitleControls::hitTest(QPoint point, int padding) const {
-	const auto test = [&](const object_ptr<Button> &button, bool close) {
+	const auto test = [&](
+			const object_ptr<AbstractButton> &button,
+			bool close) {
 		return button && button->geometry().marginsAdded(
 			{ close ? padding : 0, padding, close ? padding : 0, 0 }
 		).contains(point);
@@ -233,23 +299,29 @@ HitTestResult TitleControls::hitTest(QPoint point, int padding) const {
 
 void TitleControls::buttonOver(HitTestResult testResult) {
 	const auto update = [&](
-			const object_ptr<Button> &button,
-			HitTestResult buttonTestResult) {
+			const object_ptr<AbstractButton> &button,
+			HitTestResult buttonTestResult,
+			Control control) {
+		const auto over = (testResult == buttonTestResult);
 		if (const auto raw = button.data()) {
-			raw->setOver(testResult == buttonTestResult);
+			raw->setSynteticOver(over);
 		}
+		_buttons->notifySynteticOver(control, over);
 	};
-	update(_minimize, HitTestResult::Minimize);
-	update(_maximizeRestore, HitTestResult::MaximizeRestore);
-	update(_close, HitTestResult::Close);
+	update(_minimize, HitTestResult::Minimize, Control::Minimize);
+	update(
+		_maximizeRestore,
+		HitTestResult::MaximizeRestore,
+		Control::Maximize);
+	update(_close, HitTestResult::Close, Control::Close);
 }
 
 void TitleControls::buttonDown(HitTestResult testResult) {
 	const auto update = [&](
-			const object_ptr<Button> &button,
+			const object_ptr<AbstractButton> &button,
 			HitTestResult buttonTestResult) {
 		if (const auto raw = button.data()) {
-			raw->setDown(testResult == buttonTestResult);
+			raw->setSynteticDown(testResult == buttonTestResult);
 		}
 	};
 	update(_minimize, HitTestResult::Minimize);
@@ -257,7 +329,7 @@ void TitleControls::buttonDown(HitTestResult testResult) {
 	update(_close, HitTestResult::Close);
 }
 
-TitleControls::Button *TitleControls::controlWidget(Control control) const {
+AbstractButton *TitleControls::controlWidget(Control control) const {
 	switch (control) {
 	case Control::Minimize: return _minimize;
 	case Control::Maximize: return _maximizeRestore;
@@ -370,37 +442,7 @@ void TitleControls::handleWindowStateChanged(Qt::WindowState state) {
 }
 
 void TitleControls::updateButtonsState() {
-	const auto minimize = _activeState
-		? &_st->minimizeIconActive
-		: &_st->minimize.icon;
-	const auto minimizeOver = _activeState
-		? &_st->minimizeIconActiveOver
-		: &_st->minimize.iconOver;
-	_minimize->setIconOverride(minimize, minimizeOver);
-	if (_maximizedState) {
-		const auto restore = _activeState
-			? &_st->restoreIconActive
-			: &_st->restoreIcon;
-		const auto restoreOver = _activeState
-			? &_st->restoreIconActiveOver
-			: &_st->restoreIconOver;
-		_maximizeRestore->setIconOverride(restore, restoreOver);
-	} else {
-		const auto maximize = _activeState
-			? &_st->maximizeIconActive
-			: &_st->maximize.icon;
-		const auto maximizeOver = _activeState
-			? &_st->maximizeIconActiveOver
-			: &_st->maximize.iconOver;
-		_maximizeRestore->setIconOverride(maximize, maximizeOver);
-	}
-	const auto close = _activeState
-		? &_st->closeIconActive
-		: &_st->close.icon;
-	const auto closeOver = _activeState
-		? &_st->closeIconActiveOver
-		: &_st->close.iconOver;
-	_close->setIconOverride(close, closeOver);
+	_buttons->updateState(_activeState, _maximizedState, *_st);
 }
 
 DefaultTitleWidget::DefaultTitleWidget(not_null<RpWidget*> parent)
@@ -479,17 +521,34 @@ SeparateTitleControls::SeparateTitleControls(
 , controls(&wrap, st, std::move(maximize)) {
 }
 
+SeparateTitleControls::SeparateTitleControls(
+	QWidget *parent,
+	const style::WindowTitle &st,
+	std::unique_ptr<AbstractTitleButtons> buttons,
+	Fn<void(bool maximized)> maximize)
+: wrap(parent)
+, controls(&wrap, st, std::move(buttons), std::move(maximize)) {
+}
+
 std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 		not_null<RpWindow*> window,
 		const style::WindowTitle &st,
 		Fn<void(bool maximized)> maximize,
 		rpl::producer<int> controlsTop) {
-	auto result = std::make_unique<SeparateTitleControls>(
-		window->body(),
-		st,
-		std::move(maximize));
+	return SetupSeparateTitleControls(
+		window,
+		std::make_unique<SeparateTitleControls>(
+			window->body(),
+			st,
+			std::move(maximize)),
+		std::move(controlsTop));
+}
 
-	const auto raw = result.get();
+std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
+		not_null<RpWindow*> window,
+		std::unique_ptr<SeparateTitleControls> created,
+		rpl::producer<int> controlsTop) {
+	const auto raw = created.get();
 	auto &lifetime = raw->wrap.lifetime();
 	rpl::combine(
 		window->body()->widthValue(),
@@ -516,7 +575,7 @@ std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 
 	SetupSemiNativeSystemButtons(&raw->controls, window, lifetime);
 
-	return result;
+	return created;
 }
 
 } // namespace Platform
diff --git a/ui/platform/ui_platform_window_title.h b/ui/platform/ui_platform_window_title.h
index 278dbad..aff1172 100644
--- a/ui/platform/ui_platform_window_title.h
+++ b/ui/platform/ui_platform_window_title.h
@@ -19,6 +19,7 @@ struct WindowTitle;
 namespace Ui {
 
 class IconButton;
+class AbstractButton;
 class PlainShadow;
 class RpWindow;
 
@@ -55,12 +56,57 @@ void SetupSemiNativeSystemButtons(
 	rpl::lifetime &lifetime,
 	Fn<bool()> filter = nullptr);
 
+enum class TitleControl {
+	Unknown,
+	Minimize,
+	Maximize,
+	Close,
+};
+
+class AbstractTitleButtons {
+public:
+	[[nodiscard]] virtual object_ptr<AbstractButton> create(
+		not_null<QWidget*> parent,
+		TitleControl control,
+		const style::WindowTitle &st) = 0;
+	virtual void updateState(
+		bool active,
+		bool maximized,
+		const style::WindowTitle &st) = 0;
+	virtual void notifySynteticOver(TitleControl control, bool over) = 0;
+};
+
+class IconTitleButtons final : public AbstractTitleButtons {
+public:
+	object_ptr<AbstractButton> create(
+		not_null<QWidget*> parent,
+		TitleControl control,
+		const style::WindowTitle &st) override;
+	void updateState(
+		bool active,
+		bool maximized,
+		const style::WindowTitle &st) override;
+	void notifySynteticOver(TitleControl control, bool over) override {
+	}
+
+private:
+	QPointer<IconButton> _minimize;
+	QPointer<IconButton> _maximizeRestore;
+	QPointer<IconButton> _close;
+
+};
+
 class TitleControls final {
 public:
 	TitleControls(
 		not_null<RpWidget*> parent,
 		const style::WindowTitle &st,
 		Fn<void(bool maximized)> maximize = nullptr);
+	TitleControls(
+		not_null<RpWidget*> parent,
+		const style::WindowTitle &st,
+		std::unique_ptr<AbstractTitleButtons> buttons,
+		Fn<void(bool maximized)> maximize = nullptr);
 
 	void setStyle(const style::WindowTitle &st);
 	[[nodiscard]] not_null<const style::WindowTitle*> st() const;
@@ -73,24 +119,16 @@ public:
 	void buttonOver(HitTestResult testResult);
 	void buttonDown(HitTestResult testResult);
 
-	enum class Control {
-		Unknown,
-		Minimize,
-		Maximize,
-		Close,
-	};
-
+	using Control = TitleControl;
 	struct Layout {
 		std::vector<Control> left;
 		std::vector<Control> right;
 	};
 
 private:
-	class Button;
-
 	[[nodiscard]] not_null<RpWidget*> parent() const;
 	[[nodiscard]] not_null<QWidget*> window() const;
-	[[nodiscard]] Button *controlWidget(Control control) const;
+	[[nodiscard]] AbstractButton *controlWidget(Control control) const;
 
 	void init(Fn<void(bool maximized)> maximize);
 	void subscribeToStateChanges();
@@ -102,10 +140,11 @@ private:
 	void handleWindowStateChanged(Qt::WindowState state = Qt::WindowNoState);
 
 	not_null<const style::WindowTitle*> _st;
+	const std::unique_ptr<AbstractTitleButtons> _buttons;
 
-	object_ptr<Button> _minimize;
-	object_ptr<Button> _maximizeRestore;
-	object_ptr<Button> _close;
+	object_ptr<AbstractButton> _minimize;
+	object_ptr<AbstractButton> _maximizeRestore;
+	object_ptr<AbstractButton> _close;
 
 	bool _maximizedState = false;
 	bool _activeState = false;
@@ -143,6 +182,11 @@ struct SeparateTitleControls {
 		QWidget *parent,
 		const style::WindowTitle &st,
 		Fn<void(bool maximized)> maximize);
+	SeparateTitleControls(
+		QWidget *parent,
+		const style::WindowTitle &st,
+		std::unique_ptr<AbstractTitleButtons> buttons,
+		Fn<void(bool maximized)> maximize);
 
 	RpWidget wrap;
 	TitleControls controls;
@@ -155,5 +199,11 @@ struct SeparateTitleControls {
 	rpl::producer<int> controlsTop = nullptr)
 -> std::unique_ptr<SeparateTitleControls>;
 
+[[nodiscard]] auto SetupSeparateTitleControls(
+	not_null<RpWindow*> window,
+	std::unique_ptr<SeparateTitleControls> created,
+	rpl::producer<int> controlsTop = nullptr)
+-> std::unique_ptr<SeparateTitleControls>;
+
 } // namespace Platform
 } // namespace Ui

From c3b5f2e62dbe54bca50c14b977fac626bab98138 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 24 Feb 2023 19:11:45 +0400
Subject: [PATCH 355/635] Update title bar icons.

---
 icons/title_button_close.png       | Bin 269 -> 269 bytes
 icons/title_button_close@2x.png    | Bin 421 -> 418 bytes
 icons/title_button_close@3x.png    | Bin 542 -> 575 bytes
 icons/title_button_maximize.png    | Bin 290 -> 320 bytes
 icons/title_button_maximize@2x.png | Bin 350 -> 456 bytes
 icons/title_button_maximize@3x.png | Bin 522 -> 613 bytes
 icons/title_button_minimize.png    | Bin 217 -> 226 bytes
 icons/title_button_minimize@2x.png | Bin 262 -> 268 bytes
 icons/title_button_minimize@3x.png | Bin 359 -> 352 bytes
 icons/title_button_restore.png     | Bin 387 -> 408 bytes
 icons/title_button_restore@2x.png  | Bin 526 -> 595 bytes
 icons/title_button_restore@3x.png  | Bin 813 -> 812 bytes
 icons/title_shadow_close.png       | Bin 470 -> 403 bytes
 icons/title_shadow_close@2x.png    | Bin 890 -> 623 bytes
 icons/title_shadow_close@3x.png    | Bin 1407 -> 822 bytes
 icons/title_shadow_maximize.png    | Bin 457 -> 336 bytes
 icons/title_shadow_maximize@2x.png | Bin 798 -> 543 bytes
 icons/title_shadow_maximize@3x.png | Bin 1204 -> 731 bytes
 icons/title_shadow_minimize.png    | Bin 321 -> 251 bytes
 icons/title_shadow_minimize@2x.png | Bin 486 -> 328 bytes
 icons/title_shadow_minimize@3x.png | Bin 730 -> 415 bytes
 icons/title_shadow_restore.png     | Bin 528 -> 438 bytes
 icons/title_shadow_restore@2x.png  | Bin 1006 -> 659 bytes
 icons/title_shadow_restore@3x.png  | Bin 1583 -> 890 bytes
 24 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/title_button_close.png b/icons/title_button_close.png
index 7f3b14eadff3217d5693883126a380c1aed322db..248e5a1fa6d574b2e01a1a7238f8cdebec6cc830 100644
GIT binary patch
delta 55
zcmeBW>SdZRMdISci|5bt2Qvl;XtZkjP2{+6A%1_|(IZDDuJIM=tMryGQ;4->00K`}
KKbLh*2~7ZwRu!HA

delta 55
zcmeBW>SdZRMdJ8zbu~4%V8#FejaE&+i5wR$)c^nY^vRQnYkWoWg#))MPs~wg00K`}
KKbLh*2~7Z0u@wCP

diff --git a/icons/title_button_close@2x.png b/icons/title_button_close@2x.png
index e966135a694d502abc37529f82582e66ba6dcd2c..9bc27c89b254a199ef3b5873d2dc72fdd4391ad2 100644
GIT binary patch
delta 298
zcmZ3=yoh;1V?B?ji(^Oz>)YuExehA`xHzBxtM>nY{Feuc<;GhS6m{NlWs6$RlbYLO
ze16h|#}5=3g;3GV1HX-*m}YJZ*RSlE?|f=X&^gPNgqyrZ9mzdAE-sqC%+ZcTcj=tx
zE6bW0j5-QWzdGu$<ydaH@u_996L)NsiW05w*yinHw#a<iw2pOc0^A*wS6wY?a_>F<
zw5V`5)7{fG^Bdo`drkkDQusElhIhx2+MPT8EcUe3`@?KlSDC?Fct85#_s2yKjybPA
zD)s2e1&MRddYO7vp9{Pz%PI+dAb0ZM1&Lc4#T-wPHoi^g?t1%kVP~?tInVE(-(S5w
l7cz-~bAmDu!%&Xn1EvK=_G%}zUu<Il0#8>zmvv4FO#mhbhwlIY

delta 301
zcmZ3)yp(xDV?Dp8i(^Oz>)YuMxmpwiS{}zep67G_zh=mXHtPu!Qp;QWu1VCpyxeiN
zCh}q7hKUTE6Od7Z&x60YpJrUyy=r>apZ)xL-kMvlO_}sOZ-Qfw=8P8??=Ne#mw3B(
z`?WJU0uF43%Ut-`79CzU@2uwTw}PGKX1=qTHrD5K_#NG4Bywn1rW21s*{r39IG0IW
zPPN$W-BxsNzrTFnV;0WoT`Z#gIp^*lP&JI39&)i;p<nMt(U(7Qw&|Mlf*;oGy7S5L
z;1&tzH+M7_3OPu2&AYHAk4s6dWLDX!MJh43w)OnK&30RiCHhu|l5|k+hKol|IhvXL
p7mB+2TRYfOjY-7;34P#Tl2@4;bK5)H*_Z(cJYD@<);T3K0RW@9g(Ls~

diff --git a/icons/title_button_close@3x.png b/icons/title_button_close@3x.png
index 1781b22e8f465a72712fe998af417fa1127b6133..789dde76b1bf3b50e6481a1948e74b2b255d2d1f 100644
GIT binary patch
delta 430
zcmbQovY%x_qxnit7srqa#<#Z|^O_9=S|6@Bp3r=xsk-37yvFJc?b%xv@95H!zB$h@
z^wq<3@fqnh@_r&ta{OkKKQf9=+{;t%plZ<f_<8Z{WuBrvU8-`&CNeH|{ul4{JpO#{
z{qL3Ya(TT29wo|1UNG~hezmx^<CtJuV#M{U4>SZhz4jC`$sT{2`y<L_)08c*KYo|u
z`FO0qHBK|Q<J8v-zHeGn=WlO3EO7Gt!NY-~U8`<1`_=MKHJO_F_4(JZNER)z3gL}k
zC)X#QlG!x(bnz>Z*Cor-Tff~4+B9wb<hP$+mbRQQymM7@--PeC{)c|{lij-AB>e1>
zv^n4JTVFpjNouRZE}p~IzwGthN+;J#b+EAdnc0bnK3loqjpf~y5?{iWO0GGxFj`P_
zmadT~H<x-r{SKiOo6gu?_iWaZ3jKKUWXwCG1rkbnFEi?985PfHzGqSyP<l|b*0$X2
z|0aR8$D{4b?fQ}<r{&(>67HrXG-Zd`i{<n7PyDfST1gWF6Nf?rPQqb7)BT2wJ-tc3
RmXjHPz|+;wWt~$(69DFW#X<l8

delta 371
zcmV-(0gV2?1fB$tfiH+jL_t(|0qxpB4uc>Ng<;csxpL+GW6$EQooHed48oJx0>7)O
zGXs2r(b%qILy^E4k<SQ!k_7s`e=plG3`vPju%)kcte|tM{#_gSXW8a?9>-A|uq9gh
zTE_}%MGDT^5RE`{+zVQfX_^Y=(7JBRaGOMeqa$dgZr&EOQT#s3hp;0t-I5byikBB7
za0n^oxuo_u2_-2wwI^lAN76)wm2GjS_m@DI0e4!jCpW+pI91Po_;Zcq6zlY0t`_U8
z<CEQaoUGF*W>k*j`c@}AkjJ!DbByn(y&67a^m?WlT6tQ)pN8v-{^!Z~v{AS{N6_GG
z<F*(^JDl|e?a1lDLmE4qKmaRnYD?!wcgb`a&^lryP-Iw(nn^TC!L4WtC_+ljnlgu+
zSeqsvsxn;B?4L{*oBr->FC?}+wac<!*DZc`=5Hk0ydevb!5ERx2pDn-d;uL;9B42d
RCj<Zh002ovPDHLkV1iL8uO9#a

diff --git a/icons/title_button_maximize.png b/icons/title_button_maximize.png
index 9b0689d092e7122c7d774de721ce67dab3367233..a4e7f745a23cb6ede0694d0ef76a0af25572e75d 100644
GIT binary patch
delta 199
zcmV;&0671m0>A>0fq$w=L_t(Y4P#&!1*0J_SVDl2NQbbpvdYWLGchrtssH!y-@}Iw
zfB*iCCQd$AQ&aQVvuFQt0H7350Wqet5Tht3C+EeB7p|_Zm_7jdc=6)JKn2;^*#wOu
z$}&Mg!5cSjT)lb~t8qXnpaQH?XoBc*fF?~{?x<x{2~WBPBS2B9@%{VvmX?;<+S*u?
zzJ`Xz@#Dv-;&qTA)XLO@uehRG5RDo%8Upx20048FY>};rD`Wrw002ovPDHLkV1m}a
BUCaOg

delta 169
zcmV;a09OCN0-^$tfq#riL_t(Y4P#&!1*0J_8UnaNKv`M&_U+sMaR8tcPysHz$l@%>
z99-<MurM|@HeX*~tO}-1oeEUY-rkN?7Fm!e%h=i3U%!66Wy=<1op5$TLjzC&oQsFS
zgh!6*QlpkpB}nNSj6|izpFe+!ii-O9_+a%PPztC3s}wnc)FR5%<k&r`XEX$cK?nc<
X+GbDR*9x8*00000NkvXXu0mjfq_9ca

diff --git a/icons/title_button_maximize@2x.png b/icons/title_button_maximize@2x.png
index 606e0d74228cc4b1fb40bead01f5aa840bd76142..feca74c6bb4e04d665f86d2a724eea33770cbaa6 100644
GIT binary patch
delta 337
zcmcb|bb@(8Lp`IBr;B4q2J71y8+n@@cw9ZFutg;>SG6Swur*FnmFS+w+c3-M=OxcP
z4TIyB3!Vhe)%*AV&GX=vP9-}P2POpikj^4^@b%eEYjjRq^i4hYdKceegY%n>{xxk-
z@%*)~zS>s6sm}4zEaknci!>Cj&so&NSteS@yu3d1(8|XaWwG0Jx{aDmd~a{l?PB^^
zIq&{Ezp&7!2d<Z{)$u%}P#87i#Iut}KQD=U@+p7e`>7eON@|}be^-h~yeBEa8975R
z!Z^C@4A0t$hSq5;*Un6nHFnNUInyWEXu6sAn&FvlJ<mOB<<E*uZk*h4GO#`OPxkJo
z+nY6Sa2hrzcqzW$x;u~IqDe2e@Z{L5;mmoa8EtF+gw1Db^1a~ng5Ca^M{djn22KPz
cFqgB2q5HDsYVqYtTN!}B)78&qol`;+032$QNdN!<

delta 230
zcmX@Xe2-~DLp{R@PZ!6K4A!?d4)V4r2(%`a^M7I3sHC-+RcfIUQ|g+@6;b?YYK7*D
zf9{k_7ua{4b$V+f0~3cr1B{Sib>dh$#qij1izTj7OaEFdo}3;zr_eqA>7}}dZgJx0
zR6iIVyH}lk)+F~_W$bm!bgz?Fek^}<cmK7lzw@@diQjwe*yLZ|PwtN1pOjqQ-G9X6
zOecf;MNffOsS{?*I_0U@Y02rdx97Opv8}F!Y%#GWqOU`z+kCs;5Y^zsBH+Nl2qk_r
a9$>qzF1GF&t9CvE5O})!xvX<aXaWE{a$)cQ

diff --git a/icons/title_button_maximize@3x.png b/icons/title_button_maximize@3x.png
index bdda763b679a4334378b4b7ceff099449e3581bb..75e7923b19dedc16551a0b6ca292d3af7ba9cb24 100644
GIT binary patch
delta 494
zcmeBTdCD@OvHrZLi(^Oy<J((~tC|8N+8*XvP0YBkBy({FzhiagqS+amd5c*&)*f2H
zdPRjRE2XU7qA(+*BYxUPGoef0?d@bU7R=?7XAy8<V8lf<u41YW)eo2}-}W%aY_^Zu
z-njK?pKI)%SMG~i+qI~E#mubBPmgWCnUi;^pH=s^TB}v|-1E<`zYgW9=#RYisPx*k
zzHIl!7hjfCwJ*qyy5nY&BWPxmzcJ#=?^^RO1r|#(cin%Vy)My0=2)SP1kak}Lg|Sr
zo@bwh$M1_<|JQ7e-||&kqfVvgwrKrcI`{F%7w^6m?aY{-;TXP6@Ybi(QQzyIO5PIQ
zb@#W+Z{Z8mYA^I(_%{E_EVr6XQ@+))E_$$?S<t1iLE)euOQ3>+#|B|X5e^QaH!cFK
zOie7-*rbk#DNRd#879lpnDCRIQ~ryx+`gLkiI=Slx8L3=-L=T$_kvSR>)yEU34gcn
z-WTP|I;Yc*J>D37plGLvozYkGROLS(^X2|LIsBXdPskp(MULCe`?uX*TYpE-^2Y;i
n-#t;wZ;FNB3u{IeEv`SzRoqiwirmz1X8;0ES3j3^P6<r_-fGnd

delta 403
zcmaFL(#0~NvA)F9#WAFU@$D_cKGy(|V;`q~6k6){=Acy0fjki|?G4gX=iXrM^mA7<
zR-gIg$ZM5-hVMUy#}?H-zc>GKY(Kj=6Nf?r18!owpvUDcnX~r2-|srzHFCkxd#wiN
zKUdCkt<pCX%YJyhyr+IqhD6)+wchzUcf97j`C+p&Zd$76q(5S@*GpyGPcl8S;A=Xt
z2q?EDSG%+J@`P2Z_Iy6IDP--XMK;&GRwR`_t9d(T`7E)vh3>wWpFD1E&b_kj$iW+P
z*U#_WQ5-qnl-K3pcP2rX#s-BZKbAlRg^mTnjv^c!N-talSecqQtOQ-^amsyU7Mz~?
zF_inf+4jKOLUFJC+0*4`mc>5*z4G-g4X*vRMjMoa>uaMA$;V|CoIL!y{)f{aw?&T6
k+tqrNHSq_^cd;LgtT+5OYMyP+;b8y*Pgg&ebxsLQ0O;hSZ2$lO

diff --git a/icons/title_button_minimize.png b/icons/title_button_minimize.png
index ba19ab5c2a3fd599f7a83129353fd88119ee3533..0dda203906acf852a12b57e82c4d6040cb279f5e 100644
GIT binary patch
delta 104
zcmcb~_=s^rW1^3zi(`lfZ*qbJ>taO%DJC$Xtj;3Q`DN9VDI)y*{9#Aq_tjK>dm|a9
zS;SIVS^59p-{11=3|@?)0?F?le3mp^Cl_ig#pJBb!oVz}rM^zzk&^)kJYD@<);T3K
F0RTS)A=Ll?

delta 95
zcmaFFc$0BLV}!G(i(`lfZ*qbJ>taO%DJCf4Fj*i$<<gZqcVZF~6W4Uz-&bp0`6*>h
uPzo25@1K5VhNUM=N<waDaP&+NU|`sIRJp>H&1xY75O})!xvX<aXaWF@h9Z>!

diff --git a/icons/title_button_minimize@2x.png b/icons/title_button_minimize@2x.png
index 4d643aaeb6a288cfa931619fb2cc7e265a232e42..be5c172ee6af011edfdd126278906f2bea6dd74e 100644
GIT binary patch
delta 147
zcmZo;>S3DDSYPJp;uw;_`u36|FM}cvi^IE|1&jW<E?^R_dAF)j!0FJJ{oaxqM+Fod
z8W<RvSU4~kW*j!z=T~fXJK~a_z4p7E;2pt}(Y=QIR-Q~aCZ6|G?~T=}Q{gtREOnd_
e`VY7=+3#QN;amFu?0X&tAn<hcb6Mw<&;$VGq%;Nq

delta 141
zcmeBSYGazvSYP1j;uw;_`u5^Q&I1ZOtPYp|UhjOpl}~{~u}(y9{=p;9E!&hF8W<Rv
zSU3a}Fc}5W3dZ+?)*if<b8&Z`?W#Qni;T|%pW7%qr#SET@wDIlviT)Qnj7bH)EJ35
V`d*7aV#ojlo~~?uF6*2UngIQsFzo;U

diff --git a/icons/title_button_minimize@3x.png b/icons/title_button_minimize@3x.png
index 416c3916af702eff4ae6697ca8e07ea1b122756e..57c513fe2ce0fb9c5bba3d5849459a36fd48ec0f 100644
GIT binary patch
delta 152
zcmV;J0B8T_0^kCWfi22OL_t(|0qxYW4a6W21VH~Mh(@S`h@vTlLXe35iQIq%vaPuY
z5$vMTiQ_Pl(HoJ!Awj@SfzQsevn!=kN(mvHH`fnij9P1J?RwM$5~g79{kLFd><r&e
z@ZDdTbB-~t=$)}Md`0r@GT*m}{>0lYnFkS(upJoSQ38LmPsn5BxPa{d0000<MNUMn
GLSTaPK}l%<

delta 172
zcmaFB^qgrzqs~Q77srqa#<!Oa@*Y+YU~!nt-+Dnfbf?hv77Z3VPSG2aQeCE;skPL7
z(~)aD*^p6u;sdV94vZXdipBlEy1=v$Kh39el6&~?-HWpBTYT+T!n1JqsX_OI(~jt^
z-1|(O?|^5nbHs%grYp}>=Dhz~^YGrwB{xnVU*mY^``?d;lnai;iEW#BRz~7MI*Xn0
WmEx<uZcBL>fWXt$&t;ucLK6T;IZfIC

diff --git a/icons/title_button_restore.png b/icons/title_button_restore.png
index 0b1912a0568384c00b3a5b48deccab0bc1da5f68..91f5c10e2905806ec3a626bdb30e9b3287300599 100644
GIT binary patch
delta 289
zcmV++0p9+D1DFGlfPVo3Nkl<ZNDX6P7zLvtFd{>MkyKw#pFZ8m$qBCO*RNj(4jibi
zuKx7t6I>7%g9VoaF7dT%*WS5v2QJIY%bT8_&d0|WA0H1F#Kj=iG6@NZpr9a5PEKTl
zo;`cEdiClzZ{F0_)*_4JViRlGh7B9!<>k@BN>Nb}Xzts$Z-2SCxNup3EKaOt+S=M_
zX=%%sFGtpV^X5${DJh`;kOlFunefO_U5W~p{R0DHTt)@UcI?;@6%|E{WyHqW@87?*
zw6q)?9FPqKrVF6>$B!SkZrzG3PAR*kr3Gm2e^hY){(S`n1>%h+p#<UJ;9y}v35jpt
nz5(Nlc*{mrjv9u*;0XZ$ebr$l2HL*_00000NkvXXu0mjf7kP%F

delta 268
zcmV+n0rUQt1A_yQfPVn(Nkl<ZNDb{%F%CsQ5cSs&CvXC^96%>ptwP}t?%)C%H*f+H
zhtMiSr4*GC34ij7%|x=YLT9IX^CtV=?#zxPi4YxlWd}Z2U!7%{>$>#RzVA)b#BtpB
zJtbM-vYF?3wrx{6LP!)v!!Q6(Nf!9B3I|@-^&kjTRmFVQb$@xDgHxKOm}g;Lv#P2T
zMH$Bt3t5&0>AJ46EMuO9dCd&N@O{513M^FDwP~7d+hXzrlat!xr3cKmfAHMw0W%n9
z7=}D%yfa&t#c`a2qNZu{JWtb9mgS*zD@~FFbYX>Yz}JVBxTPx&iw?Y@13!<VStAW2
SKZO7Q002ovP6b4+LSTY3f_QoW

diff --git a/icons/title_button_restore@2x.png b/icons/title_button_restore@2x.png
index 2c55555e9e3fd93c8b8acc0fc3656f293b32c2bc..926e7939a3332b91a2a8b63f91844ad0c36d2cc6 100644
GIT binary patch
delta 476
zcmV<20VDp71k(hNfq%V8L_t(&1?`uy%7Rc7$MeH-5W*0e1p^o7kcOV1HhYZTput9)
zi-sOR_k02eA@Bu4aEu^YqG&0;?|@K~x3pvS#c`0!z31NZ|Njp6daYFGAp%5z2oM1x
zKm>>Y5g-CY;5!I#McZh#TBFfOmgTfWo6RN+L&tHB$75Q|Cx7<O=kwnuo;Z#T!$34p
zc*VNi?rb(=R1Ah{wHjF3ZnwIw@ArE|du1*q2*PACNs4OQc9~Mpb8{RQMG<)OeIILa
z9&4dwooclTM}=vcjYfmL^5t>~f?zlt?shw{v|g{_m{C=gJ*%|Q@p$~iNpTNxT{qFX
zTrQy(PDm{2$bS_Z3<jVKim+O(*b>|AcC*>+bUN&?+@r|GBuN4(;Huy6vo%49dc7Xc
zBMZ1C{kgTitU<>9TS2K}1y}5RK0}7&jgqRULn*7c>2#_n3f!2pPE3pc6k~9if-hT|
z${hV)yT_0#mTVGD(=5wkV}=+AK-^U9bgzys7K{5u@KuQx#J`&IJ@esG?|I(!dVOdL
zVj%M2Pe5+jh5SK_qFArj*_sZA!|8Nl$IvJdAOb{y2oM1xKm>>Y5g-B?2>bzM%N~0}
Se{jwK0000<MNUMnLSTZVLE;er

delta 407
zcmV;I0cify1dardfq!^OL_t(&1?`qGYJ^Y_hBqb%VrivVSa^lCu(TA9<N-W@ARa;x
z7ObpnY-}y<L=Rv<3ndwN5K^p~mC?A%yh8N(znS^J;pw|vXb=G+Km>>Y5g-CYfCvx)
zBJdgn-uAYk>$>Z@k|fO~8pp9L%Q%jUqL|a1aXtuwuRjd12Y>z%4ZI`9x*MwNy6g2i
zP1EPh7=}R<MULYv%gXb-s;awjo^sMOO|S=jjiTr&4J;I$rYRUhY!|nXY{M&_=RMDB
znr3xdfd-VIXIc8bhZ{i<HY7b_3Dml3>9+v%tgPGZ2J_$+t4ie0Jya&ka$VO+k}Q{K
z+qSBzZQCk}0)I*{<~YvJ<MP^nc+0vGhT&>%&@eGmqIV2=kFEMSOhCpCLyeS(I)(&t
zE)4sRvFn`Xq4|%8)cc8j-`6w^PRv*-&SEUfGQ%*iTtS?d-D77tc_8*`mr$F}in~;U
z7<BXL9<c@rMFfZd5g-CYfCvx)B0vO)z-tls2G>h$h!CIkt(yP<002ovPDHLkV1lkx
By66A^

diff --git a/icons/title_button_restore@3x.png b/icons/title_button_restore@3x.png
index b366e5a32c39daaab35f36755cf0ea8e3ba1d76b..b2f3b1ab894f2c45d520df6a18e0f4b273719e9c 100644
GIT binary patch
delta 643
zcmV-}0(||g2CN2<fmfDEL_t(|0qxq)%V|Lv2k_TTq@-92r7THSb_#!j9V;tkB_%6+
ztZilIACOWO7Hs4XP*Rd48|7CN_dd6Co6hc>8He+}bH7&e^30Ftb7tmn=KcD@3z6R&
zk?#k8CJ0ze=u@l9bUK|(CaqShR^Z>yACJdwx0_C<<MH_UeCnwpe+&u!7J4n0%S<LC
zKaidbYqgq?;lE1tdR<R1lE;L@;q&?Yies@@{IJn?+!MWCZ#*8?xhLA~c5=_>^DdW5
zu{$1*!C-K|-+!3$$9L!V`!|~no4=(}>BpykWJ&_rY?dMRdc9AMLD$!aHx0;Uvqd5i
zT6z`>_pY*9t!A^??RH~h8;wS+OdA3#%UnpMQtS1a%^iWlVzG!uqs++Zbh1X~^ErE8
z+CnH4x?C<SXW;@l(v3x7G7<5YDHp0-E;}5K*Sn^zAQp?g-p-3Hn6oFUGjFw8*Xxyk
zD~&`V!CIjE@?<jMs&06&If%6MSSFQ9<#al+KlK!v%_c+C6aVfQbC&bFv-)uRKr{dx
zh(I(zz<?$&6M<-efB{WlCIV3<aKGQ_yhV9~_uIRw8IhtqGm#Lx-L7KL>2yReMC+LI
zi$!#_8ufCyT)W*q91ir9Oe56LkEKF?q^Ci{;m}YYU5&}JoOPx9o**C^;A+ltrlUA|
zE~^ZGFc{E1fh!eOmumgLr+SS>L-=X7x+0yixZQ593m{Lh$K%;<w`vZta<y8O2Sp&0
zKp@cX_h})E@zFIX6bb^zgaSj=tipX(so5e|039>=d_G<a`X2{E<mw2)5P$%Y;}?<d
d2N>T>;17_4r|QkfaFhT5002ovPDHLkV1kIcJ`?}|

delta 646
zcmV;10(t$c2CW8=fmfGFL_t(|0qxmOt1(d=2k`4bw<O9!k&?C8*s!pWY`g(d-iETW
zRbGS?QOY~O)`ApScmXIjEc}h`^Lv`xugS)_^Bi|-=4<tvnR9+;&c~T!ob&O450e1{
z6Or!=e-MBG1auIv=+Ne?CNr5#I-R!JY_AG_U%%h)tJP{S7%UbG!72tXMuJ~jKdn~F
z<M9|ANThp}N=2*Tzk2KSIv5O!G-Tv5(P;E|JpPYkzu&i5es!Aq)y4$B{6HX(NF>DP
zM2EvclRz$)<NSp}q1|rtAp%i>YPHJax7+QCe^x^|wLmBoV#Mims=oB@SoAgG9rxjO
zyOYUeBog`j{QOaV`t=x%Mzh&WU2C`7@gY6n92+^vX0w~khR2SEpxJD?TrM_pI-Q(k
zxm@yj!v^7S_;R^$pEU>M$VR3^?Dcw@;hrkeE0N-;BceWYVmuyKdj5Dk%H{ImaNq$Y
ze-h;L`BW;Ul%!NolcPumxn=Z0^!a>BH@4ettya^}B}Vl7{Tiyvt@1~1I&)?NqJ-}q
zh(MGeARz@tA`m4ANJxQ^2t<{@?RKMAcjd(Sd{$j~duW`INQj+IM*(Xz8gG|VHK5Nw
z7S#>N42#8Ly<Xq%_mjy)X5Lr1424K*e-pI9@~X@7uN&uamTx1RQ6EH_zmz+qC1|_d
zE_}D&1!+l~t6Z;Fj`a%kd7S6-c`O#AJ`)Em>z_`iANAks^>TSi#j&}9QmOQ`wyN!r
zHW<{S(p-pEt93XWYJ=liw820dHRghQ>Mc3acpQ(%G^w$RU_iTlw820dHBUKl0SJ-b
g8<Fn^7*h%S1#NHiizw*qvH$=807*qoM6N<$f{`dj3IG5A

diff --git a/icons/title_shadow_close.png b/icons/title_shadow_close.png
index 84fa43c13ebf3307da3f73a5241e495d3c3c3fc6..6f3783f410e9acd188b0d357afd4ca13576c9fe4 100644
GIT binary patch
delta 284
zcmV+%0ptGG1Cs-gfPVn}Nkl<ZNDb{&!3u>S5G<|eXb|)VLH+;N)F)(zIz>gi;R&)-
z%6fV{&_lShtK-aSNfJkN;NKibzvFpo7yhgSB45!Ph#mXBZ<=OZ*YiAWwk*r8>*~7J
zT3gUF5uO}P2_cH2XxkP92FC;;K%{7;XU<ZF_0UvRRi5YgE`Q6CWf_<d9>+0`BbDnR
zOFg+;%1AK;NSVnn4BNKdDqSI08P?<Y&}8&UDWNHd2|IA@b{#ed4^T#JyspdkkJ&IB
zi%UkC;NCpX^u93pSY&u-cu%<HwokNwN~vj@IDT?_2H*C5r#AwZ5FtRMI7|UGuHTXi
i57;`EMhAZ3z!e9WZ+VFB??Mg$0000<MNUMnLSTYg^MXtO

delta 351
zcmV-l0igbq1J(nOfPVo%Nkl<ZNDb|j*$#s+3<S$vuK)j0?xXF1g;jxyQ;A3X5G5w@
zWH)Xfk2`J$P8{$~zUe1#4VLdU%)D;cO@iI}xC9i2VUi?_%)zmTiSPSS6vc5&o{Z#=
z$G<Z+jG~aTEKAcA#%m2GkVxiv9s~iod7e$)aw(VK`oI8yX@A?6BP@%eATLXoBDONB
z03g&fq@Wc|csPz@(=>hGqs-(v!SDy87}4?Eg848ERaK#EnkLgjuHpn^pTN)rOZ)@?
zsjh3pxsWL0o7ykj;G|5tTzU`p&_u{3*4|tO7jZUBS_4v9mUM)?Q`dFCXc_H$c%}z7
z3|TPfJvxx*kyv-4{iqHJp)kl_`8&fmx(-2%lm>ur1pT6xn#%0|Mr`EzI7Y4It+p<g
xyeiZD3DSmfn7RZLQKRL4<#oe7xgGe&fe*r_(>-^M<6!^*002ovPDHLkV1hI3sXqV!

diff --git a/icons/title_shadow_close@2x.png b/icons/title_shadow_close@2x.png
index 4577d49aca0a62f237aabdb2e58f0d11a9abcf4c..a801255af4f858fcf71696c2fb290b8235418850 100644
GIT binary patch
delta 505
zcmV<V0S5m12JZxrfPVqmNkl<ZXa((<Pmh8y5XI%sUXa8K5EImce*Z6}k`O|IK;lvN
zWt%j_(x$94yV>k;Fj!ve{N7Ak>S`sII3Ny)1LA-<AP$HF;($0H4!r5W$JgaQ$Wp!M
z$bqNMQ&yJccDseRX`1Wx`g}ee9fKg)?RG^`KvUOsRaFl0(tk(M(hd$iyg!{zO0Zt9
z@pTvmn;uk$!y(UeB}mh>ZQIA=Vbd>d50`fE*JoLV&;ej}QB)9^kEmKGGX}roI7Y5?
za7mJwd7Gs|>2_VGJHCHI35ICKaRdo?bYw4Vvs5U;%jKfGklYZ1AtuZ#8=H;ld_KFE
znQx%dgE`nXn}5yAyh5%xs1O4Sn2l{(qR{YBF@nvqp;2F~RQMIHj41$fzNvO@D*OuL
zKBgFc>yt5KvumK@eAxpy;JLsYR6oPU0yay9d3C?vrwb!%-sr(>RM@ZjzPIh&<kd(F
z=AcsV7Unw1ls96q{eG`cA}R^y%09~$MG@Kw^F|4VGIBc}kJI2xD)rQ4!<hi$zi}S3
zQGpF*i75xc)CJmm%8bG9Fbr`PMu<3H;UwaIXGh*pf$IE*zXoo%8!a30XedZr{(~;n
v`;RP2aX=gp2gCt!KpYSU!~t>Oe>w08(qrNH6nUh700000NkvXXu0mjf*@yDU

delta 774
zcmV+h1Nr>#1o{S$fPVtyNkl<ZXa()q+fpMj3`J1_gbBm{|0>}!kXgwYRIUJ1gjQZC
z>%sUUcWdj&Zs6i#+RVVrz|6qRz|6qRz|6qRz`_iy7VfX@tJVHdX*0Ro?R3(XTXjzL
zuZ>^q^nfMG%gak0t#`k^zCzOKzh^tu|BEoA+x0kD(iiL1)qmA`z1Dip%gf83gJH8Y
zvK7_!!OH*n`I+13xg?$*FtHK})n>D~xw$bE<>TX{$k2^!Bh{~i*#+k5>4`H>*22~U
zCMIBVkLvdJRtH#Wa%9tI=1B#LCj&-a^VtII;I*`A14|$TK_yn91BgDBqMJ@p{XQ7H
z_>|{Tptt>PV1F_#@v_cP!4ve`TlPOAOXiEpuy*Nm$>nwXgWhG8b+Rx)r<3Pf{gBF0
zyuZJHczBQzY%K@O8+*WlB&L|>2C3LMn91!zE@DQjP;Iwc9p!3!SC)H9Q9wdhNP-(9
z3xKN<RVq`Jx?l{66Do3rDs|Y!)&mCSGd5Jjar-51NPnEqP309mrC2J_4PnfrA*x)G
zX(Q}W1@>x{VA>SR;~*t;nz#&nc2%Ib3575|hAP%lZi{nJdC|Twexx-kMlNZJK5EZB
zkuP;*u@v=kh0rbcyGa|V-I(IeGgegMR)O^u#wm1#R~NdOIR872haZ{gVrv8YjLOkM
z<+fnhqJJ2$7>qNq^??0{s%~~)VHZZK4i(_DvbBL>bEs6HPuAVtosQ5)DvBvZU{nfH
zv6X09ZK=i{umqaFSsbl=l#8l<w=g4g7)NY|=Ci6FhlO};w_>V`XpDOAsiMYF(1eZD
zc16H0(b~Y0U~xmzcTYG}Y^*@@;#QF5YzWDgBY)sHENR=ogeboJg---v`+IOWR|(zH
z$QCe5Hrj5u1ZLdZ112&tf$`|HqNEH<tR;xf$i__t+NEP7=kgq*{6_!B{`;*5Oh)NY
zZ4#W^f2P2x{@)O7ZkZXF8JHQE8JHQE8JHQE8CaHqzjjp3jBs)aegFUf07*qoM6N<$
Ef?m#wj{pDw

diff --git a/icons/title_shadow_close@3x.png b/icons/title_shadow_close@3x.png
index da9e12f83517233d87f6d051f6fd7e29a540f8c0..c0c3b4e9374ce510be9ee83c9cb2f09cfeb00b3f 100644
GIT binary patch
delta 706
zcmey*wT*2;Lp{?1PZ!6K3dXm$Zg(9r5MWEV{gq*!UJWzr*T3`Kudoa3`N*L4;-7%V
z%`)G~5k}2__fE*mTy}DM;j-LYFF!alas@Oni7a4X)o{Sd6wsQ`YL@ZphtBD?!-|Vy
z*I&Q>T2yx1N{frK4$hJ;A9Tg)yALKb$lb}?{<p4vXN*#tp;Yg)&y|Ad+iyRN7ZQAa
zSj}F3TYpC1&dqV_&z`ur=l0ukX`4U)tl59Rc~S52$5*qizW(Z?ePpKJ^7g}u8Xn5*
z&wE`sxtcN~IA*m~&eNanz2L|3g9kI3+RB7mOf?VPo0;(2UtMU<`@5P=GXF(u#4YO&
z)-k#)(S368)eRe2*(Q$L)8=s4O%Z(JsB&CL_1limi=99GtjXJc`@)f^R}OdPGqtkH
z*4oIeP+8cQckpbQaQLIg58i|sb-Z9)<})FAt-_+4%-%b7+a#W>h!kL+=<=oH&G+9|
zS4$dSoWTB3TWn7AGU=yR^1iA4EAuxgSyp13v8#T$i@;pLd7W*C=gO~km0A0RBg@gn
zUZ#)j*1s^-6&x4u2hLug=OXXk+Vo=Efn51>zf$EzTbCM?PRT6xd0U$(sP(i>=}460
z*1jkKTh>ymRSqQ_izX$oE~{F(;#IkB{|m7rv3EaK@YLR$Y^3-o=1|AhrXBiaG40wj
z`zLkSHKqC0YnF>Re-Xd(UZc6=YtovsHoMs?=k_nZ%z6Hdu)534IUO!(>&0&;uiLx2
z*xFBR^0#%?(#NA5izU2xz0CNweLY)t`}$m4)@<3;n>fF5*fgwIXU)!OC3Ac0yPo+f
z_huiwZ7gu`#Kt(8jkh}gba*w{L>xKD?W@%4n$yer^l5h7T5szKh80`{648fJru}d4
W-TK@5`C1AC5O})!xvX<aXaWGEV??q5

delta 1296
zcmV+r1@HQ{2LB3>fPVz(Nkl<ZcmeI0>vq~e3<jH)<o%zQUebZVs?OSRfMA)^BmLND
zwOZNVptT|2zO^-hCeQ?$Koe*JO`r)hfhN!dnm`k10!^R^G=V121g<0Sa$VZPvR+=+
zuK51`e&v-ORp-jft*5O?THkrcs>(yZPJq*i=}P@a)mgd3O@B*u5JNdm821XbY(`cz
zu$R@SpmRr^l}p^ZR0J_A|2~;P2>v;n4x>aCl|&tC;9F^^Loq*<l{$;X?+zaB-g)ar
zq+-baF&REZ5d3>GrXnCyn)xaOnOY>*G0sNIScGw2Ay<2#Uk8z!RzD11UtbT01CCOE
zosCug5?SOZDSs<KknLeELD22CVHrVgcpr%9mm~U73r)DlVv(aujHF?1r$R0g8~F?{
zw3S&ML=b3DfSP@T14JS&DLZhmMBE_GiQh!<?d>f?qzy@f9SN3VENjL(h(li>5`q}<
zGn`8&nwB{dnG*ye#wWpEx5!byc&vj+U(5})bAlp}BY#_%3ei(6K1Mpx&wvJ;S9W6!
z%~K;37!(Hc+y%i{o!<;gz*;2868ZGt&&fc~RIKw-8%0VXsv&sch%!gy5^Bu>B7HaX
zAWO6x$N+ad9>plc$~NRy>mUZf3<!T9=rrO`whccb2)j8!Pj_5sYp3X$h$<V$FCRYd
z25rD1hkwzyC*6E}zs>j@w3Me9f*Ld_OFm{Nmi1#1M7Z3<5lr?VMA#esi1Ta&xxG4w
z*K?E<WAv0v88L#-(}Re@N+EK+Py10)(Q)USJPpLz3qj21;O?h5?yVXk7ygJNm|&;r
z3)C$VWaPnz#rp(bvMiYy+RB_AASyLFiz&x52!HZo0g9k~)tFC?96igvM(}qh$nEU|
zF>@4+EHV+>kdb6eXEB)|36AI7>f!Rkv--0C*Y$RTXlL1O)06Pu0};q{)?ft5pC?DD
zy*`?vUo3;XkS&q?yVx()J`Dq+Pstz~jtNoRvN0`lc7V7}5Qva9CqF0!$H)@wGN3%&
zg@0o;#1(?^-z^}*1%kYMwdlmyKET?SV=2TyFh9jXkQ@o}B}Vg`Ai>y<qdiGK)<HzJ
zhw)Q_bf5V6O@aeNBJ7pp1n`MC7D2p~;N?Fv$D;)EaULLAIa+d;b6xjkJH+$m^>xfU
zWH`n4U?vDY0MWd`QC_~j8J)r|n`DUu+<#4-I*7<X8#ppVXo>^D13?Zlk$^ZS5*%3)
zF{4HV+Z0?bz8ggFVKC)x5IiRs?-LUiq1cHOp%nNiqTy$eTl;ko<2YvrdG-#-;uQNb
ziJl_I<4Mkd1G0V$xn}r_+=mJenbtuZZrAQ3hy$JBb({&BV{>JWY$QkzLX8G2Lw`01
zVY<)Tnf9@{pn!e}I)W(^6phK={QygpY+<8DK`YGFZWJl)L<J)fwdg@ABf&}j>F=DN
zIdF74Q@2Mo5nEP*ERj}b`#?k<u<~04@#-fof&m26fg=%;*(F4Miwt|WrdbD3VMs-i
z`W3G)J4X}d%E`<e-53y~jzyTxD}QVhx%}UFqw2Y=$QZMcfZA+E^2WhuJCR((NG^i^
zX`P|$SEh9kRUTtF3TAq}^5DoWEFe0)zK;1{A4?&I;E(P*fPRz^alyrOaIUX2Z0u<h
zXaY^32{eHw&;*)56KDcWpb0dACeQ?$Koe*JO<-FBe*sN(_F)cy$PWMj00{s|MNUMn
GLSTY4(@&oO

diff --git a/icons/title_shadow_maximize.png b/icons/title_shadow_maximize.png
index 83ab63086a92dd3d60b295f816bda8cc55eb542f..190744f3721bdd79b00a2d425a7d26e3192fc01a 100644
GIT binary patch
delta 216
zcmV;}04M*+1JDAHfPVnGNkl<ZNDb{&u?_?g6kMD}qL646{{Npe+is%M2<|2Ca@k<l
z7I%ABQ1NEGVKOYs9Mge+ae!Po2q8pkErjTjLkQcpl~TIszWCTLj^@@{rPL7$bt$ED
z?u3BQSd1}-O5XdFQq>VrAi$(WEAm*3Qi^-lb&WAr`#I-$6j7iJ#a@l77GGLUv5y#g
ztBvC{=A7|b#+Wv5ka$Gjv=a};Vjuu74DyW;@Am3G!IpXJch$<z%5>mY4m<&`)I9%g
S3W@jt0000<MNUMnLSTYS>t?tB

delta 338
zcmV-Y0j>Vf0?7lAfPVoqNkl<ZNDb|j$&Q0S3`7&Q0fztoQ&zF$iIS{V#zS`wx#2@%
z+-{evY<N6wyA`-l;CXSTqvvT^mhtZ<AIGupJHMElV8Oz?{~Ta`PRsLLz?Lb1ZQG`4
zT9yUJj$9`KM)k5Re@_F95@Gw|3I<2S#m|LNFakzWQ51DuSASJSQQD`Xm4h^KtZ5p^
z&GT$Wt`i5NeTvffFbsX)hgv}h&Ry4COf*DI0^@>c(f+!wb|2D+EO<$3N3IhGvuidL
zjg9KjA=zCy+1vA1A3tEG;laifOB|IEh=WNqc7d&9E#DS|AV&n1W_4XB2~2F-wq+y!
zu73LP;$W=bI7^PSkHI5kAU%2cNC>yorA5&H+=bb~KtLR-3qT0~V`!N8xr&1c;9?iR
k(>s6@c6s}^0v{^y0&)en#LRm*DF6Tf07*qoM6N<$g1BX!W&i*H

diff --git a/icons/title_shadow_maximize@2x.png b/icons/title_shadow_maximize@2x.png
index 30da5ba07951e8a9f3a2ffa53c7d85c3a40ea334..d6ae3954be5f3f3602fc45e6e139a342de95deb3 100644
GIT binary patch
delta 425
zcmV;a0apH=2A>3wfPVprNkl<ZXa((9JFbK<3|x315EUoj0Nnp9R8;gxG<+lwypbXy
zlx4l<B~NK)D>fe6nQ;=udA<0f0#twsPys4H1*iZOpaS;_MEAoEqfr#)c^=2HGRD5|
z%d#BDp~Nd;K8YnsQdL!1mf)sLZ(v|G3`5s-+qOM&6u{4BAb$h`tGce!G!-ziX<gT*
zX?$_hE*N=Eu%cEjtPlb22=X<N65xjz)*e=%GNl0f!!rI9E%{`4G>+5ay05TXrfE_}
zD2n1NlsS0jc~<%gFh9hsGZ3uCaTKx&CM%SHludq?qMRd$mBfO`?vRufa}Y0xD=QX6
zc88>_n1gshTz^@yAhJ6o^>bH57kr%q?zPvy^0x)HLdm{@)ekY#+n*Qw^R_M|zBQqh
zMyOlU(?LIb%=Gq8bHC&9K;Y}~!w)e`5j_}s`}eu(N8pYidc2JMk<EH5_D0|LS(aH%
zrzV0ac-ywV9z2lL+hfj2z;wa-e(|54-_H5)g9=aqDk4Ayr~nn90#twsSPJ|CN@8)l
TDV`OZ00000NkvXXu0mjf==;MG

delta 682
zcmV;b0#*H=1fB+vfPVsrNkl<ZXa((<?QX&_3`GZn!Fc~?<zq0|5m#7N>D;vSCL!5B
zDkrs*dz`clyuFoG1*!s7fvP}Npej%m_^%2q(kEIhri^*J-Ex&o5%H`*FkHPohxPV=
z<c%1by^*6j6TpCB%H?wT{xE!XwnzcvdcA%>44<s|Y^#>J2Y+KAS*=zdcU!O5017O|
zlX|W|ozLg5yIn39u?<cd2PA-@9ulBF?}kG&p0#rqFrW^H1O0HyIx%CL$zZ$Pj->;&
zQ5=y9CJX5hvSM7vVm!ys1(PzCh#kmUp^t5;t;LQ4?|Dk=A(vonUF~Gs#-g>z3C>(F
zrj$O|FnmgWI)9yx$K&ABq9=2^-EKA;rE{f|K_-xNQgXnMA~h@#JW%cTdmfwkH2?#P
zj3Du-MmAJO=-6fgn5Hx^U|`cLE`D0zAs05=v>IeALvMT<n2oO223nztSBw-P#gC$m
zJj%%jV|p*t`(BwX&Tj!ec!Iy2kn<8L1@;ol<V4nrxqo83g!?CNMSJ5>0`K=$WH6vN
zYp^pP451jO3VnYA1$KZUJ_wt3D-BGaBO&QTi=g-ets|Ar&0<UZrX_%(Mg|G`5X!k0
zUuUJD-he5XtAW{2L1N3T955ZAI71;zD%oZ_E(IdAy!xqPBMfE*1NvKY!Bk-V0OQ~b
z6{bDLEq^~#uMZmrjLyycL7?ii<n|6|opZq$2ob2U-}dal!PkaOFUQguL|~nO3C&C}
zrbm|j3Z}_w1e&xgs*C-ZlLZz{9BA^lq+aiL)(XRqk$gH}_JBc!&s{P5u(5su7*h&^
ztG7leFnA-2W@By;mILM|fXz1>{S=tSxhkwGP$Lzn3RDHE0#$*kKyn3s0B5hH*$!=f
Q0RR9107*qoM6N<$f_M)#Qvd(}

diff --git a/icons/title_shadow_maximize@3x.png b/icons/title_shadow_maximize@3x.png
index 809d1b0bad982caa9016e0a3048fcdcfe1e549e1..0271349eb5a11f4ea9d4b67d0092e8378233434b 100644
GIT binary patch
delta 614
zcmdnOd7E`YLp_tLr;B4q1>@UUr&k>^5OH14AHs6<xXT=kU;p>3SQW0)c*HDU-tU!J
z+`UYF;_B0ZHoo8NBIg~u^yGOvKZ^nbBZmV6lRyIl7G}KLf=|<ahONF@xBvdzGU?v7
zTdKu7?!TXYI(7T)Tr=sd-m5Bk>g$<ZHqQ1@JM?^F-baCjF>AvXMcz64C+lp?#)tv~
zi8IeXN9lH~Pia5=@Mn#kT>sI`8*#eT+Iy$?uD&|UZ@E72#}_)>l9fDP<b*^YRoJWx
zY0_8NG-0B-V1MIBg;#N}zgEd<R`E;>Tp)UQrq5kTUcoE6)ASGDe!EO{&63#7H_s?c
zuAlgZuie@6se1eI=7{yyd%mQvdOk_L`0wi3^QNV3j(oQ2vfkz6ud?^twv2C^b@=f|
z4SV6`9hcYbnI5bt=d%27I!j~52Wuw54mK7Zl@%@uQUV4O76>(FI2>?j@?u%U$jHp8
zg<bMbxWM7P^=0+@j+EV!WGMEu_+}e(mnZ4^Yt!|M77HxCs3Bjkxu|zlP5tuNeX~7P
z<c?f^x#ZP}klwPFx880$>2pcRXi}_|&=%Qz-z)E4l<nrVn&}ebw#j>6Ti%i86*Jdd
zf6d`NRVPJ6DkjSQ#KA>d9CxiP^@{#_OU;k{?CsM}i}v52eOipetu=myO-Y<LyRg+<
zzh`Hh9J|iPU%I&KXp&&=MGqnFx;+|&UgmahCZtzoZBfJ**8)GdnD%Fe^vyc%@I{FM
O2s~Z=T-G@yGywqMatrtX

delta 1091
zcmV-J1ibs(1+)o}fPVxYNkl<ZcmeI1-FBQX3<i^K()WMf^e3HV7S$y!*akZnl`edQ
zkz{{^V9&zSQ(6*80!bhVB!MK51d>1!NCHV92_%6ekOY!I5=a6`ppL+EUDyRt&(Dvw
zcASo7-rwKN+HpF{Hl<90D7YAL!q_f;)27Q{*)f(z0EaP_@qZ)y{@vH_Mn*yH%W5%0
zsXmTDN`gOE3!qdsrhc~_kuM!N9VzmH-tBgC#KB6A9c4)gUO!fYBrc<8`^q+DO@hdt
zWcO0o<q*HGCIV14vFHvS4l#OAh_9;w6NpUq-N>b2n$hlyg3+FH`f)f!)j|qhcH!5>
z@R`8^N9)6@q<;@A%+{8vGf{k~GXtUoQHZUL_=+C{ZJZ9BRK`f86x8q~$c;>WIksM#
zj%`eWh&*)ODc)}0$T)1b?3z}!)}$<kZ$XOlV8nNl`3@+pDZ?QugAqem$de!~gJyqB
zX&fgHHBgF}JG`Z!S7lk@k0lIaY`r{(8`uO4hsb&%4}Z=23X|a5+gos~S4)K;s3a~=
z6u;A5*V+gkaX15F>|2o>0t*A;x5eOyk1-j+`wpd`hLIBNaL9^P_A6X?b}Gbj--ze_
z1srV%Nk)GM%9tIWMkCjscu<ln&7G8Sr{+PlO;mzlO^){_T+GQswUi<eb~xloaFbgu
zcUbUbz<)f5A2%8tp`dL*d`xi$Kw4AQzp9;||1^m5VpKyM#>}C%h>YCBltBT%|1b<%
z;D0Ea5HGmO2{9pFK;VKB*@+490s<G5$WBa%7ZA9hM0Vl@5I^l7%lgml@zT`8N<n|k
zWwJ8;@~}^Xh!R;Wum0{s{lB+OqKB8GsV_JWVt@SA4Sa})-TkHD`dW||3YA+Iy}9^u
zWQ_E3xtJW}%!9ZQ5CnNA2s=RVQmbA$=@RtYfE+hVOgo$k(Hj<RHVzc{_{SuN@mjD_
zd3g;eLMb?!8>>{7Iv+LzqN>Vwf6Sm6<qE*@EQg#rR0Tm|s9=%!P(_iCYaLcQA21xE
zP=7*O*>SJ{pQHMl^w^A|6f3JxCzgn%o62?s4~NK}N`ffla|+6tk5L?IuGc`8<`Uxb
z!{LTwea*he#|_n&T$6=P!c+^jhwf$aWT#l!D+D#nZ(e?bl_q3sHhD5;MklgGq@u?j
zL_CLR_SZlbXJlABAhHU^a?GD8Tc0}|qJK(|1T1v&bu={lKx7`P-|;4rYMKxwh|h|c
zr#2~<9}b5YJ4TW|j)E_TNLkGKv0Q9moYUU|^?S0>mWI0z{+@20kH*y3G?GTcd9>p4
z#DE<ZGoEcN+ZsOuB72fij5uL&wsq^qZ#asNQ!(FHwkc~8MD_$Vcedj+ZQWpD;XLm+
z9c42m2_%6ekOY!I5=a6`APFRaB#;D>KoUp-NgxR%fg~`5z%O~*c&xP~d$Rxl002ov
JPDHLkV1jQW^U?qS

diff --git a/icons/title_shadow_minimize.png b/icons/title_shadow_minimize.png
index ad84b490d0e2931e8f0ee45b1a6d022740bc007d..fad46d12f6eba55858c9a3399f08f9fb86e73e54 100644
GIT binary patch
delta 129
zcmV-{0Dk|$0{a1wfqG?0L_t(Y4egLY3IHJt1Kqmx1ycY2IS=9s3KfODcu?27>8VWu
zCF2|h1V8`;K;Rw%&q-Bg77_3LG;C%$XH}iLqxg=;Y7ZgA7*}rBYpp4zP2jVRo|RIF
jXw$3*em@}q0{0SVG*uVH`1U-!00000NkvXXu0mjfSjse+

delta 200
zcmV;(05|{p0l@;0fq$z>L_t(Y4egLi3Iib!L}#Lo;w`-Yl{|zi5r0YHfCw7QB8xz}
z7h}=Z_`2&js3-wSfD)ht{wINRyXvDA=N#wKTx-oa<BM7vdXsncPJp45(pn24&Q{&|
zY?V^--iHvr1Cvr3V*u)yQGjTzjWLeRrQUCbw@N9_x$C-?PeA|!18mFNvAG_0bRb3q
z2ohs#UhW<RJcPN8aSsD{W{lI^`jgG(zo_%;3A_Ln8A{0a!X60#0000<MNUMnLSTX!
Cgj)Xq

diff --git a/icons/title_shadow_minimize@2x.png b/icons/title_shadow_minimize@2x.png
index 7f22fbcd8493108212fa1dbba120308a1ed6b077..683b705b66ad39b06820a1d065afc13397550fb8 100644
GIT binary patch
delta 208
zcmaFHe1d60Lp{SLPZ!6K4A!?-e7PDF1lk@Nl{{r+d0%gGaA`Jc<~2tRGna$6*ZoLa
zR{86u86S&)0|O&=;>V-|>#B{fMLoacbUrFOJ9puSbuPslC6YNF=3V+wb<T3BNslkv
znUp+<$?0EHv|s8!y_8~+VdS}B+l?oCt|zr$TXJu=;j!xdcLL&$2AwMUxisLj^yF*z
ke^$nPdm@5tWu0~b)07nHRFB=iv>AZF)78&qol`;+0Hj`3zyJUM

delta 367
zcmX@X^o)5zLp@`Fr;B4q2J71?fqBga0<6vqjO-8oeQ#!FP@2-WtG89;s9~CY)XSgE
zItSyb({k_UWf>_j<45%;9Ug9)vFOKH;ijG~zxUl<A&{cN=`3@Ar|tRQo97-me)^i@
zRyubrS4TLLNByc*t6tAi?+uSia+1jCpTBLL_WnI;eZ3{085f5HY|Xu0D$BTj`GFN;
z9+yov20Y5Wt)%Vu=LrKFvx*4UhJEj6FY}!9`$lf$v_uIF@s<s-`nUehu(dYZwn^vn
ziW$=zdF(@9{m804AdnNy@$uu&d$p+w))$tBnYA7cGtnx$XmkE?hDF+Z!?wvsy3aE5
zIIn5j?0Ddm-o36RRpD2I|1Xa_HE~H9<1NF-6H?{~ueS6s*=_bla^{!E>g)#347MeI
tD13CCk5P?feeIWio)ZmVbYQ>P2j1zz`_sNXvh8C40#8>zmvv4FO#m3AqS*id

diff --git a/icons/title_shadow_minimize@3x.png b/icons/title_shadow_minimize@3x.png
index 73bbae00bff14177993490a9ee0826cdd38e56fe..adcfe343a8a652083f4bf6e6b836568863eff790 100644
GIT binary patch
delta 296
zcmcb`I-hw$Lp>v>r;B4q1>@VR2RT~|1Xu%N9WQXLIruMoBb#=Bz>&GdevxO}QY-H<
zO`bWwUB&mYvO@y{BNGdUfCA}^n@qW7sT&XNd%rwW>iEW7Z@>NP>a%ZeD~;`ctTD}W
zec;LDCq6s}E9dQAcUp5_VDY@?n{=ki#+x_U-4y!&;5&<Qgh{`kztFuK(b9zyZPJ?d
zw}KK~CM`F6wC}xV)1%W|%9GA)6@2`tKU<qKut4%`vdh6X%e7hdIul?1k9#hYVT#Ss
fig17YS#&_!wB49T(!BU90}yz+`njxgN@xNA-q~kf

delta 613
zcmbQwe2aBLLp_s=r;B4q1>@Um2lEaY2)G6=IKUM4=fA$v#wK3Ys;TX6f(s8GOk1+*
zJa_q|8;?I8Y&@5iC$^!1RVRUwJK_Kn1<Zfl2W)cd7k~a)yEgH{lD6A#m)RU%;Q4Q&
zif2bt_dJK(C7V|EZ|FW2^XSF$WwWg8m<9DuO}dq|QDH&&g5Sa2brSM%*Vh%EjBhjw
z@|Rz>WpB(j-|x}e1pd5|YWkD==!W>77`+b{gV`8sn-o^7C~lhcVA|eevQqsSR%^RX
z|2BBl_u%X9?1^6Wv!33(CpWWkMY6~Fmxl}X#;p(2Zu*y4Q_bwt62u<B`MA%7c~@HJ
z$DNWLAqVP8-feI$*nT^AdvtEmo_(K|C&>06Km1T3V4AXrz>-71Z->Oau2%lI=;XwG
zI~77F&fl`pWqZQ0^J#KP^Zym!{vGqI?(boXmnxs4Tra;i(^>kjuWoLAvSQP(IjWMA
z_6cjY>UQ?ezwozi|IM6=ue0XJuAKO%#A>3AhWEGoDL!mTGQ8W4t2HkE^7-eQ_xiEd
za@^$kJ5<!y$|PT$b*8o0SU}VDw@QPLVRUYt&{xHamkm-EI<=lkyxDPMqpj2|r!{vP
zmc4FXC_aChhx3^q>I!iYOi?lpNpT!kt_N^+$MHI{K8&8cCnb+fsk9|TUN3K&$gd)v
zf}WS(3x5{nJ#A1qvOKho>ElbMeVN$e{okGg{3qsC?%t`hD~|yPJYD@<);T3K0RX%C
BAiw|s

diff --git a/icons/title_shadow_restore.png b/icons/title_shadow_restore.png
index a8d8a697658f44e19af7c2e868029f049e070609..2ee5a32391aaf2d02314f873d86b117f456c6f68 100644
GIT binary patch
delta 318
zcmV-E0m1%|1hxZ^fqx)LL_t(Y4eeCRjzvHay%+?+#zumbmH+=Dv0{V>LA>tCbkdPF
zx2A70i<v~Ps!mm%(^dU=JnnT*;IB+Td3Ph0WtpbQtM+{#$8lK}ju6IsVo=JmOrSfC
zqbQ29ECu}PYFCIr!0WoMq9|yHEhMX|>id4vH0!z&wFrICVSg3{dy*tz6q2Er=Xo5*
zhG964Gfk6_Ah=RukO_i7sAO&wMQ8|O=<nNvGbkmd>pE)YdB)lBV%xUEFoedoZ5*Tx
zDKSO?(zb1BIy(Au?{qzn;_h(!mGKK=RaFhc&~@D_4US8Vk?k69IZabu$qo|k=hxym
zVMvK#<Dk$q?KgV+`@SdGg^=tIf@kD;9v<Ae9=}vw*LZDb@V4&>{EG=Z0rQe$-Lig_
Qz5oCK07*qoM6N<$f+_Wy>Hq)$

delta 409
zcmV;K0cQTT1CRuefq!~QL_t(Y4egZ6Zi6roMUw&n0z$BX4gddjNQg%g%A@V6N3yI?
zV%lz*g*6$=b9}ESoK8m^4!m&S{9^BE>#X8Ug}L>i;!}lLU*~&aLb_ZoVHmPPlwKgF
zX?j;N&oe*Q3|(<`wv~Wki`DZyNM%_DK_Epr0<5a4x~@^UEPu;ZAL_ecj^m)l_x&h}
zI73r`i4HE2=lSFD7{~FyFdRclmSstjxULJ>ltp*g+ykWcc1xUH8QpQOC<=P1A^3h3
z;jzVIi9Rc7myLAf)@bVc{(iqpcZ%2R6|FE(CQ?krKZ>&}(>idh>$=<Rh7_KV*1&XA
zEm~LB$u5{2qkkPdnQsJ<3jk%Z#kvNVm0!THj!6*!#)>#dXl>he7zXfW>ve92>01Lx
z(^RZO8G(}sZJLI+WbXCjtua!u!?-U)!F0rNj54#4CW$PojrPwK?%^2I&!350!)VR7
zga0xl>xW8C*<pBvV_=A<;l?*Gtc1SAksJ>E)qyXfeiHV~*4J{300000NkvXXu0mjf
Dqcq6U

diff --git a/icons/title_shadow_restore@2x.png b/icons/title_shadow_restore@2x.png
index 954e309eb7ad5669ca97555d09126fe764a41251..488058091a6f1db6f704c41e0b9eb59f5521c85c 100644
GIT binary patch
delta 542
zcmV+(0^$Ac2a^SmfPVq~Nkl<ZXa((9+ls<45LLTgKm`?VFXEes|Nk$(3BHK?Qp8Iy
zu9rP*mmyTrOw)7`cJefto=N7MB-5sqiZoF`6c7bO0Z~8{5Cud5QQ)5`P%WEpx7+RY
zdbL_jH_`omkD};sINWYG9mc|6E-|oLEEb%!z-qhQf*uFV!GCxhkTqsJ9(Ot&PB@ly
zFc@5~*Dwq@cq2x;LyVCeKoA5R7-43!S)<XQZV{v06@&bb#{;W@o%W?^p66Aozb697
z=ks|wor+LOVn2!xp^ktoCzA=b9}Lz1YJ&i3#(uvC-_>eG3)OD7U%?h0m&8D3xm>nd
zEoL6z(C_!x>wop}cpMIgNt96$=HM>R7}ko<D#;IfZ#tbabIk>FNsL(lQ~Bl9A{DOd
zI^K#j4bIQ`e5P*7fCR*cDn|-au<MeTnhIFqg{yj0dp@5NG1c$TcDWTDrd50>Ay!<&
zza8N%Rtzs|Vy)Wbv@qU+m|8zo+ky{;lvNdJ0*>MPet*4Q$F=Qpx$Jg3PKXgx7BN)w
z(P*Tb{<YSB{xlul!tat8KIAC_yn@lFn_;L?8L+&MT%NJKx345uyC@@1m&CA}@B_m*
zr3wHZQL4w4ZMZe%ng&_or$w{bL?ysydv+|qxKM63n>dcMk@8d&5Cud5Q9u+B1w;W+
gKok%KSQiR>0}C9ePE?vqZ2$lO07*qoM6N<$f>+h`yZ`_I

delta 891
zcmV->1BCpO1?~rsfPVv6Nkl<ZXa()p*=`##429vO*;gR%|B!)ioTSduFFpZbIGyo0
z))c)EF9Z&Uvd&LRvVC;atyiE|pjV(*pjV(*pjY5uRp5B;g^rJ>F7fg4(NN6PRrg&o
zJjP#ZGku5<Pwf5uog*{jzAJ9!pKd)jc?<)h)3u$PobX4$Ab-8Ry}iD^8u>IF&Nd4e
zWiarZpPye|UK;sBU`W_%wfem_4!pzJ<^oH*E-o(a?(XjI?|}{N1<lc`=jZ3;a{2W1
zgdZTb1Dn<oEIl!@fSsM40lT`o8lp-Z|IN*f(L~+LhU6c@)&`6S62k+js2nlfpfw3Y
zczJt!dn?&i%zth)Ybbw8d~k<MnOr%PF&J9pM5#S<x{QK(E18oiTESq%Fi1;+Jz2r}
z{2w?CIu_lO<*EP!&!cl?<ZEEDl|*28FmPmYBr|^HdsX@SIt{=qnZ2h)*Voq%4-XuX
z5h>x!W(#4G#fxfW`jl4<z@kR6^$HcXDGQsW!>II%KYwM)UO5fGtVbCzyH2k>Y6T;j
zm74f6V>-jaRyp}737e6h`OUzn%<-TDRlaR?W6k*WV}fF7`1KYNKaueK3}9$hGqCg_
z%V^Ha%ZqPYW3C5rK{*<$s~mVqhPT<+A)))m+kkDYN~rH57dJLebQ>`ML-l<JZhgYx
zkF$W0Wq$|i)#rEZYQ>LGU>x!M8vLvJR^6KmjA#;Bov~mfVl1l9q~XU(+t-;3%zoRv
z8zL(auQpW{xw}U^KNPoUH}fa@bAeImI59d%4~)^BA(%ZGiAZc$ub3bBuG8G569I<O
zW&tCSdUv|Q*R8l#{uPJkF`6W}Jh3en3u7+QI)9c!x_8FgfMw^@Q6W0_9y}7ogP~DO
z(Axq7<Njp1RE#VixKsT|LNhP`IUZ3@y0(<Q!XSmur18y4mjdRI)vOWSJ6|;eQ|8p(
zZ^f|fTw4Mjhss2jx?~o%Dbq)CTK*ryL!6!F=FpRoRlU*~U*C_9kJ##59nMpWw&@s^
zI&?-NW!P-OakixC5~SLMrKyS204!w&mOhZHX}UMkG*eOwvtlBw2~s{}$A+1>QW$b2
z1c}dvrU%0aj|J&}1p6w|nq-9MJLeoo-&g68UV&bLUV&bLUV&bLUV(Wl@COY=i=TZ<
Rh$sL6002ovPDHLkV1lE`vLpZi

diff --git a/icons/title_shadow_restore@3x.png b/icons/title_shadow_restore@3x.png
index cb97cf5862e66ea263a20f58fd5323b3eb2e2712..a4af410094b1bdb0dabb121573fa672a7abbf12d 100644
GIT binary patch
delta 774
zcmZ3_^NVdlLp{?IPZ!6K3dXmyZg#zL5NJCd8yF%YDk#o!QTzUX$30?>dkbd^e*gO?
zovm%AO3Ea^rM#b>YrPB!-L)?yynNTEZ^xQhJQ@h01G<e9qFMJpHJ<6SHOhBs&^h^%
zoiTmKA0K~S|FObmj<%O48@Cci+3wiX`+mzWSJ=d@zkW*WiimPnmR+Xl?6WRP3v+Cw
zdd0X{Sss_|4mDe}KqBnINB^VT2j9nC&Dxr@@ki~-hbj>Q-+%AzIN$5W9H^Oes&irj
zZ@PnvK<nYS_*{)I_Sf^xq}4h0oMy>RYP8=Nu_i`Oeey|tf%^I?j*TT&vYir(87H4f
zF!&K1>*5f9MtWCw!RhCpKg8?u&pZG8Zr=8&wFbQjPrg;zHp|8=`dhVEYToPPPm2|r
zVpm^v+EH1!GDIs>YwE*-4%bIX8xPbZZD?C?jrn5sH^VQtPo~<)y)Utn<E*pg$o^Ee
zyH~Jw_uVu7-{wW1HPel*pU1E<ZvE`w8L7|bm^3M0Yx7h2JNY87VBqAlX{mo5izb-9
zxHc=V<HYwzi+O$?Tzh-dr(Nn|ryF~E%J$!vwQ75LXyFnw!@B~yva|h`fBt#r)3lu%
z@4sj7UHtB0PTMCY-4=}xLYxx?SUEUmB&Y~2Vqjzx))(rWcG~B(8)KT9us&10;O!)~
z>l+%5zw29gartTSMvl16H{Yl$Px-rLsz39`qn|EUJ}nM#o~S?lbfQS|=CJgG`T_zU
z9pC=(KDR9A!@o+6{cNd69UP7<+fo@HbyM|k*REovx}O5&LH@i4mfhZ^xafe&yUih6
zZ?R4Ot9w`AqI62_Z@Znlx-(hojdlhJir3XMxxA5Eq@nZlWQvhviFai1=HxY%t0N1S
zwmy|k3%tT<Blc&4nA_ruMLSErme{w<|H;mxuuAm(N7Et;nGaKwA~nA<3+GN^;GBRT
d9nfd`&v1h0_=`qP?OX;R@O1TaS?83{1OOBvVZHzW

delta 1473
zcmV;y1wQ)v2Coc|fPV#<Nkl<ZcmeI2dr#d+3`YxPd5D(~-~T%zBwl5A*~2~Rk7*K0
zlABB_?f8$8<FTFbiD!~a`|VqkMxYUB1R8-xpb=;U8i7Wj5oiP&fkvPaXapL8M&N%z
z;NTCe^59_3s@~q-wyI^$au;7~sHrfjOu7*e<>*Lklu3DJIDc;sQC>T4AH(6{A;pYD
z`3`SL#KFuAE|WqwhFB5=Tt~j-D4+oR_g5i24wIlvbv~LJu!cV<!S{V9M@L608o#_<
zN${US2nQ+QIG{`O%WU%;wueZCh!Fq!DR8tazpN?{1^D+)USD6iBsLts%(IWf_7GWp
zAkv0lytueHIe$3;BK9%0!4YIXb^<;FQHT}sm?Zo7Yyh!DBR-ps?gQfa`T6bb?Yxp+
zUS96+?}aEnJCTvgc{#^KeIMhrln=-dvZ=_9QGE2^@$s>3IPZ=;gR`?UdQfVP6`HYL
zCk7vYY!)nX6r!&b&NRx_c?L=nUR_<01cIKDKCo3gv40Z85DYl+If74tCg2_)AGu^I
zQ6)`r*k3{8W6+IurXS&m(fj}{Gc2yxfEX4Mq_#l`N8A(;P%wH~cJM`ER-FSu&(qUW
zo`eKD;bp3&^coOdE5%S1_<%*VBD3Q#W=dU%1P&qyK2JT}Fb1MY0?}+ZEJdx8rxHZV
zpehNn<9`rp=2M2z*>Yr+lIkqi%it(|2#<48#j>hW4`O;vf_%zcUteRKU0&Y8gBik6
zWzc6SV-1L@$GuE5a%SD!-0WEcElel+QOzy(%(hSX{6?61S5GK8US3{K4IlKUsY#fJ
zH0V>oSfdju!#cw;ZvdwFwdT>50}iEMc}RIIz<*93?4AiI{ir&Y8W2;z1&h-1c)cQi
z6*Hm-s195j9(J4tOa&tLLFjexd6yaxy;F&@tPpT~7<05SmK^bsPSDf85HwGj0ZW`q
zdo{ft#Lr3soDkX9DDR#5>)#86NbAYemh5K}W#3-GQWavqiKq}{aHJEJG-HY<3WD|^
z1b<OF`xl3fC9!psst^ZD5~BS`C)$i96d2({tOV5uQ*CA39wNLD&>)~hP_Tpu?BE#t
z&i!K+x6(OLHI?llN<lQ`7z!|T!)7*9QTiO?+@DI+Qpz6z5k|;hNls-P^a-!bVkz5s
zZI0VR3?R0x0t?CxRut@U3#lmbDoF{kJbwY=yoRzpM8Wa?RVXq|Bu63gQpQ1N?cxY8
zl;`JXewAbAkBPkN0})G!*uVwHst~E9UkpUV=eG-(N;hT^jLa(NSb_j&VEIl5;={uO
zItn9pB#$H^iz`(j4z6B;{+b35H6wZoONhAr#Q6TBC8>Z2FC?ueJB?=RKe>c2qJPwb
zXeEp)S-oAxr3z)oArMQB(Ck2jnjh+blb{W#o@}|};z|vODFY=U2*AlsOd*I{NTDEl
zG6In?An+8TzZ&6~?u+706SBBc10svI469<K)ciG!e<8p!sjw1a*pV|k+JxSeaZ>Ub
z&h;QlkglOx4*o!7(Iu2gHITD}=zspjD7fH@GAa3Z=Su$r!Y!FyNu4wx8*}_Z2R-lZ
z?sy*Mf#{=(^V;~l(Y|G5xxZ0h$80!yNe5x12N5m5$<Udy0U`MG^h6#Z(uVyW>;$fK
zS!p}7dMcz&QF2L-aLH$#5XW;Q&{Q6RCBZ;k3D#$6D?xNyS-b?%q2Q|)j(=I-XEd`h
zg&2+`L2N^l#4|b9R%$?`D$rOw^`Ib>9fE@U3||lsm2e=+QGDpTtgF9>vzSu(`1CKW
zi|YY|g1jGuyQ9#N+hH7Y(+)>2gD+EK@+|8!YUzvIGMH2tBUAII=~To=k|<LX?&)6-
zq6-CFN8vKYk;Md76aq_qWICSa)(A8LjX)#N2s8qXKqJryGy;u4BhUym0*yc;&<HdF
blL-6=vitc)vC&YC00000NkvXXu0mjf-uR!v


From 85b73e98eccec7e77d7910f92bf747c7db3f1c4c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 25 Feb 2023 17:12:46 +0400
Subject: [PATCH 356/635] Fix build on macOS.

---
 ui/platform/ui_platform_window_title.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/platform/ui_platform_window_title.h b/ui/platform/ui_platform_window_title.h
index aff1172..21b2108 100644
--- a/ui/platform/ui_platform_window_title.h
+++ b/ui/platform/ui_platform_window_title.h
@@ -74,6 +74,8 @@ public:
 		bool maximized,
 		const style::WindowTitle &st) = 0;
 	virtual void notifySynteticOver(TitleControl control, bool over) = 0;
+
+	virtual ~AbstractTitleButtons() = default;
 };
 
 class IconTitleButtons final : public AbstractTitleButtons {

From d2fddd8da63d8e2b071232bd4d88fe8668cef7bd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 28 Feb 2023 15:52:02 +0400
Subject: [PATCH 357/635] Make the default rendering backend choosing logic
 public

---
 ui/gl/gl_detection.cpp | 10 ++++++++++
 ui/gl/gl_detection.h   |  1 +
 ui/gl/gl_window.cpp    | 23 +++++++++++------------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp
index 91af67f..ea5cc88 100644
--- a/ui/gl/gl_detection.cpp
+++ b/ui/gl/gl_detection.cpp
@@ -10,6 +10,7 @@
 #include "ui/integration.h"
 #include "base/debug_log.h"
 #include "base/options.h"
+#include "base/platform/base_platform_info.h"
 
 #include <QtCore/QSet>
 #include <QtCore/QFile>
@@ -206,6 +207,15 @@ Capabilities CheckCapabilities(QWidget *widget) {
 	return result;
 }
 
+Backend ChooseBackendDefault(Capabilities capabilities) {
+	const auto use = ::Platform::IsMac()
+		? true
+		: ::Platform::IsWindows()
+		? capabilities.supported
+		: capabilities.transparency;
+	return use ? Backend::OpenGL : Backend::Raster;
+}
+
 bool LastCrashCheckFailed() {
 	return QFile::exists(Integration::Instance().openglCheckFilePath());
 }
diff --git a/ui/gl/gl_detection.h b/ui/gl/gl_detection.h
index 45978ae..862be90 100644
--- a/ui/gl/gl_detection.h
+++ b/ui/gl/gl_detection.h
@@ -25,6 +25,7 @@ struct Capabilities {
 };
 
 [[nodiscard]] Capabilities CheckCapabilities(QWidget *widget = nullptr);
+[[nodiscard]] Backend ChooseBackendDefault(Capabilities capabilities);
 
 void ForceDisable(bool disable);
 
diff --git a/ui/gl/gl_window.cpp b/ui/gl/gl_window.cpp
index b866d4e..798b533 100644
--- a/ui/gl/gl_window.cpp
+++ b/ui/gl/gl_window.cpp
@@ -23,25 +23,24 @@ namespace Ui::GL {
 namespace {
 
 constexpr auto kUseNativeChild = false;// ::Platform::IsWindows();
-
-[[nodiscard]] Backend DefaultChooseBackend(Capabilities capabilities) {
-	const auto use = ::Platform::IsMac()
-		? true
-		: ::Platform::IsWindows()
-		? capabilities.supported
-		: capabilities.transparency;
-	LOG(("OpenGL: %1 (Window)").arg(use ? "[TRUE]" : "[FALSE]"));
-	return use ? Backend::OpenGL : Backend::Raster;
+[[nodiscard]] Fn<Backend(Capabilities)> ChooseBackendWrap(
+		Fn<Backend(Capabilities)> chooseBackend) {
+	return [=](Capabilities capabilities) {
+		const auto backend = chooseBackend(capabilities);
+		const auto use = backend == Backend::OpenGL;
+		LOG(("OpenGL: %1 (Window)").arg(use ? "[TRUE]" : "[FALSE]"));
+		return backend;
+	};
 }
 
 } // namespace
 
-Window::Window() : Window(DefaultChooseBackend) {
+Window::Window() : Window(ChooseBackendDefault) {
 }
 
 Window::Window(Fn<Backend(Capabilities)> chooseBackend)
-: _window(createWindow(chooseBackend))
-, _bodyNativeWrap(createNativeBodyWrap(chooseBackend))
+: _window(createWindow(ChooseBackendWrap(chooseBackend)))
+, _bodyNativeWrap(createNativeBodyWrap(ChooseBackendWrap(chooseBackend)))
 , _body(_bodyNativeWrap ? _bodyNativeWrap.get() : _window->body().get()) {
 }
 

From 0b87868b1d708020155571d4e0c90095e58d6572 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 Feb 2023 16:18:17 +0400
Subject: [PATCH 358/635] Respect real title height in WindowHelper on macOS.

---
 ui/platform/mac/ui_window_mac.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index 557d623..2f77042 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -383,11 +383,11 @@ void WindowHelper::updateCustomTitleVisibility(bool force) {
 }
 
 void WindowHelper::setMinimumSize(QSize size) {
-	window()->setMinimumSize(size.width(), _title->height() + size.height());
+	window()->setMinimumSize(size.width(), frameMargins().top() + size.height());
 }
 
 void WindowHelper::setFixedSize(QSize size) {
-	window()->setFixedSize(size.width(), _title->height() + size.height());
+	window()->setFixedSize(size.width(), frameMargins().top() + size.height());
 }
 
 void WindowHelper::setStaysOnTop(bool enabled) {
@@ -395,7 +395,7 @@ void WindowHelper::setStaysOnTop(bool enabled) {
 }
 
 void WindowHelper::setGeometry(QRect rect) {
-	window()->setGeometry(rect.marginsAdded({ 0, _title->height(), 0, 0 }));
+	window()->setGeometry(rect.marginsAdded(frameMargins()));
 }
 
 void WindowHelper::setupBodyTitleAreaEvents() {

From 3043ec69ea3aed8a846c0e57f6566166e717d453 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 18 Jun 2022 12:03:19 +0400
Subject: [PATCH 359/635] Make maximized geometry handling less bugged on
 Windows

---
 ui/platform/win/ui_window_win.cpp | 58 +++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 3507140..41701f3 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -42,6 +42,10 @@ constexpr auto kDWMWA_TEXT_COLOR = DWORD(36);
 
 UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
 
+int(__stdcall *GetSystemMetricsForDpi)(
+	_In_ int nIndex,
+	_In_ UINT dpi);
+
 [[nodiscard]] bool GetDpiForWindowSupported() {
 	static const auto Result = [&] {
 #define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
@@ -52,6 +56,16 @@ UINT(__stdcall *GetDpiForWindow)(_In_ HWND hwnd);
 	return Result;
 }
 
+[[nodiscard]] bool GetSystemMetricsForDpiSupported() {
+	static const auto Result = [&] {
+#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
+		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
+		return LOAD_SYMBOL(user32, GetSystemMetricsForDpi);
+#undef LOAD_SYMBOL
+	}();
+	return Result;
+}
+
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -426,7 +440,7 @@ bool WindowHelper::handleNativeEvent(
 	} return true;
 
 	case WM_NCCALCSIZE: {
-		if (_title->isHidden() || !wParam) {
+		if (_title->isHidden() || window()->isFullScreen() || !wParam) {
 			return false;
 		}
 		WINDOWPLACEMENT wp;
@@ -434,31 +448,37 @@ bool WindowHelper::handleNativeEvent(
 		if (GetWindowPlacement(_handle, &wp)
 			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
 			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
-			const auto hMonitor = MonitorFromPoint(
-				{ (r->left + r->right) / 2, (r->top + r->bottom) / 2 },
+			const auto dpi = _dpi.current();
+			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
+			const auto borderWidth = (GetSystemMetricsForDpiSupported() && dpi)
+				? GetSystemMetricsForDpi(SM_CXSIZEFRAME, dpi)
+					+ GetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi)
+				: GetSystemMetrics(SM_CXSIZEFRAME)
+					+ GetSystemMetrics(SM_CXPADDEDBORDER);
+			r->left += borderWidth;
+			r->right -= borderWidth;
+			r->top += borderWidth;
+			r->bottom -= borderWidth;
+			const auto hMonitor = MonitorFromWindow(
+				_handle,
 				MONITOR_DEFAULTTONEAREST);
-			if (hMonitor) {
-				MONITORINFO mi;
-				mi.cbSize = sizeof(mi);
-				if (GetMonitorInfo(hMonitor, &mi)) {
-					*r = mi.rcWork;
-					UINT uEdge = (UINT)-1;
-					if (IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
-						switch (uEdge) {
-						case ABE_LEFT: r->left += 1; break;
-						case ABE_RIGHT: r->right -= 1; break;
-						case ABE_TOP: r->top += 1; break;
-						case ABE_BOTTOM: r->bottom -= 1; break;
-						}
-					}
+			MONITORINFO mi;
+			mi.cbSize = sizeof(mi);
+			UINT uEdge = (UINT)-1;
+			if (GetMonitorInfo(hMonitor, &mi)
+				&& IsTaskbarAutoHidden(&mi.rcMonitor, &uEdge)) {
+				switch (uEdge) {
+				case ABE_LEFT: r->left += 1; break;
+				case ABE_RIGHT: r->right -= 1; break;
+				case ABE_TOP: r->top += 1; break;
+				case ABE_BOTTOM: r->bottom -= 1; break;
 				}
 			}
 			if (result) *result = 0;
 		} else {
 			if (result) *result = WVR_REDRAW;
 		}
-		return true;
-	}
+	} return true;
 
 	case WM_NCRBUTTONUP: {
 		if (_title->isHidden()) {

From 2996fb7030679e49deb093431a8db42243131d29 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 1 Mar 2023 18:31:54 +0300
Subject: [PATCH 360/635] Moved out menu item with multiline text to separated
 file.

---
 CMakeLists.txt                            |  2 +
 ui/widgets/menu/menu_multiline_action.cpp | 88 +++++++++++++++++++++++
 ui/widgets/menu/menu_multiline_action.h   | 51 +++++++++++++
 3 files changed, 141 insertions(+)
 create mode 100644 ui/widgets/menu/menu_multiline_action.cpp
 create mode 100644 ui/widgets/menu/menu_multiline_action.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0a53d2..201b0fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,6 +214,8 @@ PRIVATE
     ui/widgets/menu/menu_common.h
     ui/widgets/menu/menu_item_base.cpp
     ui/widgets/menu/menu_item_base.h
+    ui/widgets/menu/menu_multiline_action.cpp
+    ui/widgets/menu/menu_multiline_action.h
     ui/widgets/menu/menu_separator.cpp
     ui/widgets/menu/menu_separator.h
     ui/widgets/menu/menu_toggle.cpp
diff --git a/ui/widgets/menu/menu_multiline_action.cpp b/ui/widgets/menu/menu_multiline_action.cpp
new file mode 100644
index 0000000..5da592b
--- /dev/null
+++ b/ui/widgets/menu/menu_multiline_action.cpp
@@ -0,0 +1,88 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/widgets/menu/menu_multiline_action.h"
+
+#include "ui/widgets/labels.h"
+
+namespace Ui::Menu {
+
+MultilineAction::MultilineAction(
+	not_null<Ui::RpWidget*> parent,
+	const style::Menu &st,
+	const style::FlatLabel &stLabel,
+	QPoint labelPosition,
+	TextWithEntities &&about,
+	const style::icon *icon,
+	const style::icon *iconOver)
+: ItemBase(parent, st)
+, _st(st)
+, _icon(icon)
+, _iconOver(iconOver ? iconOver : icon)
+, _labelPosition(labelPosition)
+, _text(base::make_unique_q<Ui::FlatLabel>(
+	this,
+	rpl::single(std::move(about)),
+	stLabel))
+, _dummyAction(Ui::CreateChild<QAction>(parent.get())) {
+	ItemBase::enableMouseSelecting();
+	_text->setAttribute(Qt::WA_TransparentForMouseEvents);
+	updateMinWidth();
+	parent->widthValue() | rpl::start_with_next([=](int width) {
+		const auto top = _labelPosition.y();
+		const auto skip = _labelPosition.x();
+		_text->resizeToWidth(width - 2 * skip);
+		_text->moveToLeft(skip, top);
+		resize(width, contentHeight());
+	}, lifetime());
+}
+
+not_null<QAction*> MultilineAction::action() const {
+	return _dummyAction;
+}
+
+bool MultilineAction::isEnabled() const {
+	return true;
+}
+
+int MultilineAction::contentHeight() const {
+	const auto skip = _labelPosition.y();
+	return skip + _text->height() + skip;
+}
+
+void MultilineAction::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	const auto selected = isSelected();
+	p.fillRect(rect(), selected ? _st.itemBgOver : _st.itemBg);
+	RippleButton::paintRipple(p, 0, 0);
+	if (const auto icon = (selected ? _iconOver : _icon)) {
+		icon->paint(p, _st.itemIconPosition, width());
+	}
+}
+
+void MultilineAction::updateMinWidth() {
+	const auto skip = _labelPosition.x();
+	auto min = _text->naturalWidth() / 2;
+	auto max = _text->naturalWidth() - skip;
+	_text->resizeToWidth(max);
+	const auto height = _text->height();
+	_text->resizeToWidth(min);
+	const auto heightMax = _text->height();
+	if (heightMax > height) {
+		while (min + 1 < max) {
+			const auto middle = (max + min) / 2;
+			_text->resizeToWidth(middle);
+			if (_text->height() > height) {
+				min = middle;
+			} else {
+				max = middle;
+			}
+		}
+	}
+	ItemBase::setMinWidth(skip * 2 + max);
+}
+
+} // namespace Ui::Menu
diff --git a/ui/widgets/menu/menu_multiline_action.h b/ui/widgets/menu/menu_multiline_action.h
new file mode 100644
index 0000000..3f1c846
--- /dev/null
+++ b/ui/widgets/menu/menu_multiline_action.h
@@ -0,0 +1,51 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/widgets/menu/menu_item_base.h"
+
+namespace style {
+struct FlatLabel;
+struct Menu;
+} // namespace style
+
+namespace Ui {
+class FlatLabel;
+class RpWidget;
+} // namespace Ui
+
+namespace Ui::Menu {
+
+class MultilineAction final : public ItemBase {
+public:
+	MultilineAction(
+		not_null<Ui::RpWidget*> parent,
+		const style::Menu &st,
+		const style::FlatLabel &stLabel,
+		QPoint labelPosition,
+		TextWithEntities &&about,
+		const style::icon *icon = nullptr,
+		const style::icon *iconOver = nullptr);
+
+	not_null<QAction*> action() const override;
+	bool isEnabled() const override;
+
+private:
+	int contentHeight() const override;
+	void paintEvent(QPaintEvent *e) override;
+	void updateMinWidth();
+
+	const style::Menu &_st;
+	const style::icon *_icon;
+	const style::icon *_iconOver;
+	const QPoint _labelPosition;
+	const base::unique_qptr<Ui::FlatLabel> _text;
+	const not_null<QAction*> _dummyAction;
+
+};
+
+} // namespace Ui::Menu

From 03f812787528c25fb09e52d3a2db2910aced5b0c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 9 Mar 2023 09:43:13 +0400
Subject: [PATCH 361/635] Fix huge memory allocation on unused emoji.

Before that change call to Instance::setColored started emoji loading
and allocating memory for all animation frames even if it wasn't used.
---
 ui/text/custom_emoji_instance.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index 96b8395..aa98a72 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -706,7 +706,9 @@ bool Instance::ready() {
 		if (state.hasImagePreview()) {
 			return true;
 		}
-		load(state);
+		if (!_usage.empty()) {
+			load(state);
+		}
 		return false;
 	}, [](Caching &state) {
 		return state.renderer->canMakePreview();

From f3744c4ba3ddadd47e280a1ef5fbd002d357d10a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 5 Mar 2023 15:23:26 +0400
Subject: [PATCH 362/635] Use paintGL instead of paintEvent

Hopefully making GL code less crashy by using the respective initialization code
---
 ui/gl/gl_surface.cpp | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/ui/gl/gl_surface.cpp b/ui/gl/gl_surface.cpp
index fc45dd6..cd57156 100644
--- a/ui/gl/gl_surface.cpp
+++ b/ui/gl/gl_surface.cpp
@@ -12,7 +12,6 @@
 #include <QtGui/QtEvents>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QWindow>
-#include <QtGui/QPaintEngine>
 #include <QOpenGLWidget>
 
 namespace Ui::GL {
@@ -31,7 +30,7 @@ public:
 private:
 	void initializeGL() override;
 	void resizeGL(int w, int h) override;
-	void paintEvent(QPaintEvent *e) override;
+	void paintGL() override;
 	void callDeInit();
 
 	const std::unique_ptr<Renderer> _renderer;
@@ -55,6 +54,7 @@ SurfaceOpenGL::SurfaceOpenGL(
 	std::unique_ptr<Renderer> renderer)
 : RpWidgetBase<QOpenGLWidget, SurfaceTraits>(parent)
 , _renderer(std::move(renderer)) {
+	setUpdateBehavior(QOpenGLWidget::PartialUpdate);
 }
 
 SurfaceOpenGL::~SurfaceOpenGL() {
@@ -79,30 +79,17 @@ void SurfaceOpenGL::resizeGL(int w, int h) {
 	_renderer->resize(this, *context()->functions(), w, h);
 }
 
-void SurfaceOpenGL::paintEvent(QPaintEvent *e) {
+void SurfaceOpenGL::paintGL() {
 	if (!updatesEnabled() || size().isEmpty() || !isValid()) {
 		return;
 	}
-	auto redirectOffset = QPoint();
-	const auto rpd = redirected(&redirectOffset);
-	const auto device = rpd ? rpd : static_cast<QPaintDevice*>(this);
-	const auto engine = device->paintEngine();
-	if (!engine) {
-		return;
-	}
-	engine->begin(device);
-	if (!isValid()) { // The call above could lose the context.
-		return;
-	}
 	const auto f = context()->functions();
 	if (const auto bg = _renderer->clearColor()) {
 		f->glClearColor(bg->redF(), bg->greenF(), bg->blueF(), bg->alphaF());
 		f->glClear(GL_COLOR_BUFFER_BIT);
 	}
 	f->glDisable(GL_BLEND);
-	f->glViewport(0, 0, device->width(), device->height());
 	_renderer->paint(this, *f);
-	engine->end();
 }
 
 void SurfaceOpenGL::callDeInit() {

From 849a84050356a1321eedc36eb5296374e42fadd6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 Mar 2023 18:40:49 +0400
Subject: [PATCH 363/635] Implement BoxShow as a wrapper around long-living
 *Show.

---
 ui/layers/box_content.cpp      | 52 ++++++++++++++++++++-------
 ui/layers/box_content.h        | 14 +++++++-
 ui/layers/box_layer_widget.cpp |  4 +++
 ui/layers/box_layer_widget.h   |  1 +
 ui/layers/layer_manager.cpp    | 64 +++++++++++++++++++++++++++++++++-
 ui/layers/layer_manager.h      |  8 +++--
 ui/layers/layer_widget.cpp     |  5 +--
 ui/layers/layer_widget.h       | 15 ++++++--
 ui/layers/show.h               |  3 --
 ui/widgets/separate_panel.cpp  |  4 ++-
 10 files changed, 145 insertions(+), 25 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index 484dffa..5034048 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -317,37 +317,65 @@ void BoxContent::paintEvent(QPaintEvent *e) {
 	}
 }
 
-BoxShow::BoxShow(not_null<Ui::BoxContent*> box)
-: Show()
-, _weak(Ui::MakeWeak(box.get())) {
+BoxShow::BoxShow(not_null<BoxContent*> box)
+: BoxShow(MakeWeak(box.get()), nullptr) {
+}
+
+BoxShow::BoxShow(const BoxShow &other)
+: BoxShow(other._weak, other._wrapped) {
+}
+
+BoxShow::BoxShow(QPointer<BoxContent> weak, ShowPtr wrapped)
+: _weak(weak)
+, _wrapped(std::move(wrapped)) {
+	if (!resolve()) {
+		if (const auto box = _weak.data()) {
+			box->boxClosing(
+			) | rpl::start_with_next([=] {
+				resolve();
+				_lifetime.destroy();
+			}, _lifetime);
+		}
+	}
 }
 
 BoxShow::~BoxShow() = default;
 
+bool BoxShow::resolve() const {
+	if (_wrapped) {
+		return true;
+	} else if (const auto strong = _weak.data()) {
+		if (strong->hasDelegate()) {
+			_wrapped = strong->getDelegate()->showFactory()();
+			return true;
+		}
+	}
+	return false;
+}
+
 void BoxShow::showBox(
 		object_ptr<BoxContent> content,
 		LayerOptions options) const {
-	if (const auto strong = _weak.data()) {
-		strong->getDelegate()->show(std::move(content), options);
+	if (resolve()) {
+		_wrapped->showBox(std::move(content), options);
 	}
 }
 
 void BoxShow::hideLayer() const {
-	if (const auto strong = _weak.data()) {
-		strong->getDelegate()->hideLayer();
+	if (resolve()) {
+		_wrapped->hideLayer();
 	}
 }
 
 not_null<QWidget*> BoxShow::toastParent() const {
-	if (!_toastParent) {
-		Assert(_weak != nullptr);
-		_toastParent = Ui::MakeWeak(_weak->window()); // =(
+	if (resolve()) {
+		return _wrapped->toastParent();
 	}
-	return _toastParent.data();
+	Unexpected("Stale BoxShow::toastParent call.");
 }
 
 bool BoxShow::valid() const {
-	return _weak;
+	return resolve() && _wrapped->valid();
 }
 
 BoxShow::operator bool() const {
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index deeb8af..ec1ac76 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -95,6 +95,7 @@ public:
 		return result;
 	}
 
+	virtual ShowFactory showFactory() = 0;
 	virtual QPointer<QWidget> outerContainer() = 0;
 
 };
@@ -190,6 +191,9 @@ public:
 		prepare();
 		finishPrepare();
 	}
+	[[nodiscard]] bool hasDelegate() const {
+		return _delegate != nullptr;
+	}
 	[[nodiscard]] not_null<BoxContentDelegate*> getDelegate() const {
 		return _delegate;
 	}
@@ -352,6 +356,7 @@ private:
 class BoxShow : public Show {
 public:
 	explicit BoxShow(not_null<Ui::BoxContent*> box);
+	BoxShow(const BoxShow &other);
 	~BoxShow();
 	void showBox(
 		object_ptr<BoxContent> content,
@@ -360,9 +365,16 @@ public:
 	[[nodiscard]] not_null<QWidget*> toastParent() const override;
 	[[nodiscard]] bool valid() const override;
 	operator bool() const override;
+
 private:
-	mutable QPointer<QWidget> _toastParent;
+	BoxShow(QPointer<BoxContent> weak, ShowPtr wrapped);
+
+	bool resolve() const;
+
 	const QPointer<Ui::BoxContent> _weak;
+	mutable std::shared_ptr<Show> _wrapped;
+	rpl::lifetime _lifetime;
+
 };
 
 } // namespace Ui
diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index 42333be..e0b90a4 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -238,6 +238,10 @@ void BoxLayerWidget::updateButtonsPositions() {
 	}
 }
 
+ShowFactory BoxLayerWidget::showFactory() {
+	return _layer->showFactory();
+}
+
 QPointer<QWidget> BoxLayerWidget::outerContainer() {
 	return parentWidget();
 }
diff --git a/ui/layers/box_layer_widget.h b/ui/layers/box_layer_widget.h
index 8d6e182..4200ab9 100644
--- a/ui/layers/box_layer_widget.h
+++ b/ui/layers/box_layer_widget.h
@@ -58,6 +58,7 @@ public:
 	void addTopButton(object_ptr<AbstractButton> button) override;
 	void showLoading(bool show) override;
 	void updateButtonsPositions() override;
+	ShowFactory showFactory() override;
 	QPointer<QWidget> outerContainer() override;
 
 	void setDimensions(
diff --git a/ui/layers/layer_manager.cpp b/ui/layers/layer_manager.cpp
index 91e3e9e..505b4f1 100644
--- a/ui/layers/layer_manager.cpp
+++ b/ui/layers/layer_manager.cpp
@@ -6,7 +6,67 @@
 //
 #include "ui/layers/layer_manager.h"
 
+#include "ui/layers/show.h"
+
 namespace Ui {
+namespace {
+
+class ManagerShow final : public Show {
+public:
+	explicit ManagerShow(not_null<LayerManager*> manager);
+	~ManagerShow();
+	void showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options = Ui::LayerOption::KeepOther) const override;
+	void hideLayer() const override;
+	[[nodiscard]] not_null<QWidget*> toastParent() const override;
+	[[nodiscard]] bool valid() const override;
+	operator bool() const override;
+
+private:
+	const base::weak_ptr<LayerManager> _manager;
+
+};
+
+ManagerShow::ManagerShow(not_null<LayerManager*> manager)
+: _manager(manager.get()) {
+}
+
+ManagerShow::~ManagerShow() = default;
+
+void ManagerShow::showBox(
+		object_ptr<Ui::BoxContent> content,
+		Ui::LayerOptions options) const {
+	if (const auto manager = _manager.get()) {
+		manager->showBox(std::move(content), options, anim::type::normal);
+	}
+}
+
+void ManagerShow::hideLayer() const {
+	if (const auto manager = _manager.get()) {
+		manager->showBox(
+			object_ptr<Ui::BoxContent>{ nullptr },
+			Ui::LayerOption::CloseOther,
+			anim::type::normal);
+	}
+}
+
+not_null<QWidget*> ManagerShow::toastParent() const {
+	const auto manager = _manager.get();
+
+	Ensures(manager != nullptr);
+	return manager->toastParent();
+}
+
+bool ManagerShow::valid() const {
+	return (_manager.get() != nullptr);
+}
+
+ManagerShow::operator bool() const {
+	return valid();
+}
+
+} // namespace
 
 LayerManager::LayerManager(not_null<RpWidget*> widget) : _widget(widget) {
 }
@@ -67,7 +127,9 @@ void LayerManager::ensureLayerCreated() {
 	if (_layer) {
 		return;
 	}
-	_layer.emplace(_widget);
+	_layer.emplace(_widget, crl::guard(this, [=] {
+		return std::make_shared<ManagerShow>(this);
+	}));
 	_layer->setHideByBackgroundClick(_hideByBackgroundClick);
 	_layer->setStyleOverrides(_boxSt, _layerSt);
 
diff --git a/ui/layers/layer_manager.h b/ui/layers/layer_manager.h
index cce68dc..ad23a22 100644
--- a/ui/layers/layer_manager.h
+++ b/ui/layers/layer_manager.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "base/weak_ptr.h"
 #include "ui/layers/layer_widget.h"
 
 #include <QtCore/QMargins>
@@ -19,7 +20,7 @@ namespace Ui {
 class BoxContent;
 class RpWidget;
 
-class LayerManager final {
+class LayerManager final : public base::has_weak_ptr {
 public:
 	explicit LayerManager(not_null<RpWidget*> widget);
 
@@ -36,7 +37,10 @@ public:
 	void raise();
 	bool setFocus();
 
-	const LayerWidget *topShownLayer() const;
+	[[nodiscard]] not_null<Ui::RpWidget*> toastParent() const {
+		return _widget;
+	}
+	[[nodiscard]] const LayerWidget *topShownLayer() const;
 
 private:
 	void ensureLayerCreated();
diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 18aa85d..5e86df3 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -324,9 +324,10 @@ void LayerStackWidget::BackgroundWidget::animationCallback() {
 	checkIfDone();
 }
 
-LayerStackWidget::LayerStackWidget(QWidget *parent)
+LayerStackWidget::LayerStackWidget(QWidget *parent, ShowFactory showFactory)
 : RpWidget(parent)
-, _background(this) {
+, _background(this)
+, _showFactory(std::move(showFactory)) {
 	setGeometry(parentWidget()->rect());
 	hide();
 	_background->setDoneCallback([this] { animationDone(); });
diff --git a/ui/layers/layer_widget.h b/ui/layers/layer_widget.h
index 6c76b9e..4fab66b 100644
--- a/ui/layers/layer_widget.h
+++ b/ui/layers/layer_widget.h
@@ -32,7 +32,11 @@ enum class LayerOption {
 using LayerOptions = base::flags<LayerOption>;
 inline constexpr auto is_flag_type(LayerOption) { return true; };
 
-class LayerWidget : public Ui::RpWidget {
+class Show;
+using ShowPtr = std::shared_ptr<Show>;
+using ShowFactory = Fn<ShowPtr()>;
+
+class LayerWidget : public RpWidget {
 public:
 	using RpWidget::RpWidget;
 
@@ -91,9 +95,9 @@ private:
 
 };
 
-class LayerStackWidget : public Ui::RpWidget {
+class LayerStackWidget : public RpWidget {
 public:
-	LayerStackWidget(QWidget *parent);
+	LayerStackWidget(QWidget *parent, ShowFactory showFactory);
 
 	void finishAnimating();
 	rpl::producer<> hideFinishEvents() const;
@@ -107,6 +111,9 @@ public:
 	[[nodiscard]] const style::Box *boxStyleOverride() const {
 		return _boxSt;
 	}
+	[[nodiscard]] ShowFactory showFactory() const {
+		return _showFactory;
+	}
 
 	void showBox(
 		object_ptr<BoxContent> box,
@@ -222,6 +229,8 @@ private:
 	class BackgroundWidget;
 	object_ptr<BackgroundWidget> _background;
 
+	ShowFactory _showFactory;
+
 	const style::Box *_boxSt = nullptr;
 	const style::Box *_layerSt = nullptr;
 	bool _hideByBackgroundClick = true;
diff --git a/ui/layers/show.h b/ui/layers/show.h
index c4f7a49..ba8e636 100644
--- a/ui/layers/show.h
+++ b/ui/layers/show.h
@@ -26,7 +26,4 @@ public:
 
 inline Show::~Show() = default;
 
-using ShowPtr = std::shared_ptr<Show>;
-
-
 } // namespace Ui
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index d2acf72..c80c51d 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -425,7 +425,9 @@ void SeparatePanel::ensureLayerCreated() {
 	if (_layer) {
 		return;
 	}
-	_layer = base::make_unique_q<Ui::LayerStackWidget>(_body);
+	_layer = base::make_unique_q<Ui::LayerStackWidget>(
+		_body,
+		crl::guard(this, [=] { return std::make_shared<PanelShow>(this); }));
 	_layer->setHideByBackgroundClick(false);
 	_layer->move(0, 0);
 	_body->sizeValue(

From 503320296d2b626fdb8dfbfccdd681d03a163566 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 12 Mar 2023 23:28:58 +0400
Subject: [PATCH 364/635] Use NVIDIA blacklist on any system using
 desktop-app's Linux platform code

---
 ui/gl/gl_detection.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp
index ea5cc88..f6f225a 100644
--- a/ui/gl/gl_detection.cpp
+++ b/ui/gl/gl_detection.cpp
@@ -174,8 +174,9 @@ Capabilities CheckCapabilities(QWidget *widget) {
 		LOG(("EGL Extensions: %1").arg(egllist.join(", ")));
 #endif // Q_OS_WIN
 
-#ifdef Q_OS_LINUX
-		if (version && QByteArray(version).contains("NVIDIA")) {
+		if (::Platform::IsLinux()
+			&& version
+			&& QByteArray(version).contains("NVIDIA")) {
 			// https://github.com/telegramdesktop/tdesktop/issues/16830
 			if (AllowLinuxNvidiaOpenGL.value()) {
 				LOG_ONCE(("OpenGL: Allow on NVIDIA driver (experimental)."));
@@ -184,7 +185,6 @@ Capabilities CheckCapabilities(QWidget *widget) {
 				return false;
 			}
 		}
-#endif // Q_OS_LINUX
 
 		return true;
 	}();

From c80df2cdd2d2838d5e4aab50075e4f6e7c05e380 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 Mar 2023 15:56:17 +0400
Subject: [PATCH 365/635] Ensure correct FBO size in QOpenGLWidget.

---
 ui/gl/gl_image.cpp   |  3 +++
 ui/gl/gl_surface.cpp | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ui/gl/gl_image.cpp b/ui/gl/gl_image.cpp
index fc0e348..cb04fdd 100644
--- a/ui/gl/gl_image.cpp
+++ b/ui/gl/gl_image.cpp
@@ -73,6 +73,7 @@ QImage Image::takeImage() {
 
 void Image::invalidate() {
 	_storage = base::take(_image);
+	_subimage = QSize();
 }
 
 void Image::bind(QOpenGLFunctions &f) {
@@ -119,8 +120,10 @@ void Image::bind(QOpenGLFunctions &f) {
 }
 
 void Image::destroy(QOpenGLFunctions *f) {
+	invalidate();
 	_textures.destroy(f);
 	_cacheKey = 0;
+	_textureSize = QSize();
 }
 
 TexturedRect Image::texturedRect(
diff --git a/ui/gl/gl_surface.cpp b/ui/gl/gl_surface.cpp
index cd57156..c9ac213 100644
--- a/ui/gl/gl_surface.cpp
+++ b/ui/gl/gl_surface.cpp
@@ -30,11 +30,14 @@ public:
 private:
 	void initializeGL() override;
 	void resizeGL(int w, int h) override;
+	void paintEvent(QPaintEvent *e) override;
 	void paintGL() override;
 	void callDeInit();
 
 	const std::unique_ptr<Renderer> _renderer;
 	QMetaObject::Connection _connection;
+	QSize _deviceSize;
+	bool _inPaintEvent = false;
 
 };
 
@@ -76,9 +79,23 @@ void SurfaceOpenGL::initializeGL() {
 }
 
 void SurfaceOpenGL::resizeGL(int w, int h) {
+	_deviceSize = QSize(w, h) * devicePixelRatio();
 	_renderer->resize(this, *context()->functions(), w, h);
 }
 
+void SurfaceOpenGL::paintEvent(QPaintEvent *e) {
+	if (_inPaintEvent) {
+		return;
+	}
+	_inPaintEvent = true;
+	if (_deviceSize != size() * devicePixelRatio()) {
+		QResizeEvent event = { size(), size() };
+		resizeEvent(&event);
+	}
+	QOpenGLWidget::paintEvent(e);
+	_inPaintEvent = false;
+}
+
 void SurfaceOpenGL::paintGL() {
 	if (!updatesEnabled() || size().isEmpty() || !isValid()) {
 		return;

From 62a62d1fb5abe9dc1e6b9f89af1ccef6fef33c52 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 Mar 2023 17:30:27 +0400
Subject: [PATCH 366/635] Move MediaPlayerButton style outside of lib_ui.

---
 ui/widgets/widgets.style | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 136aad3..323a884 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1175,21 +1175,6 @@ historySendActionChooseStickerEyeWidth: 7px;
 historySendActionChooseStickerEyeHeight: 11px;
 historySendActionChooseStickerEyeStep: 2px;
 
-MediaPlayerButton {
-	playPosition: point;
-	playOuter: size;
-	pausePosition: point;
-	pauseOuter: size;
-	pauseStroke: pixels;
-	cancelPosition: point;
-	cancelOuter: size;
-	cancelStroke: pixels;
-
-	rippleAreaPosition: point;
-	rippleAreaSize: pixels;
-	ripple: RippleAnimation;
-}
-
 PeerListItem {
 	left: pixels;
 	bottom: pixels;

From dec1cd8cea24e396c37c327929c0135d46541626 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 15 Mar 2023 13:35:59 +0400
Subject: [PATCH 367/635] Make style align constants constexpr.

---
 ui/style/style_core_types.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/style/style_core_types.h b/ui/style/style_core_types.h
index 9cb4baa..c30adae 100644
--- a/ui/style/style_core_types.h
+++ b/ui/style/style_core_types.h
@@ -42,14 +42,14 @@ static constexpr cursor cur_sizebdiag = Qt::SizeBDiagCursor;
 static constexpr cursor cur_sizefdiag = Qt::SizeFDiagCursor;
 static constexpr cursor cur_sizeall = Qt::SizeAllCursor;
 
-static const align al_topleft = (Qt::AlignTop | Qt::AlignLeft);
-static const align al_top = (Qt::AlignTop | Qt::AlignHCenter);
-static const align al_topright = (Qt::AlignTop | Qt::AlignRight);
-static const align al_right = (Qt::AlignVCenter | Qt::AlignRight);
-static const align al_bottomright = (Qt::AlignBottom | Qt::AlignRight);
-static const align al_bottom = (Qt::AlignBottom | Qt::AlignHCenter);
-static const align al_bottomleft = (Qt::AlignBottom | Qt::AlignLeft);
-static const align al_left = (Qt::AlignVCenter | Qt::AlignLeft);
-static const align al_center = (Qt::AlignVCenter | Qt::AlignHCenter);
+static constexpr align al_topleft = (Qt::AlignTop | Qt::AlignLeft);
+static constexpr align al_top = (Qt::AlignTop | Qt::AlignHCenter);
+static constexpr align al_topright = (Qt::AlignTop | Qt::AlignRight);
+static constexpr align al_right = (Qt::AlignVCenter | Qt::AlignRight);
+static constexpr align al_bottomright = (Qt::AlignBottom | Qt::AlignRight);
+static constexpr align al_bottom = (Qt::AlignBottom | Qt::AlignHCenter);
+static constexpr align al_bottomleft = (Qt::AlignBottom | Qt::AlignLeft);
+static constexpr align al_left = (Qt::AlignVCenter | Qt::AlignLeft);
+static constexpr align al_center = (Qt::AlignVCenter | Qt::AlignHCenter);
 
 } // namespace style

From bcb56492c4cab204b8b27d762586e4bdbcc6c074 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 15 Mar 2023 17:17:15 +0400
Subject: [PATCH 368/635] Allow larger scales on high-dpi screens.

---
 ui/style/style_core_scale.cpp | 12 ++++++++++++
 ui/style/style_core_scale.h   |  8 +++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ui/style/style_core_scale.cpp b/ui/style/style_core_scale.cpp
index 9e0038f..b6be737 100644
--- a/ui/style/style_core_scale.cpp
+++ b/ui/style/style_core_scale.cpp
@@ -34,4 +34,16 @@ void SetScale(int scale) {
 	ScaleValue = scale;
 }
 
+int MaxScaleForRatio(int ratio) {
+	Expects(ratio > 0);
+
+	return std::max(kScaleMax / ratio, kScaleAlwaysAllowMax);
+}
+
+int CheckScale(int scale) {
+	return (scale == kScaleAuto)
+		? kScaleAuto
+		: std::clamp(scale, kScaleMin, MaxScaleForRatio(DevicePixelRatio()));
+}
+
 } // namespace style
diff --git a/ui/style/style_core_scale.h b/ui/style/style_core_scale.h
index 2fba205..f4b804e 100644
--- a/ui/style/style_core_scale.h
+++ b/ui/style/style_core_scale.h
@@ -19,6 +19,7 @@ inline constexpr auto kScaleAuto = 0;
 inline constexpr auto kScaleMin = 50;
 inline constexpr auto kScaleDefault = 100;
 inline constexpr auto kScaleMax = 300;
+inline constexpr auto kScaleAlwaysAllowMax = 200;
 
 [[nodiscard]] int DevicePixelRatio();
 void SetDevicePixelRatio(int ratio);
@@ -26,11 +27,8 @@ void SetDevicePixelRatio(int ratio);
 [[nodiscard]] int Scale();
 void SetScale(int scale);
 
-[[nodiscard]] inline int CheckScale(int scale) {
-	return (scale == kScaleAuto)
-		? kScaleAuto
-		: std::clamp(scale, kScaleMin, kScaleMax / DevicePixelRatio());
-}
+[[nodiscard]] int MaxScaleForRatio(int ratio);
+[[nodiscard]] int CheckScale(int scale);
 
 template <typename T>
 [[nodiscard]] inline T ConvertScale(T value, int scale) {

From 5173dfa1ca6e5d4651cb41ae4c0d8e6c4ae6b75b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 17 Mar 2023 14:21:42 +0400
Subject: [PATCH 369/635] Workaround for emoji selector in popup menu on
 Windows.

---
 ui/platform/linux/ui_utility_linux.h |  3 ++
 ui/platform/mac/ui_utility_mac.h     |  3 ++
 ui/platform/ui_platform_utility.h    | 10 +++--
 ui/platform/win/ui_utility_win.cpp   | 63 ++++++++++++++++++++++++++--
 4 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.h b/ui/platform/linux/ui_utility_linux.h
index ce28a8e..f2b58a7 100644
--- a/ui/platform/linux/ui_utility_linux.h
+++ b/ui/platform/linux/ui_utility_linux.h
@@ -36,5 +36,8 @@ inline constexpr bool UseMainQueueGeneric() {
 	return true;
 }
 
+inline void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
+}
+
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/mac/ui_utility_mac.h b/ui/platform/mac/ui_utility_mac.h
index 57abb69..04170f3 100644
--- a/ui/platform/mac/ui_utility_mac.h
+++ b/ui/platform/mac/ui_utility_mac.h
@@ -40,5 +40,8 @@ inline void UnsetWindowExtents(not_null<QWidget*> widget) {
 inline void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 }
 
+inline void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
+}
+
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 2d10077..db24bcb 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -13,7 +13,10 @@ class QPainter;
 class QPaintEvent;
 
 namespace Ui {
-namespace Platform {
+class PopupMenu;
+} // namespace Ui
+
+namespace Ui::Platform {
 
 [[nodiscard]] bool IsApplicationActive();
 
@@ -47,8 +50,9 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 [[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged();
 void NotifyTitleControlsLayoutChanged();
 
-} // namespace Platform
-} // namespace Ui
+void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
+
+} // namespace Ui::Platform
 
 // Platform dependent implementations.
 
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 6c42a73..90b9108 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -7,17 +7,18 @@
 #include "ui/platform/win/ui_utility_win.h"
 
 #include "base/platform/win/base_windows_h.h"
+#include "ui/widgets/popup_menu.h"
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QWindow>
+#include <QtCore/QAbstractNativeEventFilter>
 
 #include <wrl/client.h>
 #include <Shobjidl.h>
 
 using namespace Microsoft::WRL;
 
-namespace Ui {
-namespace Platform {
+namespace Ui::Platform {
 
 bool IsApplicationActive() {
 	return QApplication::activeWindow() != nullptr;
@@ -143,5 +144,59 @@ TitleControls::Layout TitleControlsLayout() {
 	};
 }
 
-} // namespace Platform
-} // namespace Ui
+void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
+	// Windows native emoji selector, that can be called by Win+. shortcut,
+	// is behaving strangely within an input field in a popup menu.
+	//
+	// When the selector is shown and a mouse button is pressed the system
+	// sends two events "MousePress + MouseRelease" to the popup menu, even
+	// before the button is physically released. That way we hide the menu
+	// on this MousePress, that we shouldn't have received (in case of
+	// input field in the main window no such events are sent at all).
+	//
+	// To workaround this we detect a WM_MOUSELEAVE event that is sent to
+	// the popup menu when the selector is shown and skip all mouse press
+	// events while we don't receive mouse move events. If we receive mouse
+	// move events that means the selector was hidden and the mouse is
+	// captured by the popup menu again.
+	class Filter final : public QAbstractNativeEventFilter {
+	public:
+		explicit Filter(not_null<PopupMenu*> menu) : _menu(menu) {
+		}
+
+		bool nativeEventFilter(
+				const QByteArray &eventType,
+				void *message,
+				long *result) override {
+			const auto msg = static_cast<MSG*>(message);
+			switch (msg->message) {
+			case WM_MOUSELEAVE: if (msg->hwnd == hwnd()) {
+				_skipMouseDown = true;
+			} break;
+			case WM_MOUSEMOVE: if (msg->hwnd == hwnd()) {
+				_skipMouseDown = false;
+			} break;
+			case WM_LBUTTONDOWN:
+			case WM_LBUTTONDBLCLK: if (msg->hwnd == hwnd()) {
+				return _skipMouseDown;
+			}
+			}
+			return false;
+		}
+
+	private:
+		[[nodiscard]] HWND hwnd() const {
+			const auto top = _menu->window()->windowHandle();
+			return top ? reinterpret_cast<HWND>(top->winId()) : nullptr;
+		}
+
+		not_null<PopupMenu*> _menu;
+		bool _skipMouseDown = false;
+
+	};
+
+	QGuiApplication::instance()->installNativeEventFilter(
+		menu->lifetime().make_state<Filter>(menu));
+}
+
+} // namespace Ui::Platform

From 328b75a311cd8f50c2b75dfefa7443e6eafcb9e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 17 Mar 2023 14:21:51 +0400
Subject: [PATCH 370/635] Some indentation fixes.

---
 ui/platform/win/ui_window_win.cpp | 76 +++++++++++++++----------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 41701f3..53c0068 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -30,8 +30,7 @@
 
 Q_DECLARE_METATYPE(QMargins);
 
-namespace Ui {
-namespace Platform {
+namespace Ui::Platform {
 namespace {
 
 constexpr auto kDWMWCP_ROUND = DWORD(2);
@@ -146,46 +145,46 @@ void FixAeroSnap(HWND handle) {
 
 class WindowHelper::NativeFilter final : public QAbstractNativeEventFilter {
 public:
-       void registerWindow(HWND handle, not_null<WindowHelper*> helper);
-       void unregisterWindow(HWND handle);
+	void registerWindow(HWND handle, not_null<WindowHelper*> helper);
+	void unregisterWindow(HWND handle);
 
-       bool nativeEventFilter(
-               const QByteArray &eventType,
-               void *message,
-               long *result) override;
+	bool nativeEventFilter(
+		const QByteArray &eventType,
+		void *message,
+		long *result) override;
 
 private:
-       base::flat_map<HWND, not_null<WindowHelper*>> _windowByHandle;
+	base::flat_map<HWND, not_null<WindowHelper*>> _windowByHandle;
 
 };
 
 void WindowHelper::NativeFilter::registerWindow(
-               HWND handle,
-               not_null<WindowHelper*> helper) {
-       _windowByHandle.emplace(handle, helper);
+		HWND handle,
+		not_null<WindowHelper*> helper) {
+	_windowByHandle.emplace(handle, helper);
 }
 
 void WindowHelper::NativeFilter::unregisterWindow(HWND handle) {
-       _windowByHandle.remove(handle);
+	_windowByHandle.remove(handle);
 }
 
 bool WindowHelper::NativeFilter::nativeEventFilter(
-               const QByteArray &eventType,
-               void *message,
-               long *result) {
-       auto filtered = false;
-       const auto msg = static_cast<MSG*>(message);
-       const auto i = _windowByHandle.find(msg->hwnd);
-       if (i != end(_windowByHandle)) {
-               base::Integration::Instance().enterFromEventLoop([&] {
-                       filtered = i->second->handleNativeEvent(
-                               msg->message,
-                               msg->wParam,
-                               msg->lParam,
-                               reinterpret_cast<LRESULT*>(result));
-               });
-       }
-       return filtered;
+		const QByteArray &eventType,
+		void *message,
+		long *result) {
+	auto filtered = false;
+	const auto msg = static_cast<MSG*>(message);
+	const auto i = _windowByHandle.find(msg->hwnd);
+	if (i != end(_windowByHandle)) {
+		base::Integration::Instance().enterFromEventLoop([&] {
+			filtered = i->second->handleNativeEvent(
+				msg->message,
+				msg->wParam,
+				msg->lParam,
+				reinterpret_cast<LRESULT*>(result));
+		});
+	}
+	return filtered;
 }
 
 WindowHelper::WindowHelper(not_null<RpWidget*> window)
@@ -838,15 +837,15 @@ void WindowHelper::fixMaximizedWindow() {
 }
 
 not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() {
-       Expects(QCoreApplication::instance() != nullptr);
+	Expects(QCoreApplication::instance() != nullptr);
 
-       static const auto GlobalFilter = [&] {
-               const auto application = QCoreApplication::instance();
-               const auto filter = Ui::CreateChild<NativeFilter>(application);
-               application->installNativeEventFilter(filter);
-               return filter;
-       }();
-       return GlobalFilter;
+	static const auto GlobalFilter = [&] {
+		const auto application = QCoreApplication::instance();
+		const auto filter = Ui::CreateChild<NativeFilter>(application);
+		application->installNativeEventFilter(filter);
+		return filter;
+	}();
+	return GlobalFilter;
 }
 
 HWND GetWindowHandle(not_null<QWidget*> widget) {
@@ -878,5 +877,4 @@ bool NativeWindowFrameSupported() {
 	return true;
 }
 
-} // namespace Platform
-} // namespace Ui
+} // namespace Ui::Platform

From 3185e6cd55045b4b3e5fa66a668418b7388def62 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 17 Mar 2023 20:46:09 +0400
Subject: [PATCH 371/635] Fix possible stack overflow.

---
 ui/widgets/popup_menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 9f5709d..ff81dbc 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -674,7 +674,7 @@ bool PopupMenu::eventFilter(QObject *o, QEvent *e) {
 }
 
 void PopupMenu::hideMenu(bool fast) {
-	if (isHidden()) {
+	if (isHidden() || (_hiding && !fast)) {
 		return;
 	}
 	if (_parent && !_a_opacity.animating()) {

From db4419eb300f44377b31cd4ae0453883694978d6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 22 Mar 2023 21:42:16 +0300
Subject: [PATCH 372/635] Switched preferred width of multiline menu item to
 fit icon height.

---
 ui/widgets/menu/menu_multiline_action.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/menu/menu_multiline_action.cpp b/ui/widgets/menu/menu_multiline_action.cpp
index 5da592b..c4f3dbd 100644
--- a/ui/widgets/menu/menu_multiline_action.cpp
+++ b/ui/widgets/menu/menu_multiline_action.cpp
@@ -66,9 +66,11 @@ void MultilineAction::paintEvent(QPaintEvent *e) {
 void MultilineAction::updateMinWidth() {
 	const auto skip = _labelPosition.x();
 	auto min = _text->naturalWidth() / 2;
-	auto max = _text->naturalWidth() - skip;
+	auto max = _icon ? _st.widthMax : (_text->naturalWidth() - skip);
 	_text->resizeToWidth(max);
-	const auto height = _text->height();
+	const auto height = _icon
+		? ((_st.itemIconPosition.y() * 2) + _icon->height())
+		: _text->height();
 	_text->resizeToWidth(min);
 	const auto heightMax = _text->height();
 	if (heightMax > height) {

From 8b0e9ea7b85afbaee75efc4ec2f182f5622186b9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 23 Mar 2023 12:48:07 +0400
Subject: [PATCH 373/635] Fix the detection of xdg-decoration removal

---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 0ad5ff3..8831888 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -50,6 +50,7 @@ const struct wl_registry_listener WaylandIntegration::Private::RegistryListener
 			uint32_t version) {
 		if (interface == qstr("zxdg_decoration_manager_v1")) {
 			data->xdgDecorationSupported = true;
+			data->xdgDecorationName = name;
 		}
 	}),
 	decltype(wl_registry_listener::global_remove)(+[](
@@ -58,6 +59,7 @@ const struct wl_registry_listener WaylandIntegration::Private::RegistryListener
 			uint32_t name) {
 		if (name == data->xdgDecorationName) {
 			data->xdgDecorationSupported = false;
+			data->xdgDecorationName = 0;
 		}
 	}),
 };

From 7e5ac770967d1751d2bad8768b2898bbaeddef98 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 30 Mar 2023 11:46:34 +0400
Subject: [PATCH 374/635] Fix devicePixelRatio when applying image rounding

---
 ui/image/image_prepare.cpp | 6 ++----
 ui/image/image_prepare.h   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index a729254..d5e9f16 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -50,7 +50,7 @@ const QImage &EllipseMaskCached(QSize size) {
 	}
 	lock.unlock();
 
-	auto mask = EllipseMask(size);
+	auto mask = EllipseMask(size, 1.);
 
 	lock.relock();
 	return Masks.emplace(key, std::move(mask)).first->second;
@@ -321,9 +321,7 @@ std::array<QImage, 4> CornersMask(int radius) {
 	return PrepareCornersMask(radius);
 }
 
-QImage EllipseMask(QSize size) {
-	const auto ratio = style::DevicePixelRatio();
-
+QImage EllipseMask(QSize size, double ratio) {
 	size *= ratio;
 	auto result = QImage(size, QImage::Format_ARGB32_Premultiplied);
 	result.fill(Qt::transparent);
diff --git a/ui/image/image_prepare.h b/ui/image/image_prepare.h
index da0b7cb..c312a02 100644
--- a/ui/image/image_prepare.h
+++ b/ui/image/image_prepare.h
@@ -96,7 +96,7 @@ struct CornersMaskRef {
 	const style::color &color);
 
 [[nodiscard]] std::array<QImage, 4> CornersMask(int radius);
-[[nodiscard]] QImage EllipseMask(QSize size);
+[[nodiscard]] QImage EllipseMask(QSize size, double ratio = style::DevicePixelRatio());
 
 [[nodiscard]] std::array<QImage, 4> PrepareCorners(
 	int radius,

From 80505c121627da2d973514ec0e3fd55b91682340 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 30 Mar 2023 15:49:32 +0400
Subject: [PATCH 375/635] Expose some more box scroll interface parts.

---
 ui/layers/box_content.cpp | 18 ++++++++++++++++++
 ui/layers/box_content.h   |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index 5034048..be8b707 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -179,6 +179,24 @@ void BoxContent::scrollToY(int top, int bottom) {
 	}
 }
 
+void BoxContent::sendScrollViewportEvent(not_null<QEvent*> event) {
+	if (_scroll) {
+		_scroll->viewportEvent(event);
+	}
+}
+
+rpl::producer<> BoxContent::scrolls() const {
+	return _scroll ? _scroll->scrolls() : rpl::never<>();
+}
+
+int BoxContent::scrollTop() const {
+	return _scroll ? _scroll->scrollTop() : 0;
+}
+
+int BoxContent::scrollHeight() const {
+	return _scroll ? _scroll->height() : 0;
+}
+
 void BoxContent::scrollByDraggingDelta(int delta) {
 	_draggingScroll.checkDeltaScroll(_scroll ? delta : 0);
 }
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index ec1ac76..034e0ee 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -209,6 +209,10 @@ public:
 	void scrollByDraggingDelta(int delta);
 
 	void scrollToY(int top, int bottom = -1);
+	void sendScrollViewportEvent(not_null<QEvent*> event);
+	[[nodiscard]] rpl::producer<> scrolls() const;
+	[[nodiscard]] int scrollTop() const;
+	[[nodiscard]] int scrollHeight() const;
 
 protected:
 	virtual void prepare() = 0;

From f5fb567052d9ce47c3c694ef81936e28a1c7315e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 18 Jul 2022 02:38:08 +0400
Subject: [PATCH 376/635] Take advantage of RHI

Use Metal with Qt 6.4+ and macOS 10.14+, OpenGL for Wayland whenever enabled
---
 ui/gl/gl_window.cpp              | 12 ++++++++++-
 ui/platform/mac/ui_window_mac.mm |  2 ++
 ui/rp_widget.cpp                 | 35 ++++++++++++++++++++++++++++++++
 ui/rp_widget.h                   | 16 +++++++++++++--
 4 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/ui/gl/gl_window.cpp b/ui/gl/gl_window.cpp
index 798b533..fb4e0e6 100644
--- a/ui/gl/gl_window.cpp
+++ b/ui/gl/gl_window.cpp
@@ -23,6 +23,16 @@ namespace Ui::GL {
 namespace {
 
 constexpr auto kUseNativeChild = false;// ::Platform::IsWindows();
+
+class RpWindowNoRhi : public RpWindow {
+protected:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+	std::optional<QPlatformBackingStoreRhiConfig> rhiConfig() const override {
+		return QPlatformBackingStoreRhiConfig();
+	}
+#endif // Qt >= 6.4.0
+};
+
 [[nodiscard]] Fn<Backend(Capabilities)> ChooseBackendWrap(
 		Fn<Backend(Capabilities)> chooseBackend) {
 	return [=](Capabilities capabilities) {
@@ -60,7 +70,7 @@ not_null<RpWidget*> Window::widget() const {
 
 std::unique_ptr<RpWindow> Window::createWindow(
 		const Fn<Backend(Capabilities)> &chooseBackend) {
-	auto result = std::make_unique<RpWindow>();
+	std::unique_ptr<RpWindow> result = std::make_unique<RpWindowNoRhi>();
 	if constexpr (!kUseNativeChild) {
 		_backend = chooseBackend(CheckCapabilities(result.get()));
 		if (_backend != Backend::OpenGL) {
diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index 2f77042..38334c4 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -270,7 +270,9 @@ void WindowHelper::Private::enforceStyle() {
 }
 
 void WindowHelper::Private::initOpenGL() {
+#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
 	auto forceOpenGL = std::make_unique<QOpenGLWidget>(_owner->window());
+#endif // Qt < 6.4.0
 }
 
 void WindowHelper::Private::resolveWeakPointers() {
diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index 053360c..afa77b9 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -6,10 +6,45 @@
 //
 #include "ui/rp_widget.h"
 
+#include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
+#include "ui/gl/gl_detection.h"
 
 #include <QtGui/QWindow>
 #include <QtGui/QtEvents>
+#include <private/qwidget_p.h>
+
+class TWidgetPrivate : public QWidgetPrivate {
+public:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+	QPlatformBackingStoreRhiConfig rhiConfig() const override {
+		const auto q = static_cast<TWidget*>(q_ptr);
+		if (!q->testAttribute(Qt::WA_WState_Created)) {
+			return QWidgetPrivate::rhiConfig();
+		}
+		if (const auto config = q->rhiConfig()) {
+			return *config;
+		}
+		if (::Platform::IsMac10_14OrGreater()) {
+			return { QPlatformBackingStoreRhiConfig::Metal };
+		}
+		// We can't specify the widget here as q_evaluateRhiConfig is called
+		// in QWidgetWindow constructor, while windowHandle is set right after
+		// the constructor is completed
+		if (::Platform::IsWayland() // old versions of mutter produce flicker without OpenGL
+			&& Ui::GL::ChooseBackendDefault(
+					Ui::GL::CheckCapabilities(nullptr))
+				== Ui::GL::Backend::OpenGL) {
+			return { QPlatformBackingStoreRhiConfig::OpenGL };
+		}
+		return QWidgetPrivate::rhiConfig();
+	}
+#endif // Qt >= 6.4.0
+};
+
+TWidget::TWidget(QWidget *parent)
+: TWidgetHelper<QWidget>(*(new TWidgetPrivate), parent, {}) {
+}
 
 namespace Ui {
 namespace {
diff --git a/ui/rp_widget.h b/ui/rp_widget.h
index 4095c2d..232affb 100644
--- a/ui/rp_widget.h
+++ b/ui/rp_widget.h
@@ -18,6 +18,10 @@
 #include <QtCore/QPointer>
 #include <QtGui/QtEvents>
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+#include <qpa/qplatformbackingstore.h>
+#endif // Qt >= 6.4.0
+
 namespace Ui {
 
 void ToggleChildrenVisibility(not_null<QWidget*> widget, bool visible);
@@ -25,6 +29,7 @@ void ToggleChildrenVisibility(not_null<QWidget*> widget, bool visible);
 } // namespace Ui
 
 class TWidget;
+class TWidgetPrivate;
 
 template <typename Base>
 class TWidgetHelper : public Base {
@@ -146,6 +151,12 @@ protected:
 	virtual void enterFromChildEvent(QEvent *e, QWidget *child) {
 	}
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+	virtual std::optional<QPlatformBackingStoreRhiConfig> rhiConfig() const {
+		return std::nullopt;
+	}
+#endif // Qt >= 6.4.0
+
 private:
 	TWidget *tparent() {
 		return qobject_cast<TWidget*>(Base::parentWidget());
@@ -157,6 +168,8 @@ private:
 	template <typename OtherBase>
 	friend class TWidgetHelper;
 
+	friend class TWidgetPrivate;
+
 };
 
 class TWidget : public TWidgetHelper<QWidget> {
@@ -164,8 +177,7 @@ class TWidget : public TWidgetHelper<QWidget> {
 	Q_OBJECT
 
 public:
-	TWidget(QWidget *parent = nullptr) : TWidgetHelper<QWidget>(parent) {
-	}
+	TWidget(QWidget *parent = nullptr);
 
 	// Get the size of the widget as it should be.
 	// Negative return value means no default width.

From aa5cc61b6b65ec1fb8f1c1be8b2c9c559aadd958 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 4 Apr 2023 17:06:52 +0400
Subject: [PATCH 377/635] Allow DividerLabel to wrap any widget, not just
 FlatLabel.

---
 ui/widgets/labels.cpp | 2 +-
 ui/widgets/labels.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 291539a..a6a8fac 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -978,7 +978,7 @@ void FlatLabel::paintEvent(QPaintEvent *e) {
 
 DividerLabel::DividerLabel(
 	QWidget *parent,
-	object_ptr<FlatLabel> &&child,
+	object_ptr<RpWidget> &&child,
 	const style::margins &padding,
 	RectParts parts)
 : PaddingWrap(parent, std::move(child), padding)
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index 2da193e..11735e8 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -260,11 +260,11 @@ private:
 
 };
 
-class DividerLabel : public PaddingWrap<FlatLabel> {
+class DividerLabel : public PaddingWrap<> {
 public:
 	DividerLabel(
 		QWidget *parent,
-		object_ptr<FlatLabel> &&child,
+		object_ptr<RpWidget> &&child,
 		const style::margins &padding,
 		RectParts parts = RectPart::Top | RectPart::Bottom);
 

From 93957145376d0b7c91ec22f28f9e0b29c527afac Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 8 Apr 2023 09:54:15 +0400
Subject: [PATCH 378/635] Avoid event loop being throttled by OpenGL

By default, Qt uses swap interval of 1 what causes the (egl|wgl|glx)SwapBuffers call to wait for vblank. Using swap interval of 0 makes the call to return immediately.
---
 ui/rp_widget.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index afa77b9..35fbe2f 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -44,6 +44,12 @@ public:
 
 TWidget::TWidget(QWidget *parent)
 : TWidgetHelper<QWidget>(*(new TWidgetPrivate), parent, {}) {
+	[[maybe_unused]] static const auto Once = [] {
+		auto format = QSurfaceFormat::defaultFormat();
+		format.setSwapInterval(0);
+		QSurfaceFormat::setDefaultFormat(format);
+		return true;
+	}();
 }
 
 namespace Ui {

From 56945859e3e7166ec26abf62b0bca0209ad5b498 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Apr 2023 13:36:15 +0400
Subject: [PATCH 379/635] Try allowing correct &nbsp; handling.

---
 ui/text/text_block.cpp      | 36 ++++++++++++++++++++++++++----------
 ui/text/text_parser.cpp     |  4 ++--
 ui/widgets/input_fields.cpp |  3 ---
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index 5cd9f92..54ccc74 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -185,6 +185,7 @@ public:
 private:
 	void parseWords(QFixed minResizeWidth, int blockFrom);
 	bool isLineBreak(const QCharAttributes *attributes, int index);
+	bool isSpaceBreak(const QCharAttributes *attributes, int index);
 
 	TextBlock *block;
 	QTextEngine *eng;
@@ -257,7 +258,17 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 		}
 		const QScriptItem &current = eng->layoutData->items[item];
 
-		if (attributes[lbh.currentPosition].whiteSpace) {
+		const auto atSpaceBreak = [&] {
+			for (auto index = lbh.currentPosition; index < end; ++index) {
+				if (!attributes[index].whiteSpace) {
+					return false;
+				} else if (isSpaceBreak(attributes, index)) {
+					return true;
+				}
+			}
+			return false;
+		}();
+		if (atSpaceBreak) {
 			while (lbh.currentPosition < end && attributes[lbh.currentPosition].whiteSpace)
 				addNextCluster(lbh.currentPosition, end, lbh.spaceData, lbh.glyphCount,
 					current, lbh.logClusters, lbh.glyphs);
@@ -281,7 +292,7 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 					current, lbh.logClusters, lbh.glyphs);
 
 				if (lbh.currentPosition >= eng->layoutData->string.length()
-					|| attributes[lbh.currentPosition].whiteSpace
+					|| isSpaceBreak(attributes, lbh.currentPosition)
 					|| isLineBreak(attributes, lbh.currentPosition)) {
 					lbh.calculateRightBearing();
 					block->_words.push_back(TextWord(wordStart + blockFrom, lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
@@ -330,14 +341,19 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 bool BlockParser::isLineBreak(
 		const QCharAttributes *attributes,
 		int index) {
-	bool lineBreak = attributes[index].lineBreak;
-	if (lineBreak
-		&& block->lnkIndex() > 0
-		&& index > 0
-		&& str.at(index - 1) == '/') {
-		return false; // don't break after / in links
-	}
-	return lineBreak;
+	// Don't break after / in links.
+	return attributes[index].lineBreak
+		&& (block->lnkIndex() <= 0
+			|| index <= 0
+			|| str[index - 1] != '/');
+}
+
+bool BlockParser::isSpaceBreak(
+		const QCharAttributes *attributes,
+		int index) {
+	// Don't break on &nbsp;
+	return attributes[index].whiteSpace
+		&& (str[index] != QChar::Nbsp);
 }
 
 AbstractBlock::AbstractBlock(
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 61c7ab9..41c5da8 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -422,7 +422,7 @@ void Parser::parseCurrentChar() {
 	_emojiLookback = 0;
 	const auto inCustomEmoji = !_customEmojiData.isEmpty();
 	const auto isNewLine = !inCustomEmoji && _multiline && IsNewline(_ch);
-	const auto isSpace = IsSpace(_ch);
+	const auto replaceWithSpace = IsSpace(_ch) && (_ch != QChar::Nbsp);
 	const auto isDiac = IsDiac(_ch);
 	const auto isTilde = !inCustomEmoji && _checkTilde && (_ch == '~');
 	const auto skip = [&] {
@@ -487,7 +487,7 @@ void Parser::parseCurrentChar() {
 		}
 		if (isNewLine) {
 			createNewlineBlock();
-		} else if (isSpace) {
+		} else if (replaceWithSpace) {
 			_t->_text.push_back(QChar::Space);
 			_allowDiacritic = false;
 		} else {
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 640efdf..ee7ee3b 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1974,9 +1974,6 @@ QString InputField::getTextPart(
 				if (IsNewline(*ch) && ch->unicode() != '\r') {
 					*ch = QLatin1Char('\n');
 				} else switch (ch->unicode()) {
-				case QChar::Nbsp: {
-					*ch = QLatin1Char(' ');
-				} break;
 				case QChar::ObjectReplacementCharacter: {
 					if (ch > begin) {
 						result.append(begin, ch - begin);

From efb7dc927a259bbf2ee35ab7e2d302a1c7c2e803 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 20:58:56 +0400
Subject: [PATCH 380/635] Allow AnimatedIcon to be colorized to textColor.

---
 ui/animated_icon.cpp | 25 ++++++++++++++++++++++---
 ui/animated_icon.h   |  9 ++++++++-
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ui/animated_icon.cpp b/ui/animated_icon.cpp
index 189a562..64ef391 100644
--- a/ui/animated_icon.cpp
+++ b/ui/animated_icon.cpp
@@ -195,7 +195,8 @@ void AnimatedIcon::Impl::renderPreloadFrame() {
 }
 
 AnimatedIcon::AnimatedIcon(AnimatedIconDescriptor &&descriptor)
-: _impl(std::make_shared<Impl>(base::make_weak(this))) {
+: _impl(std::make_shared<Impl>(base::make_weak(this)))
+, _colorized(descriptor.colorized) {
 	crl::async([
 		impl = _impl,
 		factory = std::move(descriptor.generator),
@@ -221,11 +222,29 @@ int AnimatedIcon::framesCount() const {
 	return _impl->framesCount();
 }
 
-QImage AnimatedIcon::frame() const {
-	return frame(QSize(), nullptr).image;
+QImage AnimatedIcon::frame(const QColor &textColor) const {
+	return frame(textColor, QSize(), nullptr).image;
+}
+
+QImage AnimatedIcon::notColorizedFrame() const {
+	return notColorizedFrame(QSize(), nullptr).image;
 }
 
 AnimatedIcon::ResizedFrame AnimatedIcon::frame(
+		const QColor &textColor,
+		QSize desiredSize,
+		Fn<void()> updateWithPerfect) const {
+	auto result = notColorizedFrame(
+		desiredSize,
+		std::move(updateWithPerfect));
+	if (_colorized) {
+		auto &image = result.image;
+		style::colorizeImage(image, textColor, &image, {}, {}, true);
+	}
+	return result;
+}
+
+AnimatedIcon::ResizedFrame AnimatedIcon::notColorizedFrame(
 		QSize desiredSize,
 		Fn<void()> updateWithPerfect) const {
 	auto &frame = _impl->frame();
diff --git a/ui/animated_icon.h b/ui/animated_icon.h
index 80755f9..edec7cd 100644
--- a/ui/animated_icon.h
+++ b/ui/animated_icon.h
@@ -22,6 +22,7 @@ class FrameGenerator;
 struct AnimatedIconDescriptor {
 	FnMut<std::unique_ptr<FrameGenerator>()> generator;
 	QSize sizeOverride;
+	bool colorized = false;
 };
 
 class AnimatedIcon final : public base::has_weak_ptr {
@@ -35,7 +36,8 @@ public:
 	[[nodiscard]] bool valid() const;
 	[[nodiscard]] int frameIndex() const;
 	[[nodiscard]] int framesCount() const;
-	[[nodiscard]] QImage frame() const;
+	[[nodiscard]] QImage frame(const QColor &textColor) const;
+	[[nodiscard]] QImage notColorizedFrame() const;
 	[[nodiscard]] int width() const;
 	[[nodiscard]] int height() const;
 	[[nodiscard]] QSize size() const;
@@ -45,6 +47,10 @@ public:
 		bool scaled = false;
 	};
 	[[nodiscard]] ResizedFrame frame(
+		const QColor &textColor,
+		QSize desiredSize,
+		Fn<void()> updateWithPerfect) const;
+	[[nodiscard]] ResizedFrame notColorizedFrame(
 		QSize desiredSize,
 		Fn<void()> updateWithPerfect) const;
 
@@ -81,6 +87,7 @@ private:
 	mutable crl::time _animationCurrentStart = 0;
 	mutable crl::time _animationNextStart = 0;
 	mutable int _animationCurrentIndex = 0;
+	bool _colorized = false;
 
 };
 

From 37531086ec21a8569deddedb11b402f8a3157b90 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Apr 2023 21:25:20 +0400
Subject: [PATCH 381/635] Drop all formatting by default in InputField.

---
 ui/widgets/input_fields.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index ee7ee3b..d02edc0 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -129,6 +129,11 @@ bool IsNewline(QChar ch) {
 		.arg(++GlobalCustomEmojiCounter);
 }
 
+[[nodiscard]] QString DefaultTagMimeProcessor(QStringView mimeTag) {
+	// By default drop formatting in InputField-s.
+	return {};
+}
+
 [[nodiscard]] uint64 CustomEmojiIdFromLink(QStringView link) {
 	const auto skip = Ui::InputField::kCustomEmojiTagStart.size();
 	const auto index = link.indexOf('?', skip + 1);
@@ -2036,7 +2041,7 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 
 	// Apply inserted tags.
 	const auto insertedTagsProcessor = _insertedTagsAreFromMime
-		? _tagMimeProcessor
+		? (_tagMimeProcessor ? _tagMimeProcessor : DefaultTagMimeProcessor)
 		: nullptr;
 	const auto breakTagOnNotLetterTill = ProcessInsertedTags(
 		_st,

From bfdd116000813504a0db60176f700df85690c748 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Apr 2023 22:11:33 +0400
Subject: [PATCH 382/635] Handle emoji myself in custom macOS title.

---
 ui/platform/mac/ui_window_mac.h        |  2 +
 ui/platform/mac/ui_window_mac.mm       |  4 ++
 ui/platform/mac/ui_window_title_mac.h  |  8 +++-
 ui/platform/mac/ui_window_title_mac.mm | 55 +++++++++++++++-----------
 ui/platform/ui_platform_window.cpp     |  4 ++
 ui/platform/ui_platform_window.h       |  3 ++
 ui/style/style_core_custom_font.cpp    |  9 ++++-
 ui/style/style_core_custom_font.h      |  2 +-
 ui/style/style_core_font.cpp           |  2 +-
 ui/widgets/rp_window.cpp               |  4 ++
 ui/widgets/rp_window.h                 |  3 ++
 ui/widgets/widgets.style               |  6 +++
 12 files changed, 74 insertions(+), 28 deletions(-)

diff --git a/ui/platform/mac/ui_window_mac.h b/ui/platform/mac/ui_window_mac.h
index dd5b9bd..e3da674 100644
--- a/ui/platform/mac/ui_window_mac.h
+++ b/ui/platform/mac/ui_window_mac.h
@@ -28,6 +28,8 @@ public:
 	void setGeometry(QRect rect) override;
 	void close() override;
 
+	const style::TextStyle &titleTextStyle() const override;
+
 private:
 	class Private;
 	friend class Private;
diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index 38334c4..514ef32 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -422,6 +422,10 @@ void WindowHelper::close() {
 	_private->close();
 }
 
+const style::TextStyle &WindowHelper::titleTextStyle() const {
+	return _title->textStyle();
+}
+
 void WindowHelper::init() {
 	updateCustomTitleVisibility(true);
 
diff --git a/ui/platform/mac/ui_window_title_mac.h b/ui/platform/mac/ui_window_title_mac.h
index 1dd161d..9b1b097 100644
--- a/ui/platform/mac/ui_window_title_mac.h
+++ b/ui/platform/mac/ui_window_title_mac.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "ui/text/text.h"
 #include "ui/rp_widget.h"
 #include "base/object_ptr.h"
 
@@ -14,6 +15,7 @@
 
 namespace style {
 struct WindowTitle;
+struct TextStyle;
 } // namespace style
 
 namespace Ui {
@@ -25,12 +27,14 @@ namespace Platform {
 class TitleWidget : public RpWidget {
 public:
 	TitleWidget(not_null<RpWidget*> parent, int height);
+	~TitleWidget();
 
 	void setText(const QString &text);
 	void setStyle(const style::WindowTitle &st);
 	void setControlsRect(const QRect &rect);
 	[[nodiscard]] QString text() const;
 	[[nodiscard]] bool shouldBeHidden() const;
+	[[nodiscard]] const style::TextStyle &textStyle() const;
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
@@ -43,11 +47,11 @@ private:
 	void init(int height);
 
 	not_null<const style::WindowTitle*> _st;
+	std::unique_ptr<style::TextStyle> _textStyle;
 	object_ptr<Ui::PlainShadow> _shadow;
 	QString _text;
-	int _textWidth = 0;
+	Ui::Text::String _string;
 	int _controlsRight = 0;
-	QFont _font;
 
 };
 
diff --git a/ui/platform/mac/ui_window_title_mac.mm b/ui/platform/mac/ui_window_title_mac.mm
index 76e9c88..0511e82 100644
--- a/ui/platform/mac/ui_window_title_mac.mm
+++ b/ui/platform/mac/ui_window_title_mac.mm
@@ -8,6 +8,7 @@
 
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
+#include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "base/debug_log.h"
 #include "styles/style_widgets.h"
@@ -27,10 +28,12 @@ TitleWidget::TitleWidget(not_null<RpWidget*> parent, int height)
 	init(height);
 }
 
+TitleWidget::~TitleWidget() = default;
+
 void TitleWidget::setText(const QString &text) {
 	if (_text != text) {
 		_text = text;
-		_textWidth = QFontMetrics(_font).horizontalAdvance(_text);
+		_string.setText(textStyle(), text);
 		update();
 	}
 }
@@ -48,6 +51,10 @@ bool TitleWidget::shouldBeHidden() const {
 	return !_st->height;
 }
 
+const style::TextStyle &TitleWidget::textStyle() const {
+	return *_textStyle;
+}
+
 QString TitleWidget::text() const {
 	return _text;
 }
@@ -64,51 +71,55 @@ void TitleWidget::init(int height) {
 		setGeometry(0, 0, width, height);
 	}, lifetime());
 
+	const auto setFromFont = [&](const style::font &font) {
+		_textStyle = std::make_unique<style::TextStyle>(style::TextStyle{
+			.font = font,
+			.linkFont = font,
+			.linkFontOver = font,
+		});
+	};
+
 	const auto families = QStringList{
 		u".AppleSystemUIFont"_q,
 		u".SF NS Text"_q,
 		u"Helvetica Neue"_q,
 	};
 	for (auto family : families) {
-		_font.setFamily(family);
-		if (QFontInfo(_font).family() == _font.family()) {
+		auto font = QFont();
+		font.setFamily(family);
+		if (QFontInfo(font).family() == font.family()) {
 			static const auto logged = [&] {
 				LOG(("Title Font: %1").arg(family));
 				return true;
 			}();
+			const auto apple = (family == u".AppleSystemUIFont"_q);
+			setFromFont(style::font(
+				apple ? 13 : (height * 15) / 24,
+				apple ? style::internal::FontBold : 0,
+				family));
 			break;
 		}
 	}
-
-	if (QFontInfo(_font).family() != _font.family()) {
-		_font = st::semiboldFont;
-		_font.setPixelSize(13);
-	} else if (_font.family() == u".AppleSystemUIFont"_q) {
-		_font.setBold(true);
-		_font.setPixelSize(13);
-	} else {
-		_font.setPixelSize((height * 15) / 24);
+	if (!_textStyle) {
+		setFromFont(style::font(13, style::internal::FontSemibold, 0));
 	}
 }
 
 void TitleWidget::paintEvent(QPaintEvent *e) {
-	QPainter p(this);
+	Painter p(this);
 
 	const auto active = isActiveWindow();
 	p.fillRect(rect(), active ? _st->bgActive : _st->bg);
 
-	p.setFont(_font);
 	p.setPen(active ? _st->fgActive : _st->fg);
 
-	if ((width() - _controlsRight * 2) < _textWidth) {
-		const auto elided = QFontMetrics(_font).elidedText(
-			_text,
-			Qt::ElideRight,
-			width() - _controlsRight);
-		const auto padding = QMargins(_controlsRight, 0, 0, 0);
-		p.drawText(rect() - padding, elided, style::al_left);
+	const auto top = (height() - _textStyle->font->height) / 2;
+	if ((width() - _controlsRight * 2) < _string.maxWidth()) {
+		const auto left = _controlsRight;
+		_string.drawElided(p, left, top, width() - left);
 	} else {
-		p.drawText(rect(), _text, style::al_center);
+		const auto left = (width() - _string.maxWidth()) / 2;
+		_string.draw(p, left, top, width() - left);
 	}
 }
 
diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index f08b233..5cada35 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -205,6 +205,10 @@ void BasicWindowHelper::setBodyTitleArea(
 	_bodyTitleAreaTestMethod = std::move(testMethod);
 }
 
+const style::TextStyle &BasicWindowHelper::titleTextStyle() const {
+	return st::defaultWindowTitle.style;
+}
+
 QMargins BasicWindowHelper::nativeFrameMargins() const {
 	const auto inner = window()->geometry();
 	const auto outer = window()->frameGeometry();
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index 2d52e7b..e1e8514 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -12,6 +12,7 @@
 
 namespace style {
 struct WindowTitle;
+struct TextStyle;
 } // namespace style
 
 namespace Ui {
@@ -62,6 +63,8 @@ public:
 	virtual int manualRoundingRadius() const;
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
+	[[nodiscard]] virtual const style::TextStyle &titleTextStyle() const;
+
 protected:
 	[[nodiscard]] WindowTitleHitTestFlags bodyTitleAreaHit(
 			QPoint point) const {
diff --git a/ui/style/style_core_custom_font.cpp b/ui/style/style_core_custom_font.cpp
index 825726f..8f42baf 100644
--- a/ui/style/style_core_custom_font.cpp
+++ b/ui/style/style_core_custom_font.cpp
@@ -26,7 +26,7 @@ void SetCustomFonts(const CustomFont &regular, const CustomFont &bold) {
 	BoldFont = bold;
 }
 
-QFont ResolveFont(uint32 flags, int size) {
+QFont ResolveFont(const QString &familyOverride, uint32 flags, int size) {
 	static auto Database = QFontDatabase();
 
 	const auto bold = ((flags & FontBold) || (flags & FontSemibold));
@@ -35,7 +35,12 @@ QFont ResolveFont(uint32 flags, int size) {
 	const auto useCustom = !custom.family.isEmpty();
 
 	auto result = QFont(QGuiApplication::font().family());
-	if (flags & FontMonospace) {
+	if (!familyOverride.isEmpty()) {
+		result.setFamily(familyOverride);
+		if (bold) {
+			result.setBold(true);
+		}
+	} else if (flags & FontMonospace) {
 		result.setFamily(MonospaceFont());
 	} else if (useCustom) {
 		const auto sizes = Database.smoothSizes(custom.family, custom.style);
diff --git a/ui/style/style_core_custom_font.h b/ui/style/style_core_custom_font.h
index 14ee48b..25999ae 100644
--- a/ui/style/style_core_custom_font.h
+++ b/ui/style/style_core_custom_font.h
@@ -40,6 +40,6 @@ inline bool operator>=(const CustomFont &a, const CustomFont &b) {
 
 void SetCustomFonts(const CustomFont &regular, const CustomFont &bold);
 
-[[nodiscard]] QFont ResolveFont(uint32 flags, int size);
+[[nodiscard]] QFont ResolveFont(const QString &familyOverride, uint32 flags, int size);
 
 } // namespace style
diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index d87de63..55fb7cc 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -300,7 +300,7 @@ int CeilTextWidth(const QFont &font, const QString &text) {
 }
 
 FontData::FontData(int size, uint32 flags, int family, Font *other)
-: f(ResolveFont(flags, size))
+: f(ResolveFont(family ? fontFamilies[family] : QString(), flags, size))
 , _m(f)
 , _size(size)
 , _flags(flags)
diff --git a/ui/widgets/rp_window.cpp b/ui/widgets/rp_window.cpp
index 0226774..90a8d70 100644
--- a/ui/widgets/rp_window.cpp
+++ b/ui/widgets/rp_window.cpp
@@ -103,4 +103,8 @@ int RpWindow::manualRoundingRadius() const {
 	return _helper->manualRoundingRadius();
 }
 
+const style::TextStyle &RpWindow::titleTextStyle() const {
+	return _helper->titleTextStyle();
+}
+
 } // namespace Ui
diff --git a/ui/widgets/rp_window.h b/ui/widgets/rp_window.h
index 57d1335..96cac73 100644
--- a/ui/widgets/rp_window.h
+++ b/ui/widgets/rp_window.h
@@ -11,6 +11,7 @@
 
 namespace style {
 struct WindowTitle;
+struct TextStyle;
 } // namespace style
 
 namespace Ui {
@@ -68,6 +69,8 @@ public:
 	[[nodiscard]] int manualRoundingRadius() const;
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
+	[[nodiscard]] const style::TextStyle &titleTextStyle() const;
+
 private:
 	const std::unique_ptr<Platform::BasicWindowHelper> _helper;
 
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 323a884..e14072b 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -555,6 +555,7 @@ WindowTitle {
 	bgActive: color;
 	fg: color;
 	fgActive: color;
+	style: TextStyle;
 	minimize: IconButton;
 	minimizeIconActive: icon;
 	minimizeIconActiveOver: icon;
@@ -1420,6 +1421,11 @@ defaultWindowTitle: WindowTitle {
 	bgActive: titleBgActive;
 	fg: titleFg;
 	fgActive: titleFgActive;
+	style: TextStyle(defaultTextStyle) {
+		font: font(semibold 12px);
+		linkFont: font(semibold 12px);
+		linkFontOver: font(semibold 12px underline);
+	}
 	minimize: IconButton(windowTitleButton) {
 		icon: icon {
 			{ windowTitleButtonSize, titleButtonBg },

From 79b6cd347c9c4d1a04013f0328bde533010d1e70 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 27 Apr 2023 10:56:50 +0400
Subject: [PATCH 383/635] Make a more robust check of OpenGL init.

---
 ui/gl/gl_detection.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp
index f6f225a..e200e9c 100644
--- a/ui/gl/gl_detection.cpp
+++ b/ui/gl/gl_detection.cpp
@@ -86,16 +86,16 @@ Capabilities CheckCapabilities(QWidget *widget) {
 	} else {
 		format.setAlphaBufferSize(8);
 	}
-	auto tester = QOpenGLWidget(widget);
-	tester.setFormat(format);
 
 	CrashCheckStart();
+	auto tester = QOpenGLWidget(widget);
+	tester.setFormat(format);
 	tester.grabFramebuffer(); // Force initialize().
-	CrashCheckFinish();
-
 	if (!tester.window()->windowHandle()) {
 		tester.window()->createWinId();
 	}
+	CrashCheckFinish();
+
 	const auto context = tester.context();
 	if (!context
 		|| !context->isValid()/*

From 7c9aa94533276d693942ed0ffb39d3d66a49e124 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 27 Apr 2023 10:59:09 +0400
Subject: [PATCH 384/635] Fix kUseNativeChild with Qt 6.4+

---
 ui/gl/gl_window.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ui/gl/gl_window.cpp b/ui/gl/gl_window.cpp
index fb4e0e6..0495700 100644
--- a/ui/gl/gl_window.cpp
+++ b/ui/gl/gl_window.cpp
@@ -24,6 +24,15 @@ namespace {
 
 constexpr auto kUseNativeChild = false;// ::Platform::IsWindows();
 
+class RpWidgetNoRhi : public RpWidget {
+protected:
+#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+	std::optional<QPlatformBackingStoreRhiConfig> rhiConfig() const override {
+		return QPlatformBackingStoreRhiConfig();
+	}
+#endif // Qt >= 6.4.0
+};
+
 class RpWindowNoRhi : public RpWindow {
 protected:
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
@@ -87,7 +96,7 @@ std::unique_ptr<RpWidget> Window::createNativeBodyWrap(
 		return nullptr;
 	}
 	const auto create = [] {
-		auto result = std::make_unique<RpWidget>();
+		auto result = std::make_unique<RpWidgetNoRhi>();
 		result->setWindowFlags(Qt::FramelessWindowHint | Qt::Window);
 		result->setAttribute(Qt::WA_NativeWindow);
 		result->setAttribute(Qt::WA_DontCreateNativeAncestors);

From b850852221fd27e8c70b01238638a29b50774369 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 May 2023 13:32:56 +0400
Subject: [PATCH 385/635] Simplify working with Ui::Show and toasts.

---
 CMakeLists.txt                |   3 +-
 ui/layers/box_content.cpp     | 178 +++++++++++++++++++++-------------
 ui/layers/box_content.h       |  40 +++-----
 ui/layers/layer_manager.cpp   |   3 +-
 ui/layers/show.cpp            |  43 ++++++++
 ui/layers/show.h              |  22 +++++
 ui/toast/toast.cpp            |   3 +-
 ui/toast/toast.h              |  10 +-
 ui/toasts/common_toasts.cpp   |  31 ------
 ui/toasts/common_toasts.h     |  32 ------
 ui/widgets/separate_panel.cpp |  25 +++--
 ui/widgets/separate_panel.h   |  21 +++-
 12 files changed, 242 insertions(+), 169 deletions(-)
 create mode 100644 ui/layers/show.cpp
 delete mode 100644 ui/toasts/common_toasts.cpp
 delete mode 100644 ui/toasts/common_toasts.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 201b0fc..69e63b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,7 @@ PRIVATE
     ui/layers/layer_manager.h
     ui/layers/layer_widget.cpp
     ui/layers/layer_widget.h
+    ui/layers/show.cpp
     ui/layers/show.h
     ui/paint/arcs.cpp
     ui/paint/arcs.h
@@ -180,8 +181,6 @@ PRIVATE
     ui/toast/toast_manager.h
     ui/toast/toast_widget.cpp
     ui/toast/toast_widget.h
-    ui/toasts/common_toasts.cpp
-    ui/toasts/common_toasts.h
     ui/widgets/box_content_divider.cpp
     ui/widgets/box_content_divider.h
     ui/widgets/buttons.cpp
diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index be8b707..ba916a4 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -19,6 +19,98 @@
 #include "styles/palette.h"
 
 namespace Ui {
+namespace {
+
+class BoxShow final : public Show {
+public:
+	explicit BoxShow(not_null<Ui::BoxContent*> box);
+	BoxShow(const BoxShow &other);
+	~BoxShow();
+	void showBox(
+		object_ptr<BoxContent> content,
+		LayerOptions options = LayerOption::KeepOther) const override;
+	void hideLayer() const override;
+	[[nodiscard]] not_null<QWidget*> toastParent() const override;
+	[[nodiscard]] bool valid() const override;
+	operator bool() const override;
+
+private:
+	BoxShow(QPointer<BoxContent> weak, ShowPtr wrapped);
+
+	bool resolve() const;
+
+	const QPointer<Ui::BoxContent> _weak;
+	mutable std::shared_ptr<Show> _wrapped;
+	rpl::lifetime _lifetime;
+
+};
+
+BoxShow::BoxShow(not_null<BoxContent*> box)
+: BoxShow(MakeWeak(box.get()), nullptr) {
+}
+
+BoxShow::BoxShow(const BoxShow &other)
+: BoxShow(other._weak, other._wrapped) {
+}
+
+BoxShow::BoxShow(QPointer<BoxContent> weak, ShowPtr wrapped)
+: _weak(weak)
+, _wrapped(std::move(wrapped)) {
+	if (!resolve()) {
+		if (const auto box = _weak.data()) {
+			box->boxClosing(
+			) | rpl::start_with_next([=] {
+				resolve();
+				_lifetime.destroy();
+			}, _lifetime);
+		}
+	}
+}
+
+BoxShow::~BoxShow() = default;
+
+bool BoxShow::resolve() const {
+	if (_wrapped) {
+		return true;
+	} else if (const auto strong = _weak.data()) {
+		if (strong->hasDelegate()) {
+			_wrapped = strong->getDelegate()->showFactory()();
+			return true;
+		}
+	}
+	return false;
+}
+
+void BoxShow::showBox(
+		object_ptr<BoxContent> content,
+		LayerOptions options) const {
+	if (resolve()) {
+		_wrapped->showBox(std::move(content), options);
+	}
+}
+
+void BoxShow::hideLayer() const {
+	if (resolve()) {
+		_wrapped->hideLayer();
+	}
+}
+
+not_null<QWidget*> BoxShow::toastParent() const {
+	if (resolve()) {
+		return _wrapped->toastParent();
+	}
+	Unexpected("Stale BoxShow::toastParent call.");
+}
+
+bool BoxShow::valid() const {
+	return resolve() && _wrapped->valid();
+}
+
+BoxShow::operator bool() const {
+	return valid();
+}
+
+} // namespace
 
 void BoxContent::setTitle(rpl::producer<QString> title) {
 	getDelegate()->setTitle(std::move(title) | Text::ToWithEntities());
@@ -197,6 +289,27 @@ int BoxContent::scrollHeight() const {
 	return _scroll ? _scroll->height() : 0;
 }
 
+base::weak_ptr<Toast::Instance> BoxContent::showToast(
+		Toast::Config &&config) {
+	return BoxShow(this).showToast(std::move(config));
+}
+
+base::weak_ptr<Toast::Instance> BoxContent::showToast(
+		TextWithEntities &&text,
+		crl::time duration) {
+	return BoxShow(this).showToast(std::move(text), duration);
+}
+
+base::weak_ptr<Toast::Instance> BoxContent::showToast(
+		const QString &text,
+		crl::time duration) {
+	return BoxShow(this).showToast(text, duration);
+}
+
+std::shared_ptr<Show> BoxContent::uiShow() {
+	return std::make_shared<BoxShow>(this);
+}
+
 void BoxContent::scrollByDraggingDelta(int delta) {
 	_draggingScroll.checkDeltaScroll(_scroll ? delta : 0);
 }
@@ -335,69 +448,4 @@ void BoxContent::paintEvent(QPaintEvent *e) {
 	}
 }
 
-BoxShow::BoxShow(not_null<BoxContent*> box)
-: BoxShow(MakeWeak(box.get()), nullptr) {
-}
-
-BoxShow::BoxShow(const BoxShow &other)
-: BoxShow(other._weak, other._wrapped) {
-}
-
-BoxShow::BoxShow(QPointer<BoxContent> weak, ShowPtr wrapped)
-: _weak(weak)
-, _wrapped(std::move(wrapped)) {
-	if (!resolve()) {
-		if (const auto box = _weak.data()) {
-			box->boxClosing(
-			) | rpl::start_with_next([=] {
-				resolve();
-				_lifetime.destroy();
-			}, _lifetime);
-		}
-	}
-}
-
-BoxShow::~BoxShow() = default;
-
-bool BoxShow::resolve() const {
-	if (_wrapped) {
-		return true;
-	} else if (const auto strong = _weak.data()) {
-		if (strong->hasDelegate()) {
-			_wrapped = strong->getDelegate()->showFactory()();
-			return true;
-		}
-	}
-	return false;
-}
-
-void BoxShow::showBox(
-		object_ptr<BoxContent> content,
-		LayerOptions options) const {
-	if (resolve()) {
-		_wrapped->showBox(std::move(content), options);
-	}
-}
-
-void BoxShow::hideLayer() const {
-	if (resolve()) {
-		_wrapped->hideLayer();
-	}
-}
-
-not_null<QWidget*> BoxShow::toastParent() const {
-	if (resolve()) {
-		return _wrapped->toastParent();
-	}
-	Unexpected("Stale BoxShow::toastParent call.");
-}
-
-bool BoxShow::valid() const {
-	return resolve() && _wrapped->valid();
-}
-
-BoxShow::operator bool() const {
-	return valid();
-}
-
 } // namespace Ui
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index 034e0ee..c5f31cd 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -35,6 +35,11 @@ namespace st {
 extern const style::ScrollArea &boxScroll;
 } // namespace st
 
+namespace Ui::Toast {
+struct Config;
+class Instance;
+} // namespace Ui::Toast
+
 namespace Ui {
 class GenericBox;
 } // namespace Ui
@@ -101,7 +106,6 @@ public:
 };
 
 class BoxContent : public RpWidget {
-
 public:
 	BoxContent() {
 		setAttribute(Qt::WA_OpaquePaintEvent);
@@ -214,6 +218,16 @@ public:
 	[[nodiscard]] int scrollTop() const;
 	[[nodiscard]] int scrollHeight() const;
 
+	base::weak_ptr<Toast::Instance> showToast(Toast::Config &&config);
+	base::weak_ptr<Toast::Instance> showToast(
+		TextWithEntities &&text,
+		crl::time duration = 0);
+	base::weak_ptr<Toast::Instance> showToast(
+		const QString &text,
+		crl::time duration = 0);
+
+	[[nodiscard]] std::shared_ptr<Show> uiShow();
+
 protected:
 	virtual void prepare() = 0;
 
@@ -357,28 +371,4 @@ private:
 
 };
 
-class BoxShow : public Show {
-public:
-	explicit BoxShow(not_null<Ui::BoxContent*> box);
-	BoxShow(const BoxShow &other);
-	~BoxShow();
-	void showBox(
-		object_ptr<BoxContent> content,
-		LayerOptions options = LayerOption::KeepOther) const override;
-	void hideLayer() const override;
-	[[nodiscard]] not_null<QWidget*> toastParent() const override;
-	[[nodiscard]] bool valid() const override;
-	operator bool() const override;
-
-private:
-	BoxShow(QPointer<BoxContent> weak, ShowPtr wrapped);
-
-	bool resolve() const;
-
-	const QPointer<Ui::BoxContent> _weak;
-	mutable std::shared_ptr<Show> _wrapped;
-	rpl::lifetime _lifetime;
-
-};
-
 } // namespace Ui
diff --git a/ui/layers/layer_manager.cpp b/ui/layers/layer_manager.cpp
index 505b4f1..81b2f83 100644
--- a/ui/layers/layer_manager.cpp
+++ b/ui/layers/layer_manager.cpp
@@ -68,7 +68,8 @@ ManagerShow::operator bool() const {
 
 } // namespace
 
-LayerManager::LayerManager(not_null<RpWidget*> widget) : _widget(widget) {
+LayerManager::LayerManager(not_null<RpWidget*> widget)
+: _widget(widget) {
 }
 
 void LayerManager::setStyleOverrides(
diff --git a/ui/layers/show.cpp b/ui/layers/show.cpp
new file mode 100644
index 0000000..8b186aa
--- /dev/null
+++ b/ui/layers/show.cpp
@@ -0,0 +1,43 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/layers/show.h"
+
+#include "ui/toast/toast.h"
+
+namespace Ui {
+namespace {
+
+using namespace Toast;
+
+} // namespace
+
+base::weak_ptr<Instance> Show::showToast(Config &&config) {
+	if (const auto strong = _lastToast.get()) {
+		strong->hideAnimated();
+	}
+	_lastToast = valid()
+		? Toast::Show(toastParent(), std::move(config))
+		: base::weak_ptr<Instance>();
+	return _lastToast;
+}
+
+base::weak_ptr<Instance> Show::showToast(
+		TextWithEntities &&text,
+		crl::time duration) {
+	return showToast({ .text = std::move(text), .duration = duration });
+}
+
+base::weak_ptr<Instance> Show::showToast(
+		const QString &text,
+		crl::time duration) {
+	return showToast({
+		.text = TextWithEntities{ text },
+		.duration = duration,
+	});
+}
+
+} // namespace Ui
diff --git a/ui/layers/show.h b/ui/layers/show.h
index ba8e636..c0719b0 100644
--- a/ui/layers/show.h
+++ b/ui/layers/show.h
@@ -6,12 +6,22 @@
 //
 #pragma once
 
+#include "base/weak_ptr.h"
 #include "ui/layers/layer_widget.h"
 
+struct TextWithEntities;
+
+namespace Ui::Toast {
+struct Config;
+class Instance;
+} // namespace Ui::Toast
+
 namespace Ui {
 
 class BoxContent;
 
+inline constexpr auto kZOrderBasic = 0;
+
 class Show {
 public:
 	virtual ~Show() = 0;
@@ -22,6 +32,18 @@ public:
 	[[nodiscard]] virtual not_null<QWidget*> toastParent() const = 0;
 	[[nodiscard]] virtual bool valid() const = 0;
 	virtual operator bool() const = 0;
+
+	base::weak_ptr<Toast::Instance> showToast(Toast::Config &&config);
+	base::weak_ptr<Toast::Instance> showToast(
+		TextWithEntities &&text,
+		crl::time duration = 0);
+	base::weak_ptr<Toast::Instance> showToast(
+		const QString &text,
+		crl::time duration = 0);
+
+private:
+	base::weak_ptr<Toast::Instance> _lastToast;
+
 };
 
 inline Show::~Show() = default;
diff --git a/ui/toast/toast.cpp b/ui/toast/toast.cpp
index 5933d0a..9884a60 100644
--- a/ui/toast/toast.cpp
+++ b/ui/toast/toast.cpp
@@ -23,7 +23,8 @@ Instance::Instance(
 	not_null<QWidget*> widgetParent,
 	const Private &)
 : _st(config.st)
-, _hideAt(crl::now() + config.durationMs)
+, _hideAt(crl::now()
+	+ (config.duration ? config.duration : kDefaultDuration))
 , _sliding(config.slideSide != RectPart::None)
 , _widget(std::make_unique<internal::Widget>(widgetParent, config)) {
 	_shownAnimation.start(
diff --git a/ui/toast/toast.h b/ui/toast/toast.h
index 9c2f71f..b34f0eb 100644
--- a/ui/toast/toast.h
+++ b/ui/toast/toast.h
@@ -17,6 +17,10 @@ namespace style {
 struct Toast;
 } // namespace style
 
+namespace st {
+extern const style::Toast &defaultMultilineToast;
+} // namespace st
+
 namespace Ui {
 namespace Toast {
 
@@ -30,10 +34,10 @@ using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
 inline constexpr auto kDefaultDuration = crl::time(1500);
 struct Config {
 	TextWithEntities text;
-	not_null<const style::Toast*> st;
-	crl::time durationMs = kDefaultDuration;
+	not_null<const style::Toast*> st = &st::defaultMultilineToast;
+	crl::time duration = kDefaultDuration;
 	int maxLines = 16;
-	bool multiline = false;
+	bool multiline = true;
 	bool dark = false;
 	RectPart slideSide = RectPart::None;
 	ClickHandlerFilter filter;
diff --git a/ui/toasts/common_toasts.cpp b/ui/toasts/common_toasts.cpp
deleted file mode 100644
index cc25a2f..0000000
--- a/ui/toasts/common_toasts.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "ui/toasts/common_toasts.h"
-
-#include "ui/toast/toast.h"
-#include "styles/style_widgets.h"
-
-namespace Ui {
-
-base::weak_ptr<Toast::Instance> ShowMultilineToast(
-		MultilineToastArgs &&args) {
-	auto config = Ui::Toast::Config{
-		.text = std::move(args.text),
-		.st = &st::defaultMultilineToast,
-		.durationMs = (args.duration
-			? args.duration
-			: Ui::Toast::kDefaultDuration),
-		.multiline = true,
-		.filter = std::move(args.filter),
-	};
-	return args.parentOverride
-		? Ui::Toast::Show(args.parentOverride, std::move(config))
-		: Ui::Toast::Show(std::move(config));
-}
-
-} // namespace Ui
diff --git a/ui/toasts/common_toasts.h b/ui/toasts/common_toasts.h
deleted file mode 100644
index 1fe074d..0000000
--- a/ui/toasts/common_toasts.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "ui/text/text_entity.h"
-#include "base/weak_ptr.h"
-
-class ClickHandler;
-using ClickHandlerPtr = std::shared_ptr<ClickHandler>;
-using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
-
-namespace Ui {
-namespace Toast {
-class Instance;
-} // namespace Toast
-
-struct MultilineToastArgs {
-	QWidget *parentOverride = nullptr;
-	TextWithEntities text;
-	crl::time duration = 0;
-	ClickHandlerFilter filter;
-};
-
-base::weak_ptr<Toast::Instance> ShowMultilineToast(
-	MultilineToastArgs &&args);
-
-} // namespace Ui
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index c80c51d..621d994 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -16,7 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/fade_wrap.h"
-#include "ui/toasts/common_toasts.h"
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/layers/layer_widget.h"
 #include "ui/layers/show.h"
@@ -410,15 +409,25 @@ void SeparatePanel::showBox(
 	}
 }
 
-std::shared_ptr<Show> SeparatePanel::uiShow() {
-	return std::make_shared<PanelShow>(this);
+base::weak_ptr<Toast::Instance> SeparatePanel::showToast(
+		Toast::Config &&config) {
+	return PanelShow(this).showToast(std::move(config));
 }
 
-void SeparatePanel::showToast(const TextWithEntities &text) {
-	Ui::ShowMultilineToast({
-		.parentOverride = this,
-		.text = text,
-	});
+base::weak_ptr<Toast::Instance> SeparatePanel::showToast(
+		TextWithEntities &&text,
+		crl::time duration) {
+	return PanelShow(this).showToast(std::move(text), duration);
+}
+
+base::weak_ptr<Toast::Instance> SeparatePanel::showToast(
+		const QString &text,
+		crl::time duration) {
+	return PanelShow(this).showToast(text, duration);
+}
+
+std::shared_ptr<Show> SeparatePanel::uiShow() {
+	return std::make_shared<PanelShow>(this);
 }
 
 void SeparatePanel::ensureLayerCreated() {
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index f30077c..13745ad 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/weak_ptr.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
 #include "ui/layers/layer_widget.h"
@@ -18,6 +19,11 @@ namespace Ui::Menu {
 struct MenuCallback;
 } // namespace Ui::Menu
 
+namespace Ui::Toast {
+struct Config;
+class Instance;
+} // namespace Ui::Toast
+
 namespace Ui {
 
 class Show;
@@ -32,6 +38,7 @@ class FadeWrapScaled;
 struct SeparatePanelArgs {
 	QWidget *parent = nullptr;
 	bool onAllSpaces = false;
+	Fn<bool(int zorder)> animationsPaused;
 };
 
 class SeparatePanel final : public RpWidget {
@@ -52,15 +59,25 @@ public:
 		object_ptr<BoxContent> box,
 		LayerOptions options,
 		anim::type animated);
-	void showToast(const TextWithEntities &text);
 	void destroyLayer();
 
+	[[nodiscard]] bool animationsPaused(int zorder) const;
+
 	[[nodiscard]] rpl::producer<> backRequests() const;
 	[[nodiscard]] rpl::producer<> closeRequests() const;
 	[[nodiscard]] rpl::producer<> closeEvents() const;
 	void setBackAllowed(bool allowed);
 
 	void setMenuAllowed(Fn<void(const Menu::MenuCallback&)> fill);
+
+	base::weak_ptr<Toast::Instance> showToast(Toast::Config &&config);
+	base::weak_ptr<Toast::Instance> showToast(
+		TextWithEntities &&text,
+		crl::time duration = 0);
+	base::weak_ptr<Toast::Instance> showToast(
+		const QString &text,
+		crl::time duration = 0);
+
 	[[nodiscard]] std::shared_ptr<Show> uiShow();
 
 protected:
@@ -127,6 +144,8 @@ private:
 	QPixmap _animationCache;
 	QPixmap _borderParts;
 
+	Fn<bool(int zorder)> _animationsPaused;
+
 };
 
 } // namespace Ui

From e8857f5792c8c8bc721be0607e07ccd5616b939b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 6 May 2023 02:31:50 +0400
Subject: [PATCH 386/635] Get rid of DESKTOP_APP_DISABLE_DBUS_INTEGRATION

---
 ui/basic_click_handlers.cpp            | 11 ++++-------
 ui/platform/linux/ui_utility_linux.cpp | 11 ++---------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/ui/basic_click_handlers.cpp b/ui/basic_click_handlers.cpp
index b7bf0b9..dc870a3 100644
--- a/ui/basic_click_handlers.cpp
+++ b/ui/basic_click_handlers.cpp
@@ -11,19 +11,16 @@
 #include "ui/integration.h"
 #include "base/qthelp_url.h"
 #include "base/qt/qt_string_view.h"
-
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include "base/platform/linux/base_linux_app_launch_context.h"
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 #include <QtCore/QUrl>
 #include <QtCore/QRegularExpression>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QGuiApplication>
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#if __has_include(<giomm.h>)
 #include <giomm.h>
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#endif // __has_include(<giomm.h>)
 
 QString TextClickHandler::readable() const {
 	const auto result = url();
@@ -88,7 +85,7 @@ void UrlClickHandler::Open(QString url, QVariant context) {
 		if (IsEmail(url)) {
 			url = "mailto: " + url;
 		}
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#if __has_include(<giomm.h>)
 		// Desktop entry spec implementation,
 		// prefer it over QDesktopServices::openUrl since it just calls
 		// the xdg-open shell script that is known to be bugged:
@@ -106,7 +103,7 @@ void UrlClickHandler::Open(QString url, QVariant context) {
 			}
 		} catch (...) {
 		}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#endif // __has_include(<giomm.h>)
 		QDesktopServices::openUrl(url);
 	}
 }
diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 87cfaf9..aff221c 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -7,13 +7,10 @@
 #include "ui/platform/linux/ui_utility_linux.h"
 
 #include "base/platform/base_platform_info.h"
-#include "ui/platform/linux/ui_linux_wayland_integration.h"
-#include "base/const_string.h"
-
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 #include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
+#include "ui/platform/linux/ui_linux_wayland_integration.h"
+#include "base/const_string.h"
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xcb_utilities.h"
@@ -566,7 +563,6 @@ TitleControls::Layout TitleControlsLayout() {
 		}
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 		using XDPSettingWatcher = base::Platform::XDP::SettingWatcher;
 		static const XDPSettingWatcher settingWatcher(
 			[=](
@@ -578,7 +574,6 @@ TitleControls::Layout TitleControlsLayout() {
 					NotifyTitleControlsLayoutChanged();
 				}
 			});
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 		return true;
 	}();
@@ -604,7 +599,6 @@ TitleControls::Layout TitleControlsLayout() {
 	}
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
-#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 	const auto portalResult = []() -> std::optional<TitleControls::Layout> {
 		try {
 			using namespace base::Platform::XDP;
@@ -630,7 +624,6 @@ TitleControls::Layout TitleControlsLayout() {
 	if (portalResult.has_value()) {
 		return *portalResult;
 	}
-#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
 
 	return TitleControls::Layout{
 		.right = {

From be0067a8c7879171fa4cfb870ef1ad91f523e2d8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 13 May 2023 23:31:54 +0400
Subject: [PATCH 387/635] Switch Wayland integration to the new type safe Qt
 API

This also makes it possible to get a more right seat/serial pair
---
 .../linux/ui_linux_wayland_integration.cpp    | 89 +++++++------------
 ui/widgets/popup_menu.cpp                     | 10 +--
 2 files changed, 37 insertions(+), 62 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 8831888..d27d9b9 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -13,12 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
-#include <qpa/qplatformnativeinterface.h>
+#include <qpa/qplatformwindow_p.h>
 #include <wayland-client.h>
 
-typedef void (*SetWindowMarginsFunc)(
-	QWindow *window,
-	const QMargins &margins);
+using namespace QNativeInterface;
+using namespace QNativeInterface::Private;
 
 namespace Ui {
 namespace Platform {
@@ -66,14 +65,12 @@ const struct wl_registry_listener WaylandIntegration::Private::RegistryListener
 
 WaylandIntegration::WaylandIntegration()
 : _private(std::make_unique<Private>()) {
-	const auto native = QGuiApplication::platformNativeInterface();
+	const auto native = qApp->nativeInterface<QWaylandApplication>();
 	if (!native) {
 		return;
 	}
 
-	const auto display = reinterpret_cast<wl_display*>(
-		native->nativeResourceForIntegration(QByteArray("wl_display")));
-
+	const auto display = native->display();
 	if (!display) {
 		return;
 	}
@@ -85,7 +82,7 @@ WaylandIntegration::WaylandIntegration()
 		_private.get());
 
 	base::qt_signal_producer(
-		native,
+		qApp,
 		&QObject::destroyed
 	) | rpl::start_with_next([=] {
 		// too late for standard destructors, just free
@@ -108,77 +105,57 @@ bool WaylandIntegration::xdgDecorationSupported() {
 }
 
 bool WaylandIntegration::windowExtentsSupported() {
-	const auto native = QGuiApplication::platformNativeInterface();
-	if (!native) {
-		return false;
-	}
-
-	const auto setWindowMargins = reinterpret_cast<SetWindowMarginsFunc>(
-		reinterpret_cast<void*>(
-			native->nativeResourceFunctionForWindow("setmargins")));
-
-	if (!setWindowMargins) {
-		return false;
-	}
-
-	return true;
+	QWindow window;
+	window.create();
+	return window.nativeInterface<QWaylandWindow>();
 }
 
 void WaylandIntegration::setWindowExtents(
 		not_null<QWidget*> widget,
 		const QMargins &extents) {
-	const auto native = QGuiApplication::platformNativeInterface();
+	const auto window = widget->windowHandle();
+	if (!window) {
+		return;
+	}
+
+	const auto native = window->nativeInterface<QWaylandWindow>();
 	if (!native) {
 		return;
 	}
 
-	const auto setWindowMargins = reinterpret_cast<SetWindowMarginsFunc>(
-		reinterpret_cast<void*>(
-			native->nativeResourceFunctionForWindow("setmargins")));
-
-	if (!setWindowMargins) {
-		return;
-	}
-
-	setWindowMargins(widget->windowHandle(), extents);
+	native->setCustomMargins(extents);
 }
 
 void WaylandIntegration::unsetWindowExtents(not_null<QWidget*> widget) {
-	const auto native = QGuiApplication::platformNativeInterface();
+	const auto window = widget->windowHandle();
+	if (!window) {
+		return;
+	}
+
+	const auto native = window->nativeInterface<QWaylandWindow>();
 	if (!native) {
 		return;
 	}
 
-	const auto setWindowMargins = reinterpret_cast<SetWindowMarginsFunc>(
-		reinterpret_cast<void*>(
-			native->nativeResourceFunctionForWindow("setmargins")));
-
-	if (!setWindowMargins) {
-		return;
-	}
-
-	setWindowMargins(widget->windowHandle(), QMargins());
+	native->setCustomMargins(QMargins());
 }
 
 void WaylandIntegration::showWindowMenu(
 		not_null<QWidget*> widget,
 		const QPoint &point) {
-	const auto native = QGuiApplication::platformNativeInterface();
-	if (!native) {
+	const auto window = widget->windowHandle();
+	if (!window) {
 		return;
 	}
 
-	const auto toplevel = reinterpret_cast<xdg_toplevel*>(
-		native->nativeResourceForWindow(
-			QByteArray("xdg_toplevel"),
-			widget->windowHandle()));
-
-	const auto seat = reinterpret_cast<wl_seat*>(
-		native->nativeResourceForIntegration(QByteArray("wl_seat")));
-
-	const auto serial = uint32_t(reinterpret_cast<quintptr>(
-		native->nativeResourceForIntegration(QByteArray("serial"))));
+	const auto native = qApp->nativeInterface<QWaylandApplication>();
+	const auto nativeWindow = window->nativeInterface<QWaylandWindow>();
+	if (!native || !nativeWindow) {
+		return;
+	}
 
+	const auto toplevel = nativeWindow->surfaceRole<xdg_toplevel>();
+	const auto seat = native->lastInputSeat();
 	if (!toplevel || !seat) {
 		return;
 	}
@@ -186,7 +163,7 @@ void WaylandIntegration::showWindowMenu(
 	xdg_toplevel_show_window_menu(
 		toplevel,
 		seat,
-		serial,
+		native->lastInputSerial(),
 		point.x(),
 		point.y());
 }
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index ff81dbc..2ab8c63 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -323,12 +323,10 @@ void PopupMenu::validateCompositingSupport() {
 			std::max(_st.shadow.extend.bottom(), additional.bottom()));
 		_extents = _padding - (additional - _additionalMenuExtents);
 	}
-	if (windowHandle()) {
-		if (_extents.isNull()) {
-			Platform::UnsetWindowExtents(this);
-		} else {
-			Platform::SetWindowExtents(this, _extents);
-		}
+	if (_extents.isNull()) {
+		Platform::UnsetWindowExtents(this);
+	} else {
+		Platform::SetWindowExtents(this, _extents);
 	}
 	_scroll->moveToLeft(_padding.left(), _padding.top());
 	handleMenuResize();

From 8c58ebc136f220a24a291658eadeacf0be4613d8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 13 May 2023 23:32:17 +0400
Subject: [PATCH 388/635] Remove unnecessary private Qt API usage

---
 ui/style/style_core_font.cpp | 7 -------
 ui/style/style_core_font.h   | 4 +---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index 55fb7cc..4ca722c 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -17,7 +17,6 @@
 #include <QtGui/QFontInfo>
 #include <QtGui/QFontDatabase>
 #include <QtWidgets/QApplication>
-#include <private/qfontengine_p.h>
 
 void style_InitFontsResource() {
 #ifdef Q_OS_MAC // Use resources from the .app bundle on macOS.
@@ -293,12 +292,6 @@ int registerFontFamily(const QString &family) {
 	return result;
 }
 
-int CeilTextWidth(const QFont &font, const QString &text) {
-	return text.isEmpty()
-		? 0
-		: QStackTextEngine(text, font).width(0, text.size()).ceil().toInt();
-}
-
 FontData::FontData(int size, uint32 flags, int family, Font *other)
 : f(ResolveFont(family ? fontFamilies[family] : QString(), flags, size))
 , _m(f)
diff --git a/ui/style/style_core_font.h b/ui/style/style_core_font.h
index 152357b..898fd75 100644
--- a/ui/style/style_core_font.h
+++ b/ui/style/style_core_font.h
@@ -68,12 +68,10 @@ enum FontFlags {
 	FontDifferentFlags = 0x40,
 };
 
-[[nodiscard]] int CeilTextWidth(const QFont &font, const QString &text);
-
 class FontData {
 public:
 	[[nodiscard]] int width(const QString &text) const {
-		return CeilTextWidth(f, text);
+		return int(std::ceil(_m.horizontalAdvance(text)));
 	}
 	[[nodiscard]] int width(const QString &text, int from, int to) const {
 		return width(text.mid(from, to));

From f0225406ec57d0cdccc05166ff398b0dec4bedfe Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 May 2023 15:42:17 +0400
Subject: [PATCH 389/635] Detach mediaview control color from main window.

---
 ui/colors.palette | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/colors.palette b/ui/colors.palette
index e392465..d709796 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -515,7 +515,7 @@ mediaviewMenuFg: windowFgActive; // context menu item text
 mediaviewBg: #222222eb; // Media Viewer background
 mediaviewVideoBg: imageBg; // Media Viewer background when viewing a video in full screen
 mediaviewControlBg: #0000003c; // controls background (like next photo / previous photo)
-mediaviewControlFg: windowFgActive; // controls icon (like next photo / previous photo)
+mediaviewControlFg: #ffffff; // controls icon (like next photo / previous photo)
 mediaviewCaptionBg: #11111180; // caption text background (when viewing photo with caption)
 mediaviewCaptionFg: mediaviewControlFg; // caption text
 mediaviewTextLinkFg: #91d9ff; // caption text link

From 303a07f9461524dc6debf86ae04d0ee6d3134eb6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 17 May 2023 16:28:26 +0400
Subject: [PATCH 390/635] Remove unused copy-constructor from BoxShow.

---
 ui/layers/box_content.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index ba916a4..afea011 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -24,8 +24,8 @@ namespace {
 class BoxShow final : public Show {
 public:
 	explicit BoxShow(not_null<Ui::BoxContent*> box);
-	BoxShow(const BoxShow &other);
 	~BoxShow();
+
 	void showBox(
 		object_ptr<BoxContent> content,
 		LayerOptions options = LayerOption::KeepOther) const override;
@@ -49,10 +49,6 @@ BoxShow::BoxShow(not_null<BoxContent*> box)
 : BoxShow(MakeWeak(box.get()), nullptr) {
 }
 
-BoxShow::BoxShow(const BoxShow &other)
-: BoxShow(other._weak, other._wrapped) {
-}
-
 BoxShow::BoxShow(QPointer<BoxContent> weak, ShowPtr wrapped)
 : _weak(weak)
 , _wrapped(std::move(wrapped)) {

From f86d876efffe2dd936d26ac98d15a81f7cfe2158 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 May 2023 20:47:19 +0400
Subject: [PATCH 391/635] Allow arbitrary window now+delayed activation.

---
 ui/delayed_activation.cpp | 7 +++++++
 ui/delayed_activation.h   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/ui/delayed_activation.cpp b/ui/delayed_activation.cpp
index 8f6b247..2dc2ea4 100644
--- a/ui/delayed_activation.cpp
+++ b/ui/delayed_activation.cpp
@@ -38,6 +38,13 @@ bool Unpause(bool force = false) {
 
 } // namespace
 
+void ActivateWindow(not_null<QWidget*> widget) {
+	const auto window = widget->window();
+	window->raise();
+	window->activateWindow();
+	ActivateWindowDelayed(window);
+}
+
 void ActivateWindowDelayed(not_null<QWidget*> widget) {
 	if (Paused) {
 		Attempted = true;
diff --git a/ui/delayed_activation.h b/ui/delayed_activation.h
index 4fd1c74..ed6b4cc 100644
--- a/ui/delayed_activation.h
+++ b/ui/delayed_activation.h
@@ -8,6 +8,7 @@
 
 namespace Ui {
 
+void ActivateWindow(not_null<QWidget*> widget);
 void ActivateWindowDelayed(not_null<QWidget*> widget);
 void PreventDelayedActivation();
 

From a7b6b97bd73580a590569f322cec06e5ceb29a4d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 May 2023 20:47:23 +0400
Subject: [PATCH 392/635] Improve and unify Ui::Show interface.

---
 ui/layers/box_content.cpp     | 29 ++++++-------
 ui/layers/layer_manager.cpp   | 78 ++++++++++++++++++++++-------------
 ui/layers/layer_manager.h     | 10 +++++
 ui/layers/show.cpp            | 24 +++++++++--
 ui/layers/show.h              | 46 +++++++++++++++++----
 ui/widgets/separate_panel.cpp | 72 +++++++++++++++++++++-----------
 ui/widgets/separate_panel.h   | 10 +++--
 7 files changed, 189 insertions(+), 80 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index afea011..00ec1b6 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -26,10 +26,13 @@ public:
 	explicit BoxShow(not_null<Ui::BoxContent*> box);
 	~BoxShow();
 
-	void showBox(
-		object_ptr<BoxContent> content,
-		LayerOptions options = LayerOption::KeepOther) const override;
-	void hideLayer() const override;
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const override;
 	[[nodiscard]] not_null<QWidget*> toastParent() const override;
 	[[nodiscard]] bool valid() const override;
 	operator bool() const override;
@@ -77,17 +80,15 @@ bool BoxShow::resolve() const {
 	return false;
 }
 
-void BoxShow::showBox(
-		object_ptr<BoxContent> content,
-		LayerOptions options) const {
+void BoxShow::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const {
 	if (resolve()) {
-		_wrapped->showBox(std::move(content), options);
-	}
-}
-
-void BoxShow::hideLayer() const {
-	if (resolve()) {
-		_wrapped->hideLayer();
+		_wrapped->showOrHideBoxOrLayer(std::move(layer), options, animated);
 	}
 }
 
diff --git a/ui/layers/layer_manager.cpp b/ui/layers/layer_manager.cpp
index 81b2f83..7a22e09 100644
--- a/ui/layers/layer_manager.cpp
+++ b/ui/layers/layer_manager.cpp
@@ -9,16 +9,19 @@
 #include "ui/layers/show.h"
 
 namespace Ui {
-namespace {
 
-class ManagerShow final : public Show {
+class LayerManager::ManagerShow final : public Show {
 public:
 	explicit ManagerShow(not_null<LayerManager*> manager);
 	~ManagerShow();
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options = Ui::LayerOption::KeepOther) const override;
-	void hideLayer() const override;
+
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const override;
 	[[nodiscard]] not_null<QWidget*> toastParent() const override;
 	[[nodiscard]] bool valid() const override;
 	operator bool() const override;
@@ -28,46 +31,49 @@ private:
 
 };
 
-ManagerShow::ManagerShow(not_null<LayerManager*> manager)
+LayerManager::ManagerShow::ManagerShow(not_null<LayerManager*> manager)
 : _manager(manager.get()) {
 }
 
-ManagerShow::~ManagerShow() = default;
+LayerManager::ManagerShow::~ManagerShow() = default;
 
-void ManagerShow::showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options) const {
-	if (const auto manager = _manager.get()) {
-		manager->showBox(std::move(content), options, anim::type::normal);
+void LayerManager::ManagerShow::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const {
+	using UniqueLayer = std::unique_ptr<Ui::LayerWidget>;
+	using ObjectBox = object_ptr<Ui::BoxContent>;
+	if (auto layerWidget = std::get_if<UniqueLayer>(&layer)) {
+		if (const auto manager = _manager.get()) {
+			manager->showLayer(std::move(*layerWidget), options, animated);
+		}
+	} else if (auto box = std::get_if<ObjectBox>(&layer)) {
+		if (const auto manager = _manager.get()) {
+			manager->showBox(std::move(*box), options, animated);
+		}
+	} else if (const auto manager = _manager.get()) {
+		manager->hideAll(animated);
 	}
 }
 
-void ManagerShow::hideLayer() const {
-	if (const auto manager = _manager.get()) {
-		manager->showBox(
-			object_ptr<Ui::BoxContent>{ nullptr },
-			Ui::LayerOption::CloseOther,
-			anim::type::normal);
-	}
-}
-
-not_null<QWidget*> ManagerShow::toastParent() const {
+not_null<QWidget*> LayerManager::ManagerShow::toastParent() const {
 	const auto manager = _manager.get();
 
 	Ensures(manager != nullptr);
 	return manager->toastParent();
 }
 
-bool ManagerShow::valid() const {
+bool LayerManager::ManagerShow::valid() const {
 	return (_manager.get() != nullptr);
 }
 
-ManagerShow::operator bool() const {
+LayerManager::ManagerShow::operator bool() const {
 	return valid();
 }
 
-} // namespace
-
 LayerManager::LayerManager(not_null<RpWidget*> widget)
 : _widget(widget) {
 }
@@ -98,6 +104,15 @@ void LayerManager::showBox(
 	setFocus();
 }
 
+void LayerManager::showLayer(
+		std::unique_ptr<LayerWidget> layer,
+		LayerOptions options,
+		anim::type animated) {
+	ensureLayerCreated();
+	_layer->showLayer(std::move(layer), options, animated);
+	setFocus();
+}
+
 void LayerManager::hideAll(anim::type animated) {
 	if (animated == anim::type::instant) {
 		destroyLayer();
@@ -120,6 +135,13 @@ bool LayerManager::setFocus() {
 	return true;
 }
 
+std::shared_ptr<Show> LayerManager::uiShow() {
+	if (!_cachedShow) {
+		_cachedShow = std::make_shared<ManagerShow>(this);
+	}
+	return _cachedShow;
+}
+
 const LayerWidget *LayerManager::topShownLayer() const {
 	return _layer ? _layer->topShownLayer() : nullptr;
 }
@@ -129,7 +151,7 @@ void LayerManager::ensureLayerCreated() {
 		return;
 	}
 	_layer.emplace(_widget, crl::guard(this, [=] {
-		return std::make_shared<ManagerShow>(this);
+		return uiShow();
 	}));
 	_layer->setHideByBackgroundClick(_hideByBackgroundClick);
 	_layer->setStyleOverrides(_boxSt, _layerSt);
diff --git a/ui/layers/layer_manager.h b/ui/layers/layer_manager.h
index ad23a22..a051a11 100644
--- a/ui/layers/layer_manager.h
+++ b/ui/layers/layer_manager.h
@@ -19,6 +19,7 @@ namespace Ui {
 
 class BoxContent;
 class RpWidget;
+class Show;
 
 class LayerManager final : public base::has_weak_ptr {
 public:
@@ -33,6 +34,10 @@ public:
 		object_ptr<BoxContent> box,
 		LayerOptions options = LayerOption::KeepOther,
 		anim::type animated = anim::type::normal);
+	void showLayer(
+		std::unique_ptr<LayerWidget> layer,
+		LayerOptions options = LayerOption::KeepOther,
+		anim::type animated = anim::type::normal);
 	void hideAll(anim::type animated = anim::type::normal);
 	void raise();
 	bool setFocus();
@@ -42,12 +47,17 @@ public:
 	}
 	[[nodiscard]] const LayerWidget *topShownLayer() const;
 
+	[[nodiscard]] std::shared_ptr<Show> uiShow();
+
 private:
+	class ManagerShow;
+
 	void ensureLayerCreated();
 	void destroyLayer();
 
 	const not_null<RpWidget*> _widget;
 	base::unique_qptr<LayerStackWidget> _layer;
+	std::shared_ptr<ManagerShow> _cachedShow;
 
 	const style::Box *_boxSt = nullptr;
 	const style::Box *_layerSt = nullptr;
diff --git a/ui/layers/show.cpp b/ui/layers/show.cpp
index 8b186aa..f28c64b 100644
--- a/ui/layers/show.cpp
+++ b/ui/layers/show.cpp
@@ -15,7 +15,25 @@ using namespace Toast;
 
 } // namespace
 
-base::weak_ptr<Instance> Show::showToast(Config &&config) {
+void Show::showBox(
+		object_ptr<BoxContent> content,
+		LayerOptions options,
+		anim::type animated) const {
+	return showOrHideBoxOrLayer(std::move(content), options, animated);
+}
+
+void Show::showLayer(
+		std::unique_ptr<LayerWidget> layer,
+		LayerOptions options,
+		anim::type animated) const {
+	return showOrHideBoxOrLayer(std::move(layer), options, animated);
+}
+
+void Show::hideLayer(anim::type animated) const {
+	return showOrHideBoxOrLayer(v::null, LayerOptions(), animated);
+}
+
+base::weak_ptr<Instance> Show::showToast(Config &&config) const {
 	if (const auto strong = _lastToast.get()) {
 		strong->hideAnimated();
 	}
@@ -27,13 +45,13 @@ base::weak_ptr<Instance> Show::showToast(Config &&config) {
 
 base::weak_ptr<Instance> Show::showToast(
 		TextWithEntities &&text,
-		crl::time duration) {
+		crl::time duration) const {
 	return showToast({ .text = std::move(text), .duration = duration });
 }
 
 base::weak_ptr<Instance> Show::showToast(
 		const QString &text,
-		crl::time duration) {
+		crl::time duration) const {
 	return showToast({
 		.text = TextWithEntities{ text },
 		.duration = duration,
diff --git a/ui/layers/show.h b/ui/layers/show.h
index c0719b0..37413fd 100644
--- a/ui/layers/show.h
+++ b/ui/layers/show.h
@@ -11,6 +11,10 @@
 
 struct TextWithEntities;
 
+namespace anim {
+enum class type : uchar;
+} // namespace anim
+
 namespace Ui::Toast {
 struct Config;
 class Instance;
@@ -19,30 +23,56 @@ class Instance;
 namespace Ui {
 
 class BoxContent;
+class LayerWidget;
 
 inline constexpr auto kZOrderBasic = 0;
 
 class Show {
 public:
 	virtual ~Show() = 0;
-	virtual void showBox(
-		object_ptr<BoxContent> content,
-		LayerOptions options = LayerOption::KeepOther) const = 0;
-	virtual void hideLayer() const = 0;
+	virtual void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const = 0;
 	[[nodiscard]] virtual not_null<QWidget*> toastParent() const = 0;
 	[[nodiscard]] virtual bool valid() const = 0;
 	virtual operator bool() const = 0;
 
-	base::weak_ptr<Toast::Instance> showToast(Toast::Config &&config);
+	void showBox(
+		object_ptr<BoxContent> content,
+		LayerOptions options = LayerOption::KeepOther,
+		anim::type animated = anim::type()) const;
+	void showLayer(
+		std::unique_ptr<LayerWidget> layer,
+		LayerOptions options = LayerOption::KeepOther,
+		anim::type animated = anim::type()) const;
+	void hideLayer(anim::type animated = anim::type()) const;
+
+	base::weak_ptr<Toast::Instance> showToast(Toast::Config &&config) const;
 	base::weak_ptr<Toast::Instance> showToast(
 		TextWithEntities &&text,
-		crl::time duration = 0);
+		crl::time duration = 0) const;
 	base::weak_ptr<Toast::Instance> showToast(
 		const QString &text,
-		crl::time duration = 0);
+		crl::time duration = 0) const;
+
+	template <
+		typename BoxType,
+		typename = std::enable_if_t<std::is_base_of_v<BoxContent, BoxType>>>
+	QPointer<BoxType> show(
+			object_ptr<BoxType> content,
+			LayerOptions options = LayerOption::KeepOther,
+			anim::type animated = anim::type()) const {
+		auto result = QPointer<BoxType>(content.data());
+		showBox(std::move(content), options, animated);
+		return result;
+	}
 
 private:
-	base::weak_ptr<Toast::Instance> _lastToast;
+	mutable base::weak_ptr<Toast::Instance> _lastToast;
 
 };
 
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 621d994..83dc4bb 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/platform/ui_platform_utility.h"
+#include "ui/layers/box_content.h"
 #include "ui/layers/layer_widget.h"
 #include "ui/layers/show.h"
 #include "ui/painter.h"
@@ -36,10 +37,14 @@ class PanelShow final : public Show {
 public:
 	explicit PanelShow(not_null<SeparatePanel*> panel);
 	~PanelShow();
-	void showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options = Ui::LayerOption::KeepOther) const override;
-	void hideLayer() const override;
+
+	void showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const;
 	[[nodiscard]] not_null<QWidget*> toastParent() const override;
 	[[nodiscard]] bool valid() const override;
 	operator bool() const override;
@@ -55,20 +60,25 @@ PanelShow::PanelShow(not_null<SeparatePanel*> panel)
 
 PanelShow::~PanelShow() = default;
 
-void PanelShow::showBox(
-		object_ptr<Ui::BoxContent> content,
-		Ui::LayerOptions options) const {
-	if (const auto panel = _panel.data()) {
-		panel->showBox(std::move(content), options, anim::type::normal);
-	}
-}
-
-void PanelShow::hideLayer() const {
-	if (const auto panel = _panel.data()) {
-		panel->showBox(
-			object_ptr<Ui::BoxContent>{ nullptr },
-			Ui::LayerOption::CloseOther,
-			anim::type::normal);
+void PanelShow::showOrHideBoxOrLayer(
+		std::variant<
+			v::null_t,
+			object_ptr<BoxContent>,
+			std::unique_ptr<LayerWidget>> &&layer,
+		LayerOptions options,
+		anim::type animated) const {
+	using UniqueLayer = std::unique_ptr<LayerWidget>;
+	using ObjectBox = object_ptr<BoxContent>;
+	if (auto layerWidget = std::get_if<UniqueLayer>(&layer)) {
+		if (const auto panel = _panel.data()) {
+			panel->showLayer(std::move(*layerWidget), options, animated);
+		}
+	} else if (auto box = std::get_if<ObjectBox>(&layer)) {
+		if (const auto panel = _panel.data()) {
+			panel->showBox(std::move(*box), options, animated);
+		}
+	} else if (const auto panel = _panel.data()) {
+		panel->hideLayer(animated);
 	}
 }
 
@@ -398,13 +408,27 @@ int SeparatePanel::hideGetDuration() {
 }
 
 void SeparatePanel::showBox(
-		object_ptr<Ui::BoxContent> box,
-		Ui::LayerOptions options,
+		object_ptr<BoxContent> box,
+		LayerOptions options,
 		anim::type animated) {
-	if (box) {
-		ensureLayerCreated();
-		_layer->showBox(std::move(box), options, animated);
-	} else if (_layer) {
+	Expects(box != nullptr);
+
+	ensureLayerCreated();
+	_layer->showBox(std::move(box), options, animated);
+}
+
+void SeparatePanel::showLayer(
+		std::unique_ptr<LayerWidget> layer,
+		LayerOptions options,
+		anim::type animated) {
+	Expects(layer != nullptr);
+
+	ensureLayerCreated();
+	_layer->showLayer(std::move(layer), options, animated);
+}
+
+void SeparatePanel::hideLayer(anim::type animated) {
+	if (_layer) {
 		_layer->hideAll(animated);
 	}
 }
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 13745ad..12070b1 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -31,6 +31,7 @@ class BoxContent;
 class IconButton;
 class PopupMenu;
 class LayerStackWidget;
+class LayerWidget;
 class FlatLabel;
 template <typename Widget>
 class FadeWrapScaled;
@@ -59,9 +60,11 @@ public:
 		object_ptr<BoxContent> box,
 		LayerOptions options,
 		anim::type animated);
-	void destroyLayer();
-
-	[[nodiscard]] bool animationsPaused(int zorder) const;
+	void showLayer(
+		std::unique_ptr<LayerWidget> layer,
+		LayerOptions options,
+		anim::type animated);
+	void hideLayer(anim::type animated);
 
 	[[nodiscard]] rpl::producer<> backRequests() const;
 	[[nodiscard]] rpl::producer<> closeRequests() const;
@@ -103,6 +106,7 @@ private:
 	void createBorderImage();
 	void opacityCallback();
 	void ensureLayerCreated();
+	void destroyLayer();
 
 	void updateTitleGeometry(int newWidth);
 	void updateTitlePosition();

From facdf5a2d837939a3d82cc3cd63ba69b98f717e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 19 May 2023 22:01:59 +0400
Subject: [PATCH 393/635] Fix build with Xcode.

---
 ui/widgets/separate_panel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 83dc4bb..2f6b2e0 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -44,7 +44,7 @@ public:
 			object_ptr<BoxContent>,
 			std::unique_ptr<LayerWidget>> &&layer,
 		LayerOptions options,
-		anim::type animated) const;
+		anim::type animated) const override;
 	[[nodiscard]] not_null<QWidget*> toastParent() const override;
 	[[nodiscard]] bool valid() const override;
 	operator bool() const override;

From a7d503188918904d12a069bca7d3f6c92b9fb553 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 24 May 2023 21:00:53 +0400
Subject: [PATCH 394/635] I hope this fixes some focus problems.

---
 ui/widgets/input_fields.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index d02edc0..ba59c44 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1783,7 +1783,7 @@ void InputField::focusInEvent(QFocusEvent *e) {
 	_borderAnimationStart = (e->reason() == Qt::MouseFocusReason)
 		? mapFromGlobal(QCursor::pos()).x()
 		: (width() / 2);
-	InvokeQueued(this, [=] { onFocusInner(); });
+	InvokeQueued(this, [=] { if (hasFocus()) onFocusInner(); });
 }
 
 void InputField::mousePressEvent(QMouseEvent *e) {

From 1893967b4a77016ab232199a8b15a5a760c2b1a7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 25 May 2023 09:34:19 +0400
Subject: [PATCH 395/635] Destroy Wayland integration before Wayland
 disconnection

---
 .../linux/ui_linux_wayland_integration.cpp    | 20 +++++++++----------
 .../linux/ui_linux_wayland_integration.h      |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index d27d9b9..e3ea156 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
+#include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformwindow_p.h>
 #include <wayland-client.h>
 
@@ -81,14 +82,6 @@ WaylandIntegration::WaylandIntegration()
 		&Private::RegistryListener,
 		_private.get());
 
-	base::qt_signal_producer(
-		qApp,
-		&QObject::destroyed
-	) | rpl::start_with_next([=] {
-		// too late for standard destructors, just free
-		free(_private->registry.release());
-	}, _private->lifetime);
-
 	wl_display_roundtrip(display);
 }
 
@@ -96,8 +89,15 @@ WaylandIntegration::~WaylandIntegration() = default;
 
 WaylandIntegration *WaylandIntegration::Instance() {
 	if (!::Platform::IsWayland()) return nullptr;
-	static WaylandIntegration instance;
-	return &instance;
+	static std::optional<WaylandIntegration> instance(std::in_place);
+	base::qt_signal_producer(
+		QGuiApplication::platformNativeInterface(),
+		&QObject::destroyed
+	) | rpl::start_with_next([&] {
+		instance = std::nullopt;
+	}, instance->_private->lifetime);
+	if (!instance) return nullptr;
+	return &*instance;
 }
 
 bool WaylandIntegration::xdgDecorationSupported() {
diff --git a/ui/platform/linux/ui_linux_wayland_integration.h b/ui/platform/linux/ui_linux_wayland_integration.h
index ef089d2..4ce6a8a 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.h
+++ b/ui/platform/linux/ui_linux_wayland_integration.h
@@ -14,6 +14,9 @@ namespace Platform {
 
 class WaylandIntegration {
 public:
+	WaylandIntegration();
+	~WaylandIntegration();
+
 	[[nodiscard]] static WaylandIntegration *Instance();
 
 	[[nodiscard]] bool xdgDecorationSupported();
@@ -23,9 +26,6 @@ public:
 	void showWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 private:
-	WaylandIntegration();
-	~WaylandIntegration();
-
 	struct Private;
 	const std::unique_ptr<Private> _private;
 };

From bf4cb33faba84b855eff583bb1b20004434b5424 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 25 May 2023 03:37:56 +0400
Subject: [PATCH 396/635] Use new base_linux_wayland_utilities

---
 .../linux/ui_linux_wayland_integration.cpp      | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index e3ea156..07538e1 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/platform/linux/ui_linux_wayland_integration.h"
 
+#include "base/platform/linux/base_linux_wayland_utilities.h"
 #include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
 #include "qwayland-xdg-shell.h"
@@ -19,29 +20,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 using namespace QNativeInterface;
 using namespace QNativeInterface::Private;
+using namespace base::Platform::Wayland;
 
 namespace Ui {
 namespace Platform {
-namespace {
-
-struct WlRegistryDeleter {
-	void operator()(wl_registry *value) {
-		wl_registry_destroy(value);
-	}
-};
-
-} // namespace
 
 struct WaylandIntegration::Private {
-	std::unique_ptr<wl_registry, WlRegistryDeleter> registry;
+	std::unique_ptr<wl_registry, RegistryDeleter> registry;
 	bool xdgDecorationSupported = false;
 	uint32_t xdgDecorationName = 0;
 	rpl::lifetime lifetime;
 
-	static const struct wl_registry_listener RegistryListener;
+	static const wl_registry_listener RegistryListener;
 };
 
-const struct wl_registry_listener WaylandIntegration::Private::RegistryListener = {
+const wl_registry_listener WaylandIntegration::Private::RegistryListener = {
 	decltype(wl_registry_listener::global)(+[](
 			Private *data,
 			wl_registry *registry,

From ff1d5fce29cbd85605e5de0125318be33b2eb9bb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 30 May 2023 17:36:11 +0400
Subject: [PATCH 397/635] Allow tracking isLayerShown in LayerManager.

---
 ui/layers/layer_manager.cpp | 4 ++++
 ui/layers/layer_manager.h   | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ui/layers/layer_manager.cpp b/ui/layers/layer_manager.cpp
index 7a22e09..a6470ac 100644
--- a/ui/layers/layer_manager.cpp
+++ b/ui/layers/layer_manager.cpp
@@ -168,6 +168,8 @@ void LayerManager::ensureLayerCreated() {
 	) | rpl::start_with_next([=](QSize size) {
 		_layer->resize(size);
 	}, _layer->lifetime());
+
+	_layerShown = true;
 }
 
 void LayerManager::destroyLayer() {
@@ -176,6 +178,8 @@ void LayerManager::destroyLayer() {
 	}
 
 	auto layer = base::take(_layer);
+	_layerShown = false;
+
 	const auto resetFocus = Ui::InFocusChain(layer);
 	if (resetFocus) {
 		_widget->setFocus();
diff --git a/ui/layers/layer_manager.h b/ui/layers/layer_manager.h
index a051a11..b8ce72b 100644
--- a/ui/layers/layer_manager.h
+++ b/ui/layers/layer_manager.h
@@ -42,6 +42,10 @@ public:
 	void raise();
 	bool setFocus();
 
+	[[nodiscard]] rpl::producer<bool> layerShownValue() const {
+		return _layerShown.value();
+	}
+
 	[[nodiscard]] not_null<Ui::RpWidget*> toastParent() const {
 		return _widget;
 	}
@@ -58,6 +62,7 @@ private:
 	const not_null<RpWidget*> _widget;
 	base::unique_qptr<LayerStackWidget> _layer;
 	std::shared_ptr<ManagerShow> _cachedShow;
+	rpl::variable<bool> _layerShown;
 
 	const style::Box *_boxSt = nullptr;
 	const style::Box *_layerSt = nullptr;

From 627abc6728ec84f3a96584ee6d7461e41c83865d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 30 May 2023 04:36:27 +0400
Subject: [PATCH 398/635] C++ify wl_registry

---
 CMakeLists.txt                                |  1 +
 .../linux/ui_linux_wayland_integration.cpp    | 46 +++++++------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e63b1..09d3900 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -301,6 +301,7 @@ elseif(LINUX)
 
     qt_generate_wayland_protocol_client_sources(lib_ui
     FILES
+        ${third_party_loc}/wayland/protocol/wayland.xml
         ${third_party_loc}/wayland-protocols/stable/xdg-shell/xdg-shell.xml
     )
 
diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 07538e1..392f574 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -10,13 +10,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/linux/base_linux_wayland_utilities.h"
 #include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
+
+#include "qwayland-wayland.h"
 #include "qwayland-xdg-shell.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformwindow_p.h>
-#include <wayland-client.h>
 
 using namespace QNativeInterface;
 using namespace QNativeInterface::Private;
@@ -25,36 +26,28 @@ using namespace base::Platform::Wayland;
 namespace Ui {
 namespace Platform {
 
-struct WaylandIntegration::Private {
-	std::unique_ptr<wl_registry, RegistryDeleter> registry;
+struct WaylandIntegration::Private : public AutoDestroyer<QtWayland::wl_registry> {
 	bool xdgDecorationSupported = false;
 	uint32_t xdgDecorationName = 0;
 	rpl::lifetime lifetime;
 
-	static const wl_registry_listener RegistryListener;
-};
-
-const wl_registry_listener WaylandIntegration::Private::RegistryListener = {
-	decltype(wl_registry_listener::global)(+[](
-			Private *data,
-			wl_registry *registry,
+protected:
+	void registry_global(
 			uint32_t name,
-			const char *interface,
-			uint32_t version) {
+			const QString &interface,
+			uint32_t version) override {
 		if (interface == qstr("zxdg_decoration_manager_v1")) {
-			data->xdgDecorationSupported = true;
-			data->xdgDecorationName = name;
+			xdgDecorationSupported = true;
+			xdgDecorationName = name;
 		}
-	}),
-	decltype(wl_registry_listener::global_remove)(+[](
-			Private *data,
-			wl_registry *registry,
-			uint32_t name) {
-		if (name == data->xdgDecorationName) {
-			data->xdgDecorationSupported = false;
-			data->xdgDecorationName = 0;
+	}
+
+	void registry_global_remove(uint32_t name) override {
+		if (name == xdgDecorationName) {
+			xdgDecorationSupported = false;
+			xdgDecorationName = 0;
 		}
-	}),
+	}
 };
 
 WaylandIntegration::WaylandIntegration()
@@ -69,12 +62,7 @@ WaylandIntegration::WaylandIntegration()
 		return;
 	}
 
-	_private->registry.reset(wl_display_get_registry(display));
-	wl_registry_add_listener(
-		_private->registry.get(),
-		&Private::RegistryListener,
-		_private.get());
-
+	_private->init(wl_display_get_registry(display));
 	wl_display_roundtrip(display);
 }
 

From cf906f14bd6ed66826527f072f249840dc578f8c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 30 May 2023 18:57:43 +0400
Subject: [PATCH 399/635] Store xdg-decoration support with std::optional

---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 392f574..c87a2dc 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -27,8 +27,7 @@ namespace Ui {
 namespace Platform {
 
 struct WaylandIntegration::Private : public AutoDestroyer<QtWayland::wl_registry> {
-	bool xdgDecorationSupported = false;
-	uint32_t xdgDecorationName = 0;
+	std::optional<uint32_t> xdgDecoration;
 	rpl::lifetime lifetime;
 
 protected:
@@ -37,15 +36,13 @@ protected:
 			const QString &interface,
 			uint32_t version) override {
 		if (interface == qstr("zxdg_decoration_manager_v1")) {
-			xdgDecorationSupported = true;
-			xdgDecorationName = name;
+			xdgDecoration = name;
 		}
 	}
 
 	void registry_global_remove(uint32_t name) override {
-		if (name == xdgDecorationName) {
-			xdgDecorationSupported = false;
-			xdgDecorationName = 0;
+		if (xdgDecoration && name == *xdgDecoration) {
+			xdgDecoration = std::nullopt;
 		}
 	}
 };
@@ -82,7 +79,7 @@ WaylandIntegration *WaylandIntegration::Instance() {
 }
 
 bool WaylandIntegration::xdgDecorationSupported() {
-	return _private->xdgDecorationSupported;
+	return _private->xdgDecoration.has_value();
 }
 
 bool WaylandIntegration::windowExtentsSupported() {

From 6c216e437d2fb7ad864062eb5e3b8b967335e7ab Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 1 Jun 2023 06:42:52 +0400
Subject: [PATCH 400/635] Fix button state after synthesized mouse release

---
 ui/ui_utility.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp
index 283b340..2a5de32 100644
--- a/ui/ui_utility.cpp
+++ b/ui/ui_utility.cpp
@@ -166,7 +166,9 @@ void SendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton
 			, localPoint
 			, globalPoint
 			, button
-			, QGuiApplication::mouseButtons() | button
+			, type == QEvent::MouseButtonRelease
+				? QGuiApplication::mouseButtons() ^ button
+				: QGuiApplication::mouseButtons() | button
 			, QGuiApplication::keyboardModifiers()
 			, Qt::MouseEventSynthesizedByApplication
 		);

From 784dedac4de65e23b4f54712458cce9e00b8b992 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 1 Jun 2023 05:46:23 +0400
Subject: [PATCH 401/635] Send mouse release event after
 startSystemMove/startSystemResize

---
 ui/platform/ui_platform_window.cpp       | 8 ++++++++
 ui/platform/ui_platform_window_title.cpp | 4 ++++
 ui/widgets/separate_panel.cpp            | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 5cada35..e3bcff0 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -266,6 +266,10 @@ void BasicWindowHelper::setupBodyTitleAreaEvents() {
 #endif // Q_OS_WIN
 				_mousePressed = false;
 				_window->windowHandle()->startSystemMove();
+				SendSynteticMouseEvent(
+					body().get(),
+					QEvent::MouseButtonRelease,
+					Qt::LeftButton);
 			}
 		}
 	}, body()->lifetime());
@@ -363,6 +367,10 @@ void DefaultWindowHelper::init() {
 
 			if (mouseEvent->button() == Qt::LeftButton && edges) {
 				window()->windowHandle()->startSystemResize(edges);
+				SendSynteticMouseEvent(
+					window().get(),
+					QEvent::MouseButtonRelease,
+					Qt::LeftButton);
 			}
 		} else if (e->type() == QEvent::WindowStateChange) {
 			_windowState = window()->windowState();
diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index af4bbb6..1a47b1a 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -501,6 +501,10 @@ void DefaultTitleWidget::mouseReleaseEvent(QMouseEvent *e) {
 void DefaultTitleWidget::mouseMoveEvent(QMouseEvent *e) {
 	if (_mousePressed) {
 		window()->windowHandle()->startSystemMove();
+		SendSynteticMouseEvent(
+			this,
+			QEvent::MouseButtonRelease,
+			Qt::LeftButton);
 	}
 }
 
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 2f6b2e0..60a7cbe 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -768,6 +768,10 @@ void SeparatePanel::mousePressEvent(QMouseEvent *e) {
 		if (dragArea.contains(e->pos())) {
 			const auto dragViaSystem = [&] {
 				if (windowHandle()->startSystemMove()) {
+					SendSynteticMouseEvent(
+						this,
+						QEvent::MouseButtonRelease,
+						Qt::LeftButton);
 					return true;
 				}
 				return false;

From 57143bfae1c5e49deb7bcfd12aa597c7fe41d0a7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 1 Jun 2023 19:51:09 +0400
Subject: [PATCH 402/635] Allow custom rounding radius for PopupMenu.

---
 ui/widgets/popup_menu.cpp | 14 +++++++-------
 ui/widgets/widgets.style  |  2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 2ab8c63..ed7cb00 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -34,8 +34,8 @@ constexpr auto kShadowCornerMultiplier = 3;
 		style::margins padding,
 		not_null<const style::Shadow*> shadow,
 		not_null<const RoundRect*> body,
+		int radius,
 		rpl::lifetime &lifetime) {
-	const auto radius = st::roundRadiusSmall;
 	const auto side = radius * kShadowCornerMultiplier;
 	const auto middle = radius;
 	const auto size = side * 2 + middle;
@@ -62,6 +62,7 @@ constexpr auto kShadowCornerMultiplier = 3;
 void PaintCachedShadow(
 		QPainter &p,
 		QSize outer,
+		int radius,
 		style::margins padding,
 		const QImage &cached) {
 	const auto fill = [&](
@@ -81,7 +82,6 @@ void PaintCachedShadow(
 		fill(dstx, dsty, width, height, srcx, srcy, width, height);
 	};
 
-	const auto radius = st::roundRadiusSmall;
 	const auto side = radius * kShadowCornerMultiplier;
 	const auto middle = radius;
 	const auto size = side * 2 + middle;
@@ -164,7 +164,7 @@ void PaintCachedShadow(
 PopupMenu::PopupMenu(QWidget *parent, const style::PopupMenu &st)
 : RpWidget(parent)
 , _st(st)
-, _roundRect(ImageRoundRadius::Small, _st.menu.itemBg)
+, _roundRect(_st.radius, _st.menu.itemBg)
 , _scroll(this, st::defaultMultiSelect.scroll)
 , _menu(_scroll->setOwnedWidget(
 	object_ptr<PaddingWrap<Menu::Menu>>(
@@ -177,7 +177,7 @@ PopupMenu::PopupMenu(QWidget *parent, const style::PopupMenu &st)
 PopupMenu::PopupMenu(QWidget *parent, QMenu *menu, const style::PopupMenu &st)
 : RpWidget(parent)
 , _st(st)
-, _roundRect(ImageRoundRadius::Small, _st.menu.itemBg)
+, _roundRect(_st.radius, _st.menu.itemBg)
 , _scroll(this, st::defaultMultiSelect.scroll)
 , _menu(_scroll->setOwnedWidget(
 	object_ptr<PaddingWrap<Menu::Menu>>(
@@ -351,6 +351,7 @@ void PopupMenu::updateRoundingOverlay() {
 		_padding,
 		&_st.shadow,
 		&_roundRect,
+		_st.radius,
 		_roundingOverlay->lifetime());
 
 	_roundingOverlay->paintRequest(
@@ -361,7 +362,7 @@ void PopupMenu::updateRoundingOverlay() {
 		_roundRect.paint(p, _inner, RectPart::AllCorners);
 		if (!_grabbingForPanelAnimation) {
 			p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-			PaintCachedShadow(p, size(), _padding, *shadow);
+			PaintCachedShadow(p, size(), _st.radius, _padding, *shadow);
 		}
 	}, _roundingOverlay->lifetime());
 
@@ -834,8 +835,7 @@ void PopupMenu::startShowAnimation() {
 		_showAnimation = std::make_unique<PanelAnimation>(_st.animation, _origin);
 		_showAnimation->setFinalImage(std::move(cache), QRect(_inner.topLeft() * pixelRatio, _inner.size() * pixelRatio));
 		if (_useTransparency) {
-			_showAnimation->setCornerMasks(
-				Images::CornersMask(ImageRoundRadius::Small));
+			_showAnimation->setCornerMasks(Images::CornersMask(_st.radius));
 		} else {
 			_showAnimation->setSkipShadow(true);
 		}
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index e14072b..921040e 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -255,6 +255,7 @@ PopupMenu {
 
 	menu: Menu;
 
+	radius: pixels;
 	duration: int;
 	showDuration: int;
 }
@@ -849,6 +850,7 @@ defaultPopupMenu: PopupMenu {
 
 	menu: defaultMenu;
 
+	radius: 3px;
 	duration: 150;
 	showDuration: 200;
 }

From 83cab52cd6ba93e9292405b23358d8dde3f95567 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 1 Jun 2023 19:51:28 +0400
Subject: [PATCH 403/635] Add access to scrollTop[Value] of PopupMenu.

---
 ui/widgets/popup_menu.cpp | 8 ++++++++
 ui/widgets/popup_menu.h   | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index ed7cb00..305bc0f 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -942,6 +942,14 @@ bool PopupMenu::useTransparency() const {
 	return _useTransparency;
 }
 
+int PopupMenu::scrollTop() const {
+	return _scroll->scrollTop();
+}
+
+rpl::producer<int> PopupMenu::scrollTopValue() const {
+	return _scroll->scrollTopValue();
+}
+
 rpl::producer<PopupMenu::ShowState> PopupMenu::showStateValue() const {
 	return _showStateChanges.events();
 }
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 751b20f..5908d58 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -93,6 +93,9 @@ public:
 	[[nodiscard]] QMargins preparedExtents() const;
 	[[nodiscard]] bool useTransparency() const;
 
+	[[nodiscard]] int scrollTop() const;
+	[[nodiscard]] rpl::producer<int> scrollTopValue() const;
+
 	void setDestroyedCallback(Fn<void()> callback) {
 		_destroyedCallback = std::move(callback);
 	}

From 1e89c19a03ddd654e063e26fbb5223247212822d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 9 Jun 2023 03:54:50 +0400
Subject: [PATCH 404/635] Make window check in Wayland integration assert

This function was always requiring a window handle but after latest refactor it would fail silently
---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index c87a2dc..c76a293 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -92,9 +92,7 @@ void WaylandIntegration::setWindowExtents(
 		not_null<QWidget*> widget,
 		const QMargins &extents) {
 	const auto window = widget->windowHandle();
-	if (!window) {
-		return;
-	}
+	Expects(window != nullptr);
 
 	const auto native = window->nativeInterface<QWaylandWindow>();
 	if (!native) {
@@ -106,9 +104,7 @@ void WaylandIntegration::setWindowExtents(
 
 void WaylandIntegration::unsetWindowExtents(not_null<QWidget*> widget) {
 	const auto window = widget->windowHandle();
-	if (!window) {
-		return;
-	}
+	Expects(window != nullptr);
 
 	const auto native = window->nativeInterface<QWaylandWindow>();
 	if (!native) {
@@ -122,9 +118,7 @@ void WaylandIntegration::showWindowMenu(
 		not_null<QWidget*> widget,
 		const QPoint &point) {
 	const auto window = widget->windowHandle();
-	if (!window) {
-		return;
-	}
+	Expects(window != nullptr);
 
 	const auto native = qApp->nativeInterface<QWaylandApplication>();
 	const auto nativeWindow = window->nativeInterface<QWaylandWindow>();

From 3749f10e7ffd0b70bdcc7043f6217750fde7c895 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 15 Jun 2023 20:07:58 +0400
Subject: [PATCH 405/635] Allow getting AnimatedIcon frame rate.

---
 ui/animated_icon.cpp | 13 +++++++++++++
 ui/animated_icon.h   |  1 +
 2 files changed, 14 insertions(+)

diff --git a/ui/animated_icon.cpp b/ui/animated_icon.cpp
index 64ef391..5e5be7d 100644
--- a/ui/animated_icon.cpp
+++ b/ui/animated_icon.cpp
@@ -41,6 +41,7 @@ public:
 	[[nodiscard]] bool valid() const;
 	[[nodiscard]] QSize size() const;
 	[[nodiscard]] int framesCount() const;
+	[[nodiscard]] double frameRate() const;
 	[[nodiscard]] Frame &frame();
 	[[nodiscard]] const Frame &frame() const;
 
@@ -67,6 +68,7 @@ private:
 
 	base::weak_ptr<AnimatedIcon> _weak;
 	int _framesCount = 0;
+	double _frameRate = 0.;
 	mutable crl::semaphore _semaphore;
 	mutable bool _ready = false;
 
@@ -88,6 +90,7 @@ void AnimatedIcon::Impl::prepareFromAsync(
 		return;
 	}
 	_framesCount = generator->count();
+	_frameRate = generator->rate();
 	_current.generated = generator->renderNext(QImage(), sizeOverride);
 	if (_current.generated.image.isNull()) {
 		return;
@@ -120,6 +123,11 @@ int AnimatedIcon::Impl::framesCount() const {
 	return _framesCount;
 }
 
+double AnimatedIcon::Impl::frameRate() const {
+	waitTillPrepared();
+	return _frameRate;
+}
+
 AnimatedIcon::Frame &AnimatedIcon::Impl::frame() {
 	waitTillPrepared();
 	return _current;
@@ -222,6 +230,10 @@ int AnimatedIcon::framesCount() const {
 	return _impl->framesCount();
 }
 
+double AnimatedIcon::frameRate() const {
+	return _impl->frameRate();
+}
+
 QImage AnimatedIcon::frame(const QColor &textColor) const {
 	return frame(textColor, QSize(), nullptr).image;
 }
@@ -356,6 +368,7 @@ int AnimatedIcon::wantedFrameIndex(
 		const auto next = _animationCurrentStart + duration;
 		if (frame->generated.last) {
 			_animation.stop();
+			if (_repaint) _repaint();
 			return _animationCurrentIndex;
 		} else if (now < next) {
 			return _animationCurrentIndex;
diff --git a/ui/animated_icon.h b/ui/animated_icon.h
index edec7cd..b6c6b35 100644
--- a/ui/animated_icon.h
+++ b/ui/animated_icon.h
@@ -36,6 +36,7 @@ public:
 	[[nodiscard]] bool valid() const;
 	[[nodiscard]] int frameIndex() const;
 	[[nodiscard]] int framesCount() const;
+	[[nodiscard]] double frameRate() const;
 	[[nodiscard]] QImage frame(const QColor &textColor) const;
 	[[nodiscard]] QImage notColorizedFrame() const;
 	[[nodiscard]] int width() const;

From 8a560488011f833b7ba534999f878d20d5152e6c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 16 Jun 2023 11:59:16 +0400
Subject: [PATCH 406/635] Ensure Wayland integration instance accessor doesn't
 leak

---
 .../linux/ui_linux_wayland_integration.cpp        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index c76a293..b01f2f7 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -68,12 +68,15 @@ WaylandIntegration::~WaylandIntegration() = default;
 WaylandIntegration *WaylandIntegration::Instance() {
 	if (!::Platform::IsWayland()) return nullptr;
 	static std::optional<WaylandIntegration> instance(std::in_place);
-	base::qt_signal_producer(
-		QGuiApplication::platformNativeInterface(),
-		&QObject::destroyed
-	) | rpl::start_with_next([&] {
-		instance = std::nullopt;
-	}, instance->_private->lifetime);
+	[[maybe_unused]] static const auto Inited = [] {
+		base::qt_signal_producer(
+			QGuiApplication::platformNativeInterface(),
+			&QObject::destroyed
+		) | rpl::start_with_next([] {
+			instance = std::nullopt;
+		}, instance->_private->lifetime);
+		return true;
+	}();
 	if (!instance) return nullptr;
 	return &*instance;
 }

From fc8d4d25dee6e3ded99749c06fd870e6df4615f8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Jun 2023 20:05:35 +0400
Subject: [PATCH 407/635] Add a hook into click handler activation.

---
 ui/click_handler.cpp | 5 ++++-
 ui/integration.cpp   | 6 ++++++
 ui/integration.h     | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ui/click_handler.cpp b/ui/click_handler.cpp
index f5129cb..4cb8ae2 100644
--- a/ui/click_handler.cpp
+++ b/ui/click_handler.cpp
@@ -8,6 +8,7 @@
 
 #include "base/algorithm.h"
 #include "ui/text/text_entity.h"
+#include "ui/integration.h"
 
 #include <QtCore/QPointer>
 
@@ -170,7 +171,9 @@ void ActivateClickHandler(
 		ClickContext context) {
 	crl::on_main(guard, [=, weak = std::weak_ptr<ClickHandler>(handler)] {
 		if (const auto strong = weak.lock()) {
-			strong->onClick(context);
+			if (Ui::Integration::Instance().allowClickHandlerActivation(strong, context)) {
+				strong->onClick(context);
+			}
 		}
 	});
 }
diff --git a/ui/integration.cpp b/ui/integration.cpp
index 495e17a..722b433 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -76,6 +76,12 @@ Fn<void()> Integration::createSpoilerRepaint(const std::any &context) {
 	return nullptr;
 }
 
+bool Integration::allowClickHandlerActivation(
+		const std::shared_ptr<ClickHandler> &handler,
+		const ClickContext &context) {
+	return true;
+}
+
 bool Integration::handleUrlClick(
 		const QString &url,
 		const QVariant &context) {
diff --git a/ui/integration.h b/ui/integration.h
index 09b4da0..93603ef 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -20,6 +20,7 @@ class QVariant;
 
 struct TextParseOptions;
 class ClickHandler;
+struct ClickContext;
 struct EntityLinkData;
 
 namespace Ui {
@@ -64,6 +65,9 @@ public:
 		const std::any &context) -> std::unique_ptr<Text::CustomEmoji>;
 	[[nodiscard]] virtual Fn<void()> createSpoilerRepaint(
 		const std::any &context);
+	[[nodiscard]] virtual bool allowClickHandlerActivation(
+		const std::shared_ptr<ClickHandler> &handler,
+		const ClickContext &context);
 
 	[[nodiscard]] virtual rpl::producer<> forcePopupMenuHideRequests();
 

From 8908c9b5c041f51176383a55e0b324588b28b68d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 19:40:11 +0400
Subject: [PATCH 408/635] Allow custom wheel event processing in ScrollArea.

---
 ui/widgets/scroll_area.cpp | 11 ++++++++++-
 ui/widgets/scroll_area.h   |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/scroll_area.cpp b/ui/widgets/scroll_area.cpp
index bb63b0c..1c1ed76 100644
--- a/ui/widgets/scroll_area.cpp
+++ b/ui/widgets/scroll_area.cpp
@@ -490,12 +490,21 @@ bool ScrollArea::eventFilter(QObject *obj, QEvent *e) {
 }
 
 bool ScrollArea::viewportEvent(QEvent *e) {
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
+	const auto type = e->type();
+	if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate
+		|| type == QEvent::TouchEnd
+		|| type == QEvent::TouchCancel) {
 		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
 		if (_touchEnabled && ev->device()->type() == base::TouchDevice::TouchScreen) {
 			touchEvent(ev);
 			return true;
 		}
+	} else if (type == QEvent::Wheel) {
+		if (_customWheelProcess
+			&& _customWheelProcess(static_cast<QWheelEvent*>(e))) {
+			return true;
+		}
 	}
 	return QScrollArea::viewportEvent(e);
 }
diff --git a/ui/widgets/scroll_area.h b/ui/widgets/scroll_area.h
index 03692a6..8df7e30 100644
--- a/ui/widgets/scroll_area.h
+++ b/ui/widgets/scroll_area.h
@@ -172,6 +172,10 @@ public:
 	void scrolled();
 	void innerResized();
 
+	void setCustomWheelProcess(Fn<bool(not_null<QWheelEvent*>)> process) {
+		_customWheelProcess = std::move(process);
+	}
+
 	[[nodiscard]] rpl::producer<> scrolls() const;
 	[[nodiscard]] rpl::producer<> innerResizes() const;
 	[[nodiscard]] rpl::producer<> geometryChanged() const;
@@ -227,6 +231,7 @@ private:
 	crl::time _touchTime = 0;
 	base::Timer _touchScrollTimer;
 
+	Fn<bool(not_null<QWheelEvent*>)> _customWheelProcess;
 	bool _widgetAcceptsTouch = false;
 
 	object_ptr<QWidget> _widget = { nullptr };

From 6fe9e0838685b0a799057a9218c4beca0cd7c52e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 27 Jun 2023 21:25:16 +0400
Subject: [PATCH 409/635] Allow custom touch event processing in scroll area.

---
 ui/widgets/scroll_area.cpp | 66 +++++++++++++++++++++++---------------
 ui/widgets/scroll_area.h   |  8 +++--
 2 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/ui/widgets/scroll_area.cpp b/ui/widgets/scroll_area.cpp
index 1c1ed76..8fcee09 100644
--- a/ui/widgets/scroll_area.cpp
+++ b/ui/widgets/scroll_area.cpp
@@ -475,32 +475,27 @@ void ScrollArea::touchResetSpeed() {
 	_touchPrevPosValid = false;
 }
 
-bool ScrollArea::eventFilter(QObject *obj, QEvent *e) {
-	bool res = QScrollArea::eventFilter(obj, e);
-	if (e->type() == QEvent::TouchBegin || e->type() == QEvent::TouchUpdate || e->type() == QEvent::TouchEnd || e->type() == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
-		if (_touchEnabled && ev->device()->type() == base::TouchDevice::TouchScreen) {
-			if (obj == widget()) {
-				touchEvent(ev);
-				return true;
-			}
-		}
+bool ScrollArea::eventHook(QEvent *e) {
+	const auto was = (e->type() == QEvent::LayoutRequest)
+		? verticalScrollBar()->minimum()
+		: 0;
+	const auto result = RpWidgetBase<QScrollArea>::eventHook(e);
+	if (was) {
+		// Because LayoutRequest resets custom-set minimum allowed value.
+		verticalScrollBar()->setMinimum(was);
 	}
-	return res;
+	return result;
+}
+
+bool ScrollArea::eventFilter(QObject *obj, QEvent *e) {
+	const auto result = QScrollArea::eventFilter(obj, e);
+	return (obj == widget() && filterOutTouchEvent(e)) || result;
 }
 
 bool ScrollArea::viewportEvent(QEvent *e) {
-	const auto type = e->type();
-	if (type == QEvent::TouchBegin
-		|| type == QEvent::TouchUpdate
-		|| type == QEvent::TouchEnd
-		|| type == QEvent::TouchCancel) {
-		QTouchEvent *ev = static_cast<QTouchEvent*>(e);
-		if (_touchEnabled && ev->device()->type() == base::TouchDevice::TouchScreen) {
-			touchEvent(ev);
-			return true;
-		}
-	} else if (type == QEvent::Wheel) {
+	if (filterOutTouchEvent(e)) {
+		return true;
+	} else if (e->type() == QEvent::Wheel) {
 		if (_customWheelProcess
 			&& _customWheelProcess(static_cast<QWheelEvent*>(e))) {
 			return true;
@@ -509,6 +504,24 @@ bool ScrollArea::viewportEvent(QEvent *e) {
 	return QScrollArea::viewportEvent(e);
 }
 
+bool ScrollArea::filterOutTouchEvent(QEvent *e) {
+	const auto type = e->type();
+	if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate
+		|| type == QEvent::TouchEnd
+		|| type == QEvent::TouchCancel) {
+		const auto ev = static_cast<QTouchEvent*>(e);
+		if (_customTouchProcess && _customTouchProcess(ev)) {
+			return true;
+		} else if (_touchEnabled
+			&& ev->device()->type() == base::TouchDevice::TouchScreen) {
+			touchEvent(ev);
+			return true;
+		}
+	}
+	return false;
+}
+
 void ScrollArea::touchEvent(QTouchEvent *e) {
 	if (!e->touchPoints().isEmpty()) {
 		_touchPrevPos = _touchPos;
@@ -624,9 +637,12 @@ void ScrollArea::scrollContentsBy(int dx, int dy) {
 }
 
 bool ScrollArea::touchScroll(const QPoint &delta) {
-	int32 scTop = scrollTop(), scMax = scrollTopMax(), scNew = std::clamp(scTop - delta.y(), 0, scMax);
-	if (scNew == scTop) return false;
-
+	const auto scTop = scrollTop();
+	const auto scMax = scrollTopMax();
+	const auto scNew = std::clamp(scTop - delta.y(), 0, scMax);
+	if (scNew == scTop) {
+		return false;
+	}
 	scrollToY(scNew);
 	return true;
 }
diff --git a/ui/widgets/scroll_area.h b/ui/widgets/scroll_area.h
index 8df7e30..b1d03a2 100644
--- a/ui/widgets/scroll_area.h
+++ b/ui/widgets/scroll_area.h
@@ -175,12 +175,16 @@ public:
 	void setCustomWheelProcess(Fn<bool(not_null<QWheelEvent*>)> process) {
 		_customWheelProcess = std::move(process);
 	}
+	void setCustomTouchProcess(Fn<bool(not_null<QTouchEvent*>)> process) {
+		_customTouchProcess = std::move(process);
+	}
 
 	[[nodiscard]] rpl::producer<> scrolls() const;
 	[[nodiscard]] rpl::producer<> innerResizes() const;
 	[[nodiscard]] rpl::producer<> geometryChanged() const;
 
 protected:
+	bool eventHook(QEvent *e) override;
 	bool eventFilter(QObject *obj, QEvent *e) override;
 
 	void resizeEvent(QResizeEvent *e) override;
@@ -197,8 +201,7 @@ private:
 	void doSetOwnedWidget(object_ptr<QWidget> widget);
 	object_ptr<QWidget> doTakeWidget();
 
-	void setWidget(QWidget *widget);
-
+	bool filterOutTouchEvent(QEvent *e);
 	void touchScrollTimer();
 	bool touchScroll(const QPoint &delta);
 	void touchScrollUpdated(const QPoint &screenPos);
@@ -232,6 +235,7 @@ private:
 	base::Timer _touchScrollTimer;
 
 	Fn<bool(not_null<QWheelEvent*>)> _customWheelProcess;
+	Fn<bool(not_null<QTouchEvent*>)> _customTouchProcess;
 	bool _widgetAcceptsTouch = false;
 
 	object_ptr<QWidget> _widget = { nullptr };

From a6d472ee686dd5465d3e1ab58bea11a21d0dd24a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 28 Jun 2023 15:04:56 +0400
Subject: [PATCH 410/635] Ignore touchpad touch events, on macOS unreliable.

---
 ui/widgets/scroll_area.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/widgets/scroll_area.cpp b/ui/widgets/scroll_area.cpp
index 8fcee09..f885147 100644
--- a/ui/widgets/scroll_area.cpp
+++ b/ui/widgets/scroll_area.cpp
@@ -9,6 +9,7 @@
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "base/qt/qt_common_adapters.h"
+#include "base/debug_log.h"
 
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QApplication>
@@ -511,12 +512,13 @@ bool ScrollArea::filterOutTouchEvent(QEvent *e) {
 		|| type == QEvent::TouchEnd
 		|| type == QEvent::TouchCancel) {
 		const auto ev = static_cast<QTouchEvent*>(e);
-		if (_customTouchProcess && _customTouchProcess(ev)) {
-			return true;
-		} else if (_touchEnabled
-			&& ev->device()->type() == base::TouchDevice::TouchScreen) {
-			touchEvent(ev);
-			return true;
+		if (ev->device()->type() == base::TouchDevice::TouchScreen) {
+			if (_customTouchProcess && _customTouchProcess(ev)) {
+				return true;
+			} else if (_touchEnabled) {
+				touchEvent(ev);
+				return true;
+			}
 		}
 	}
 	return false;

From 855f8f7b75f83127642eb5bbb1457f2087b3f1de Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 28 Jun 2023 18:52:50 +0400
Subject: [PATCH 411/635] Implement custom scrolling using DirectManipulation.

Use it in Ui::RpWindow. This is an experiment.

Thanks Chromium and Firefox.
---
 CMakeLists.txt                                |   6 +
 ui/platform/win/ui_window_win.cpp             |  51 ++
 ui/platform/win/ui_window_win.h               |   5 +
 .../win/ui_windows_direct_manipulation.cpp    | 439 ++++++++++++++++++
 .../win/ui_windows_direct_manipulation.h      |  71 +++
 5 files changed, 572 insertions(+)
 create mode 100644 ui/platform/win/ui_windows_direct_manipulation.cpp
 create mode 100644 ui/platform/win/ui_windows_direct_manipulation.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09d3900..e0d6636 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,8 @@ PRIVATE
     ui/platform/win/ui_window_title_win.h
     ui/platform/win/ui_window_win.cpp
     ui/platform/win/ui_window_win.h
+    ui/platform/win/ui_windows_direct_manipulation.cpp
+    ui/platform/win/ui_windows_direct_manipulation.h
     ui/platform/win/ui_utility_win.cpp
     ui/platform/win/ui_utility_win.h
     ui/platform/ui_platform_window_title.cpp
@@ -294,6 +296,10 @@ if (NOT DESKTOP_APP_USE_PACKAGED_FONTS)
     nice_target_sources(lib_ui ${src_loc} PRIVATE fonts/fonts.qrc)
 endif()
 
+if (WIN32)
+    nuget_add_winrt(lib_ui)
+endif()
+
 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
     remove_target_sources(lib_ui ${src_loc} ui/platform/linux/ui_linux_wayland_integration.cpp)
 elseif(LINUX)
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 53c0068..c691ef2 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -8,6 +8,7 @@
 
 #include "ui/inactive_press.h"
 #include "ui/platform/win/ui_window_title_win.h"
+#include "ui/platform/win/ui_windows_direct_manipulation.h"
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/widgets/rp_window.h"
 #include "base/platform/win/base_windows_safe_library.h"
@@ -19,6 +20,7 @@
 #include "styles/style_widgets.h"
 
 #include <QtCore/QAbstractNativeEventFilter>
+#include <QtCore/QPoint>
 #include <QtGui/QWindow>
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QApplication>
@@ -30,6 +32,8 @@
 
 Q_DECLARE_METATYPE(QMargins);
 
+bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event);
+
 namespace Ui::Platform {
 namespace {
 
@@ -402,6 +406,46 @@ void WindowHelper::init() {
 		handleStateChanged);
 
 	initialShadowUpdate();
+
+	auto dm = std::make_unique<DirectManipulation>(window());
+	if (dm->valid()) {
+		_directManipulation = std::move(dm);
+		_directManipulation->events(
+		) | rpl::start_with_next([=](const DirectManipulationEvent &event) {
+			handleDirectManipulationEvent(event);
+		}, window()->lifetime());
+	}
+}
+
+void WindowHelper::handleDirectManipulationEvent(
+		const DirectManipulationEvent &event) {
+	using Type = DirectManipulationEventType;
+	const auto send = [&](Qt::ScrollPhase phase) {
+		if (const auto windowHandle = window()->windowHandle()) {
+			const auto global = QCursor::pos();
+			const auto local = windowHandle->mapFromGlobal(global);
+			auto e = QWheelEvent(
+				QPointF(local),
+				QPointF(global),
+				event.delta,
+				event.delta,
+				QGuiApplication::mouseButtons(),
+				QGuiApplication::keyboardModifiers(),
+				phase,
+				false,
+				Qt::MouseEventSynthesizedByApplication);
+			e.setTimestamp(crl::now());
+			qt_sendSpontaneousEvent(windowHandle, &e);
+		}
+	};
+	switch (event.type) {
+	case Type::ScrollStart: send(Qt::ScrollBegin); break;
+	case Type::Scroll: send(Qt::ScrollUpdate); break;
+	case Type::FlingStart:
+	case Type::Fling: send(Qt::ScrollMomentum); break;
+	case Type::ScrollStop: send(Qt::ScrollEnd); break;
+	case Type::FlingStop: send(Qt::ScrollEnd); break;
+	}
 }
 
 bool WindowHelper::handleNativeEvent(
@@ -622,6 +666,13 @@ bool WindowHelper::handleNativeEvent(
 		});
 	} return false;
 
+	case DM_POINTERHITTEST: {
+		if (_directManipulation) {
+			_directManipulation->handlePointerHitTest(wParam);
+			return true;
+		}
+	} return false;
+
 	}
 	return false;
 }
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index d29fc11..490d87d 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -17,6 +17,8 @@ namespace Platform {
 class TitleWidget;
 struct HitTestRequest;
 enum class HitTestResult;
+class DirectManipulation;
+struct DirectManipulationEvent;
 
 class WindowHelper final : public BasicWindowHelper {
 public:
@@ -55,6 +57,8 @@ private:
 	void initialShadowUpdate();
 	void updateCornersRounding();
 	void fixMaximizedWindow();
+	void handleDirectManipulationEvent(
+		const DirectManipulationEvent &event);
 	[[nodiscard]] bool handleNativeEvent(
 		UINT msg,
 		WPARAM wParam,
@@ -75,6 +79,7 @@ private:
 	const HWND _handle = nullptr;
 	const not_null<TitleWidget*> _title;
 	const not_null<RpWidget*> _body;
+	std::unique_ptr<DirectManipulation> _directManipulation;
 	rpl::event_stream<not_null<HitTestRequest*>> _hitTestRequests;
 	rpl::event_stream<HitTestResult> _systemButtonOver;
 	rpl::event_stream<HitTestResult> _systemButtonDown;
diff --git a/ui/platform/win/ui_windows_direct_manipulation.cpp b/ui/platform/win/ui_windows_direct_manipulation.cpp
new file mode 100644
index 0000000..8f24c93
--- /dev/null
+++ b/ui/platform/win/ui_windows_direct_manipulation.cpp
@@ -0,0 +1,439 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/platform/win/ui_windows_direct_manipulation.h"
+
+#include "base/integration.h"
+#include "base/platform/base_platform_info.h"
+#include "ui/rp_widget.h"
+#include "ui/platform/win/ui_window_win.h"
+
+namespace Ui::Platform {
+
+class DirectManipulation::Handler
+	: public IDirectManipulationViewportEventHandler
+	, public IDirectManipulationInteractionEventHandler {
+public:
+	Handler();
+
+	void setViewportSize(QSize size);
+
+	HRESULT STDMETHODCALLTYPE QueryInterface(
+		REFIID iid,
+		void **ppv) override;
+
+	ULONG STDMETHODCALLTYPE AddRef() override {
+		return ++_ref;
+	}
+	ULONG STDMETHODCALLTYPE Release() override {
+		if (--_ref == 0) {
+			delete this;
+			return 0;
+		}
+		return _ref;
+	}
+
+	[[nodiscard]] rpl::producer<bool> interacting() const {
+		return _interacting.value();
+	}
+	[[nodiscard]] rpl::producer<Event> events() const {
+		return _events.events();
+	}
+
+private:
+	~Handler();
+
+	enum class State {
+		None,
+		Scroll,
+		Fling,
+		Pinch,
+	};
+
+	void transitionToState(State state);
+
+	HRESULT STDMETHODCALLTYPE OnViewportStatusChanged(
+		_In_ IDirectManipulationViewport* viewport,
+		_In_ DIRECTMANIPULATION_STATUS current,
+		_In_ DIRECTMANIPULATION_STATUS previous) override;
+
+	HRESULT STDMETHODCALLTYPE OnViewportUpdated(
+		_In_ IDirectManipulationViewport *viewport) override;
+
+	HRESULT STDMETHODCALLTYPE OnContentUpdated(
+		_In_ IDirectManipulationViewport *viewport,
+		_In_ IDirectManipulationContent *content) override;
+
+	HRESULT STDMETHODCALLTYPE OnInteraction(
+		_In_ IDirectManipulationViewport2 *viewport,
+		_In_ DIRECTMANIPULATION_INTERACTION_TYPE interaction) override;
+
+	State _state = State::None;
+	int _width = 0;
+	int _height = 0;
+	rpl::variable<bool> _interacting = false;
+	rpl::event_stream<Event> _events;
+	float _scale = 1.0f;
+	float _xOffset = 0.f;
+	float _yOffset = 0.f;
+	bool _pendingScrollBegin = false;
+
+	std::atomic<ULONG> _ref = 1;
+
+};
+
+DirectManipulation::Handler::Handler() {
+}
+
+DirectManipulation::Handler::~Handler() {
+}
+
+void DirectManipulation::Handler::setViewportSize(QSize size) {
+	_width = size.width();
+	_height = size.height();
+}
+
+STDMETHODIMP DirectManipulation::Handler::QueryInterface(
+		REFIID iid,
+		void **ppv) {
+	const IID IID_IDirectManipulationViewportEventHandler =
+		__uuidof(IDirectManipulationViewportEventHandler);
+	const IID IID_IDirectManipulationInteractionEventHandler =
+		__uuidof(IDirectManipulationInteractionEventHandler);
+
+	if ((IID_IUnknown == iid) ||
+		(IID_IDirectManipulationViewportEventHandler == iid)) {
+		*ppv = static_cast<IDirectManipulationViewportEventHandler*>(this);
+		AddRef();
+		return S_OK;
+	}
+	if (IID_IDirectManipulationInteractionEventHandler == iid) {
+		*ppv = static_cast<IDirectManipulationInteractionEventHandler*>(
+			this);
+		AddRef();
+		return S_OK;
+	}
+
+	return E_NOINTERFACE;
+}
+
+void DirectManipulation::Handler::transitionToState(State state)  {
+	if (_state == state) {
+		return;
+	}
+
+	const auto was = _state;
+	_state = state;
+
+	switch (was) {
+	case State::Scroll: {
+		if (state != State::Fling) {
+			_events.fire({ .type = Event::Type::ScrollStop });
+		}
+	} break;
+	case State::Fling: {
+		_events.fire({ .type = Event::Type::FlingStop });
+	} break;
+	case State::Pinch: {
+		// _events.fire({ .type = Event::Type::PinchStop });
+	} break;
+	}
+
+	switch (state) {
+	case State::Scroll: {
+		_pendingScrollBegin = true;
+	} break;
+	case State::Fling: {
+		Assert(was == State::Scroll);
+		_events.fire({ .type = Event::Type::FlingStart });
+	} break;
+	case State::Pinch: {
+		//_events.fire({ .type = Event::Type::PinchStart });
+	} break;
+	}
+}
+
+HRESULT DirectManipulation::Handler::OnViewportStatusChanged(
+		IDirectManipulationViewport *viewport,
+		DIRECTMANIPULATION_STATUS current,
+		DIRECTMANIPULATION_STATUS previous) {
+	Expects(viewport != nullptr);
+
+	if (current == previous) {
+		return S_OK;
+	} else if (current == DIRECTMANIPULATION_INERTIA) {
+		if (previous != DIRECTMANIPULATION_RUNNING
+			|| _state != State::Scroll) {
+			return S_OK;
+		}
+		transitionToState(State::Fling);
+	}
+
+	if (current == DIRECTMANIPULATION_RUNNING) {
+		if (previous == DIRECTMANIPULATION_INERTIA) {
+			transitionToState(State::None);
+		}
+	}
+
+	if (current != DIRECTMANIPULATION_READY) {
+		return S_OK;
+	}
+
+	if (_scale != 1.0f || _xOffset != 0. || _yOffset != 0.) {
+		const auto hr = viewport->ZoomToRect(0, 0, _width, _height, FALSE);
+		if (!SUCCEEDED(hr)) {
+			return hr;
+		}
+	}
+
+	_scale = 1.0f;
+	_xOffset = 0.0f;
+	_yOffset = 0.0f;
+
+	transitionToState(State::None);
+
+	return S_OK;
+}
+
+HRESULT DirectManipulation::Handler::OnViewportUpdated(
+		IDirectManipulationViewport *viewport) {
+	return S_OK;
+}
+
+HRESULT DirectManipulation::Handler::OnContentUpdated(
+		IDirectManipulationViewport *viewport,
+		IDirectManipulationContent *content) {
+	Expects(viewport != nullptr);
+	Expects(content != nullptr);
+
+	float xform[6];
+	const auto hr = content->GetContentTransform(xform, ARRAYSIZE(xform));
+	if (!SUCCEEDED(hr)) {
+		return hr;
+	}
+
+	float scale = xform[0];
+	float xOffset = xform[4];
+	float yOffset = xform[5];
+
+	if (scale == 0.0f) {
+		return hr;
+	} else if (qFuzzyCompare(scale, _scale)
+		&& xOffset == _xOffset
+		&& yOffset == _yOffset) {
+		return hr;
+	}
+	if (qFuzzyCompare(scale, 1.0f)) {
+		if (_state == State::None) {
+			transitionToState(State::Scroll);
+		}
+	} else {
+		transitionToState(State::Pinch);
+	}
+
+	auto getIntDeltaPart = [](float &was, float now) {
+		if (was < now) {
+			const auto result = std::floor(now - was);
+			was += result;
+			return int(result);
+		} else {
+			const auto result = std::floor(was - now);
+			was -= result;
+			return -int(result);
+		}
+	};
+	const auto d = QPoint(
+		getIntDeltaPart(_xOffset, xOffset),
+		getIntDeltaPart(_yOffset, yOffset));
+	if ((_state == State::Scroll || _state == State::Fling) && d.isNull()) {
+		return S_OK;
+	}
+	if (_state == State::Scroll) {
+		if (_pendingScrollBegin) {
+			_events.fire({ .type = Event::Type::ScrollStart, .delta = d });
+			_pendingScrollBegin = false;
+		} else {
+			_events.fire({ .type = Event::Type::Scroll, .delta = d });
+		}
+	} else if (_state == State::Fling) {
+		_events.fire({ .type = Event::Type::Fling, .delta = d });
+	} else {
+		//_events.fire({ .type = Event::Type::Pinch, .delta = ... });
+	}
+	_scale = scale;
+
+	return hr;
+}
+
+HRESULT DirectManipulation::Handler::OnInteraction(
+		IDirectManipulationViewport2 *viewport,
+		DIRECTMANIPULATION_INTERACTION_TYPE interaction) {
+	if (interaction == DIRECTMANIPULATION_INTERACTION_BEGIN) {
+		_interacting = true;
+	} else if (interaction == DIRECTMANIPULATION_INTERACTION_END) {
+		_interacting = false;
+	}
+	return S_OK;
+}
+
+DirectManipulation::DirectManipulation(not_null<RpWidget*> widget)
+: _handle(GetWindowHandle(widget))
+, _interacting([=] { _updateManager->Update(nullptr); }) {
+	if (!init(widget)) {
+		destroy();
+	}
+}
+
+DirectManipulation::~DirectManipulation() {
+	destroy();
+}
+
+bool DirectManipulation::valid() const {
+	return _manager != nullptr;
+}
+
+bool DirectManipulation::init(not_null<RpWidget*> widget) {
+	if (!_handle || !::Platform::IsWindows10OrGreater()) {
+		return false;
+	}
+	_manager = base::WinRT::TryCreateInstance<IDirectManipulationManager>(
+		CLSID_DirectManipulationManager);
+	if (!_manager) {
+		return false;
+	}
+
+	auto hr = S_OK;
+	hr = _manager->GetUpdateManager(IID_PPV_ARGS(_updateManager.put()));
+	if (!SUCCEEDED(hr) || !_updateManager) {
+		return false;
+	}
+
+	hr = _manager->CreateViewport(
+		nullptr,
+		_handle,
+		IID_PPV_ARGS(_viewport.put()));
+	if (!SUCCEEDED(hr) || !_viewport) {
+		return false;
+	}
+
+	const auto configuration = DIRECTMANIPULATION_CONFIGURATION_INTERACTION
+		| DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X
+		| DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_Y
+		| DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_INERTIA
+		| DIRECTMANIPULATION_CONFIGURATION_RAILS_X
+		| DIRECTMANIPULATION_CONFIGURATION_RAILS_Y;
+
+	hr = _viewport->ActivateConfiguration(configuration);
+	if (!SUCCEEDED(hr)) {
+		return false;
+	}
+	hr = _viewport->SetViewportOptions(
+		DIRECTMANIPULATION_VIEWPORT_OPTIONS_MANUALUPDATE);
+	if (!SUCCEEDED(hr)) {
+		return false;
+	}
+
+	_handler.attach(new Handler());
+	_handler->interacting(
+	) | rpl::start_with_next([=](bool interacting) {
+		base::Integration::Instance().enterFromEventLoop([&] {
+			if (interacting) {
+				_interacting.start();
+			} else {
+				_interacting.stop();
+			}
+		});
+	}, _lifetime);
+
+	widget->sizeValue() | rpl::start_with_next([=](QSize size) {
+		const auto r = QRect(QPoint(), size * widget->devicePixelRatio());
+		_handler->setViewportSize(r.size());
+		const auto rect = RECT{ r.left(), r.top(), r.right(), r.bottom() };
+		_viewport->SetViewportRect(&rect);
+	}, _lifetime);
+
+	hr = _viewport->AddEventHandler(_handle, _handler.get(), &_cookie);
+	if (!SUCCEEDED(hr)) {
+		return false;
+	}
+
+	RECT rect = { 0, 0, 1024, 1024 };
+	hr = _viewport->SetViewportRect(&rect);
+	if (!SUCCEEDED(hr)) {
+		return false;
+	}
+
+	hr = _manager->Activate(_handle);
+	if (!SUCCEEDED(hr)) {
+		return false;
+	}
+
+	hr = _viewport->Enable();
+	if (!SUCCEEDED(hr)) {
+		return false;
+	}
+
+	hr = _updateManager->Update(nullptr);
+	if (!SUCCEEDED(hr)) {
+		return false;
+	}
+
+	return true;
+}
+
+auto DirectManipulation::events() const -> rpl::producer<Event> {
+	if (!_handler) {
+		return rpl::never<Event>();
+	}
+	return [events = _handler->events()](auto consumer) mutable {
+		auto result = rpl::lifetime();
+		std::move(
+			events
+		) | rpl::start_with_next([=](Event &&event) {
+			base::Integration::Instance().enterFromEventLoop([&] {
+				consumer.put_next(std::move(event));
+			});
+		}, result);
+		return result;
+	};
+}
+
+void DirectManipulation::handlePointerHitTest(WPARAM wParam) {
+	const auto id = UINT32(GET_POINTERID_WPARAM(wParam));
+	auto type = POINTER_INPUT_TYPE();
+	if (::GetPointerType(id, &type) && type == PT_TOUCHPAD) {
+		_viewport->SetContact(id);
+	}
+}
+
+void DirectManipulation::destroy() {
+	_interacting.stop();
+
+	if (_handler) {
+		_handler = nullptr;
+	}
+
+	if (_viewport) {
+		_viewport->Stop();
+		if (_cookie) {
+			_viewport->RemoveEventHandler(_cookie);
+			_cookie = 0;
+		}
+		_viewport->Abandon();
+		_viewport = nullptr;
+	}
+
+	if (_updateManager) {
+		_updateManager = nullptr;
+	}
+
+	if (_manager) {
+		_manager->Deactivate(_handle);
+		_manager = nullptr;
+	}
+}
+
+}  // namespace Ui::Platform
diff --git a/ui/platform/win/ui_windows_direct_manipulation.h b/ui/platform/win/ui_windows_direct_manipulation.h
new file mode 100644
index 0000000..22c34a0
--- /dev/null
+++ b/ui/platform/win/ui_windows_direct_manipulation.h
@@ -0,0 +1,71 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "base/platform/win/base_windows_winrt.h"
+#include "base/platform/win/base_windows_h.h"
+#include "ui/effects/animations.h"
+
+#include <QtCore/QPoint>
+
+#include <directmanipulation.h>
+
+namespace Ui {
+class RpWidget;
+} // namespace Ui
+
+namespace Ui::Platform {
+
+enum class DirectManipulationEventType {
+	ScrollStart,
+	Scroll,
+	ScrollStop,
+	FlingStart,
+	Fling,
+	FlingStop,
+};
+
+struct DirectManipulationEvent {
+	using Type = DirectManipulationEventType;
+	Type type = Type ();
+	QPoint delta;
+};
+
+class DirectManipulation final {
+public:
+	explicit DirectManipulation(not_null<RpWidget*> widget);
+	~DirectManipulation();
+
+	[[nodiscard]] bool valid() const;
+
+	void handlePointerHitTest(WPARAM wParam);
+
+	using Event = DirectManipulationEvent;
+	[[nodiscard]] rpl::producer<Event> events() const;
+
+private:
+	class Handler;
+
+	bool init(not_null<RpWidget*> widget);
+	void destroy();
+
+	HWND _handle = nullptr;
+	winrt::com_ptr<IDirectManipulationManager> _manager;
+	winrt::com_ptr<IDirectManipulationUpdateManager> _updateManager;
+	winrt::com_ptr<IDirectManipulationViewport> _viewport;
+	winrt::com_ptr<Handler> _handler;
+	DWORD _cookie = 0;
+	//bool has_animation_observer_ = false;
+
+	Ui::Animations::Basic _interacting;
+	rpl::event_stream<Event> _events;
+	rpl::lifetime _lifetime;
+
+};
+
+
+} // namespace Ui::Platform

From ed00cd28098e1b04979e7b2dd3a582b7a8a6713a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Jun 2023 14:48:04 +0400
Subject: [PATCH 412/635] Allow Text::String constructor with entitites.

---
 ui/text/text.cpp | 11 +++++++++++
 ui/text/text.h   |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index f2f6a69..cb0ffab 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -162,6 +162,17 @@ String::String(
 	setText(st, text, options);
 }
 
+String::String(
+	const style::TextStyle &st,
+	const TextWithEntities &textWithEntities,
+	const TextParseOptions &options,
+	int32 minResizeWidth,
+	const std::any &context)
+: _minResizeWidth(minResizeWidth) {
+	setMarkedText(st, textWithEntities, options, context);
+}
+
+
 String::String(String &&other) = default;
 
 String &String::operator=(String &&other) = default;
diff --git a/ui/text/text.h b/ui/text/text.h
index ab39c25..809f926 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -157,6 +157,12 @@ public:
 		const QString &text,
 		const TextParseOptions &options = kDefaultTextOptions,
 		int32 minResizeWidth = QFIXED_MAX);
+	String(
+		const style::TextStyle &st,
+		const TextWithEntities &textWithEntities,
+		const TextParseOptions &options = kMarkupTextOptions,
+		int32 minResizeWidth = QFIXED_MAX,
+		const std::any &context = {});
 	String(String &&other);
 	String &operator=(String &&other);
 	~String();

From 08f80548668df2737905365b254624055642b937 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 29 Jun 2023 20:48:38 +0400
Subject: [PATCH 413/635] Use QWindowSystemInterface::handleWheelEvent.

---
 ui/platform/win/ui_window_win.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index c691ef2..e434525 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -25,6 +25,7 @@
 #include <QtWidgets/QStyleFactory>
 #include <QtWidgets/QApplication>
 #include <qpa/qplatformnativeinterface.h>
+#include <qpa/qwindowsysteminterface.h>
 
 #include <dwmapi.h>
 #include <uxtheme.h>
@@ -32,8 +33,6 @@
 
 Q_DECLARE_METATYPE(QMargins);
 
-bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event);
-
 namespace Ui::Platform {
 namespace {
 
@@ -422,20 +421,19 @@ void WindowHelper::handleDirectManipulationEvent(
 	using Type = DirectManipulationEventType;
 	const auto send = [&](Qt::ScrollPhase phase) {
 		if (const auto windowHandle = window()->windowHandle()) {
-			const auto global = QCursor::pos();
-			const auto local = windowHandle->mapFromGlobal(global);
-			auto e = QWheelEvent(
-				QPointF(local),
-				QPointF(global),
+			auto global = POINT();
+			::GetCursorPos(&global);
+			auto local = global;
+			::ScreenToClient(_handle, &local);
+			QWindowSystemInterface::handleWheelEvent(
+				windowHandle,
+				QPointF(local.x, local.y),
+				QPointF(global.x, global.y),
 				event.delta,
 				event.delta,
-				QGuiApplication::mouseButtons(),
 				QGuiApplication::keyboardModifiers(),
 				phase,
-				false,
-				Qt::MouseEventSynthesizedByApplication);
-			e.setTimestamp(crl::now());
-			qt_sendSpontaneousEvent(windowHandle, &e);
+				Qt::MouseEventSynthesizedBySystem);
 		}
 	};
 	switch (event.type) {

From 67dc933d72fa5e20e6480bbff5a88a2c52d9d0d0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 15:24:37 +0400
Subject: [PATCH 414/635] Move InfoTopBar to the child project styles.

---
 ui/widgets/widgets.style | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 921040e..cd85819 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1272,23 +1272,6 @@ SearchFieldRow {
 	fieldCancelSkip: pixels;
 }
 
-InfoTopBar {
-	height: pixels;
-	back: IconButton;
-	title: FlatLabel;
-	titlePosition: point;
-	bg: color;
-	mediaCancel: IconButton;
-	mediaActionsSkip: pixels;
-	mediaForward: IconButton;
-	mediaDelete: IconButton;
-	search: IconButton;
-	searchRow: SearchFieldRow;
-	highlightBg: color;
-	highlightDuration: int;
-	radius: pixels;
-}
-
 LevelMeter {
 	height: pixels;
 	lineWidth: pixels;

From c3aab1bd141101c32393edc07032113ae4f1122a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 30 Jun 2023 21:12:21 +0400
Subject: [PATCH 415/635] Allow disabling spoilers / emoji in FlatLabel.

---
 ui/widgets/labels.cpp |  7 +++++++
 ui/widgets/labels.h   | 11 ++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index a6a8fac..902b9c4 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -962,6 +962,9 @@ void FlatLabel::paintEvent(QPaintEvent *e) {
 		: _st.maxHeight
 		? qMax(_st.maxHeight / lineHeight, 1)
 		: ((height() / lineHeight) + 2);
+	const auto paused = _animationsPausedCallback
+		? _animationsPausedCallback()
+		: WhichAnimationsPaused::None;
 	_text.draw(p, {
 		.position = { textLeft, _st.margin.top() },
 		.availableWidth = textWidth,
@@ -970,6 +973,10 @@ void FlatLabel::paintEvent(QPaintEvent *e) {
 		.palette = &_st.palette,
 		.spoiler = Text::DefaultSpoilerCache(),
 		.now = crl::now(),
+		.pausedEmoji = (paused == WhichAnimationsPaused::CustomEmoji
+			|| paused == WhichAnimationsPaused::All),
+		.pausedSpoiler = (paused == WhichAnimationsPaused::Spoiler
+			|| paused == WhichAnimationsPaused::All),
 		.selection = selection,
 		.elisionLines = lines,
 		.elisionBreakEverywhere = renderElided && _breakEverywhere,
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index 11735e8..fe0bf3c 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -94,7 +94,6 @@ private:
 };
 
 class FlatLabel : public RpWidget, public ClickHandlerHost {
-
 public:
 	FlatLabel(
 		QWidget *parent,
@@ -130,6 +129,15 @@ public:
 	void setContextCopyText(const QString &copyText);
 	void setBreakEverywhere(bool breakEverywhere);
 	void setTryMakeSimilarLines(bool tryMakeSimilarLines);
+	enum class WhichAnimationsPaused {
+		None,
+		CustomEmoji,
+		Spoiler,
+		All,
+	};
+	void setAnimationsPausedCallback(Fn<WhichAnimationsPaused()> callback) {
+		_animationsPausedCallback = std::move(callback);
+	}
 
 	int naturalWidth() const override;
 	QMargins getMargins() const override;
@@ -251,6 +259,7 @@ private:
 	QString _contextCopyText;
 
 	ClickHandlerFilter _clickHandlerFilter;
+	Fn<WhichAnimationsPaused()> _animationsPausedCallback;
 
 	// text selection and context menu by touch support (at least Windows Surface tablets)
 	bool _touchSelect = false;

From 6abad69ca6de8b592d23902b7bc2bf4190af2dcb Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 4 Jul 2023 10:43:34 +0400
Subject: [PATCH 416/635] Cache title controls layout value

So it's not requested on every window width change and etc...
---
 ui/platform/linux/ui_utility_linux.cpp |  3 +++
 ui/platform/mac/ui_utility_mac.mm      |  3 +++
 ui/platform/ui_platform_utility.cpp    | 29 ++++++++++++++++----------
 ui/platform/ui_platform_utility.h      |  8 ++++++-
 ui/platform/win/ui_utility_win.cpp     |  4 ++++
 5 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index aff221c..2479325 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -548,6 +548,8 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 	}
 }
 
+namespace internal {
+
 TitleControls::Layout TitleControlsLayout() {
 	[[maybe_unused]] static const auto Inited = [] {
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -634,5 +636,6 @@ TitleControls::Layout TitleControlsLayout() {
 	};
 }
 
+} // namespace internal
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 8ada998..857db1e 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -147,6 +147,8 @@ std::optional<bool> IsOverlapped(
 	return false;
 }
 
+namespace internal {
+
 TitleControls::Layout TitleControlsLayout() {
 	return TitleControls::Layout{
 		.left = {
@@ -157,5 +159,6 @@ TitleControls::Layout TitleControlsLayout() {
 	};
 }
 
+} // namespace internal
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/ui_platform_utility.cpp b/ui/platform/ui_platform_utility.cpp
index 9a5d462..cb8286d 100644
--- a/ui/platform/ui_platform_utility.cpp
+++ b/ui/platform/ui_platform_utility.cpp
@@ -8,26 +8,33 @@
 
 namespace Ui {
 namespace Platform {
+namespace internal {
 namespace {
 
-rpl::event_stream<TitleControls::Layout> TitleControlsLayoutChanges;
+auto &CachedTitleControlsLayout() {
+	using Layout = TitleControls::Layout;
+	static rpl::variable<Layout> Result = TitleControlsLayout();
+	return Result;
+};
 
 } // namespace
 
+void NotifyTitleControlsLayoutChanged() {
+	CachedTitleControlsLayout() = TitleControlsLayout();
+}
+
+} // namespace internal
+
+TitleControls::Layout TitleControlsLayout() {
+	return internal::CachedTitleControlsLayout().current();
+}
+
 rpl::producer<TitleControls::Layout> TitleControlsLayoutValue() {
-	return rpl::single(
-		TitleControlsLayout()
-	) | rpl::then(
-		TitleControlsLayoutChanged()
-	);
+	return internal::CachedTitleControlsLayout().value();
 }
 
 rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged() {
-	return TitleControlsLayoutChanges.events();
-}
-
-void NotifyTitleControlsLayoutChanged() {
-	TitleControlsLayoutChanges.fire_copy(TitleControlsLayout());
+	return internal::CachedTitleControlsLayout().changes();
 }
 
 } // namespace Platform
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index db24bcb..3def532 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -17,6 +17,13 @@ class PopupMenu;
 } // namespace Ui
 
 namespace Ui::Platform {
+namespace internal {
+
+// Actual requestor, cached by the public interface
+[[nodiscard]] TitleControls::Layout TitleControlsLayout();
+void NotifyTitleControlsLayoutChanged();
+
+} // namespace internal
 
 [[nodiscard]] bool IsApplicationActive();
 
@@ -48,7 +55,6 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 [[nodiscard]] TitleControls::Layout TitleControlsLayout();
 [[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutValue();
 [[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged();
-void NotifyTitleControlsLayoutChanged();
 
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
 
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 90b9108..bb1cc32 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -134,6 +134,8 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 		MAKELPARAM(p.x, p.y));
 }
 
+namespace internal {
+
 TitleControls::Layout TitleControlsLayout() {
 	return TitleControls::Layout{
 		.right = {
@@ -144,6 +146,8 @@ TitleControls::Layout TitleControlsLayout() {
 	};
 }
 
+} // namespace internal
+
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
 	// Windows native emoji selector, that can be called by Win+. shortcut,
 	// is behaving strangely within an input field in a popup menu.

From d431d803c8b347c192d1bc9b6a206d2622a10748 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 5 Jul 2023 12:55:05 +0400
Subject: [PATCH 417/635] Allow a more customized round checkbox.

---
 ui/widgets/widgets.style | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index cd85819..4517138 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -370,6 +370,7 @@ RoundCheckbox {
 }
 
 RoundImageCheckbox {
+	selectExtendTwice: pixels;
 	imageRadius: pixels;
 	imageSmallRadius: pixels;
 	selectWidth: pixels;
@@ -1062,6 +1063,7 @@ defaultPeerListCheck: RoundCheckbox(defaultRoundCheckbox) {
 	check: defaultPeerListCheckIcon;
 }
 defaultPeerListCheckbox: RoundImageCheckbox {
+	selectExtendTwice: 0px;
 	imageRadius: 21px;
 	imageSmallRadius: 18px;
 	selectWidth: 2px;

From 7135f3ed87ee1a6d89cebe6510a2250ffedfb1a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 7 Jul 2023 22:48:36 +0400
Subject: [PATCH 418/635] First attempt to implement Ui::ElasticScroll.

---
 CMakeLists.txt                |   2 +
 ui/widgets/elastic_scroll.cpp | 982 ++++++++++++++++++++++++++++++++++
 ui/widgets/elastic_scroll.h   | 229 ++++++++
 ui/widgets/widgets.style      |   1 +
 4 files changed, 1214 insertions(+)
 create mode 100644 ui/widgets/elastic_scroll.cpp
 create mode 100644 ui/widgets/elastic_scroll.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0d6636..5f7bc3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,6 +221,8 @@ PRIVATE
     ui/widgets/menu/menu_separator.h
     ui/widgets/menu/menu_toggle.cpp
     ui/widgets/menu/menu_toggle.h
+    ui/widgets/elastic_scroll.cpp
+    ui/widgets/elastic_scroll.h
     ui/widgets/popup_menu.cpp
     ui/widgets/popup_menu.h
     ui/widgets/rp_window.cpp
diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
new file mode 100644
index 0000000..adbbc49
--- /dev/null
+++ b/ui/widgets/elastic_scroll.cpp
@@ -0,0 +1,982 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/widgets/elastic_scroll.h"
+
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "base/platform/base_platform_info.h"
+#include "base/qt/qt_common_adapters.h"
+#include "styles/style_widgets.h"
+
+#include <QtGui/QWindow>
+#include <QtWidgets/QApplication>
+
+namespace Ui {
+namespace {
+
+constexpr auto kOverscrollReturnDuration = crl::time(250);
+constexpr auto kOverscrollPower = 0.6;
+
+} // namespace
+
+// Flick scroll taken from
+// http://qt-project.org/doc/qt-4.8
+// /demos-embedded-anomaly-src-flickcharm-cpp.html
+
+ElasticScrollBar::ElasticScrollBar(
+	QWidget *parent,
+	const style::ScrollArea &st,
+	Qt::Orientation orientation)
+: RpWidget(parent)
+, _st(st)
+, _hideTimer([=] { toggle(false); })
+, _shown(!_st.hiding)
+, _vertical(orientation == Qt::Vertical) {
+}
+
+void ElasticScrollBar::refreshGeometry() {
+	update();
+	const auto skip = _st.deltax;
+	const auto fullSkip = _st.deltat + _st.deltab;
+	const auto extSize = _vertical ? height() : width();
+	const auto thickness = (_vertical ? width() : height()) - 2 * skip;
+	const auto minSize = fullSkip + 2 * thickness;
+	if (_state.fullSize <= 0
+		|| _state.visibleFrom >= _state.visibleTill
+		|| extSize < minSize) {
+		_bar = _area = QRect();
+		hide();
+		return;
+	}
+	const auto available = extSize - fullSkip;
+	const auto scale = [&](int value) {
+		return (available * value) / _state.fullSize;
+	};
+
+	_area = _vertical
+		? QRect(skip, _st.deltat, thickness, available)
+		: QRect(_st.deltat, skip, available, thickness);
+	const auto barMin = std::min(st::scrollBarMin, available / 2);
+	const auto barWanted = scale(_state.visibleTill - _state.visibleFrom);
+	if (barWanted >= available) {
+		_bar = _area = QRect();
+		hide();
+		return;
+	}
+	const auto bar = std::max(barMin, barWanted);
+	const auto barFrom = scale(_state.visibleFrom);
+	const auto barTill = barFrom + bar;
+	const auto cutFrom = std::clamp(barFrom, 0, available - thickness);
+	const auto cutTill = std::clamp(barTill, thickness, available);
+	const auto cutBar = cutTill - cutFrom;
+	_bar = _vertical
+		? QRect(_area.x(), _area.y() + cutFrom, _area.width(), cutBar)
+		: QRect(_area.x() + cutFrom, _area.y(), cutBar, _area.height());
+	if (isHidden()) {
+		show();
+	}
+}
+
+bool ElasticScrollBar::barHighlighted() const {
+	return _overBar || _dragging;
+}
+
+void ElasticScrollBar::toggle(bool shown, anim::type animated) {
+	const auto instant = (animated == anim::type::instant);
+	const auto changed = (_shown != shown);
+	_shown = shown;
+	if (instant) {
+		_shownAnimation.stop();
+	}
+	if (_shown && _st.hiding) {
+		_hideTimer.callOnce(_st.hiding);
+	}
+	if (changed && !instant) {
+		_shownAnimation.start(
+			[=] { update(); },
+			_shown ? 0. : 1.,
+			_shown ? 1. : 0.,
+			_st.duration);
+	}
+	update();
+}
+
+void ElasticScrollBar::toggleOver(bool over, anim::type animated) {
+	const auto instant = (animated == anim::type::instant);
+	const auto changed = (_over != over);
+	_over = over;
+	if (instant) {
+		_overAnimation.stop();
+	}
+	if (!instant && changed) {
+		_overAnimation.start(
+			[=] { update(); },
+			_over ? 0. : 1.,
+			_over ? 1. : 0.,
+			_st.duration);
+	}
+	update();
+}
+
+void ElasticScrollBar::toggleOverBar(bool over, anim::type animated) {
+	const auto instant = (animated == anim::type::instant);
+	const auto wasHighlight = barHighlighted();
+	_overBar = over;
+	if (instant) {
+		_barHighlightAnimation.stop();
+	} else {
+		startBarHighlightAnimation(wasHighlight);
+	}
+	update();
+}
+
+void ElasticScrollBar::toggleDragging(bool dragging, anim::type animated) {
+	const auto instant = (animated == anim::type::instant);
+	const auto wasHighlight = barHighlighted();
+	_dragging = dragging;
+	if (instant) {
+		_barHighlightAnimation.stop();
+	} else {
+		startBarHighlightAnimation(wasHighlight);
+	}
+	update();
+}
+
+void ElasticScrollBar::startBarHighlightAnimation(bool wasHighlighted) {
+	if (barHighlighted() == wasHighlighted) {
+		return;
+	}
+	const auto highlighted = !wasHighlighted;
+	_barHighlightAnimation.start(
+		[=] { update(); },
+		highlighted ? 0. : 1.,
+		highlighted ? 1. : 0.,
+		_st.duration);
+}
+
+rpl::producer<int> ElasticScrollBar::visibleFromDragged() const {
+	return _visibleFromDragged.events();
+}
+
+void ElasticScrollBar::updateState(ScrollState state) {
+	if (_state != state) {
+		_state = state;
+		refreshGeometry();
+		toggle(true);
+	}
+}
+
+void ElasticScrollBar::paintEvent(QPaintEvent *e) {
+	if (_bar.isEmpty()) {
+		hide();
+		return;
+	}
+	const auto barHighlight = _barHighlightAnimation.value(
+		barHighlighted() ? 1. : 0.);
+	const auto over = std::max(
+		_overAnimation.value(_over ? 1. : 0.),
+		barHighlight);
+	const auto shown = std::max(
+		_shownAnimation.value(_shown ? 1. : 0.),
+		over);
+	if (shown < 1. / 255) {
+		return;
+	}
+	QPainter p(this);
+	p.setPen(Qt::NoPen);
+	auto bg = anim::color(_st.bg, _st.bgOver, over);
+	bg.setAlpha(anim::interpolate(0, bg.alpha(), shown));
+	auto bar = anim::color(_st.barBg, _st.barBgOver, barHighlight);
+	bar.setAlpha(anim::interpolate(0, bar.alpha(), shown));
+	const auto radius = (_st.round < 0)
+		? (std::min(_area.width(), _area.height()) / 2.)
+		: _st.round;
+	if (radius) {
+		PainterHighQualityEnabler hq(p);
+		p.setBrush(bg);
+		p.drawRoundedRect(_area, radius, radius);
+		p.setBrush(bar);
+		p.drawRoundedRect(_bar, radius, radius);
+	} else {
+		p.fillRect(_area, bg);
+		p.fillRect(_bar, bar);
+	}
+}
+
+void ElasticScrollBar::enterEventHook(QEnterEvent *e) {
+	_hideTimer.cancel();
+	setMouseTracking(true);
+	toggleOver(true);
+}
+
+void ElasticScrollBar::leaveEventHook(QEvent *e) {
+	if (!_dragging) {
+		setMouseTracking(false);
+	}
+	toggleOver(false);
+	toggleOverBar(false);
+	if (_st.hiding && _shown) {
+		_hideTimer.callOnce(_st.hiding);
+	}
+}
+
+void ElasticScrollBar::mouseMoveEvent(QMouseEvent *e) {
+	toggleOverBar(_bar.contains(e->pos()));
+	if (_dragging && !_bar.isEmpty()) {
+		const auto position = e->globalPos();
+		const auto delta = position - _dragPosition;
+		_dragPosition = position;
+		if (auto change = _vertical ? delta.y() : delta.x()) {
+			if (_dragOverscrollAccumulated * change < 0) {
+				const auto overscroll = (change < 0)
+					? std::max(_dragOverscrollAccumulated + change, 0)
+					: std::min(_dragOverscrollAccumulated + change, 0);
+				const auto delta = overscroll - _dragOverscrollAccumulated;
+				_dragOverscrollAccumulated = overscroll;
+				change -= delta;
+			}
+			if (change) {
+				const auto now = std::clamp(
+					_state.visibleFrom + change,
+					std::min(_state.visibleFrom, 0),
+					std::max(
+						_state.visibleFrom,
+						(_state.visibleFrom
+							+ (_state.fullSize - _state.visibleTill))));
+				const auto delta = now - _state.visibleFrom;
+				if (change != delta) {
+					_dragOverscrollAccumulated
+						= ((_dragOverscrollAccumulated * change < 0)
+							? change
+							: (_dragOverscrollAccumulated + change));
+				}
+				_visibleFromDragged.fire_copy(now);
+			}
+		}
+	}
+}
+
+void ElasticScrollBar::mousePressEvent(QMouseEvent *e) {
+	if (_bar.isEmpty()) {
+		return;
+	}
+	toggleDragging(true);
+	_dragPosition = e->globalPos();
+	_dragOverscrollAccumulated = 0;
+	if (!_overBar) {
+		const auto start = _vertical ? _area.y() : _area.x();
+		const auto full = _vertical ? _area.height() : _area.width();
+		const auto bar = _vertical ? _bar.height() : _bar.width();
+		const auto half = bar / 2;
+		const auto middle = std::clamp(
+			_vertical ? e->pos().y() : e->pos().x(),
+			start + half,
+			start + full + half - bar);
+		const auto range = _state.visibleFrom
+			+ (_state.fullSize - _state.visibleTill);
+		const auto from = range * (middle - half - start) / (full - bar);
+		_visibleFromDragged.fire_copy(from);
+	}
+}
+
+void ElasticScrollBar::mouseReleaseEvent(QMouseEvent *e) {
+	toggleDragging(false);
+	if (!_over) {
+		setMouseTracking(false);
+	}
+}
+
+void ElasticScrollBar::resizeEvent(QResizeEvent *e) {
+	refreshGeometry();
+}
+
+ElasticScroll::ElasticScroll(
+	QWidget *parent,
+	const style::ScrollArea &st,
+	Qt::Orientation orientation)
+: RpWidget(parent)
+, _st(st)
+, _bar(std::make_unique<ElasticScrollBar>(this, _st, orientation))
+, _touchTimer([=] { _touchRightButton = true; })
+, _touchScrollTimer([=] { touchScrollTimer(); })
+, _vertical(orientation == Qt::Vertical) {
+	setAttribute(Qt::WA_AcceptTouchEvents);
+
+	_bar->visibleFromDragged(
+	) | rpl::start_with_next([=](int from) {
+		tryScrollTo(from, false);
+	}, _bar->lifetime());
+}
+
+void ElasticScroll::setHandleTouch(bool handle) {
+	if (_touchDisabled != handle) {
+		return;
+	}
+	_touchDisabled = !handle;
+	constexpr auto attribute = Qt::WA_AcceptTouchEvents;
+	setAttribute(attribute, handle);
+	if (_widget) {
+		if (handle) {
+			_widgetAcceptsTouch = _widget->testAttribute(attribute);
+			if (!_widgetAcceptsTouch) {
+				_widget->setAttribute(attribute);
+			}
+		} else {
+			if (!_widgetAcceptsTouch) {
+				_widget->setAttribute(attribute, false);
+			}
+		}
+	}
+}
+
+bool ElasticScroll::viewportEvent(QEvent *e) {
+	return (e->type() == QEvent::Wheel)
+		&& handleWheelEvent(static_cast<QWheelEvent*>(e));
+}
+
+void ElasticScroll::touchDeaccelerate(int32 elapsed) {
+	int32 x = _touchSpeed.x();
+	int32 y = _touchSpeed.y();
+	_touchSpeed.setX((x == 0) ? x : (x > 0) ? qMax(0, x - elapsed) : qMin(0, x + elapsed));
+	_touchSpeed.setY((y == 0) ? y : (y > 0) ? qMax(0, y - elapsed) : qMin(0, y + elapsed));
+}
+
+int ElasticScroll::overscrollAmount() const {
+	return (_state.visibleFrom < 0)
+		? _state.visibleFrom
+		: (_state.visibleTill > _state.fullSize)
+		? (_state.visibleTill - _state.fullSize)
+		: 0;
+}
+
+void ElasticScroll::overscrollReturn() {
+	_ignoreMomentum = _overscrollReturning = true;
+	if (overscrollFinish()) {
+		_overscrollReturnAnimation.stop();
+		return;
+	} else if (_overscrollReturnAnimation.animating()) {
+		return;
+	}
+	_overscrollReturnAnimation.start(
+		[=] { applyAccumulatedScroll(); },
+		0.,
+		1.,
+		kOverscrollReturnDuration,
+		anim::sineInOut);
+}
+
+void ElasticScroll::overscrollReturnCancel() {
+	if (_overscrollReturning) {
+		const auto returnProgress = _overscrollReturnAnimation.value(1.);
+		_overscrollAccumulated *= (1. - returnProgress);
+		_overscrollReturning = false;
+		_overscrollReturnAnimation.stop();
+		applyAccumulatedScroll();
+	}
+}
+
+bool ElasticScroll::overscrollFinish() {
+	if (overscrollAmount()) {
+		return false;
+	}
+	_overscrollReturning = false;
+	_overscrollAccumulated = 0;
+	return true;
+}
+
+void ElasticScroll::innerResized() {
+	_innerResizes.fire({});
+}
+
+int ElasticScroll::scrollWidth() const {
+	return (_vertical || !_widget)
+		? width()
+		: std::max(_widget->width(), width());
+}
+
+int ElasticScroll::scrollHeight() const {
+	return (!_vertical || !_widget)
+		? height()
+		: std::max(_widget->height(), height());
+}
+
+int ElasticScroll::scrollLeftMax() const {
+	return scrollWidth() - width();
+}
+
+int ElasticScroll::scrollTopMax() const {
+	return scrollHeight() - height();
+}
+
+int ElasticScroll::scrollLeft() const {
+	return _vertical ? 0 : _state.visibleFrom;
+}
+
+int ElasticScroll::scrollTop() const {
+	return _vertical ? _state.visibleFrom : 0;
+}
+
+void ElasticScroll::touchScrollTimer() {
+	auto nowTime = crl::now();
+	if (_touchScrollState == TouchScrollState::Acceleration && _touchWaitingAcceleration && (nowTime - _touchAccelerationTime) > 40) {
+		_touchScrollState = TouchScrollState::Manual;
+		touchResetSpeed();
+	} else if (_touchScrollState == TouchScrollState::Auto || _touchScrollState == TouchScrollState::Acceleration) {
+		int32 elapsed = int32(nowTime - _touchTime);
+		QPoint delta = _touchSpeed * elapsed / 1000;
+		bool hasScrolled = touchScroll(delta);
+
+		if (_touchSpeed.isNull() || !hasScrolled) {
+			_touchScrollState = TouchScrollState::Manual;
+			_touchScroll = false;
+			_touchScrollTimer.cancel();
+		} else {
+			_touchTime = nowTime;
+		}
+		touchDeaccelerate(elapsed);
+	}
+}
+
+void ElasticScroll::touchUpdateSpeed() {
+	const auto nowTime = crl::now();
+	if (_touchPreviousPositionValid) {
+		const int elapsed = nowTime - _touchSpeedTime;
+		if (elapsed) {
+			const QPoint newPixelDiff = (_touchPosition - _touchPreviousPosition);
+			const QPoint pixelsPerSecond = newPixelDiff * (1000 / elapsed);
+
+			// fingers are inacurates, we ignore small changes to avoid stopping the autoscroll because
+			// of a small horizontal offset when scrolling vertically
+			const int newSpeedY = (qAbs(pixelsPerSecond.y()) > kFingerAccuracyThreshold) ? pixelsPerSecond.y() : 0;
+			const int newSpeedX = (qAbs(pixelsPerSecond.x()) > kFingerAccuracyThreshold) ? pixelsPerSecond.x() : 0;
+			if (_touchScrollState == TouchScrollState::Auto) {
+				const int oldSpeedY = _touchSpeed.y();
+				const int oldSpeedX = _touchSpeed.x();
+				if ((oldSpeedY <= 0 && newSpeedY <= 0) || ((oldSpeedY >= 0 && newSpeedY >= 0)
+					&& (oldSpeedX <= 0 && newSpeedX <= 0)) || (oldSpeedX >= 0 && newSpeedX >= 0)) {
+					_touchSpeed.setY(std::clamp((oldSpeedY + (newSpeedY / 4)), -kMaxScrollAccelerated, +kMaxScrollAccelerated));
+					_touchSpeed.setX(std::clamp((oldSpeedX + (newSpeedX / 4)), -kMaxScrollAccelerated, +kMaxScrollAccelerated));
+				} else {
+					_touchSpeed = QPoint();
+				}
+			} else {
+				// we average the speed to avoid strange effects with the last delta
+				if (!_touchSpeed.isNull()) {
+					_touchSpeed.setX(std::clamp((_touchSpeed.x() / 4) + (newSpeedX * 3 / 4), -kMaxScrollFlick, +kMaxScrollFlick));
+					_touchSpeed.setY(std::clamp((_touchSpeed.y() / 4) + (newSpeedY * 3 / 4), -kMaxScrollFlick, +kMaxScrollFlick));
+				} else {
+					_touchSpeed = QPoint(newSpeedX, newSpeedY);
+				}
+			}
+		}
+	} else {
+		_touchPreviousPositionValid = true;
+	}
+	_touchSpeedTime = nowTime;
+	_touchPreviousPosition = _touchPosition;
+}
+
+void ElasticScroll::touchResetSpeed() {
+	_touchSpeed = QPoint();
+	_touchPreviousPositionValid = false;
+}
+
+bool ElasticScroll::eventHook(QEvent *e) {
+	return filterOutTouchEvent(e) || RpWidget::eventHook(e);
+}
+
+void ElasticScroll::wheelEvent(QWheelEvent *e) {
+	if (handleWheelEvent(e)) {
+		e->accept();
+	} else {
+		e->ignore();
+	}
+}
+
+void ElasticScroll::paintEvent(QPaintEvent *e) {
+	if (!_overscrollBg) {
+		return;
+	}
+	const auto fillFrom = std::max(-_state.visibleFrom, 0);
+	const auto fillTill = std::max(_state.visibleTill - _state.fullSize, 0);
+	if (!fillFrom && !fillTill) {
+		return;
+	}
+	auto p = QPainter(this);
+	if (fillFrom) {
+		p.fillRect(
+			0,
+			0,
+			_vertical ? width() : fillFrom,
+			_vertical ? fillFrom : height(),
+			*_overscrollBg);
+	}
+	if (fillTill) {
+		p.fillRect(
+			_vertical ? 0 : (width() - fillTill),
+			_vertical ? (height() - fillTill) : 0,
+			_vertical ? width() : fillTill,
+			_vertical ? fillTill : height(),
+			*_overscrollBg);
+	}
+}
+
+bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e) {
+	if (_customWheelProcess
+		&& _customWheelProcess(static_cast<QWheelEvent*>(e.get()))) {
+		return true;
+	}
+	const auto phase = e->phase();
+	const auto momentum = (phase == Qt::ScrollMomentum)
+		|| (phase == Qt::ScrollEnd);
+	const auto now = crl::now();
+	const auto guard = gsl::finally([&] {
+		_lastScroll = now;
+	});
+	if (_ignoreMomentum) {
+		if (momentum) {
+			if (!_overscrollReturnAnimation.animating()) {
+				return true;
+			}
+		} else {
+			_ignoreMomentum = false;
+		}
+	}
+	const auto pixels = ScrollDelta(e);
+	const auto amount = overscrollAmount();
+	auto delta = _vertical ? -pixels.y() : pixels.x();
+	if (phase == Qt::NoScrollPhase) {
+		if (!amount) {
+			tryScrollTo(_state.visibleFrom + delta);
+		} else if (!_overscrollReturnAnimation.animating()) {
+			overscrollReturn();
+		}
+		return true;
+	}
+	if (!momentum) {
+		overscrollReturnCancel();
+	} else if (amount && !_overscrollReturnAnimation.animating()) {
+		overscrollReturn();
+	}
+	if (!amount) {
+		const auto normalTo = willScrollTo(_state.visibleFrom + delta);
+		delta -= normalTo - _state.visibleFrom;
+		applyScrollTo(normalTo);
+	}
+	if (!delta) {
+		return true;
+	}
+	const auto accumulated = _overscrollAccumulated + delta;
+	if (_overscrollAccumulated * accumulated < 0) {
+		_overscrollAccumulated = 0;
+	} else {
+		_overscrollAccumulated = accumulated;
+	}
+	applyAccumulatedScroll();
+	return true;
+}
+
+void ElasticScroll::applyAccumulatedScroll() {
+	if (_overscrollReturning) {
+		if (!_overscrollReturnAnimation.animating()) {
+			_overscrollReturning = false;
+			_overscrollAccumulated = 0;
+		} else if (overscrollFinish()) {
+			_overscrollReturnAnimation.stop();
+		}
+	}
+	const auto returnProgress = _overscrollReturnAnimation.value(
+		_overscrollReturning ? 1. : 0.);
+	const auto accumulated = (1. - returnProgress) * _overscrollAccumulated;
+	const auto byAccumulated = (accumulated > 0 ? 1. : -1.)
+		* int(base::SafeRound(pow(std::abs(accumulated), kOverscrollPower)));
+
+	applyScrollTo(_state.visibleFrom - overscrollAmount() + byAccumulated);
+}
+
+bool ElasticScroll::eventFilter(QObject *obj, QEvent *e) {
+	const auto result = RpWidget::eventFilter(obj, e);
+	if (obj == _widget.data()) {
+		if (filterOutTouchEvent(e)) {
+			return true;
+		} else if (e->type()  == QEvent::Resize) {
+			const auto weak = Ui::MakeWeak(this);
+			updateState();
+			if (weak) {
+				_innerResizes.fire({});
+			}
+		} else if (e->type()  == QEvent::Move) {
+			updateState();
+		}
+		return result;
+	}
+	return false;
+}
+
+bool ElasticScroll::filterOutTouchEvent(QEvent *e) {
+	const auto type = e->type();
+	if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate
+		|| type == QEvent::TouchEnd
+		|| type == QEvent::TouchCancel) {
+		const auto ev = static_cast<QTouchEvent*>(e);
+		if (ev->device()->type() == base::TouchDevice::TouchScreen) {
+			if (_customTouchProcess && _customTouchProcess(ev)) {
+				return true;
+			} else if (!_touchDisabled) {
+				handleTouchEvent(ev);
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+void ElasticScroll::handleTouchEvent(QTouchEvent *e) {
+	if (!e->touchPoints().isEmpty()) {
+		_touchPreviousPosition = _touchPosition;
+		_touchPosition = e->touchPoints().cbegin()->screenPos().toPoint();
+	}
+
+	switch (e->type()) {
+	case QEvent::TouchBegin: {
+		if (_touchPress || e->touchPoints().isEmpty()) return;
+		_touchPress = true;
+		if (_touchScrollState == TouchScrollState::Auto) {
+			_touchScrollState = TouchScrollState::Acceleration;
+			_touchWaitingAcceleration = true;
+			_touchAccelerationTime = crl::now();
+			touchUpdateSpeed();
+			_touchStart = _touchPosition;
+		} else {
+			_touchScroll = false;
+			_touchTimer.callOnce(QApplication::startDragTime());
+		}
+		_touchStart = _touchPreviousPosition = _touchPosition;
+		_touchRightButton = false;
+	} break;
+
+	case QEvent::TouchUpdate: {
+		if (!_touchPress) return;
+		if (!_touchScroll && (_touchPosition - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
+			_touchTimer.cancel();
+			_touchScroll = true;
+			touchUpdateSpeed();
+		}
+		if (_touchScroll) {
+			if (_touchScrollState == TouchScrollState::Manual) {
+				touchScrollUpdated(_touchPosition);
+			} else if (_touchScrollState == TouchScrollState::Acceleration) {
+				touchUpdateSpeed();
+				_touchAccelerationTime = crl::now();
+				if (_touchSpeed.isNull()) {
+					_touchScrollState = TouchScrollState::Manual;
+				}
+			}
+		}
+	} break;
+
+	case QEvent::TouchEnd: {
+		if (!_touchPress) return;
+		_touchPress = false;
+		auto weak = MakeWeak(this);
+		if (_touchScroll) {
+			if (_touchScrollState == TouchScrollState::Manual) {
+				_touchScrollState = TouchScrollState::Auto;
+				_touchPreviousPositionValid = false;
+				_touchScrollTimer.callEach(15);
+				_touchTime = crl::now();
+			} else if (_touchScrollState == TouchScrollState::Auto) {
+				_touchScrollState = TouchScrollState::Manual;
+				_touchScroll = false;
+				touchResetSpeed();
+			} else if (_touchScrollState == TouchScrollState::Acceleration) {
+				_touchScrollState = TouchScrollState::Auto;
+				_touchWaitingAcceleration = false;
+				_touchPreviousPositionValid = false;
+			}
+		} else if (window()) { // one short tap -- like left mouse click, one long tap -- like right mouse click
+			Qt::MouseButton btn(_touchRightButton ? Qt::RightButton : Qt::LeftButton);
+
+			if (weak) SendSynteticMouseEvent(this, QEvent::MouseMove, Qt::NoButton, _touchStart);
+			if (weak) SendSynteticMouseEvent(this, QEvent::MouseButtonPress, btn, _touchStart);
+			if (weak) SendSynteticMouseEvent(this, QEvent::MouseButtonRelease, btn, _touchStart);
+
+			if (weak && _touchRightButton) {
+				auto windowHandle = window()->windowHandle();
+				auto localPoint = windowHandle->mapFromGlobal(_touchStart);
+				QContextMenuEvent ev(QContextMenuEvent::Mouse, localPoint, _touchStart, QGuiApplication::keyboardModifiers());
+				ev.setTimestamp(crl::now());
+				QGuiApplication::sendEvent(windowHandle, &ev);
+			}
+		}
+		if (weak) {
+			_touchTimer.cancel();
+			_touchRightButton = false;
+		}
+	} break;
+
+	case QEvent::TouchCancel: {
+		_touchPress = false;
+		_touchScroll = false;
+		_touchScrollState = TouchScrollState::Manual;
+		_touchTimer.cancel();
+	} break;
+	}
+}
+
+void ElasticScroll::touchScrollUpdated(const QPoint &screenPos) {
+	_touchPosition = screenPos;
+	touchScroll(_touchPosition - _touchPreviousPosition);
+	touchUpdateSpeed();
+}
+
+void ElasticScroll::disableScroll(bool dis) {
+	_disabled = dis;
+	if (_disabled && _st.hiding) {
+		_bar->toggle(false);
+	}
+}
+
+void ElasticScroll::updateState() {
+	_dirtyState = false;
+	if (!_widget) {
+		setState({});
+		return;
+	}
+	auto from = _vertical ? -_widget->y() : -_widget->x();
+	auto till = from + (_vertical ? height() : width());
+	const auto wasFullSize = _state.fullSize;
+	const auto nowFullSize = _vertical ? scrollHeight() : scrollWidth();
+	if (wasFullSize > nowFullSize) {
+		const auto wasOverscroll = std::max(_state.visibleTill - wasFullSize, 0);
+		const auto nowOverscroll = std::max(till - nowFullSize, 0);
+		const auto delta = std::max(
+			std::min(nowOverscroll - wasOverscroll, from),
+			0);
+		from -= delta;
+		till -= delta;
+	}
+	setState({
+		.visibleFrom = from,
+		.visibleTill = till,
+		.fullSize = nowFullSize,
+	});
+}
+
+void ElasticScroll::setState(ScrollState state) {
+	if (_state == state) {
+		return;
+	}
+	const auto weak = Ui::MakeWeak(this);
+	const auto old = _state.visibleFrom;
+	_state = state;
+	_bar->updateState(state);
+	if (weak && _state.visibleFrom != old) {
+		if (_vertical) {
+			_scrollTopUpdated.fire_copy(_state.visibleFrom);
+		}
+		if (weak) {
+			_scrolls.fire({});
+		}
+	}
+}
+
+void ElasticScroll::applyScrollTo(int position, bool synthMouseMove) {
+	if (_disabled) {
+		return;
+	}
+	const auto weak = Ui::MakeWeak(this);
+	_dirtyState = true;
+	_widget->move(
+		_vertical ? _widget->x() : -position,
+		_vertical ? -position : _widget->y());
+	if (weak) {
+		if (_dirtyState) {
+			updateState();
+		}
+		if (weak && synthMouseMove) {
+			SendSynteticMouseEvent(this, QEvent::MouseMove, Qt::NoButton);
+		}
+	}
+}
+
+int ElasticScroll::willScrollTo(int position) const {
+	return std::clamp(
+		position,
+		std::min(_state.visibleFrom, 0),
+		std::max(
+			_state.visibleFrom,
+			(_state.visibleFrom
+				+ (_state.fullSize - _state.visibleTill))));
+}
+
+void ElasticScroll::tryScrollTo(int position, bool synthMouseMove) {
+	applyScrollTo(willScrollTo(position), synthMouseMove);
+}
+
+bool ElasticScroll::touchScroll(const QPoint &delta) {
+	const auto scTop = scrollTop();
+	const auto scMax = scrollTopMax();
+	const auto scNew = std::clamp(scTop - delta.y(), 0, scMax);
+	if (scNew == scTop) {
+		return false;
+	}
+	scrollToY(scNew);
+	return true;
+}
+
+void ElasticScroll::resizeEvent(QResizeEvent *e) {
+	const auto rtl = (layoutDirection() == Qt::RightToLeft);
+	_bar->setGeometry(_vertical
+		? QRect(
+			(rtl ? 0 : (width() - _st.width)),
+			0,
+			_st.width,
+			height())
+		: QRect(0, height() - _st.width, width(), _st.width));
+	_geometryChanged.fire({});
+}
+
+void ElasticScroll::moveEvent(QMoveEvent *e) {
+	_geometryChanged.fire({});
+}
+
+void ElasticScroll::keyPressEvent(QKeyEvent *e) {
+	if ((e->key() == Qt::Key_Up || e->key() == Qt::Key_Down)
+		&& e->modifiers().testFlag(Qt::AltModifier)) {
+		e->ignore();
+	} else if (_widget && (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back)) {
+		((QObject*)_widget.data())->event(e);
+	}
+}
+
+void ElasticScroll::enterEventHook(QEnterEvent *e) {
+	if (!_disabled) {
+		_bar->toggle(true);
+	}
+}
+
+void ElasticScroll::leaveEventHook(QEvent *e) {
+	_bar->toggle(false);
+}
+
+void ElasticScroll::scrollTo(ScrollToRequest request) {
+	scrollToY(request.ymin, request.ymax);
+}
+
+void ElasticScroll::scrollToWidget(not_null<QWidget*> widget) {
+	if (const auto local = _widget.data()) {
+		const auto position = Ui::MapFrom(
+			local,
+			widget.get(),
+			QPoint(0, 0));
+		const auto from = _vertical ? position.y() : position.x();
+		const auto till = _vertical
+			? (position.y() + widget->height())
+			: (position.x() + widget->width());
+		scrollToY(from, till);
+	}
+}
+
+void ElasticScroll::scrollToY(int toTop, int toBottom) {
+	if (_vertical) {
+		scrollTo(toTop, toBottom);
+	}
+}
+
+void ElasticScroll::scrollTo(int toFrom, int toTill) {
+	if (const auto inner = _widget.data()) {
+		SendPendingMoveResizeEvents(inner);
+	}
+	SendPendingMoveResizeEvents(this);
+
+	int toMin = std::min(_state.visibleFrom, 0);
+	int toMax = std::max(
+		_state.visibleFrom,
+		_state.visibleFrom + _state.fullSize - _state.visibleTill);
+	if (toFrom < toMin) {
+		toFrom = toMin;
+	} else if (toFrom > toMax) {
+		toFrom = toMax;
+	}
+	bool exact = (toTill < 0);
+
+	int curFrom = _state.visibleFrom, curRange = _state.visibleTill - _state.visibleFrom, curTill = curFrom + curRange, scTo = toFrom;
+	if (!exact && toFrom >= curFrom) {
+		if (toTill < toFrom) toTill = toFrom;
+		if (toTill <= curTill) return;
+
+		scTo = toTill - curRange;
+		if (scTo > toFrom) scTo = toFrom;
+		if (scTo == curFrom) return;
+	} else {
+		scTo = toFrom;
+	}
+	applyScrollTo(scTo);
+}
+
+void ElasticScroll::doSetOwnedWidget(object_ptr<QWidget> w) {
+	constexpr auto attribute = Qt::WA_AcceptTouchEvents;
+	if (_widget) {
+		_widget->removeEventFilter(this);
+		if (!_touchDisabled && !_widgetAcceptsTouch) {
+			_widget->setAttribute(attribute, false);
+		}
+	}
+	_widget = std::move(w);
+	if (_widget) {
+		if (_widget->parentWidget() != this) {
+			_widget->setParent(this);
+			_widget->show();
+		}
+		_bar->raise();
+		_widget->installEventFilter(this);
+		if (!_touchDisabled) {
+			_widgetAcceptsTouch = _widget->testAttribute(attribute);
+			if (!_widgetAcceptsTouch) {
+				_widget->setAttribute(attribute);
+			}
+		}
+		updateState();
+	}
+}
+
+object_ptr<QWidget> ElasticScroll::doTakeWidget() {
+	return std::move(_widget);
+}
+
+void ElasticScroll::updateBars() {
+	_bar->update();
+}
+
+rpl::producer<> ElasticScroll::scrolls() const {
+	return _scrolls.events();
+}
+
+rpl::producer<> ElasticScroll::innerResizes() const {
+	return _innerResizes.events();
+}
+
+rpl::producer<> ElasticScroll::geometryChanged() const {
+	return _geometryChanged.events();
+}
+
+QPoint ScrollDelta(not_null<QWheelEvent*> e) {
+	const auto convert = [](QPoint point) {
+		return QPoint(
+			style::ConvertScale(point.x()),
+			style::ConvertScale(point.y()));
+	};
+	if (Platform::IsMac()
+		|| (Platform::IsWindows() && e->phase() != Qt::NoScrollPhase)) {
+		return convert(e->pixelDelta());
+	}
+	return convert(e->angleDelta() * style::DevicePixelRatio());
+}
+
+} // namespace Ui
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
new file mode 100644
index 0000000..58f2144
--- /dev/null
+++ b/ui/widgets/elastic_scroll.h
@@ -0,0 +1,229 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/widgets/scroll_area.h" // For helpers, like ScrollToRequest.
+#include "ui/effects/animations.h"
+#include "ui/rp_widget.h"
+#include "base/object_ptr.h"
+#include "base/timer.h"
+
+namespace style {
+struct ScrollArea;
+} // namespace style
+
+namespace st {
+extern const style::ScrollArea &defaultScrollArea;
+} // namespace st
+
+namespace Ui {
+
+struct ScrollState {
+	int visibleFrom = 0;
+	int visibleTill = 0;
+	int fullSize = 0;
+
+	friend inline constexpr auto operator<=>(
+		const ScrollState &,
+		const ScrollState &) = default;
+	friend inline constexpr bool operator==(
+		const ScrollState &,
+		const ScrollState &) = default;
+};
+
+class ElasticScrollBar final : public RpWidget {
+public:
+	ElasticScrollBar(
+		QWidget *parent,
+		const style::ScrollArea &st,
+		Qt::Orientation orientation = Qt::Vertical);
+
+	void updateState(ScrollState state);
+	void toggle(bool shown, anim::type animated = anim::type::normal);
+
+	[[nodiscard]] rpl::producer<int> visibleFromDragged() const;
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void enterEventHook(QEnterEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+
+	[[nodiscard]] bool barHighlighted() const;
+	void toggleOver(bool over, anim::type animated = anim::type::normal);
+	void toggleOverBar(bool over, anim::type animated = anim::type::normal);
+	void toggleDragging(
+		bool dragging,
+		anim::type animated = anim::type::normal);
+	void startBarHighlightAnimation(bool wasHighlighted);
+	void refreshGeometry();
+
+	const style::ScrollArea &_st;
+	Ui::Animations::Simple _shownAnimation;
+	Ui::Animations::Simple _overAnimation;
+	Ui::Animations::Simple _barHighlightAnimation;
+	base::Timer _hideTimer;
+	rpl::event_stream<int> _visibleFromDragged;
+	int _dragOverscrollAccumulated = 0;
+	QRect _area;
+	QRect _bar;
+	QPoint _dragPosition;
+	ScrollState _state;
+	bool _shown : 1 = false;
+	bool _over : 1 = false;
+	bool _overBar : 1 = false;
+	bool _vertical : 1 = false;
+	bool _dragging : 1 = false;
+
+};
+
+class ElasticScroll final : public RpWidget {
+public:
+	ElasticScroll(
+		QWidget *parent,
+		const style::ScrollArea &st = st::defaultScrollArea,
+		Qt::Orientation orientation = Qt::Vertical);
+
+	void setHandleTouch(bool handle);
+	bool viewportEvent(QEvent *e);
+
+	int scrollWidth() const;
+	int scrollHeight() const;
+	int scrollLeftMax() const;
+	int scrollTopMax() const;
+	int scrollLeft() const;
+	int scrollTop() const;
+
+	template <typename Widget>
+	QPointer<Widget> setOwnedWidget(object_ptr<Widget> widget) {
+		auto result = QPointer<Widget>(widget);
+		doSetOwnedWidget(std::move(widget));
+		return result;
+	}
+	template <typename Widget>
+	object_ptr<Widget> takeWidget() {
+		return object_ptr<Widget>::fromRaw(
+			static_cast<Widget*>(doTakeWidget().release()));
+	}
+
+	void updateBars();
+
+	auto scrollTopValue() const {
+		return _scrollTopUpdated.events_starting_with(scrollTop());
+	}
+	auto scrollTopChanges() const {
+		return _scrollTopUpdated.events();
+	}
+
+	void scrollTo(ScrollToRequest request);
+	void scrollToWidget(not_null<QWidget*> widget);
+	void scrollToY(int toTop, int toBottom = -1);
+	void scrollTo(int toFrom, int toTill = -1);
+	void disableScroll(bool dis);
+	void innerResized();
+
+	void setCustomWheelProcess(Fn<bool(not_null<QWheelEvent*>)> process) {
+		_customWheelProcess = std::move(process);
+	}
+	void setCustomTouchProcess(Fn<bool(not_null<QTouchEvent*>)> process) {
+		_customTouchProcess = std::move(process);
+	}
+	void setOverscrollBg(QColor bg) {
+		_overscrollBg = bg;
+		update();
+	}
+
+	[[nodiscard]] rpl::producer<> scrolls() const;
+	[[nodiscard]] rpl::producer<> innerResizes() const;
+	[[nodiscard]] rpl::producer<> geometryChanged() const;
+
+private:
+	bool eventHook(QEvent *e) override;
+	bool eventFilter(QObject *obj, QEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void moveEvent(QMoveEvent *e) override;
+	void wheelEvent(QWheelEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	void enterEventHook(QEnterEvent *e) override;
+	void leaveEventHook(QEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
+	bool handleWheelEvent(not_null<QWheelEvent*> e);
+	void handleTouchEvent(QTouchEvent *e);
+
+	void updateState();
+	void setState(ScrollState state);
+	[[nodiscard]] int willScrollTo(int position) const;
+	void tryScrollTo(int position, bool synthMouseMove = true);
+	void applyScrollTo(int position, bool synthMouseMove = true);
+
+	void doSetOwnedWidget(object_ptr<QWidget> widget);
+	object_ptr<QWidget> doTakeWidget();
+
+	bool filterOutTouchEvent(QEvent *e);
+	void touchScrollTimer();
+	bool touchScroll(const QPoint &delta);
+	void touchScrollUpdated(const QPoint &screenPos);
+
+	void touchResetSpeed();
+	void touchUpdateSpeed();
+	void touchDeaccelerate(int32 elapsed);
+
+	[[nodiscard]] int overscrollAmount() const;
+	void overscrollReturn();
+	void overscrollReturnCancel();
+	bool overscrollFinish();
+	void applyAccumulatedScroll();
+
+	const style::ScrollArea &_st;
+	std::unique_ptr<ElasticScrollBar> _bar;
+	ScrollState _state;
+
+	base::Timer _touchTimer;
+	base::Timer _touchScrollTimer;
+	QPoint _touchStart;
+	QPoint _touchPreviousPosition;
+	QPoint _touchPosition;
+	QPoint _touchSpeed;
+	crl::time _touchSpeedTime = 0;
+	crl::time _touchAccelerationTime = 0;
+	crl::time _touchTime = 0;
+	crl::time _lastScroll = 0;
+	TouchScrollState _touchScrollState = TouchScrollState::Manual;
+	int _overscrollAccumulated = 0;
+	bool _touchDisabled : 1 = false;
+	bool _touchScroll : 1 = false;
+	bool _touchPress : 1 = false;
+	bool _touchRightButton : 1 = false;
+	bool _touchPreviousPositionValid : 1 = false;
+	bool _touchWaitingAcceleration : 1 = false;
+	bool _vertical : 1 = false;
+	bool _widgetAcceptsTouch : 1 = false;
+	bool _disabled : 1 = false;
+	bool _dirtyState : 1 = false;
+	bool _ignoreMomentum : 1 = false;
+	bool _overscrollReturning : 1 = false;
+
+	Fn<bool(not_null<QWheelEvent*>)> _customWheelProcess;
+	Fn<bool(not_null<QTouchEvent*>)> _customTouchProcess;
+	std::optional<QColor> _overscrollBg;
+	Ui::Animations::Simple _overscrollReturnAnimation;
+
+	object_ptr<QWidget> _widget = { nullptr };
+
+	rpl::event_stream<int> _scrollTopUpdated;
+	rpl::event_stream<> _scrolls;
+	rpl::event_stream<> _innerResizes;
+	rpl::event_stream<> _geometryChanged;
+
+};
+
+[[nodiscard]] QPoint ScrollDelta(not_null<QWheelEvent*> e);
+
+} // namespace Ui
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 4517138..ee9e2e8 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -703,6 +703,7 @@ defaultScrollArea: ScrollArea {
 	duration: 150;
 	hiding: 1000;
 }
+scrollBarMin: 40px;
 
 defaultSolidScroll: ScrollArea(defaultScrollArea) {
 	deltax: 5px;

From 081d1725afa92fc2a4b1988624e8ac79563956d9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 10 Jul 2023 11:06:56 +0400
Subject: [PATCH 419/635] Fix scrolling by scrollbar drag.

---
 ui/widgets/elastic_scroll.cpp | 24 +++++++++++++++++++-----
 ui/widgets/elastic_scroll.h   |  1 +
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index adbbc49..9019a01 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -53,21 +53,24 @@ void ElasticScrollBar::refreshGeometry() {
 		return;
 	}
 	const auto available = extSize - fullSkip;
-	const auto scale = [&](int value) {
-		return (available * value) / _state.fullSize;
-	};
-
 	_area = _vertical
 		? QRect(skip, _st.deltat, thickness, available)
 		: QRect(_st.deltat, skip, available, thickness);
 	const auto barMin = std::min(st::scrollBarMin, available / 2);
-	const auto barWanted = scale(_state.visibleTill - _state.visibleFrom);
+	const auto visibleHeight = _state.visibleTill - _state.visibleFrom;
+	const auto scrollableHeight = _state.fullSize - visibleHeight;
+	const auto barWanted = (available * visibleHeight) / _state.fullSize;
 	if (barWanted >= available) {
 		_bar = _area = QRect();
 		hide();
 		return;
 	}
 	const auto bar = std::max(barMin, barWanted);
+	const auto outsideBar = available - bar;
+
+	const auto scale = [&](int value) {
+		return (outsideBar * value) / scrollableHeight;
+	};
 	const auto barFrom = scale(_state.visibleFrom);
 	const auto barTill = barFrom + bar;
 	const auto cutFrom = std::clamp(barFrom, 0, available - thickness);
@@ -224,6 +227,16 @@ void ElasticScrollBar::leaveEventHook(QEvent *e) {
 	}
 }
 
+int ElasticScrollBar::scaleToBar(int change) const {
+	const auto scrollable = _state.fullSize
+		- (_state.visibleTill - _state.visibleFrom);
+	const auto outsideBar = (_vertical ? _area.height() : _area.width())
+		- (_vertical ? _bar.height() : _bar.width());
+	return (outsideBar <= 0 || scrollable <= outsideBar)
+		? change
+		: (change * scrollable / outsideBar);
+}
+
 void ElasticScrollBar::mouseMoveEvent(QMouseEvent *e) {
 	toggleOverBar(_bar.contains(e->pos()));
 	if (_dragging && !_bar.isEmpty()) {
@@ -231,6 +244,7 @@ void ElasticScrollBar::mouseMoveEvent(QMouseEvent *e) {
 		const auto delta = position - _dragPosition;
 		_dragPosition = position;
 		if (auto change = _vertical ? delta.y() : delta.x()) {
+			change = scaleToBar(change);
 			if (_dragOverscrollAccumulated * change < 0) {
 				const auto overscroll = (change < 0)
 					? std::max(_dragOverscrollAccumulated + change, 0)
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index 58f2144..a34a4d3 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -56,6 +56,7 @@ private:
 	void leaveEventHook(QEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
 
+	[[nodiscard]] int scaleToBar(int change) const;
 	[[nodiscard]] bool barHighlighted() const;
 	void toggleOver(bool over, anim::type animated = anim::type::normal);
 	void toggleOverBar(bool over, anim::type animated = anim::type::normal);

From 80308cea4f57fd13e73abec121325f174ba21883 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 11:13:17 +0400
Subject: [PATCH 420/635] Support non-zero default overscroll amounts.

---
 ui/widgets/elastic_scroll.cpp | 278 +++++++++++++++++++++++++++++-----
 ui/widgets/elastic_scroll.h   |  57 ++++++-
 2 files changed, 290 insertions(+), 45 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 9019a01..e9ef0f4 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -20,6 +20,26 @@ namespace {
 
 constexpr auto kOverscrollReturnDuration = crl::time(250);
 constexpr auto kOverscrollPower = 0.6;
+constexpr auto kOverscrollFromThreshold = -(1 << 30);
+constexpr auto kOverscrollTillThreshold = (1 << 30);
+
+[[nodiscard]] int OverscrollFromAccumulated(int accumulated) {
+	if (!accumulated) {
+		return 0;
+	}
+	return (accumulated > 0 ? 1. : -1.)
+		* int(base::SafeRound(
+			pow(std::abs(accumulated), kOverscrollPower)));
+}
+
+[[nodiscard]] int OverscrollToAccumulated(int overscroll) {
+	if (!overscroll) {
+		return 0;
+	}
+	return (overscroll > 0 ? 1. : -1.)
+		* int(base::SafeRound(
+			pow(std::abs(overscroll), 1. / kOverscrollPower)));
+}
 
 } // namespace
 
@@ -243,9 +263,8 @@ void ElasticScrollBar::mouseMoveEvent(QMouseEvent *e) {
 		const auto position = e->globalPos();
 		const auto delta = position - _dragPosition;
 		_dragPosition = position;
-		if (auto change = _vertical ? delta.y() : delta.x()) {
-			change = scaleToBar(change);
-			if (_dragOverscrollAccumulated * change < 0) {
+		if (auto change = scaleToBar(_vertical ? delta.y() : delta.x())) {
+			if (base::OppositeSigns(_dragOverscrollAccumulated, change)) {
 				const auto overscroll = (change < 0)
 					? std::max(_dragOverscrollAccumulated + change, 0)
 					: std::min(_dragOverscrollAccumulated + change, 0);
@@ -264,7 +283,9 @@ void ElasticScrollBar::mouseMoveEvent(QMouseEvent *e) {
 				const auto delta = now - _state.visibleFrom;
 				if (change != delta) {
 					_dragOverscrollAccumulated
-						= ((_dragOverscrollAccumulated * change < 0)
+						= (base::OppositeSigns(
+							_dragOverscrollAccumulated,
+							change)
 							? change
 							: (_dragOverscrollAccumulated + change));
 				}
@@ -317,7 +338,9 @@ ElasticScroll::ElasticScroll(
 , _bar(std::make_unique<ElasticScrollBar>(this, _st, orientation))
 , _touchTimer([=] { _touchRightButton = true; })
 , _touchScrollTimer([=] { touchScrollTimer(); })
-, _vertical(orientation == Qt::Vertical) {
+, _vertical(orientation == Qt::Vertical)
+, _position(Position{ 0, 0 })
+, _movement(Movement::None) {
 	setAttribute(Qt::WA_AcceptTouchEvents);
 
 	_bar->visibleFromDragged(
@@ -359,14 +382,6 @@ void ElasticScroll::touchDeaccelerate(int32 elapsed) {
 	_touchSpeed.setY((y == 0) ? y : (y > 0) ? qMax(0, y - elapsed) : qMin(0, y + elapsed));
 }
 
-int ElasticScroll::overscrollAmount() const {
-	return (_state.visibleFrom < 0)
-		? _state.visibleFrom
-		: (_state.visibleTill > _state.fullSize)
-		? (_state.visibleTill - _state.fullSize)
-		: 0;
-}
-
 void ElasticScroll::overscrollReturn() {
 	_ignoreMomentum = _overscrollReturning = true;
 	if (overscrollFinish()) {
@@ -375,6 +390,7 @@ void ElasticScroll::overscrollReturn() {
 	} else if (_overscrollReturnAnimation.animating()) {
 		return;
 	}
+	_movement = Movement::Returning;
 	_overscrollReturnAnimation.start(
 		[=] { applyAccumulatedScroll(); },
 		0.,
@@ -383,22 +399,64 @@ void ElasticScroll::overscrollReturn() {
 		anim::sineInOut);
 }
 
+auto ElasticScroll::computeAccumulatedParts() const ->AccumulatedParts {
+	const auto baseAccumulated = currentOverscrollDefaultAccumulated();
+	const auto returnProgress = _overscrollReturnAnimation.value(
+		_overscrollReturning ? 1. : 0.);
+	const auto relativeAccumulated = (1. - returnProgress)
+		* (_overscrollAccumulated - baseAccumulated);
+	return {
+		.base = baseAccumulated,
+		.relative = int(base::SafeRound(relativeAccumulated)),
+	};
+}
+
 void ElasticScroll::overscrollReturnCancel() {
+	_movement = Movement::Progress;
 	if (_overscrollReturning) {
-		const auto returnProgress = _overscrollReturnAnimation.value(1.);
-		_overscrollAccumulated *= (1. - returnProgress);
-		_overscrollReturning = false;
+		const auto parts = computeAccumulatedParts();
+		_overscrollAccumulated = parts.base + parts.relative;
 		_overscrollReturnAnimation.stop();
+		_overscrollReturning = false;
 		applyAccumulatedScroll();
 	}
 }
 
+int ElasticScroll::currentOverscrollDefault() const {
+	return (_overscroll < 0)
+		? _overscrollDefaultFrom
+		: (_overscroll > 0)
+		? _overscrollDefaultTill
+		: 0;
+}
+
+int ElasticScroll::currentOverscrollDefaultAccumulated() const {
+	return (_overscrollAccumulated < 0)
+		? (_overscrollDefaultFrom ? kOverscrollFromThreshold : 0)
+		: (_overscrollAccumulated > 0)
+		? (_overscrollDefaultTill ? kOverscrollTillThreshold : 0)
+		: 0;
+}
+
+void ElasticScroll::overscrollCheckReturnFinish() {
+	if (!_overscrollReturning) {
+		return;
+	} else if (!_overscrollReturnAnimation.animating()) {
+		_overscrollReturning = false;
+		_overscrollAccumulated = currentOverscrollDefaultAccumulated();
+		_movement = Movement::None;
+	} else if (overscrollFinish()) {
+		_overscrollReturnAnimation.stop();
+	}
+}
+
 bool ElasticScroll::overscrollFinish() {
-	if (overscrollAmount()) {
+	if (_overscroll != currentOverscrollDefault()) {
 		return false;
 	}
 	_overscrollReturning = false;
-	_overscrollAccumulated = 0;
+	_overscrollAccumulated = currentOverscrollDefaultAccumulated();
+	_movement = Movement::None;
 	return true;
 }
 
@@ -516,7 +574,12 @@ void ElasticScroll::paintEvent(QPaintEvent *e) {
 		return;
 	}
 	const auto fillFrom = std::max(-_state.visibleFrom, 0);
-	const auto fillTill = std::max(_state.visibleTill - _state.fullSize, 0);
+	const auto content = _widget
+		? (_vertical ? _widget->height() : _widget->width())
+		: 0;
+	const auto fillTill = content
+		? std::max(_state.visibleTill - content, 0)
+		: (_vertical ? height() : width());
 	if (!fillFrom && !fillTill) {
 		return;
 	}
@@ -561,11 +624,11 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e) {
 		}
 	}
 	const auto pixels = ScrollDelta(e);
-	const auto amount = overscrollAmount();
 	auto delta = _vertical ? -pixels.y() : pixels.x();
 	if (phase == Qt::NoScrollPhase) {
-		if (!amount) {
+		if (_overscroll == currentOverscrollDefault()) {
 			tryScrollTo(_state.visibleFrom + delta);
+			_movement = Movement::None;
 		} else if (!_overscrollReturnAnimation.animating()) {
 			overscrollReturn();
 		}
@@ -573,10 +636,15 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e) {
 	}
 	if (!momentum) {
 		overscrollReturnCancel();
-	} else if (amount && !_overscrollReturnAnimation.animating()) {
+	} else if (_overscroll != currentOverscrollDefault()
+		&& !_overscrollReturnAnimation.animating()) {
 		overscrollReturn();
+	} else if (!_overscrollReturnAnimation.animating()) {
+		_movement = (phase == Qt::ScrollEnd)
+			? Movement::None
+			: Movement::Momentum;
 	}
-	if (!amount) {
+	if (!_overscroll) {
 		const auto normalTo = willScrollTo(_state.visibleFrom + delta);
 		delta -= normalTo - _state.visibleFrom;
 		applyScrollTo(normalTo);
@@ -585,7 +653,13 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e) {
 		return true;
 	}
 	const auto accumulated = _overscrollAccumulated + delta;
-	if (_overscrollAccumulated * accumulated < 0) {
+	const auto type = (accumulated < 0)
+		? _overscrollTypeFrom
+		: (accumulated > 0)
+		? _overscrollTypeTill
+		: OverscrollType::None;
+	if (type == OverscrollType::None
+		|| base::OppositeSigns(_overscrollAccumulated, accumulated)) {
 		_overscrollAccumulated = 0;
 	} else {
 		_overscrollAccumulated = accumulated;
@@ -595,21 +669,15 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e) {
 }
 
 void ElasticScroll::applyAccumulatedScroll() {
-	if (_overscrollReturning) {
-		if (!_overscrollReturnAnimation.animating()) {
-			_overscrollReturning = false;
-			_overscrollAccumulated = 0;
-		} else if (overscrollFinish()) {
-			_overscrollReturnAnimation.stop();
-		}
-	}
-	const auto returnProgress = _overscrollReturnAnimation.value(
-		_overscrollReturning ? 1. : 0.);
-	const auto accumulated = (1. - returnProgress) * _overscrollAccumulated;
-	const auto byAccumulated = (accumulated > 0 ? 1. : -1.)
-		* int(base::SafeRound(pow(std::abs(accumulated), kOverscrollPower)));
-
-	applyScrollTo(_state.visibleFrom - overscrollAmount() + byAccumulated);
+	overscrollCheckReturnFinish();
+	const auto parts = computeAccumulatedParts();
+	const auto baseOverscroll = (_overscrollAccumulated < 0)
+		? _overscrollDefaultFrom
+		: (_overscrollAccumulated > 0)
+		? _overscrollDefaultTill
+		: 0;
+	applyOverscroll(baseOverscroll
+		+ OverscrollFromAccumulated(parts.relative));
 }
 
 bool ElasticScroll::eventFilter(QObject *obj, QEvent *e) {
@@ -767,7 +835,9 @@ void ElasticScroll::updateState() {
 	const auto wasFullSize = _state.fullSize;
 	const auto nowFullSize = _vertical ? scrollHeight() : scrollWidth();
 	if (wasFullSize > nowFullSize) {
-		const auto wasOverscroll = std::max(_state.visibleTill - wasFullSize, 0);
+		const auto wasOverscroll = std::max(
+			_state.visibleTill - wasFullSize,
+			0);
 		const auto nowOverscroll = std::max(till - nowFullSize, 0);
 		const auto delta = std::max(
 			std::min(nowOverscroll - wasOverscroll, from),
@@ -783,13 +853,32 @@ void ElasticScroll::updateState() {
 }
 
 void ElasticScroll::setState(ScrollState state) {
+	if (_overscroll < 0
+		&& (state.visibleFrom > 0
+			|| (!state.visibleFrom
+				&& _overscrollTypeFrom == OverscrollType::Real))) {
+		_overscroll = _overscrollDefaultFrom = 0;
+		overscrollFinish();
+		_overscrollReturnAnimation.stop();
+	} else if (_overscroll > 0
+		&& (state.visibleTill < state.fullSize
+			|| (state.visibleTill == state.fullSize
+				&& _overscrollTypeTill == OverscrollType::Real))) {
+		_overscroll = _overscrollDefaultTill = 0;
+		overscrollFinish();
+		_overscrollReturnAnimation.stop();
+	}
 	if (_state == state) {
+		_position = Position{ _state.visibleFrom, _overscroll };
 		return;
 	}
 	const auto weak = Ui::MakeWeak(this);
 	const auto old = _state.visibleFrom;
 	_state = state;
 	_bar->updateState(state);
+	if (weak) {
+		_position = Position{ _state.visibleFrom, _overscroll };
+	}
 	if (weak && _state.visibleFrom != old) {
 		if (_vertical) {
 			_scrollTopUpdated.fire_copy(_state.visibleFrom);
@@ -819,6 +908,27 @@ void ElasticScroll::applyScrollTo(int position, bool synthMouseMove) {
 	}
 }
 
+void ElasticScroll::applyOverscroll(int overscroll) {
+	if (_overscroll == overscroll) {
+		return;
+	}
+	_overscroll = overscroll;
+	const auto max = _state.fullSize
+		- (_state.visibleTill - _state.visibleFrom);
+	if (_overscroll > 0) {
+		const auto added = (_overscrollTypeTill == OverscrollType::Real)
+			? _overscroll
+			: 0;
+		applyScrollTo(max + added);
+	} else if (_overscroll < 0) {
+		applyScrollTo((_overscrollTypeFrom == OverscrollType::Real)
+			? _overscroll
+			: 0);
+	} else {
+		applyScrollTo(std::clamp(_state.visibleFrom, 0, max));
+	}
+}
+
 int ElasticScroll::willScrollTo(int position) const {
 	return std::clamp(
 		position,
@@ -968,6 +1078,78 @@ void ElasticScroll::updateBars() {
 	_bar->update();
 }
 
+void ElasticScroll::setOverscrollTypes(
+		OverscrollType from,
+		OverscrollType till) {
+	const auto fromChanged = (_overscroll < 0)
+		&& (_overscrollTypeFrom != from);
+	const auto tillChanged = (_overscroll > 0)
+		&& (_overscrollTypeTill != till);
+	_overscrollTypeFrom = from;
+	_overscrollTypeTill = till;
+	if (fromChanged) {
+		switch (_overscrollTypeFrom) {
+		case OverscrollType::None:
+			_overscroll = 0;
+			applyScrollTo(0);
+			break;
+		case OverscrollType::Virtual:
+			applyScrollTo(0);
+			break;
+		case OverscrollType::Real:
+			applyScrollTo(_overscroll);
+			break;
+		}
+	} else if (tillChanged) {
+		const auto max = _state.fullSize
+			- (_state.visibleTill - _state.visibleFrom);
+		switch (_overscrollTypeTill) {
+		case OverscrollType::None:
+			_overscroll = 0;
+			applyScrollTo(max);
+			break;
+		case OverscrollType::Virtual:
+			applyScrollTo(max);
+			break;
+		case OverscrollType::Real:
+			applyScrollTo(max + _overscroll);
+			break;
+		}
+	}
+}
+
+void ElasticScroll::setOverscrollDefaults(int from, int till) {
+	Expects(from <= 0 && till >= 0);
+
+	const auto fromChanged = (_overscrollDefaultFrom != from);
+	const auto tillChanged = (_overscrollDefaultTill != till);
+	const auto changed = (fromChanged && _overscroll < 0)
+		|| (tillChanged && _overscroll > 0);
+	const auto movement = _movement.current();
+	if (_overscrollReturnAnimation.animating()) {
+		overscrollReturnCancel();
+	}
+	_overscrollDefaultFrom = from;
+	_overscrollDefaultTill = till;
+	if (changed) {
+		const auto delta = (_overscroll < 0)
+			? (_overscroll - _overscrollDefaultFrom)
+			: (_overscroll - _overscrollDefaultTill);
+		_overscrollAccumulated = currentOverscrollDefaultAccumulated()
+			+ OverscrollToAccumulated(delta);
+	}
+	if (movement == Movement::Momentum || movement == Movement::Returning) {
+		if (_overscroll != currentOverscrollDefault()) {
+			overscrollReturn();
+		}
+	}
+}
+
+void ElasticScroll::setOverscrollBg(QColor bg) {
+	_overscrollBg = bg;
+	update();
+}
+
 rpl::producer<> ElasticScroll::scrolls() const {
 	return _scrolls.events();
 }
@@ -980,6 +1162,22 @@ rpl::producer<> ElasticScroll::geometryChanged() const {
 	return _geometryChanged.events();
 }
 
+ElasticScrollPosition ElasticScroll::position() const {
+	return _position.current();
+}
+
+rpl::producer<ElasticScrollPosition> ElasticScroll::positionValue() const {
+	return _position.value();
+}
+
+ElasticScrollMovement ElasticScroll::movement() const {
+	return _movement.current();
+}
+
+rpl::producer<ElasticScrollMovement> ElasticScroll::movementValue() const {
+	return _movement.value();
+}
+
 QPoint ScrollDelta(not_null<QWheelEvent*> e) {
 	const auto convert = [](QPoint point) {
 		return QPoint(
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index a34a4d3..cba6c51 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -85,6 +85,25 @@ private:
 
 };
 
+struct ElasticScrollPosition {
+	int value = 0;
+	int overscroll = 0;
+
+	friend inline auto operator<=>(
+		ElasticScrollPosition,
+		ElasticScrollPosition) = default;
+	friend inline bool operator==(
+		ElasticScrollPosition,
+		ElasticScrollPosition) = default;
+};
+
+enum class ElasticScrollMovement {
+	None,
+	Progress,
+	Momentum,
+	Returning,
+};
+
 class ElasticScroll final : public RpWidget {
 public:
 	ElasticScroll(
@@ -136,15 +155,28 @@ public:
 	void setCustomTouchProcess(Fn<bool(not_null<QTouchEvent*>)> process) {
 		_customTouchProcess = std::move(process);
 	}
-	void setOverscrollBg(QColor bg) {
-		_overscrollBg = bg;
-		update();
-	}
+
+	enum class OverscrollType : uchar {
+		None,
+		Virtual,
+		Real,
+	};
+	void setOverscrollTypes(OverscrollType from, OverscrollType till);
+	void setOverscrollDefaults(int from, int till);
+	void setOverscrollBg(QColor bg);
 
 	[[nodiscard]] rpl::producer<> scrolls() const;
 	[[nodiscard]] rpl::producer<> innerResizes() const;
 	[[nodiscard]] rpl::producer<> geometryChanged() const;
 
+	using Position = ElasticScrollPosition;
+	[[nodiscard]] Position position() const;
+	[[nodiscard]] rpl::producer<Position> positionValue() const;
+
+	using Movement = ElasticScrollMovement;
+	[[nodiscard]] Movement movement() const;
+	[[nodiscard]] rpl::producer<Movement> movementValue() const;
+
 private:
 	bool eventHook(QEvent *e) override;
 	bool eventFilter(QObject *obj, QEvent *e) override;
@@ -163,6 +195,7 @@ private:
 	[[nodiscard]] int willScrollTo(int position) const;
 	void tryScrollTo(int position, bool synthMouseMove = true);
 	void applyScrollTo(int position, bool synthMouseMove = true);
+	void applyOverscroll(int overscroll);
 
 	void doSetOwnedWidget(object_ptr<QWidget> widget);
 	object_ptr<QWidget> doTakeWidget();
@@ -176,9 +209,16 @@ private:
 	void touchUpdateSpeed();
 	void touchDeaccelerate(int32 elapsed);
 
-	[[nodiscard]] int overscrollAmount() const;
+	struct AccumulatedParts {
+		int base = 0;
+		int relative = 0;
+	};
+	[[nodiscard]] AccumulatedParts computeAccumulatedParts() const;
+	[[nodiscard]] int currentOverscrollDefault() const;
+	[[nodiscard]] int currentOverscrollDefaultAccumulated() const;
 	void overscrollReturn();
 	void overscrollReturnCancel();
+	void overscrollCheckReturnFinish();
 	bool overscrollFinish();
 	void applyAccumulatedScroll();
 
@@ -213,8 +253,15 @@ private:
 
 	Fn<bool(not_null<QWheelEvent*>)> _customWheelProcess;
 	Fn<bool(not_null<QTouchEvent*>)> _customTouchProcess;
+	int _overscroll = 0;
+	int _overscrollDefaultFrom = 0;
+	int _overscrollDefaultTill = 0;
+	OverscrollType _overscrollTypeFrom = OverscrollType::None;
+	OverscrollType _overscrollTypeTill = OverscrollType::None;
 	std::optional<QColor> _overscrollBg;
 	Ui::Animations::Simple _overscrollReturnAnimation;
+	rpl::variable<Position> _position;
+	rpl::variable<Movement> _movement;
 
 	object_ptr<QWidget> _widget = { nullptr };
 

From 763b3a37c34fd7819f9d553b94387c4fe16554ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 12:21:33 +0400
Subject: [PATCH 421/635] Allow to change overscroll from outside.

---
 ui/widgets/elastic_scroll.cpp | 16 +++++++++++++---
 ui/widgets/elastic_scroll.h   |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index e9ef0f4..255ce12 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -1118,9 +1118,19 @@ void ElasticScroll::setOverscrollTypes(
 	}
 }
 
-void ElasticScroll::setOverscrollDefaults(int from, int till) {
+void ElasticScroll::setOverscrollDefaults(int from, int till, bool shift) {
 	Expects(from <= 0 && till >= 0);
 
+	if (_state.visibleFrom > 0
+		|| (!_state.visibleFrom
+			&& _overscrollTypeFrom != OverscrollType::Virtual)) {
+		from = 0;
+	}
+	if (_state.visibleTill < _state.fullSize
+		|| (_state.visibleTill == _state.fullSize
+			&& _overscrollTypeTill != OverscrollType::Virtual)) {
+		till = 0;
+	}
 	const auto fromChanged = (_overscrollDefaultFrom != from);
 	const auto tillChanged = (_overscrollDefaultTill != till);
 	const auto changed = (fromChanged && _overscroll < 0)
@@ -1133,8 +1143,8 @@ void ElasticScroll::setOverscrollDefaults(int from, int till) {
 	_overscrollDefaultTill = till;
 	if (changed) {
 		const auto delta = (_overscroll < 0)
-			? (_overscroll - _overscrollDefaultFrom)
-			: (_overscroll - _overscrollDefaultTill);
+			? (_overscroll - (shift ? 0 : _overscrollDefaultFrom))
+			: (_overscroll - (shift ? 0 : _overscrollDefaultTill));
 		_overscrollAccumulated = currentOverscrollDefaultAccumulated()
 			+ OverscrollToAccumulated(delta);
 	}
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index cba6c51..4a3434b 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -162,7 +162,7 @@ public:
 		Real,
 	};
 	void setOverscrollTypes(OverscrollType from, OverscrollType till);
-	void setOverscrollDefaults(int from, int till);
+	void setOverscrollDefaults(int from, int till, bool shift = false);
 	void setOverscrollBg(QColor bg);
 
 	[[nodiscard]] rpl::producer<> scrolls() const;

From 427fc4c8f7c8b92cca900e0270718f83fcb16e35 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 19:18:20 +0400
Subject: [PATCH 422/635] Fix painting glitch in elastic scroll.

---
 ui/widgets/elastic_scroll.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 255ce12..532fabb 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -895,10 +895,25 @@ void ElasticScroll::applyScrollTo(int position, bool synthMouseMove) {
 	}
 	const auto weak = Ui::MakeWeak(this);
 	_dirtyState = true;
+	const auto was = _widget->geometry();
 	_widget->move(
 		_vertical ? _widget->x() : -position,
 		_vertical ? -position : _widget->y());
 	if (weak) {
+		const auto now = _widget->geometry();
+		const auto wasFrom = _vertical ? was.y() : was.x();
+		const auto wasTill = wasFrom
+			+ (_vertical ? was.height() : was.width());
+		const auto nowFrom = _vertical ? now.y() : now.x();
+		const auto nowTill = nowFrom
+			+ (_vertical ? now.height() : now.width());
+		const auto mySize = _vertical ? height() : width();
+		if ((wasFrom > 0 && wasFrom < mySize)
+			|| (wasTill > 0 && wasTill < mySize)
+			|| (nowFrom > 0 && nowFrom < mySize)
+			|| (nowTill > 0 && nowTill < mySize)) {
+			update();
+		}
 		if (_dirtyState) {
 			updateState();
 		}

From 6af98c08025027cc3e7833e068db47670aa34dab Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 11 Jul 2023 21:40:50 +0400
Subject: [PATCH 423/635] Process touch through wheel events.

---
 ui/widgets/elastic_scroll.cpp | 82 +++++++++++++++++++++++++----------
 ui/widgets/elastic_scroll.h   |  7 +--
 2 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 532fabb..79fe18d 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -22,6 +22,7 @@ constexpr auto kOverscrollReturnDuration = crl::time(250);
 constexpr auto kOverscrollPower = 0.6;
 constexpr auto kOverscrollFromThreshold = -(1 << 30);
 constexpr auto kOverscrollTillThreshold = (1 << 30);
+constexpr auto kTouchOverscrollMultiplier = 2;
 
 [[nodiscard]] int OverscrollFromAccumulated(int accumulated) {
 	if (!accumulated) {
@@ -56,6 +57,7 @@ ElasticScrollBar::ElasticScrollBar(
 , _hideTimer([=] { toggle(false); })
 , _shown(!_st.hiding)
 , _vertical(orientation == Qt::Vertical) {
+	setAttribute(Qt::WA_NoMousePropagation);
 }
 
 void ElasticScrollBar::refreshGeometry() {
@@ -329,6 +331,11 @@ void ElasticScrollBar::resizeEvent(QResizeEvent *e) {
 	refreshGeometry();
 }
 
+bool ElasticScrollBar::eventHook(QEvent *e) {
+	setAttribute(Qt::WA_NoMousePropagation, e->type() != QEvent::Wheel);
+	return RpWidget::eventHook(e);
+}
+
 ElasticScroll::ElasticScroll(
 	QWidget *parent,
 	const style::ScrollArea &st,
@@ -371,8 +378,17 @@ void ElasticScroll::setHandleTouch(bool handle) {
 }
 
 bool ElasticScroll::viewportEvent(QEvent *e) {
-	return (e->type() == QEvent::Wheel)
-		&& handleWheelEvent(static_cast<QWheelEvent*>(e));
+	const auto type = e->type();
+	if (type == QEvent::Wheel) {
+		return handleWheelEvent(static_cast<QWheelEvent*>(e));
+	} else if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate
+		|| type == QEvent::TouchEnd
+		|| type == QEvent::TouchCancel) {
+		handleTouchEvent(static_cast<QTouchEvent*>(e));
+		return true;
+	}
+	return false;
 }
 
 void ElasticScroll::touchDeaccelerate(int32 elapsed) {
@@ -496,14 +512,18 @@ void ElasticScroll::touchScrollTimer() {
 	auto nowTime = crl::now();
 	if (_touchScrollState == TouchScrollState::Acceleration && _touchWaitingAcceleration && (nowTime - _touchAccelerationTime) > 40) {
 		_touchScrollState = TouchScrollState::Manual;
+		sendWheelEvent(Qt::ScrollEnd);
 		touchResetSpeed();
 	} else if (_touchScrollState == TouchScrollState::Auto || _touchScrollState == TouchScrollState::Acceleration) {
 		int32 elapsed = int32(nowTime - _touchTime);
 		QPoint delta = _touchSpeed * elapsed / 1000;
-		bool hasScrolled = touchScroll(delta);
+		sendWheelEvent(
+			_touchPress ? Qt::ScrollUpdate : Qt::ScrollMomentum,
+			delta);
 
-		if (_touchSpeed.isNull() || !hasScrolled) {
+		if (_touchSpeed.isNull()) {
 			_touchScrollState = TouchScrollState::Manual;
+			sendWheelEvent(Qt::ScrollEnd);
 			_touchScroll = false;
 			_touchScrollTimer.cancel();
 		} else {
@@ -602,7 +622,7 @@ void ElasticScroll::paintEvent(QPaintEvent *e) {
 	}
 }
 
-bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e) {
+bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e, bool touch) {
 	if (_customWheelProcess
 		&& _customWheelProcess(static_cast<QWheelEvent*>(e.get()))) {
 		return true;
@@ -652,6 +672,9 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e) {
 	if (!delta) {
 		return true;
 	}
+	if (touch) {
+		delta *= kTouchOverscrollMultiplier;
+	}
 	const auto accumulated = _overscrollAccumulated + delta;
 	const auto type = (accumulated < 0)
 		? _overscrollTypeFrom
@@ -726,7 +749,9 @@ void ElasticScroll::handleTouchEvent(QTouchEvent *e) {
 
 	switch (e->type()) {
 	case QEvent::TouchBegin: {
-		if (_touchPress || e->touchPoints().isEmpty()) return;
+		if (_touchPress || e->touchPoints().isEmpty()) {
+			return;
+		}
 		_touchPress = true;
 		if (_touchScrollState == TouchScrollState::Auto) {
 			_touchScrollState = TouchScrollState::Acceleration;
@@ -740,18 +765,23 @@ void ElasticScroll::handleTouchEvent(QTouchEvent *e) {
 		}
 		_touchStart = _touchPreviousPosition = _touchPosition;
 		_touchRightButton = false;
+		sendWheelEvent(Qt::ScrollBegin);
 	} break;
 
 	case QEvent::TouchUpdate: {
-		if (!_touchPress) return;
-		if (!_touchScroll && (_touchPosition - _touchStart).manhattanLength() >= QApplication::startDragDistance()) {
+		if (!_touchPress) {
+			return;
+		}
+		if (!_touchScroll
+			&& ((_touchPosition - _touchStart).manhattanLength()
+				>= QApplication::startDragDistance())) {
 			_touchTimer.cancel();
 			_touchScroll = true;
 			touchUpdateSpeed();
 		}
 		if (_touchScroll) {
 			if (_touchScrollState == TouchScrollState::Manual) {
-				touchScrollUpdated(_touchPosition);
+				touchScrollUpdated();
 			} else if (_touchScrollState == TouchScrollState::Acceleration) {
 				touchUpdateSpeed();
 				_touchAccelerationTime = crl::now();
@@ -763,7 +793,9 @@ void ElasticScroll::handleTouchEvent(QTouchEvent *e) {
 	} break;
 
 	case QEvent::TouchEnd: {
-		if (!_touchPress) return;
+		if (!_touchPress) {
+			return;
+		}
 		_touchPress = false;
 		auto weak = MakeWeak(this);
 		if (_touchScroll) {
@@ -811,9 +843,12 @@ void ElasticScroll::handleTouchEvent(QTouchEvent *e) {
 	}
 }
 
-void ElasticScroll::touchScrollUpdated(const QPoint &screenPos) {
-	_touchPosition = screenPos;
-	touchScroll(_touchPosition - _touchPreviousPosition);
+void ElasticScroll::touchScrollUpdated() {
+	//touchScroll(_touchPosition - _touchPreviousPosition);
+	const auto phase = !_touchPress
+		? Qt::ScrollMomentum
+		: Qt::ScrollUpdate;
+	sendWheelEvent(phase, _touchPosition - _touchPreviousPosition);
 	touchUpdateSpeed();
 }
 
@@ -958,15 +993,18 @@ void ElasticScroll::tryScrollTo(int position, bool synthMouseMove) {
 	applyScrollTo(willScrollTo(position), synthMouseMove);
 }
 
-bool ElasticScroll::touchScroll(const QPoint &delta) {
-	const auto scTop = scrollTop();
-	const auto scMax = scrollTopMax();
-	const auto scNew = std::clamp(scTop - delta.y(), 0, scMax);
-	if (scNew == scTop) {
-		return false;
-	}
-	scrollToY(scNew);
-	return true;
+void ElasticScroll::sendWheelEvent(Qt::ScrollPhase phase, QPoint delta) {
+	auto e = QWheelEvent(
+		mapFromGlobal(_touchPosition),
+		_touchPosition,
+		delta,
+		delta,
+		Qt::NoButton,
+		QGuiApplication::keyboardModifiers(),
+		phase,
+		false,
+		Qt::MouseEventSynthesizedByApplication);
+	handleWheelEvent(&e, true);
 }
 
 void ElasticScroll::resizeEvent(QResizeEvent *e) {
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index 4a3434b..50d6111 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -55,6 +55,7 @@ private:
 	void enterEventHook(QEnterEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
+	bool eventHook(QEvent *e) override;
 
 	[[nodiscard]] int scaleToBar(int change) const;
 	[[nodiscard]] bool barHighlighted() const;
@@ -187,7 +188,7 @@ private:
 	void enterEventHook(QEnterEvent *e) override;
 	void leaveEventHook(QEvent *e) override;
 	void keyPressEvent(QKeyEvent *e) override;
-	bool handleWheelEvent(not_null<QWheelEvent*> e);
+	bool handleWheelEvent(not_null<QWheelEvent*> e, bool touch = false);
 	void handleTouchEvent(QTouchEvent *e);
 
 	void updateState();
@@ -202,8 +203,8 @@ private:
 
 	bool filterOutTouchEvent(QEvent *e);
 	void touchScrollTimer();
-	bool touchScroll(const QPoint &delta);
-	void touchScrollUpdated(const QPoint &screenPos);
+	void touchScrollUpdated();
+	void sendWheelEvent(Qt::ScrollPhase phase, QPoint delta = {});
 
 	void touchResetSpeed();
 	void touchUpdateSpeed();

From d04a38e15d957ab0dacfe825396c199541097443 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 12:20:54 +0400
Subject: [PATCH 424/635] Try different overscroll function.

---
 ui/widgets/elastic_scroll.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 79fe18d..2615d20 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -13,24 +13,38 @@
 #include "styles/style_widgets.h"
 
 #include <QtGui/QWindow>
+#include <QtCore/QtMath>
 #include <QtWidgets/QApplication>
 
 namespace Ui {
 namespace {
 
 constexpr auto kOverscrollReturnDuration = crl::time(250);
-constexpr auto kOverscrollPower = 0.6;
+//constexpr auto kOverscrollPower = 0.6;
 constexpr auto kOverscrollFromThreshold = -(1 << 30);
 constexpr auto kOverscrollTillThreshold = (1 << 30);
 constexpr auto kTouchOverscrollMultiplier = 2;
 
+constexpr auto kLogA = 16.;
+constexpr auto kLogB = 10.;
+
+[[nodiscard]] float64 RawFrom(float64 value) {
+	return kLogA * log(1. + value / kLogB);
+	//return pow(value, kOverscrollPower);
+}
+
+[[nodiscard]] float64 RawTo(float64 value) {
+	return (exp(value / kLogA) - 1.) * kLogB;
+	//return pow(value, 1. / kOverscrollPower);
+}
+
 [[nodiscard]] int OverscrollFromAccumulated(int accumulated) {
 	if (!accumulated) {
 		return 0;
 	}
+
 	return (accumulated > 0 ? 1. : -1.)
-		* int(base::SafeRound(
-			pow(std::abs(accumulated), kOverscrollPower)));
+		* int(base::SafeRound(RawFrom(std::abs(accumulated))));
 }
 
 [[nodiscard]] int OverscrollToAccumulated(int overscroll) {
@@ -38,8 +52,7 @@ constexpr auto kTouchOverscrollMultiplier = 2;
 		return 0;
 	}
 	return (overscroll > 0 ? 1. : -1.)
-		* int(base::SafeRound(
-			pow(std::abs(overscroll), 1. / kOverscrollPower)));
+		* int(base::SafeRound(RawTo(std::abs(overscroll))));
 }
 
 } // namespace

From 8db6dcf125da5c767d36a696794d4a51d82c7955 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 22:03:35 +0400
Subject: [PATCH 425/635] Workaround Wayland popup menu bug.

When hiding a child popup first the app receives ApplicationDeactivate
event and in a short time (a couple of ms) ApplicationActivate.

But the first event hides all popups, so the parent popup gets closed too.

Delay handling of ApplicationDeactivate event in this specific case.
---
 ui/platform/linux/ui_utility_linux.cpp | 35 +++++++++++++++++++++++++-
 ui/platform/mac/ui_utility_mac.mm      | 10 ++++++++
 ui/platform/ui_platform_utility.h      |  6 +++++
 ui/platform/win/ui_utility_win.cpp     | 10 ++++++++
 ui/widgets/popup_menu.cpp              |  3 +++
 5 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 2479325..76bb270 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -9,8 +9,9 @@
 #include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
-#include "ui/platform/linux/ui_linux_wayland_integration.h"
+#include "base/call_delayed.h"
 #include "base/const_string.h"
+#include "ui/platform/linux/ui_linux_wayland_integration.h"
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xcb_utilities.h"
@@ -26,6 +27,10 @@ namespace Platform {
 namespace {
 
 constexpr auto kXCBFrameExtentsAtomName = "_GTK_FRAME_EXTENTS"_cs;
+constexpr auto kDelayDeactivateEventTimeout = crl::time(400);
+
+bool PendingDeactivateEvent/* = false*/;
+int ChildPopupsHiddenOnWayland/* = 0*/;
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 std::optional<bool> XCBWindowMapped(xcb_window_t window) {
@@ -548,6 +553,34 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 	}
 }
 
+void RegisterChildPopupHiding() {
+	if (!::Platform::IsWayland()) {
+		return;
+	}
+	++ChildPopupsHiddenOnWayland;
+	base::call_delayed(kDelayDeactivateEventTimeout, [] {
+		if (!--ChildPopupsHiddenOnWayland) {
+			if (base::take(PendingDeactivateEvent)) {
+				// We didn't receive ApplicationActivate event in time.
+				QEvent appDeactivate(QEvent::ApplicationDeactivate);
+				QCoreApplication::sendEvent(qApp, &appDeactivate);
+			}
+		}
+	});
+}
+
+bool SkipApplicationDeactivateEvent() {
+	if (!ChildPopupsHiddenOnWayland) {
+		return false;
+	}
+	PendingDeactivateEvent = true;
+	return true;
+}
+
+void GotApplicationActivateEvent() {
+	PendingDeactivateEvent = false;
+}
+
 namespace internal {
 
 TitleControls::Layout TitleControlsLayout() {
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 857db1e..3c59a5f 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -147,6 +147,16 @@ std::optional<bool> IsOverlapped(
 	return false;
 }
 
+void RegisterChildPopupHiding() {
+}
+
+bool SkipApplicationDeactivateEvent() {
+	return false;
+}
+
+void GotApplicationActivateEvent() {
+}
+
 namespace internal {
 
 TitleControls::Layout TitleControlsLayout() {
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 3def532..e7343cc 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -58,6 +58,12 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
 
+// Workaround for a Qt/Wayland bug that hides the parent popup when
+// the child popup gets hidden, by sending Deactivate / Activate events.
+void RegisterChildPopupHiding();
+[[nodiscard]] bool SkipApplicationDeactivateEvent();
+void GotApplicationActivateEvent();
+
 } // namespace Ui::Platform
 
 // Platform dependent implementations.
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index bb1cc32..e81b150 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -203,4 +203,14 @@ void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
 		menu->lifetime().make_state<Filter>(menu));
 }
 
+void RegisterChildPopupHiding() {
+}
+
+bool SkipApplicationDeactivateEvent() {
+	return false;
+}
+
+void GotApplicationActivateEvent() {
+}
+
 } // namespace Ui::Platform
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 305bc0f..049455d 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -673,6 +673,9 @@ bool PopupMenu::eventFilter(QObject *o, QEvent *e) {
 }
 
 void PopupMenu::hideMenu(bool fast) {
+	if (fast && _parent) {
+		Platform::RegisterChildPopupHiding();
+	}
 	if (isHidden() || (_hiding && !fast)) {
 		return;
 	}

From b6cb6cb770236a49bffdf572427faa477f00ccc0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 12 Jul 2023 23:01:19 +0400
Subject: [PATCH 426/635] Ignore wrong wheel direction in ElasticScroll.

---
 ui/widgets/elastic_scroll.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 2615d20..4ae5bd9 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -658,6 +658,9 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e, bool touch) {
 	}
 	const auto pixels = ScrollDelta(e);
 	auto delta = _vertical ? -pixels.y() : pixels.x();
+	if (std::abs(_vertical ? pixels.x() : pixels.y()) >= std::abs(delta)) {
+		delta = 0;
+	}
 	if (phase == Qt::NoScrollPhase) {
 		if (_overscroll == currentOverscrollDefault()) {
 			tryScrollTo(_state.visibleFrom + delta);

From fd1752a5c2e71810e75c3b90eee3ff6fd9e0d71b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 14 Jul 2023 16:08:47 +0400
Subject: [PATCH 427/635] Improve overscroll handling.

---
 ui/widgets/elastic_scroll.cpp | 20 ++++++++++----------
 ui/widgets/elastic_scroll.h   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 4ae5bd9..9a5b7fa 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -412,7 +412,8 @@ void ElasticScroll::touchDeaccelerate(int32 elapsed) {
 }
 
 void ElasticScroll::overscrollReturn() {
-	_ignoreMomentum = _overscrollReturning = true;
+	_overscrollReturning = true;
+	_ignoreMomentumFromOverscroll = _overscroll;
 	if (overscrollFinish()) {
 		_overscrollReturnAnimation.stop();
 		return;
@@ -647,20 +648,19 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e, bool touch) {
 	const auto guard = gsl::finally([&] {
 		_lastScroll = now;
 	});
-	if (_ignoreMomentum) {
-		if (momentum) {
-			if (!_overscrollReturnAnimation.animating()) {
-				return true;
-			}
-		} else {
-			_ignoreMomentum = false;
-		}
-	}
 	const auto pixels = ScrollDelta(e);
 	auto delta = _vertical ? -pixels.y() : pixels.x();
 	if (std::abs(_vertical ? pixels.x() : pixels.y()) >= std::abs(delta)) {
 		delta = 0;
 	}
+	if (_ignoreMomentumFromOverscroll) {
+		if (!momentum) {
+			_ignoreMomentumFromOverscroll = 0;
+		} else if (!_overscrollReturnAnimation.animating()
+			&& !base::OppositeSigns(_ignoreMomentumFromOverscroll, delta)) {
+			return true;
+		}
+	}
 	if (phase == Qt::NoScrollPhase) {
 		if (_overscroll == currentOverscrollDefault()) {
 			tryScrollTo(_state.visibleFrom + delta);
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index 50d6111..af74ec4 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -239,6 +239,7 @@ private:
 	crl::time _lastScroll = 0;
 	TouchScrollState _touchScrollState = TouchScrollState::Manual;
 	int _overscrollAccumulated = 0;
+	int _ignoreMomentumFromOverscroll = 0;
 	bool _touchDisabled : 1 = false;
 	bool _touchScroll : 1 = false;
 	bool _touchPress : 1 = false;
@@ -249,7 +250,6 @@ private:
 	bool _widgetAcceptsTouch : 1 = false;
 	bool _disabled : 1 = false;
 	bool _dirtyState : 1 = false;
-	bool _ignoreMomentum : 1 = false;
 	bool _overscrollReturning : 1 = false;
 
 	Fn<bool(not_null<QWheelEvent*>)> _customWheelProcess;

From c7e0b7af37bce7ec77195ff717d70457e51e1e7a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 17 Jul 2023 11:39:31 +0400
Subject: [PATCH 428/635] Apply interface scale multiplier in overscroll.

---
 ui/widgets/elastic_scroll.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 9a5b7fa..68b297e 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -29,13 +29,23 @@ constexpr auto kLogA = 16.;
 constexpr auto kLogB = 10.;
 
 [[nodiscard]] float64 RawFrom(float64 value) {
-	return kLogA * log(1. + value / kLogB);
-	//return pow(value, kOverscrollPower);
+	const auto scale = style::Scale() / 100.;
+	value /= scale;
+
+	const auto result = kLogA * log(1. + value / kLogB);
+	//const auto result = pow(value, kOverscrollPower);
+
+	return result * scale;
 }
 
 [[nodiscard]] float64 RawTo(float64 value) {
-	return (exp(value / kLogA) - 1.) * kLogB;
-	//return pow(value, 1. / kOverscrollPower);
+	const auto scale = style::Scale() / 100.;
+	value /= scale;
+
+	const auto result = (exp(value / kLogA) - 1.) * kLogB;
+	//const auto result = pow(value, 1. / kOverscrollPower);
+
+	return result * scale;
 }
 
 [[nodiscard]] int OverscrollFromAccumulated(int accumulated) {

From 1c0889f78a74bb29e8cea6986ea8b18e7add7fb0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 12:15:05 +0400
Subject: [PATCH 429/635] Fix ElasticScroll glitch after resizing.

---
 ui/widgets/elastic_scroll.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 68b297e..50b622c 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -1043,6 +1043,7 @@ void ElasticScroll::resizeEvent(QResizeEvent *e) {
 			height())
 		: QRect(0, height() - _st.width, width(), _st.width));
 	_geometryChanged.fire({});
+	updateState();
 }
 
 void ElasticScroll::moveEvent(QMoveEvent *e) {

From 048156ecda89b54ea48aafd5b0f97ccffcc922c9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 18 Jul 2023 20:44:53 +0400
Subject: [PATCH 430/635] Support fractional border in rounded input field.

---
 ui/widgets/input_fields.cpp | 13 ++++++-------
 ui/widgets/widgets.style    |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index ba59c44..b16f66b 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1645,20 +1645,19 @@ void InputField::paintRoundSurrounding(
 		QRect clip,
 		float64 errorDegree,
 		float64 focusedDegree) {
+	const auto divide = _st.borderDenominator ? _st.borderDenominator : 1;
+	const auto border = _st.border / float64(divide);
+	const auto borderHalf = border / 2.;
 	auto pen = anim::pen(_st.borderFg, _st.borderFgActive, focusedDegree);
-	pen.setWidth(_st.border);
+	pen.setWidthF(border);
 	p.setPen(pen);
 	p.setBrush(anim::brush(_st.textBg, _st.textBgActive, focusedDegree));
 
 	PainterHighQualityEnabler hq(p);
-	const auto radius = _st.borderRadius - (_st.border / 2.);
+	const auto radius = _st.borderRadius - borderHalf;
 	p.drawRoundedRect(
 		QRectF(0, 0, width(), height()).marginsRemoved(
-			QMarginsF(
-				_st.border / 2.,
-				_st.border / 2.,
-				_st.border / 2.,
-				_st.border / 2.)),
+			QMarginsF(borderHalf, borderHalf, borderHalf, borderHalf)),
 		radius,
 		radius);
 }
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index ee9e2e8..cd7aa2b 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -285,6 +285,7 @@ InputField {
 	border: pixels;
 	borderActive: pixels;
 	borderRadius: pixels;
+	borderDenominator: int;
 
 	font: font;
 	menu: PopupMenu;
@@ -881,6 +882,7 @@ defaultInputField: InputField {
 	border: 1px;
 	borderActive: 2px;
 	borderRadius: 0px;
+	borderDenominator: 1;
 
 	font: boxTextFont;
 	menu: defaultPopupMenu;

From b9aa8a17d49f5c400868879b22a54d3339024852 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 19 Jul 2023 11:38:53 +0400
Subject: [PATCH 431/635] Allow to pass new title controls layout value to
 notifier

In case the getter is trivial (has only one implementation)
---
 ui/platform/ui_platform_utility.cpp | 5 +++--
 ui/platform/ui_platform_utility.h   | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui/platform/ui_platform_utility.cpp b/ui/platform/ui_platform_utility.cpp
index cb8286d..cdeec97 100644
--- a/ui/platform/ui_platform_utility.cpp
+++ b/ui/platform/ui_platform_utility.cpp
@@ -19,8 +19,9 @@ auto &CachedTitleControlsLayout() {
 
 } // namespace
 
-void NotifyTitleControlsLayoutChanged() {
-	CachedTitleControlsLayout() = TitleControlsLayout();
+void NotifyTitleControlsLayoutChanged(
+		const std::optional<TitleControls::Layout> &layout) {
+	CachedTitleControlsLayout() = layout ? *layout : TitleControlsLayout();
 }
 
 } // namespace internal
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index e7343cc..4fa6a5d 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -21,7 +21,8 @@ namespace internal {
 
 // Actual requestor, cached by the public interface
 [[nodiscard]] TitleControls::Layout TitleControlsLayout();
-void NotifyTitleControlsLayoutChanged();
+void NotifyTitleControlsLayoutChanged(
+    const std::optional<TitleControls::Layout> &layout = std::nullopt);
 
 } // namespace internal
 

From 6419b54383b0e0c149ca6143e3cabc0bcb29e8ff Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 19 Jul 2023 12:59:58 +0400
Subject: [PATCH 432/635] Extract controls side deduction code

---
 ui/platform/ui_platform_utility.h        | 11 +++++++++++
 ui/platform/ui_platform_window_title.cpp | 12 ++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 4fa6a5d..64c8dd9 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -56,6 +56,17 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 [[nodiscard]] TitleControls::Layout TitleControlsLayout();
 [[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutValue();
 [[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged();
+[[nodiscard]] bool TitleControlsOnLeft(
+		const TitleControls::Layout &layout = TitleControlsLayout()) {
+	if (ranges::contains(layout.left, TitleControl::Close)) {
+		return true;
+	} else if (ranges::contains(layout.right, TitleControl::Close)) {
+		return false;
+	} else if (layout.left.size() > layout.right.size()) {
+		return true;
+	}
+	return false;
+}
 
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
 
diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index 1a47b1a..4162364 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -340,9 +340,9 @@ AbstractButton *TitleControls::controlWidget(Control control) const {
 }
 
 void TitleControls::updateControlsPosition() {
-	const auto controlsLayout = TitleControlsLayout();
-	auto controlsLeft = controlsLayout.left;
-	auto controlsRight = controlsLayout.right;
+	auto controlsLayout = TitleControlsLayout();
+	auto &controlsLeft = controlsLayout.left;
+	auto &controlsRight = controlsLayout.right;
 	const auto moveFromTo = [&](auto &from, auto &to) {
 		for (const auto control : from) {
 			if (!ranges::contains(to, control)) {
@@ -351,11 +351,7 @@ void TitleControls::updateControlsPosition() {
 		}
 		from.clear();
 	};
-	if (ranges::contains(controlsLeft, Control::Close)) {
-		moveFromTo(controlsRight, controlsLeft);
-	} else if (ranges::contains(controlsRight, Control::Close)) {
-		moveFromTo(controlsLeft, controlsRight);
-	} else if (controlsLeft.size() > controlsRight.size()) {
+	if (TitleControlsOnLeft(controlsLayout)) {
 		moveFromTo(controlsRight, controlsLeft);
 	} else {
 		moveFromTo(controlsLeft, controlsRight);

From 19d044a212f7006d7282eda47010c1b882ed8d3f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 19 Jul 2023 14:09:06 +0400
Subject: [PATCH 433/635] Move TitleControlsLayout from ui_platform_utility to
 ui_platform_window_title

---
 CMakeLists.txt                              |   3 +-
 ui/platform/linux/ui_utility_linux.cpp      | 127 -----------------
 ui/platform/linux/ui_window_title_linux.cpp | 146 ++++++++++++++++++++
 ui/platform/linux/ui_window_title_linux.h   |   9 ++
 ui/platform/mac/ui_utility_mac.mm           |  13 --
 ui/platform/mac/ui_window_title_mac.mm      |  13 ++
 ui/platform/ui_platform_utility.cpp         |  42 ------
 ui/platform/ui_platform_utility.h           |  25 ----
 ui/platform/ui_platform_window_title.cpp    |  30 ++++
 ui/platform/ui_platform_window_title.h      |  24 ++++
 ui/platform/win/ui_utility_win.cpp          |  14 --
 ui/platform/win/ui_window_title_win.cpp     |  14 ++
 12 files changed, 238 insertions(+), 222 deletions(-)
 create mode 100644 ui/platform/linux/ui_window_title_linux.cpp
 create mode 100644 ui/platform/linux/ui_window_title_linux.h
 delete mode 100644 ui/platform/ui_platform_utility.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f7bc3e..9073bcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,8 @@ PRIVATE
     ui/platform/linux/ui_linux_wayland_integration.h
     ui/platform/linux/ui_window_linux.cpp
     ui/platform/linux/ui_window_linux.h
+    ui/platform/linux/ui_window_title_linux.cpp
+    ui/platform/linux/ui_window_title_linux.h
     ui/platform/linux/ui_utility_linux.cpp
     ui/platform/linux/ui_utility_linux.h
     ui/platform/mac/ui_window_mac.h
@@ -134,7 +136,6 @@ PRIVATE
     ui/platform/ui_platform_window_title.h
     ui/platform/ui_platform_window.cpp
     ui/platform/ui_platform_window.h
-    ui/platform/ui_platform_utility.cpp
     ui/platform/ui_platform_utility.h
     ui/style/style_core.cpp
     ui/style/style_core.h
diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 76bb270..96c4059 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -7,15 +7,12 @@
 #include "ui/platform/linux/ui_utility_linux.h"
 
 #include "base/platform/base_platform_info.h"
-#include "base/platform/linux/base_linux_glibmm_helper.h"
-#include "base/platform/linux/base_linux_xdp_utilities.h"
 #include "base/call_delayed.h"
 #include "base/const_string.h"
 #include "ui/platform/linux/ui_linux_wayland_integration.h"
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xcb_utilities.h"
-#include "base/platform/linux/base_linux_xsettings.h"
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 #include <QtCore/QPoint>
@@ -399,41 +396,6 @@ void ShowXCBWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 }
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
-TitleControls::Control GtkKeywordToTitleControl(const QString &keyword) {
-	if (keyword == qstr("minimize")) {
-		return TitleControls::Control::Minimize;
-	} else if (keyword == qstr("maximize")) {
-		return TitleControls::Control::Maximize;
-	} else if (keyword == qstr("close")) {
-		return TitleControls::Control::Close;
-	}
-
-	return TitleControls::Control::Unknown;
-}
-
-TitleControls::Layout GtkKeywordsToTitleControlsLayout(const QString &keywords) {
-	const auto splitted = keywords.split(':');
-
-	std::vector<TitleControls::Control> controlsLeft;
-	ranges::transform(
-		splitted[0].split(','),
-		ranges::back_inserter(controlsLeft),
-		GtkKeywordToTitleControl);
-
-	std::vector<TitleControls::Control> controlsRight;
-	if (splitted.size() > 1) {
-		ranges::transform(
-			splitted[1].split(','),
-			ranges::back_inserter(controlsRight),
-			GtkKeywordToTitleControl);
-	}
-
-	return TitleControls::Layout{
-		.left = controlsLeft,
-		.right = controlsRight
-	};
-}
-
 } // namespace
 
 bool IsApplicationActive() {
@@ -581,94 +543,5 @@ void GotApplicationActivateEvent() {
 	PendingDeactivateEvent = false;
 }
 
-namespace internal {
-
-TitleControls::Layout TitleControlsLayout() {
-	[[maybe_unused]] static const auto Inited = [] {
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-		using base::Platform::XCB::XSettings;
-		if (const auto xSettings = XSettings::Instance()) {
-			xSettings->registerCallbackForProperty("Gtk/DecorationLayout", [](
-					xcb_connection_t *,
-					const QByteArray &,
-					const QVariant &,
-					void *) {
-				NotifyTitleControlsLayoutChanged();
-			}, nullptr);
-		}
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
-
-		using XDPSettingWatcher = base::Platform::XDP::SettingWatcher;
-		static const XDPSettingWatcher settingWatcher(
-			[=](
-				const Glib::ustring &group,
-				const Glib::ustring &key,
-				const Glib::VariantBase &value) {
-				if (group == "org.gnome.desktop.wm.preferences"
-					&& key == "button-layout") {
-					NotifyTitleControlsLayoutChanged();
-				}
-			});
-
-		return true;
-	}();
-
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-	const auto xSettingsResult = []() -> std::optional<TitleControls::Layout> {
-		using base::Platform::XCB::XSettings;
-		const auto xSettings = XSettings::Instance();
-		if (!xSettings) {
-			return std::nullopt;
-		}
-
-		const auto decorationLayout = xSettings->setting("Gtk/DecorationLayout");
-		if (!decorationLayout.isValid()) {
-			return std::nullopt;
-		}
-
-		return GtkKeywordsToTitleControlsLayout(decorationLayout.toString());
-	}();
-
-	if (xSettingsResult.has_value()) {
-		return *xSettingsResult;
-	}
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
-
-	const auto portalResult = []() -> std::optional<TitleControls::Layout> {
-		try {
-			using namespace base::Platform::XDP;
-
-			const auto decorationLayout = ReadSetting(
-				"org.gnome.desktop.wm.preferences",
-				"button-layout");
-
-			if (!decorationLayout.has_value()) {
-				return std::nullopt;
-			}
-
-			return GtkKeywordsToTitleControlsLayout(
-				QString::fromStdString(
-					base::Platform::GlibVariantCast<Glib::ustring>(
-						*decorationLayout)));
-		} catch (...) {
-		}
-
-		return std::nullopt;
-	}();
-
-	if (portalResult.has_value()) {
-		return *portalResult;
-	}
-
-	return TitleControls::Layout{
-		.right = {
-			TitleControls::Control::Minimize,
-			TitleControls::Control::Maximize,
-			TitleControls::Control::Close,
-		}
-	};
-}
-
-} // namespace internal
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/linux/ui_window_title_linux.cpp b/ui/platform/linux/ui_window_title_linux.cpp
new file mode 100644
index 0000000..eca5024
--- /dev/null
+++ b/ui/platform/linux/ui_window_title_linux.cpp
@@ -0,0 +1,146 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/platform/linux/ui_window_title_linux.h"
+
+#include "base/platform/linux/base_linux_glibmm_helper.h"
+#include "base/platform/linux/base_linux_xdp_utilities.h"
+
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+#include "base/platform/linux/base_linux_xsettings.h"
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+
+namespace Ui {
+namespace Platform {
+namespace internal {
+namespace {
+
+TitleControls::Control GtkKeywordToTitleControl(const QString &keyword) {
+	if (keyword == qstr("minimize")) {
+		return TitleControls::Control::Minimize;
+	} else if (keyword == qstr("maximize")) {
+		return TitleControls::Control::Maximize;
+	} else if (keyword == qstr("close")) {
+		return TitleControls::Control::Close;
+	}
+
+	return TitleControls::Control::Unknown;
+}
+
+TitleControls::Layout GtkKeywordsToTitleControlsLayout(const QString &keywords) {
+	const auto splitted = keywords.split(':');
+
+	std::vector<TitleControls::Control> controlsLeft;
+	ranges::transform(
+		splitted[0].split(','),
+		ranges::back_inserter(controlsLeft),
+		GtkKeywordToTitleControl);
+
+	std::vector<TitleControls::Control> controlsRight;
+	if (splitted.size() > 1) {
+		ranges::transform(
+			splitted[1].split(','),
+			ranges::back_inserter(controlsRight),
+			GtkKeywordToTitleControl);
+	}
+
+	return TitleControls::Layout{
+		.left = controlsLeft,
+		.right = controlsRight,
+	};
+}
+
+} // namespace
+
+TitleControls::Layout TitleControlsLayout() {
+	[[maybe_unused]] static const auto Inited = [] {
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+		using base::Platform::XCB::XSettings;
+		if (const auto xSettings = XSettings::Instance()) {
+			xSettings->registerCallbackForProperty("Gtk/DecorationLayout", [](
+					xcb_connection_t *,
+					const QByteArray &,
+					const QVariant &,
+					void *) {
+				NotifyTitleControlsLayoutChanged();
+			}, nullptr);
+		}
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+
+		using XDPSettingWatcher = base::Platform::XDP::SettingWatcher;
+		static const XDPSettingWatcher settingWatcher(
+			[=](
+				const Glib::ustring &group,
+				const Glib::ustring &key,
+				const Glib::VariantBase &value) {
+				if (group == "org.gnome.desktop.wm.preferences"
+					&& key == "button-layout") {
+					NotifyTitleControlsLayoutChanged();
+				}
+			});
+
+		return true;
+	}();
+
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+	const auto xSettingsResult = []() -> std::optional<TitleControls::Layout> {
+		using base::Platform::XCB::XSettings;
+		const auto xSettings = XSettings::Instance();
+		if (!xSettings) {
+			return std::nullopt;
+		}
+
+		const auto decorationLayout = xSettings->setting("Gtk/DecorationLayout");
+		if (!decorationLayout.isValid()) {
+			return std::nullopt;
+		}
+
+		return GtkKeywordsToTitleControlsLayout(decorationLayout.toString());
+	}();
+
+	if (xSettingsResult.has_value()) {
+		return *xSettingsResult;
+	}
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+
+	const auto portalResult = []() -> std::optional<TitleControls::Layout> {
+		try {
+			using namespace base::Platform::XDP;
+
+			const auto decorationLayout = ReadSetting(
+				"org.gnome.desktop.wm.preferences",
+				"button-layout");
+
+			if (!decorationLayout.has_value()) {
+				return std::nullopt;
+			}
+
+			return GtkKeywordsToTitleControlsLayout(
+				QString::fromStdString(
+					base::Platform::GlibVariantCast<Glib::ustring>(
+						*decorationLayout)));
+		} catch (...) {
+		}
+
+		return std::nullopt;
+	}();
+
+	if (portalResult.has_value()) {
+		return *portalResult;
+	}
+
+	return TitleControls::Layout{
+		.right = {
+			TitleControls::Control::Minimize,
+			TitleControls::Control::Maximize,
+			TitleControls::Control::Close,
+		}
+	};
+}
+
+} // namespace internal
+} // namespace Platform
+} // namespace Ui
diff --git a/ui/platform/linux/ui_window_title_linux.h b/ui/platform/linux/ui_window_title_linux.h
new file mode 100644
index 0000000..0aa287b
--- /dev/null
+++ b/ui/platform/linux/ui_window_title_linux.h
@@ -0,0 +1,9 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/platform/ui_platform_window_title.h"
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 3c59a5f..8aa7475 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -157,18 +157,5 @@ bool SkipApplicationDeactivateEvent() {
 void GotApplicationActivateEvent() {
 }
 
-namespace internal {
-
-TitleControls::Layout TitleControlsLayout() {
-	return TitleControls::Layout{
-		.left = {
-			TitleControls::Control::Close,
-			TitleControls::Control::Minimize,
-			TitleControls::Control::Maximize,
-		}
-	};
-}
-
-} // namespace internal
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/mac/ui_window_title_mac.mm b/ui/platform/mac/ui_window_title_mac.mm
index 0511e82..d9de411 100644
--- a/ui/platform/mac/ui_window_title_mac.mm
+++ b/ui/platform/mac/ui_window_title_mac.mm
@@ -20,6 +20,19 @@
 
 namespace Ui {
 namespace Platform {
+namespace internal {
+
+TitleControls::Layout TitleControlsLayout() {
+	return TitleControls::Layout{
+		.left = {
+			TitleControls::Control::Close,
+			TitleControls::Control::Minimize,
+			TitleControls::Control::Maximize,
+		}
+	};
+}
+
+} // namespace internal
 
 TitleWidget::TitleWidget(not_null<RpWidget*> parent, int height)
 : RpWidget(parent)
diff --git a/ui/platform/ui_platform_utility.cpp b/ui/platform/ui_platform_utility.cpp
deleted file mode 100644
index cdeec97..0000000
--- a/ui/platform/ui_platform_utility.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// This file is part of Desktop App Toolkit,
-// a set of libraries for developing nice desktop applications.
-//
-// For license and copyright information please follow this link:
-// https://github.com/desktop-app/legal/blob/master/LEGAL
-//
-#include "ui/platform/ui_platform_utility.h"
-
-namespace Ui {
-namespace Platform {
-namespace internal {
-namespace {
-
-auto &CachedTitleControlsLayout() {
-	using Layout = TitleControls::Layout;
-	static rpl::variable<Layout> Result = TitleControlsLayout();
-	return Result;
-};
-
-} // namespace
-
-void NotifyTitleControlsLayoutChanged(
-		const std::optional<TitleControls::Layout> &layout) {
-	CachedTitleControlsLayout() = layout ? *layout : TitleControlsLayout();
-}
-
-} // namespace internal
-
-TitleControls::Layout TitleControlsLayout() {
-	return internal::CachedTitleControlsLayout().current();
-}
-
-rpl::producer<TitleControls::Layout> TitleControlsLayoutValue() {
-	return internal::CachedTitleControlsLayout().value();
-}
-
-rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged() {
-	return internal::CachedTitleControlsLayout().changes();
-}
-
-} // namespace Platform
-} // namespace Ui
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 64c8dd9..d9adad4 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -6,8 +6,6 @@
 //
 #pragma once
 
-#include "ui/platform/ui_platform_window_title.h"
-
 class QPoint;
 class QPainter;
 class QPaintEvent;
@@ -17,14 +15,6 @@ class PopupMenu;
 } // namespace Ui
 
 namespace Ui::Platform {
-namespace internal {
-
-// Actual requestor, cached by the public interface
-[[nodiscard]] TitleControls::Layout TitleControlsLayout();
-void NotifyTitleControlsLayoutChanged(
-    const std::optional<TitleControls::Layout> &layout = std::nullopt);
-
-} // namespace internal
 
 [[nodiscard]] bool IsApplicationActive();
 
@@ -53,21 +43,6 @@ void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents);
 void UnsetWindowExtents(not_null<QWidget*> widget);
 void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
-[[nodiscard]] TitleControls::Layout TitleControlsLayout();
-[[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutValue();
-[[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged();
-[[nodiscard]] bool TitleControlsOnLeft(
-		const TitleControls::Layout &layout = TitleControlsLayout()) {
-	if (ranges::contains(layout.left, TitleControl::Close)) {
-		return true;
-	} else if (ranges::contains(layout.right, TitleControl::Close)) {
-		return false;
-	} else if (layout.left.size() > layout.right.size()) {
-		return true;
-	}
-	return false;
-}
-
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
 
 // Workaround for a Qt/Wayland bug that hides the parent popup when
diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index 4162364..ddb69a8 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -441,6 +441,36 @@ void TitleControls::updateButtonsState() {
 	_buttons->updateState(_activeState, _maximizedState, *_st);
 }
 
+namespace internal {
+namespace {
+
+auto &CachedTitleControlsLayout() {
+	using Layout = TitleControls::Layout;
+	static rpl::variable<Layout> Result = TitleControlsLayout();
+	return Result;
+};
+
+} // namespace
+
+void NotifyTitleControlsLayoutChanged(
+		const std::optional<TitleControls::Layout> &layout) {
+	CachedTitleControlsLayout() = layout ? *layout : TitleControlsLayout();
+}
+
+} // namespace internal
+
+TitleControls::Layout TitleControlsLayout() {
+	return internal::CachedTitleControlsLayout().current();
+}
+
+rpl::producer<TitleControls::Layout> TitleControlsLayoutValue() {
+	return internal::CachedTitleControlsLayout().value();
+}
+
+rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged() {
+	return internal::CachedTitleControlsLayout().changes();
+}
+
 DefaultTitleWidget::DefaultTitleWidget(not_null<RpWidget*> parent)
 : RpWidget(parent)
 , _controls(this, st::defaultWindowTitle)
diff --git a/ui/platform/ui_platform_window_title.h b/ui/platform/ui_platform_window_title.h
index 21b2108..a2612ab 100644
--- a/ui/platform/ui_platform_window_title.h
+++ b/ui/platform/ui_platform_window_title.h
@@ -154,6 +154,30 @@ private:
 
 };
 
+namespace internal {
+
+// Actual requestor, cached by the public interface
+[[nodiscard]] TitleControls::Layout TitleControlsLayout();
+void NotifyTitleControlsLayoutChanged(
+    const std::optional<TitleControls::Layout> &layout = std::nullopt);
+
+} // namespace internal
+
+[[nodiscard]] TitleControls::Layout TitleControlsLayout();
+[[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutValue();
+[[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged();
+[[nodiscard]] bool TitleControlsOnLeft(
+		const TitleControls::Layout &layout = TitleControlsLayout()) {
+	if (ranges::contains(layout.left, TitleControl::Close)) {
+		return true;
+	} else if (ranges::contains(layout.right, TitleControl::Close)) {
+		return false;
+	} else if (layout.left.size() > layout.right.size()) {
+		return true;
+	}
+	return false;
+}
+
 class DefaultTitleWidget : public RpWidget {
 public:
 	explicit DefaultTitleWidget(not_null<RpWidget*> parent);
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index e81b150..c9678c0 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -134,20 +134,6 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 		MAKELPARAM(p.x, p.y));
 }
 
-namespace internal {
-
-TitleControls::Layout TitleControlsLayout() {
-	return TitleControls::Layout{
-		.right = {
-			TitleControls::Control::Minimize,
-			TitleControls::Control::Maximize,
-			TitleControls::Control::Close,
-		}
-	};
-}
-
-} // namespace internal
-
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
 	// Windows native emoji selector, that can be called by Win+. shortcut,
 	// is behaving strangely within an input field in a popup menu.
diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index bce7acc..cb3d645 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -44,6 +44,20 @@ HRESULT(__stdcall *GetScaleFactorForMonitor)(
 
 } // namespace
 
+namespace internal {
+
+TitleControls::Layout TitleControlsLayout() {
+	return TitleControls::Layout{
+		.right = {
+			TitleControls::Control::Minimize,
+			TitleControls::Control::Maximize,
+			TitleControls::Control::Close,
+		}
+	};
+}
+
+} // namespace internal
+
 struct TitleWidget::PaddingHelper {
 	explicit PaddingHelper(QWidget *parent) : controlsParent(parent) {
 	}

From 3e7f1250c50071e5d3ce76cb50b8546b51728191 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 19 Jul 2023 18:21:51 +0400
Subject: [PATCH 434/635] Mark TitleControlsOnLeft inline

---
 ui/platform/ui_platform_window_title.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/platform/ui_platform_window_title.h b/ui/platform/ui_platform_window_title.h
index a2612ab..cb4bc13 100644
--- a/ui/platform/ui_platform_window_title.h
+++ b/ui/platform/ui_platform_window_title.h
@@ -166,7 +166,7 @@ void NotifyTitleControlsLayoutChanged(
 [[nodiscard]] TitleControls::Layout TitleControlsLayout();
 [[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutValue();
 [[nodiscard]] rpl::producer<TitleControls::Layout> TitleControlsLayoutChanged();
-[[nodiscard]] bool TitleControlsOnLeft(
+[[nodiscard]] inline bool TitleControlsOnLeft(
 		const TitleControls::Layout &layout = TitleControlsLayout()) {
 	if (ranges::contains(layout.left, TitleControl::Close)) {
 		return true;

From da7f4fe4251fe7076e437dec7ed71aefd99f8537 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 20 May 2023 18:23:27 +0400
Subject: [PATCH 435/635] Use new glibmm 2.78 API

---
 ui/platform/linux/ui_window_title_linux.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/platform/linux/ui_window_title_linux.cpp b/ui/platform/linux/ui_window_title_linux.cpp
index eca5024..848e42f 100644
--- a/ui/platform/linux/ui_window_title_linux.cpp
+++ b/ui/platform/linux/ui_window_title_linux.cpp
@@ -6,13 +6,14 @@
 //
 #include "ui/platform/linux/ui_window_title_linux.h"
 
-#include "base/platform/linux/base_linux_glibmm_helper.h"
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xsettings.h"
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
+#include <glibmm.h>
+
 namespace Ui {
 namespace Platform {
 namespace internal {
@@ -120,8 +121,7 @@ TitleControls::Layout TitleControlsLayout() {
 
 			return GtkKeywordsToTitleControlsLayout(
 				QString::fromStdString(
-					base::Platform::GlibVariantCast<Glib::ustring>(
-						*decorationLayout)));
+					decorationLayout->get_dynamic<Glib::ustring>()));
 		} catch (...) {
 		}
 

From ae465109201b30fa61b643d72aaf374265c6a9ed Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 09:59:23 +0400
Subject: [PATCH 436/635] Cancel system move if didn't start (macOS).

---
 ui/platform/mac/ui_window_mac.mm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index 514ef32..9d91f3c 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -105,7 +105,10 @@ public:
 				_dragStarted = _checkStartDrag();
 			} else if (([e type] == NSEventTypeLeftMouseDragged)
 					&& _dragStarted) {
-				return _checkPerformDrag([e window]);
+				if (_checkPerformDrag([e window])) {
+					return true;
+				}
+				_dragStarted = false;
 			}
 		}
 		return false;

From 8f03125ec1d6b0f4a3f0fe6b6849aa57a1006063 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 10:19:51 +0400
Subject: [PATCH 437/635] Fix build with Xcode.

---
 ui/platform/mac/ui_window_title_mac.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/platform/mac/ui_window_title_mac.mm b/ui/platform/mac/ui_window_title_mac.mm
index d9de411..be22393 100644
--- a/ui/platform/mac/ui_window_title_mac.mm
+++ b/ui/platform/mac/ui_window_title_mac.mm
@@ -6,6 +6,7 @@
 //
 #include "ui/platform/mac/ui_window_title_mac.h"
 
+#include "ui/platform/ui_platform_window_title.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
 #include "ui/painter.h"

From 0f20eb152a491dc8ffc675b0cb5d8a21c6a8690d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 20 Jul 2023 03:52:34 +0400
Subject: [PATCH 438/635] Use string literal instead of const_string for
 QString constants

---
 ui/platform/linux/ui_utility_linux.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 96c4059..53d04a3 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -8,7 +8,6 @@
 
 #include "base/platform/base_platform_info.h"
 #include "base/call_delayed.h"
-#include "base/const_string.h"
 #include "ui/platform/linux/ui_linux_wayland_integration.h"
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -23,7 +22,7 @@ namespace Ui {
 namespace Platform {
 namespace {
 
-constexpr auto kXCBFrameExtentsAtomName = "_GTK_FRAME_EXTENTS"_cs;
+static const auto kXCBFrameExtentsAtomName = u"_GTK_FRAME_EXTENTS"_q;
 constexpr auto kDelayDeactivateEventTimeout = crl::time(400);
 
 bool PendingDeactivateEvent/* = false*/;
@@ -298,7 +297,7 @@ void SetXCBFrameExtents(not_null<QWidget*> widget, const QMargins &extents) {
 
 	const auto frameExtentsAtom = base::Platform::XCB::GetAtom(
 		connection,
-		kXCBFrameExtentsAtomName.utf16());
+		kXCBFrameExtentsAtomName);
 
 	if (!frameExtentsAtom.has_value()) {
 		return;
@@ -333,7 +332,7 @@ void UnsetXCBFrameExtents(not_null<QWidget*> widget) {
 
 	const auto frameExtentsAtom = base::Platform::XCB::GetAtom(
 		connection,
-		kXCBFrameExtentsAtomName.utf16());
+		kXCBFrameExtentsAtomName);
 
 	if (!frameExtentsAtom.has_value()) {
 		return;
@@ -477,7 +476,7 @@ bool WindowExtentsSupported() {
 	if (::Platform::IsX11()
 		&& XCB::IsSupportedByWM(
 			XCB::GetConnectionFromQt(),
-			kXCBFrameExtentsAtomName.utf16())) {
+			kXCBFrameExtentsAtomName)) {
 		return true;
 	}
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION

From 288bec7157bf654d121ebfd2828801b49beb34ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 20 Jul 2023 21:36:39 +0400
Subject: [PATCH 439/635] Fix overscroll modification.

---
 ui/widgets/elastic_scroll.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 50b622c..221d790 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -1170,7 +1170,7 @@ void ElasticScroll::setOverscrollTypes(
 	if (fromChanged) {
 		switch (_overscrollTypeFrom) {
 		case OverscrollType::None:
-			_overscroll = 0;
+			_overscroll = _overscrollAccumulated = 0;
 			applyScrollTo(0);
 			break;
 		case OverscrollType::Virtual:
@@ -1185,7 +1185,7 @@ void ElasticScroll::setOverscrollTypes(
 			- (_state.visibleTill - _state.visibleFrom);
 		switch (_overscrollTypeTill) {
 		case OverscrollType::None:
-			_overscroll = 0;
+			_overscroll = _overscrollAccumulated = 0;
 			applyScrollTo(max);
 			break;
 		case OverscrollType::Virtual:

From 39d440f774b5b0986200299c4893e3f6a4678c85 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 14:42:01 +0400
Subject: [PATCH 440/635] Don't check requested emoji size.

---
 ui/text/custom_emoji_instance.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index aa98a72..65621cd 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -20,7 +20,6 @@ class QPainter;
 namespace Ui::CustomEmoji {
 namespace {
 
-constexpr auto kMaxSize = 128;
 constexpr auto kMaxFrames = 180;
 constexpr auto kCacheVersion = 1;
 constexpr auto kPreloadFrames = 3;
@@ -169,8 +168,6 @@ Cache::Cache(int size) : _size(size) {
 std::optional<Cache> Cache::FromSerialized(
 		const QByteArray &serialized,
 		int requestedSize) {
-	Expects(requestedSize > 0 && requestedSize <= kMaxSize);
-
 	if (serialized.size() <= sizeof(CacheHeader)) {
 		return {};
 	}

From 079d966e45922f90de297fc9f7435cbf8b127b09 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 21 Jul 2023 17:10:30 +0400
Subject: [PATCH 441/635] Provide menu shown signal from InputField.

---
 ui/widgets/input_fields.cpp | 13 +++++++++++++
 ui/widgets/input_fields.h   |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index b16f66b..1df821b 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -1278,6 +1278,15 @@ void InputField::scrollTo(int top) {
 	_inner->verticalScrollBar()->setValue(top);
 }
 
+
+bool InputField::menuShown() const {
+	return _contextMenu != nullptr;
+}
+
+rpl::producer<bool> InputField::menuShownValue() const {
+	return _menuShownChanges.events_starting_with(menuShown());
+}
+
 bool InputField::viewportEventInner(QEvent *e) {
 	if (e->type() == QEvent::TouchBegin
 		|| e->type() == QEvent::TouchUpdate
@@ -3634,6 +3643,10 @@ void InputField::contextMenuEventInner(QContextMenuEvent *e, QMenu *m) {
 	if (const auto menu = m ? m : _inner->createStandardContextMenu()) {
 		addMarkdownActions(menu, e);
 		_contextMenu = base::make_unique_q<PopupMenu>(this, menu, _st.menu);
+		QObject::connect(_contextMenu.get(), &QObject::destroyed, [=] {
+			_menuShownChanges.fire(false);
+		});
+		_menuShownChanges.fire(true);
 		_contextMenu->popup(e->globalPos());
 	}
 }
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 8d7de73..b6b8dad 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -312,6 +312,9 @@ public:
 		return _markdownTagApplies.events();
 	}
 
+	[[nodiscard]] bool menuShown() const;
+	[[nodiscard]] rpl::producer<bool> menuShownValue() const;
+
 	~InputField();
 
 private Q_SLOTS:
@@ -543,6 +546,7 @@ private:
 
 	bool _correcting = false;
 	MimeDataHook _mimeDataHook;
+	rpl::event_stream<bool> _menuShownChanges;
 	base::unique_qptr<PopupMenu> _contextMenu;
 
 	QTextCharFormat _defaultCharFormat;

From ad852f0f4ab271de4db799d01fa8b7032eb33b11 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 10:43:45 +0400
Subject: [PATCH 442/635] Fix incorrect state of ElasticScroll.

---
 ui/widgets/elastic_scroll.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 221d790..4406c43 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -734,13 +734,13 @@ bool ElasticScroll::eventFilter(QObject *obj, QEvent *e) {
 	if (obj == _widget.data()) {
 		if (filterOutTouchEvent(e)) {
 			return true;
-		} else if (e->type()  == QEvent::Resize) {
+		} else if (e->type() == QEvent::Resize) {
 			const auto weak = Ui::MakeWeak(this);
 			updateState();
 			if (weak) {
 				_innerResizes.fire({});
 			}
-		} else if (e->type()  == QEvent::Move) {
+		} else if (e->type() == QEvent::Move) {
 			updateState();
 		}
 		return result;
@@ -903,8 +903,10 @@ void ElasticScroll::updateState() {
 		const auto delta = std::max(
 			std::min(nowOverscroll - wasOverscroll, from),
 			0);
-		from -= delta;
-		till -= delta;
+		if (delta) {
+			applyScrollTo(from - delta);
+			return;
+		}
 	}
 	setState({
 		.visibleFrom = from,

From bd1e8f7c47c3e99493adf9653d684c86a0a51941 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 16:59:55 +0400
Subject: [PATCH 443/635] Update default tooltip colors.

---
 ui/colors.palette         |  6 +++---
 ui/toast/toast_widget.cpp |  2 +-
 ui/widgets/tooltip.cpp    | 38 ++++++++++++++++++++++++++++++++++++++
 ui/widgets/tooltip.h      | 16 ++++++++++++++++
 4 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/ui/colors.palette b/ui/colors.palette
index d709796..f62334b 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -435,8 +435,8 @@ youtubePlayIconBg: #e83131c8; // youtube play icon background (when a link to a
 youtubePlayIconFg: windowFgActive; // youtube play icon arrow (when a link to a youtube video with a webpage preview is sent)
 videoPlayIconBg: #0000007f; // other video play icon background (like when a link to a vimeo video with a webpage preview is sent)
 videoPlayIconFg: #ffffff; // other video play icon arrow (like when a link to a vimeo video with a webpage preview is sent)
-toastBg: #000000b2; // toast notification background (like when you click on your t.me link when editing your username)
-toastFg: windowFgActive; // toast notification text (like when you click on your t.me link when editing your username)
+toastBg: #2c3033e5; // toast notification background (like when you click on your t.me link when editing your username)
+toastFg: #ffffff; // toast notification text (like when you click on your t.me link when editing your username)
 
 historyToDownBg: windowBg; // arrow button background (to scroll to the end of the viewed chat)
 historyToDownBgOver: windowBgOver; // arrow button background with mouse over
@@ -518,7 +518,7 @@ mediaviewControlBg: #0000003c; // controls background (like next photo / previou
 mediaviewControlFg: #ffffff; // controls icon (like next photo / previous photo)
 mediaviewCaptionBg: #11111180; // caption text background (when viewing photo with caption)
 mediaviewCaptionFg: mediaviewControlFg; // caption text
-mediaviewTextLinkFg: #91d9ff; // caption text link
+mediaviewTextLinkFg: #4db8ff; // caption text link
 mediaviewSaveMsgBg: toastBg; // save to file toast message background in Media Viewer
 mediaviewSaveMsgFg: toastFg; // save to file toast message text
 
diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index 9640f88..6851cc1 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -138,7 +138,7 @@ void Widget::paintEvent(QPaintEvent *e) {
 	}
 	_roundRect.paint(p, rect());
 	if (_dark) {
-		_roundRect.paint(p, rect());
+		//_roundRect.paint(p, rect());
 	}
 
 	if (!_st->icon.empty()) {
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index 895bdde..c90065d 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -9,6 +9,7 @@
 #include "ui/ui_utility.h"
 #include "ui/painter.h"
 #include "ui/platform/ui_platform_utility.h"
+#include "ui/widgets/labels.h"
 #include "base/invoke_queued.h"
 #include "base/platform/base_platform_info.h"
 #include "styles/style_widgets.h"
@@ -410,4 +411,41 @@ void ImportantTooltip::paintEvent(QPaintEvent *e) {
 	}
 }
 
+object_ptr<FlatLabel> MakeNiceTooltipLabel(
+		QWidget *parent,
+		rpl::producer<TextWithEntities> &&text,
+		int maxWidth,
+		const style::FlatLabel &st,
+		const style::PopupMenu &stMenu) {
+	Expects(st.minWidth > 0);
+	Expects(st.minWidth < maxWidth);
+
+	auto result = object_ptr<FlatLabel>(
+		parent,
+		rpl::duplicate(text),
+		st,
+		stMenu);
+	const auto raw = result.data();
+	std::move(text) | rpl::start_with_next([=, &st] {
+		raw->resizeToNaturalWidth(maxWidth);
+		if (raw->naturalWidth() <= maxWidth) {
+			return;
+		}
+		const auto desired = raw->heightNoMargins();
+		auto from = st.minWidth;
+		auto till = maxWidth;
+		while (till - from > 1) {
+			const auto middle = (from + till) / 2;
+			raw->resizeToWidth(middle);
+			if (raw->heightNoMargins() > desired) {
+				from = middle;
+			} else {
+				till = middle;
+			}
+		}
+		raw->resizeToWidth(till);
+	}, raw->lifetime());
+	return result;
+}
+
 } // namespace Ui
diff --git a/ui/widgets/tooltip.h b/ui/widgets/tooltip.h
index c7c3d10..b5984f1 100644
--- a/ui/widgets/tooltip.h
+++ b/ui/widgets/tooltip.h
@@ -16,10 +16,19 @@
 namespace style {
 struct Tooltip;
 struct ImportantTooltip;
+struct FlatLabel;
+struct PopupMenu;
 } // namespace style
 
+namespace st {
+extern const style::FlatLabel &defaultFlatLabel;
+extern const style::PopupMenu &defaultPopupMenu;
+} // namespace st
+
 namespace Ui {
 
+class FlatLabel;
+
 class AbstractTooltipShower {
 public:
 	virtual QString tooltipText() const = 0;
@@ -113,4 +122,11 @@ private:
 
 };
 
+[[nodiscard]] object_ptr<FlatLabel> MakeNiceTooltipLabel(
+	QWidget *parent,
+	rpl::producer<TextWithEntities> &&text,
+	int maxWidth,
+	const style::FlatLabel &st = st::defaultFlatLabel,
+	const style::PopupMenu &stMenu = st::defaultPopupMenu);
+
 } // namespace Ui

From 8314fc9b3f292dd9921ef2bfa1c30bcfd2ed05ed Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 24 Jul 2023 21:40:53 +0400
Subject: [PATCH 444/635] Improve default style of important tooltip.

---
 ui/widgets/widgets.style | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index cd7aa2b..4d42bf5 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1110,9 +1110,9 @@ defaultTooltip: Tooltip {
 defaultImportantTooltip: ImportantTooltip {
 	bg: importantTooltipBg;
 	margin: margins(4px, 4px, 4px, 4px);
-	padding: margins(13px, 9px, 13px, 10px);
-	radius: 6px;
-	arrow: 9px;
+	padding: margins(10px, 3px, 10px, 5px);
+	radius: 4px;
+	arrow: 4px;
 	arrowSkipMin: 24px;
 	arrowSkip: 66px;
 	shift: 12px;
@@ -1121,15 +1121,16 @@ defaultImportantTooltip: ImportantTooltip {
 
 defaultImportantTooltipLabel: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
-		font: font(14px);
-		linkFont: font(14px);
-		linkFontOver: font(14px underline);
+		font: font(11px);
+		linkFont: font(11px);
+		linkFontOver: font(11px underline);
 	}
 	textFg: importantTooltipFg;
 	palette: TextPalette(defaultTextPalette) {
 		linkFg: importantTooltipFgLink;
 		selectLinkFg: importantTooltipFgLink;
 	}
+	minWidth: 36px;
 }
 
 BotKeyboardButton {

From 2f0ac382289d0584002c007bdf2b3e4464f75b58 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 25 Jul 2023 10:44:02 +0400
Subject: [PATCH 445/635] Lock tab-focus inside a layer widget.

---
 ui/layers/layer_widget.cpp | 5 +++++
 ui/layers/layer_widget.h   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 5e86df3..2dbab88 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -13,6 +13,7 @@
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "ui/round_rect.h"
+#include "base/qt/qt_tab_key.h"
 #include "base/integration.h"
 #include "styles/style_layers.h"
 #include "styles/style_widgets.h"
@@ -366,6 +367,10 @@ void LayerWidget::resizeEvent(QResizeEvent *e) {
 	}
 }
 
+bool LayerWidget::focusNextPrevChild(bool next) {
+	return base::FocusNextPrevChildBlocked(this, next);
+}
+
 void LayerStackWidget::setHideByBackgroundClick(bool hide) {
 	_hideByBackgroundClick = hide;
 }
diff --git a/ui/layers/layer_widget.h b/ui/layers/layer_widget.h
index 4fab66b..096e551 100644
--- a/ui/layers/layer_widget.h
+++ b/ui/layers/layer_widget.h
@@ -82,6 +82,8 @@ public:
 protected:
 	void mousePressEvent(QMouseEvent *e) override;
 	void resizeEvent(QResizeEvent *e) override;
+	bool focusNextPrevChild(bool next) override;
+
 	virtual void doSetInnerFocus() {
 		setFocus();
 	}

From 91d43ea4b50ef1e7df810ab1f14c49e044570734 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 26 Jul 2023 12:00:10 +0400
Subject: [PATCH 446/635] Provide (almost) correct modifiers in
 DirectManipulation.

---
 ui/platform/win/ui_window_win.cpp | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index e434525..7918bf4 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -144,6 +144,28 @@ void FixAeroSnap(HWND handle) {
 	return result;
 }
 
+[[nodiscard]] Qt::KeyboardModifiers LookupModifiers() {
+	const auto check = [](int key) {
+		return (GetKeyState(key) & 0x8000) != 0;
+	};
+
+	auto result = Qt::KeyboardModifiers();
+	if (check(VK_SHIFT)) {
+		result |= Qt::ShiftModifier;
+	}
+	// NB AltGr key (i.e., VK_RMENU on some keyboard layout) is not handled.
+	if (check(VK_RMENU) || check(VK_MENU)) {
+		result |= Qt::AltModifier;
+	}
+	if (check(VK_CONTROL)) {
+		result |= Qt::ControlModifier;
+	}
+	if (check(VK_LWIN) || check(VK_RWIN)) {
+		result |= Qt::MetaModifier;
+	}
+	return result;
+}
+
 } // namespace
 
 class WindowHelper::NativeFilter final : public QAbstractNativeEventFilter {
@@ -431,7 +453,7 @@ void WindowHelper::handleDirectManipulationEvent(
 				QPointF(global.x, global.y),
 				event.delta,
 				event.delta,
-				QGuiApplication::keyboardModifiers(),
+				LookupModifiers(),
 				phase,
 				Qt::MouseEventSynthesizedBySystem);
 		}

From ad356135e4f6b92c6fb7453cc22792d8398dd698 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Aug 2023 19:05:07 +0200
Subject: [PATCH 447/635] Improve toasts: adaptive, with a title.

---
 ui/toast/toast.h          |  2 ++
 ui/toast/toast_widget.cpp | 26 ++++++++++++++++++++++++-
 ui/toast/toast_widget.h   |  1 +
 ui/widgets/tooltip.cpp    | 40 ++++++++++++++++++++++++++-------------
 ui/widgets/tooltip.h      |  5 +++++
 5 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/ui/toast/toast.h b/ui/toast/toast.h
index b34f0eb..3352942 100644
--- a/ui/toast/toast.h
+++ b/ui/toast/toast.h
@@ -33,10 +33,12 @@ using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
 
 inline constexpr auto kDefaultDuration = crl::time(1500);
 struct Config {
+	QString title;
 	TextWithEntities text;
 	not_null<const style::Toast*> st = &st::defaultMultilineToast;
 	crl::time duration = kDefaultDuration;
 	int maxLines = 16;
+	bool adaptive = false;
 	bool multiline = true;
 	bool dark = false;
 	RectPart slideSide = RectPart::None;
diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index 6851cc1..c676776 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -7,6 +7,8 @@
 #include "ui/toast/toast_widget.h"
 
 #include "ui/image/image_prepare.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/tooltip.h"
 #include "ui/painter.h"
 #include "styles/palette.h"
 #include "styles/style_widgets.h"
@@ -16,6 +18,21 @@
 namespace Ui {
 namespace Toast {
 namespace internal {
+namespace {
+
+[[nodiscard]] TextWithEntities ComputeText(const Config &config) {
+	auto result = config.text;
+	if (!config.title.isEmpty()) {
+		result = Text::Bold(
+			config.title
+		).append('\n').append(std::move(result));
+	}
+	return config.multiline
+		? result
+		: TextUtilities::SingleLine(std::move(result));
+}
+
+} // namespace
 
 Widget::Widget(QWidget *parent, const Config &config)
 : RpWidget(parent)
@@ -24,6 +41,7 @@ Widget::Widget(QWidget *parent, const Config &config)
 , _slideSide(config.slideSide)
 , _multiline(config.multiline)
 , _dark(config.dark)
+, _adaptive(config.adaptive)
 , _maxTextWidth(widthWithoutPadding(_st->maxWidth))
 , _maxTextHeight(
 	config.st->style.font->height * (_multiline ? config.maxLines : 1))
@@ -37,7 +55,7 @@ Widget::Widget(QWidget *parent, const Config &config)
 	};
 	_text.setMarkedText(
 		_st->style,
-		_multiline ? config.text : TextUtilities::SingleLine(config.text),
+		ComputeText(config),
 		toastOptions,
 		config.textContext ? config.textContext(this) : std::any());
 	if (_text.hasSpoilers()) {
@@ -74,6 +92,12 @@ void Widget::updateGeometry() {
 	accumulate_min(
 		width,
 		parentWidget()->width() - _st->margin.left() - _st->margin.right());
+	if (_adaptive) {
+		const auto added = _st->padding.left() + _st->padding.right();
+		width = FindNiceTooltipWidth(0, width - added, [&](int width) {
+			return _text.countHeight(width);
+		}) + added;
+	}
 	_textWidth = widthWithoutPadding(width);
 	_textHeight = _multiline
 		? qMin(_text.countHeight(_textWidth), _maxTextHeight)
diff --git a/ui/toast/toast_widget.h b/ui/toast/toast_widget.h
index 1da5e19..cff7e86 100644
--- a/ui/toast/toast_widget.h
+++ b/ui/toast/toast_widget.h
@@ -45,6 +45,7 @@ private:
 	bool _multiline = false;
 	bool _dark = false;
 	bool _processMouse = false;
+	bool _adaptive = false;
 
 	int _maxTextWidth = 0;
 	int _maxTextHeight = 0;
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index c90065d..1613af3 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -411,6 +411,25 @@ void ImportantTooltip::paintEvent(QPaintEvent *e) {
 	}
 }
 
+[[nodiscard]] int FindNiceTooltipWidth(
+		int minWidth,
+		int maxWidth,
+		Fn<int(int width)> heightForWidth) {
+	Expects(minWidth >= 0);
+	Expects(maxWidth > minWidth);
+
+	const auto desired = heightForWidth(maxWidth);
+	while (maxWidth - minWidth > 1) {
+		const auto middle = (minWidth + maxWidth) / 2;
+		if (heightForWidth(middle) > desired) {
+			minWidth = middle;
+		} else {
+			maxWidth = middle;
+		}
+	}
+	return maxWidth;
+}
+
 object_ptr<FlatLabel> MakeNiceTooltipLabel(
 		QWidget *parent,
 		rpl::producer<TextWithEntities> &&text,
@@ -431,19 +450,14 @@ object_ptr<FlatLabel> MakeNiceTooltipLabel(
 		if (raw->naturalWidth() <= maxWidth) {
 			return;
 		}
-		const auto desired = raw->heightNoMargins();
-		auto from = st.minWidth;
-		auto till = maxWidth;
-		while (till - from > 1) {
-			const auto middle = (from + till) / 2;
-			raw->resizeToWidth(middle);
-			if (raw->heightNoMargins() > desired) {
-				from = middle;
-			} else {
-				till = middle;
-			}
-		}
-		raw->resizeToWidth(till);
+		const auto niceWidth = FindNiceTooltipWidth(
+			st.minWidth,
+			maxWidth,
+			[&](int width) {
+				raw->resizeToWidth(width);
+				return raw->heightNoMargins();
+			});
+		raw->resizeToWidth(niceWidth);
 	}, raw->lifetime());
 	return result;
 }
diff --git a/ui/widgets/tooltip.h b/ui/widgets/tooltip.h
index b5984f1..10d97dc 100644
--- a/ui/widgets/tooltip.h
+++ b/ui/widgets/tooltip.h
@@ -122,6 +122,11 @@ private:
 
 };
 
+[[nodiscard]] int FindNiceTooltipWidth(
+	int minWidth,
+	int maxWidth,
+	Fn<int(int width)> heightForWidth);
+
 [[nodiscard]] object_ptr<FlatLabel> MakeNiceTooltipLabel(
 	QWidget *parent,
 	rpl::producer<TextWithEntities> &&text,

From 7c60b03c9bb91d177876467b6ad0b1dedf68000a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 1 Aug 2023 19:05:34 +0200
Subject: [PATCH 448/635] Resize centered labels wide by default.

---
 ui/widgets/labels.cpp | 6 +++++-
 ui/widgets/labels.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 902b9c4..daf48c9 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -318,10 +318,14 @@ int FlatLabel::resizeGetHeight(int newWidth) {
 	return countTextHeight(_textWidth);
 }
 
-int FlatLabel::naturalWidth() const {
+int FlatLabel::textMaxWidth() const {
 	return _text.maxWidth();
 }
 
+int FlatLabel::naturalWidth() const {
+	return (_st.align == style::al_top) ? -1 : textMaxWidth();
+}
+
 QMargins FlatLabel::getMargins() const {
 	return _st.margin;
 }
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index fe0bf3c..46552d4 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -139,6 +139,7 @@ public:
 		_animationsPausedCallback = std::move(callback);
 	}
 
+	[[nodiscard]] int textMaxWidth() const;
 	int naturalWidth() const override;
 	QMargins getMargins() const override;
 

From 0f25a9451012c7fba93777a009f3b5dcc0f1ca89 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 1 Aug 2023 16:04:01 +0400
Subject: [PATCH 449/635] Port AppLaunchContext to cppgir

---
 ui/basic_click_handlers.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ui/basic_click_handlers.cpp b/ui/basic_click_handlers.cpp
index dc870a3..1421f5e 100644
--- a/ui/basic_click_handlers.cpp
+++ b/ui/basic_click_handlers.cpp
@@ -18,9 +18,9 @@
 #include <QtGui/QDesktopServices>
 #include <QtGui/QGuiApplication>
 
-#if __has_include(<giomm.h>)
-#include <giomm.h>
-#endif // __has_include(<giomm.h>)
+#if __has_include(<gio/gio.hpp>)
+#include <gio/gio.hpp>
+#endif // __has_include(<gio/gio.hpp>)
 
 QString TextClickHandler::readable() const {
 	const auto result = url();
@@ -85,7 +85,7 @@ void UrlClickHandler::Open(QString url, QVariant context) {
 		if (IsEmail(url)) {
 			url = "mailto: " + url;
 		}
-#if __has_include(<giomm.h>)
+#if __has_include(<gio/gio.hpp>)
 		// Desktop entry spec implementation,
 		// prefer it over QDesktopServices::openUrl since it just calls
 		// the xdg-open shell script that is known to be bugged:
@@ -95,15 +95,16 @@ void UrlClickHandler::Open(QString url, QVariant context) {
 		// that allows various ill people to develop extensions
 		// to the standard and differ the behavior across apps.
 		// https://specifications.freedesktop.org/desktop-entry-spec/latest/
-		try {
+		{
+			using namespace gi::repository;
 			if (Gio::AppInfo::launch_default_for_uri(
 				url.toStdString(),
-				base::Platform::AppLaunchContext())) {
+				base::Platform::AppLaunchContext(),
+				nullptr)) {
 				return;
 			}
-		} catch (...) {
 		}
-#endif // __has_include(<giomm.h>)
+#endif // __has_include(<gio/gio.hpp>)
 		QDesktopServices::openUrl(url);
 	}
 }

From 5f2e0a32b12df1468419b123ac8fb4bb17cf47cc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 9 Aug 2023 11:47:15 +0200
Subject: [PATCH 450/635] Improve default tabs slider design.

---
 ui/widgets/widgets.style | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 4d42bf5..f9a93a2 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -991,6 +991,7 @@ SettingsSlider {
 	barRadius: pixels;
 	barFg: color;
 	barFgActive: color;
+	barSnapToLabel: bool;
 	labelTop: pixels;
 	labelStyle: TextStyle;
 	labelFg: color;
@@ -1018,11 +1019,14 @@ defaultSettingsSlider: SettingsSlider {
 }
 
 defaultTabsSlider: SettingsSlider(defaultSettingsSlider) {
-	height: 53px;
-	barTop: 50px;
+	height: 43px;
+	barTop: 40px;
 	barSkip: 0px;
+	barStroke: 6px;
+	barRadius: 2px;
 	barFg: transparent;
-	labelTop: 19px;
+	barSnapToLabel: true;
+	labelTop: 12px;
 	labelStyle: semiboldTextStyle;
 	labelFg: windowSubTextFg;
 	labelFgActive: lightButtonFg;

From b49ee81df9d285d08ef6bf834c6e14c5064b4070 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 14:34:31 +0200
Subject: [PATCH 451/635] Disable OpenGL ANGLE backend.

Currently ANGLE can work through desktop OpenGL only with enabled
attribute EGL_SURFACE_ORIENTATION_INVERT_Y_ANGLE.

Qt can't work with it enabled and shows vertically flipped content.
---
 ui/gl/gl_detection.cpp | 6 +++---
 ui/gl/gl_detection.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp
index e200e9c..3d2a542 100644
--- a/ui/gl/gl_detection.cpp
+++ b/ui/gl/gl_detection.cpp
@@ -33,7 +33,7 @@ namespace {
 bool ForceDisabled/* = false*/;
 
 #ifdef Q_OS_WIN
-ANGLE ResolvedANGLE = ANGLE::Auto;
+ANGLE ResolvedANGLE/* = ANGLE::Auto*/;
 #endif // Q_OS_WIN
 
 base::options::toggle AllowLinuxNvidiaOpenGL({
@@ -247,7 +247,7 @@ void ConfigureANGLE() {
 			qputenv("DESKTOP_APP_QT_ANGLE_PLATFORM", backend);
 		}
 	};
-	check("gl", ANGLE::OpenGL);
+	//check("gl", ANGLE::OpenGL);
 	check("d3d9", ANGLE::D3D9);
 	check("d3d11", ANGLE::D3D11);
 	check("d3d11on12", ANGLE::D3D11on12);
@@ -272,7 +272,7 @@ void ChangeANGLE(ANGLE backend) {
 	case ANGLE::D3D9: write("d3d9"); break;
 	case ANGLE::D3D11: write("d3d11"); break;
 	case ANGLE::D3D11on12: write("d3d11on12"); break;
-	case ANGLE::OpenGL: write("gl"); break;
+	//case ANGLE::OpenGL: write("gl"); break;
 	default: Unexpected("ANGLE backend value.");
 	}
 }
diff --git a/ui/gl/gl_detection.h b/ui/gl/gl_detection.h
index 862be90..8ea77be 100644
--- a/ui/gl/gl_detection.h
+++ b/ui/gl/gl_detection.h
@@ -38,7 +38,7 @@ enum class ANGLE {
 	D3D9,
 	D3D11,
 	D3D11on12,
-	OpenGL,
+	//OpenGL,
 };
 
 void ConfigureANGLE(); // Requires Ui::Integration being set.

From 8e31adc0af9c477a8e389eaa9bc0cbeb27455707 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 20 Mar 2023 17:47:08 +0400
Subject: [PATCH 452/635] Remove unused variable

---
 ui/platform/win/ui_window_win.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 7918bf4..aa71452 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -512,7 +512,6 @@ bool WindowHelper::handleNativeEvent(
 			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
 			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
 			const auto dpi = _dpi.current();
-			const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 			const auto borderWidth = (GetSystemMetricsForDpiSupported() && dpi)
 				? GetSystemMetricsForDpi(SM_CXSIZEFRAME, dpi)
 					+ GetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi)

From 4a41346a6428571ec57422ea86e426f252c8ce39 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 18 Jun 2022 12:05:52 +0400
Subject: [PATCH 453/635] Use native window resize on Windows 11

---
 ui/platform/ui_platform_window_title.cpp |  21 +++--
 ui/platform/win/ui_window_shadow_win.cpp |   5 +-
 ui/platform/win/ui_window_shadow_win.h   |   1 -
 ui/platform/win/ui_window_title_win.cpp  |  12 ++-
 ui/platform/win/ui_window_title_win.h    |   4 +-
 ui/platform/win/ui_window_win.cpp        | 109 +++++++++++++++++------
 6 files changed, 108 insertions(+), 44 deletions(-)

diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index ddb69a8..04bfac2 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -280,18 +280,21 @@ void TitleControls::raise() {
 }
 
 HitTestResult TitleControls::hitTest(QPoint point, int padding) const {
-	const auto test = [&](
-			const object_ptr<AbstractButton> &button,
-			bool close) {
+	const auto test = [&](const object_ptr<AbstractButton> &button) {
 		return button && button->geometry().marginsAdded(
-			{ close ? padding : 0, padding, close ? padding : 0, 0 }
+			{ 0, padding, 0, 0 }
 		).contains(point);
 	};
-	if (test(_minimize, false)) {
+	if (::Platform::IsWindows11OrGreater()
+		&& !_maximizedState
+		&& (point.y() < style::ConvertScale(
+			window()->windowHandle()->devicePixelRatio()))) {
+		return HitTestResult::Top;
+	} else if (test(_minimize)) {
 		return HitTestResult::Minimize;
-	} else if (test(_maximizeRestore, false)) {
+	} else if (test(_maximizeRestore)) {
 		return HitTestResult::MaximizeRestore;
-	} else if (test(_close, true)) {
+	} else if (test(_close)) {
 		return HitTestResult::Close;
 	}
 	return HitTestResult::None;
@@ -586,9 +589,9 @@ std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 		controlsTop ? std::move(controlsTop) : rpl::single(0)
 	) | rpl::start_with_next([=](int width, int padding, int top) {
 		raw->wrap.setGeometry(
-			padding,
+			0,
 			top,
-			width - 2 * padding,
+			width,
 			raw->controls.geometry().height());
 	}, lifetime);
 
diff --git a/ui/platform/win/ui_window_shadow_win.cpp b/ui/platform/win/ui_window_shadow_win.cpp
index 79abd98..59bbe55 100644
--- a/ui/platform/win/ui_window_shadow_win.cpp
+++ b/ui/platform/win/ui_window_shadow_win.cpp
@@ -43,8 +43,7 @@ base::flat_map<HWND, not_null<WindowShadow*>> ShadowByHandle;
 
 WindowShadow::WindowShadow(not_null<RpWidget*> window, QColor color)
 : _window(window)
-, _handle(GetWindowHandle(window))
-, _windows11(::Platform::IsWindows11OrGreater()) {
+, _handle(GetWindowHandle(window)) {
 	init(color);
 }
 
@@ -317,7 +316,7 @@ void WindowShadow::horCorners(int w, Gdiplus::Graphics *pgraphics0, Gdiplus::Gra
 }
 
 Gdiplus::Color WindowShadow::getColor(uchar alpha) const {
-	return Gdiplus::Color(BYTE(_windows11 ? 1 : alpha), _r, _g, _b);
+	return Gdiplus::Color(BYTE(alpha), _r, _g, _b);
 }
 
 Gdiplus::SolidBrush WindowShadow::getBrush(uchar alpha) const {
diff --git a/ui/platform/win/ui_window_shadow_win.h b/ui/platform/win/ui_window_shadow_win.h
index db63914..c157fa5 100644
--- a/ui/platform/win/ui_window_shadow_win.h
+++ b/ui/platform/win/ui_window_shadow_win.h
@@ -78,7 +78,6 @@ private:
 
 	const not_null<RpWidget*> _window;
 	const HWND _handle;
-	const bool _windows11 = false;
 
 	int _x = 0;
 	int _y = 0;
diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index cb3d645..3433df0 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -88,7 +88,7 @@ void TitleWidget::initInWindow(not_null<RpWindow*> window) {
 	) | rpl::filter([=](not_null<HitTestRequest*> request) {
 		return !isHidden() && geometry().contains(request->point);
 	}) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
-		request->result = hitTest(request->point);
+		request->result = hitTest(request->point, request->result);
 	}, lifetime());
 
 	SetupSemiNativeSystemButtons(&_controls, window, lifetime(), [=] {
@@ -112,9 +112,9 @@ void TitleWidget::refreshGeometryWithWidth(int width) {
 	setGeometry(0, 0, width, _controls.st()->height + add);
 	if (_paddingHelper) {
 		_paddingHelper->controlsParent.setGeometry(
+			0,
 			add,
-			add,
-			width - 2 * add,
+			width,
 			_controls.st()->height);
 	}
 	update();
@@ -140,7 +140,9 @@ void TitleWidget::resizeEvent(QResizeEvent *e) {
 	_shadow->setGeometry(0, height() - thickness, width(), thickness);
 }
 
-HitTestResult TitleWidget::hitTest(QPoint point) const {
+HitTestResult TitleWidget::hitTest(
+		QPoint point,
+		HitTestResult oldResult) const {
 	const auto origin = _paddingHelper
 		? _paddingHelper->controlsParent.pos()
 		: QPoint();
@@ -150,6 +152,8 @@ HitTestResult TitleWidget::hitTest(QPoint point) const {
 	const auto controlsResult = _controls.hitTest(point - origin, padding);
 	return (controlsResult != HitTestResult::None)
 		? controlsResult
+		: (oldResult != HitTestResult::Client)
+		? oldResult
 		: HitTestResult::Caption;
 }
 
diff --git a/ui/platform/win/ui_window_title_win.h b/ui/platform/win/ui_window_title_win.h
index 39177e6..7cce4dc 100644
--- a/ui/platform/win/ui_window_title_win.h
+++ b/ui/platform/win/ui_window_title_win.h
@@ -55,7 +55,9 @@ protected:
 private:
 	struct PaddingHelper;
 
-	[[nodiscard]] HitTestResult hitTest(QPoint point) const;
+	[[nodiscard]] HitTestResult hitTest(
+		QPoint point,
+		HitTestResult oldResult) const;
 	[[nodiscard]] bool additionalPaddingRequired() const;
 	void refreshGeometryWithWidth(int width);
 	void setAdditionalPadding(int padding);
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index aa71452..9339dd7 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -48,6 +48,13 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	_In_ int nIndex,
 	_In_ UINT dpi);
 
+BOOL(__stdcall *AdjustWindowRectExForDpi)(
+	_Inout_ LPRECT lpRect,
+	_In_ DWORD dwStyle,
+	_In_ BOOL bMenu,
+	_In_ DWORD dwExStyle,
+	_In_ UINT dpi);
+
 [[nodiscard]] bool GetDpiForWindowSupported() {
 	static const auto Result = [&] {
 #define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
@@ -68,6 +75,16 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	return Result;
 }
 
+[[nodiscard]] bool AdjustWindowRectExForDpiSupported() {
+	static const auto Result = [&] {
+#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
+		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
+		return LOAD_SYMBOL(user32, AdjustWindowRectExForDpi);
+#undef LOAD_SYMBOL
+	}();
+	return Result;
+}
+
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -217,7 +234,6 @@ WindowHelper::WindowHelper(not_null<RpWidget*> window)
 , _handle(ResolveWindowHandle(window))
 , _title(Ui::CreateChild<TitleWidget>(window.get()))
 , _body(Ui::CreateChild<RpWidget>(window.get()))
-, _shadow(std::in_place, window, st::windowShadowFg->c)
 , _dpi(GetDpiForWindowSupported() ? GetDpiForWindow(_handle) : 0) {
 	Expects(_handle != nullptr);
 
@@ -273,13 +289,14 @@ void WindowHelper::setNativeFrame(bool enabled) {
 		}
 	}
 	_title->setVisible(!enabled);
-	if (enabled) {
+	if (enabled || ::Platform::IsWindows11OrGreater()) {
 		_shadow.reset();
 	} else {
 		_shadow.emplace(window(), st::windowShadowFg->c);
 		_shadow->setResizeEnabled(!fixedSize());
 		initialShadowUpdate();
 	}
+	updateCornersRounding();
 	updateMargins();
 	updateWindowFrameColors();
 	fixMaximizedWindow();
@@ -298,6 +315,9 @@ void WindowHelper::setNativeFrame(bool enabled) {
 }
 
 void WindowHelper::initialShadowUpdate() {
+	if (!_shadow) {
+		return;
+	}
 	using Change = WindowShadow::Change;
 	const auto noShadowStates = (Qt::WindowMinimized | Qt::WindowMaximized);
 	if ((window()->windowState() & noShadowStates) || window()->isHidden()) {
@@ -305,7 +325,6 @@ void WindowHelper::initialShadowUpdate() {
 	} else {
 		_shadow->update(Change::Moved | Change::Resized | Change::Shown);
 	}
-	updateCornersRounding();
 }
 
 void WindowHelper::updateCornersRounding() {
@@ -397,12 +416,41 @@ void WindowHelper::init() {
 			size.height() - (titleShown ? titleHeight : 0));
 	}, _body->lifetime());
 
+	hitTestRequests(
+	) | rpl::filter([=](not_null<HitTestRequest*> request) {
+		return ::Platform::IsWindows11OrGreater();
+	}) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
+		request->result = [=] {
+			RECT r{};
+			const auto style = GetWindowLongPtr(_handle, GWL_STYLE)
+				& ~WS_CAPTION;
+			const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
+			const auto dpi = style::ConvertScale(
+				96 * style::DevicePixelRatio());
+			if (AdjustWindowRectExForDpiSupported() && dpi) {
+				AdjustWindowRectExForDpi(&r, style, false, styleEx, dpi);
+			} else {
+				AdjustWindowRectEx(&r, style, false, styleEx);
+			}
+			const auto maximized = window()->isMaximized()
+				|| window()->isFullScreen();
+			return (!maximized && (request->point.y() < -r.top))
+				? HitTestResult::Top
+				: HitTestResult::Client;
+		}();
+	}, window()->lifetime());
+
 	updateMargins();
 
+	if (!::Platform::IsWindows11OrGreater()) {
+		_shadow.emplace(window(), st::windowShadowFg->c);
+	}
+
 	if (!::Platform::IsWindows8OrGreater()) {
 		SetWindowTheme(_handle, L" ", L" ");
 		QApplication::setStyle(QStyleFactory::create("Windows"));
 	}
+
 	updateWindowFrameColors();
 
 	const auto handleStateChanged = [=](Qt::WindowState state) {
@@ -427,6 +475,7 @@ void WindowHelper::init() {
 		handleStateChanged);
 
 	initialShadowUpdate();
+	updateCornersRounding();
 
 	auto dm = std::make_unique<DirectManipulation>(window());
 	if (dm->valid()) {
@@ -506,11 +555,16 @@ bool WindowHelper::handleNativeEvent(
 		if (_title->isHidden() || window()->isFullScreen() || !wParam) {
 			return false;
 		}
-		WINDOWPLACEMENT wp;
-		wp.length = sizeof(WINDOWPLACEMENT);
-		if (GetWindowPlacement(_handle, &wp)
-			&& (wp.showCmd == SW_SHOWMAXIMIZED)) {
-			const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
+		const auto r = &((LPNCCALCSIZE_PARAMS)lParam)->rgrc[0];
+		const auto maximized = [&] {
+			WINDOWPLACEMENT wp;
+			wp.length = sizeof(WINDOWPLACEMENT);
+			return GetWindowPlacement(_handle, &wp)
+				&& (wp.showCmd == SW_SHOWMAXIMIZED);
+		}();
+		const auto addBorders = maximized
+			|| ::Platform::IsWindows11OrGreater();
+		if (addBorders) {
 			const auto dpi = _dpi.current();
 			const auto borderWidth = (GetSystemMetricsForDpiSupported() && dpi)
 				? GetSystemMetricsForDpi(SM_CXSIZEFRAME, dpi)
@@ -519,8 +573,12 @@ bool WindowHelper::handleNativeEvent(
 					+ GetSystemMetrics(SM_CXPADDEDBORDER);
 			r->left += borderWidth;
 			r->right -= borderWidth;
-			r->top += borderWidth;
+			if (maximized) {
+				r->top += borderWidth;
+			}
 			r->bottom -= borderWidth;
+		}
+		if (maximized) {
 			const auto hMonitor = MonitorFromWindow(
 				_handle,
 				MONITOR_DEFAULTTONEAREST);
@@ -536,10 +594,8 @@ bool WindowHelper::handleNativeEvent(
 				case ABE_BOTTOM: r->bottom -= 1; break;
 				}
 			}
-			if (result) *result = 0;
-		} else {
-			if (result) *result = WVR_REDRAW;
 		}
+		if (result) *result = addBorders ? 0 : WVR_REDRAW;
 	} return true;
 
 	case WM_NCRBUTTONUP: {
@@ -569,15 +625,15 @@ bool WindowHelper::handleNativeEvent(
 
 	case WM_WINDOWPOSCHANGING:
 	case WM_WINDOWPOSCHANGED: {
+		auto placement = WINDOWPLACEMENT{
+			.length = sizeof(WINDOWPLACEMENT),
+		};
+		if (!GetWindowPlacement(_handle, &placement)) {
+			LOG(("System Error: GetWindowPlacement failed."));
+			return false;
+		}
+		_title->refreshAdditionalPaddings(_handle, placement);
 		if (_shadow) {
-			auto placement = WINDOWPLACEMENT{
-				.length = sizeof(WINDOWPLACEMENT),
-			};
-			if (!GetWindowPlacement(_handle, &placement)) {
-				LOG(("System Error: GetWindowPlacement failed."));
-				return false;
-			}
-			_title->refreshAdditionalPaddings(_handle, placement);
 			if (placement.showCmd == SW_SHOWMAXIMIZED
 				|| placement.showCmd == SW_SHOWMINIMIZED) {
 				_shadow->update(WindowShadow::Change::Hidden);
@@ -606,8 +662,8 @@ bool WindowHelper::handleNativeEvent(
 				window()->windowHandle()->windowStateChanged(state);
 			}
 			updateMargins();
+			_title->refreshAdditionalPaddings(_handle);
 			if (_shadow) {
-				_title->refreshAdditionalPaddings(_handle);
 				const auto changes = (wParam == SIZE_MINIMIZED
 					|| wParam == SIZE_MAXIMIZED)
 					? WindowShadow::Change::Hidden
@@ -630,8 +686,8 @@ bool WindowHelper::handleNativeEvent(
 	} return false;
 
 	case WM_MOVE: {
+		_title->refreshAdditionalPaddings(_handle);
 		if (_shadow) {
-			_title->refreshAdditionalPaddings(_handle);
 			_shadow->update(WindowShadow::Change::Moved);
 		}
 	} return false;
@@ -647,9 +703,9 @@ bool WindowHelper::handleNativeEvent(
 		const auto mapped = QPoint(
 			int(std::floor(p.x / ratio)),
 			int(std::floor(p.y / ratio)));
-		*result = [&] {
+		*result = [&]() -> LRESULT {
 			if (!window()->rect().contains(mapped)) {
-				return HTTRANSPARENT;
+				return DefWindowProc(_handle, msg, wParam, lParam);
 			}
 			auto request = HitTestRequest{
 				.point = mapped,
@@ -672,7 +728,7 @@ bool WindowHelper::handleNativeEvent(
 			case HitTestResult::Close: return systemButtonHitTest(result);
 
 			case HitTestResult::None:
-			default: return HTTRANSPARENT;
+			default: return DefWindowProc(_handle, msg, wParam, lParam);
 			};
 		}();
 		_systemButtonOver.fire(systemButtonHitTest(*result));
@@ -814,7 +870,7 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 }
 
 void WindowHelper::updateMargins() {
-	if (_updatingMargins) return;
+	if (::Platform::IsWindows11OrGreater() || _updatingMargins) return;
 
 	_updatingMargins = true;
 	const auto guard = gsl::finally([&] { _updatingMargins = false; });
@@ -888,6 +944,7 @@ void WindowHelper::updateMargins() {
 }
 
 void WindowHelper::fixMaximizedWindow() {
+	if (::Platform::IsWindows11OrGreater()) return;
 	auto r = RECT();
 	GetClientRect(_handle, &r);
 	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);

From 2631d64a5f11a084457210fe2419f42a5f15f7ae Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 10 Aug 2023 22:14:48 +0200
Subject: [PATCH 454/635] Use smaller top resize area.

---
 ui/platform/win/ui_window_win.cpp | 32 +++----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 9339dd7..72058a0 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -48,13 +48,6 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	_In_ int nIndex,
 	_In_ UINT dpi);
 
-BOOL(__stdcall *AdjustWindowRectExForDpi)(
-	_Inout_ LPRECT lpRect,
-	_In_ DWORD dwStyle,
-	_In_ BOOL bMenu,
-	_In_ DWORD dwExStyle,
-	_In_ UINT dpi);
-
 [[nodiscard]] bool GetDpiForWindowSupported() {
 	static const auto Result = [&] {
 #define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
@@ -75,16 +68,6 @@ BOOL(__stdcall *AdjustWindowRectExForDpi)(
 	return Result;
 }
 
-[[nodiscard]] bool AdjustWindowRectExForDpiSupported() {
-	static const auto Result = [&] {
-#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
-		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
-		return LOAD_SYMBOL(user32, AdjustWindowRectExForDpi);
-#undef LOAD_SYMBOL
-	}();
-	return Result;
-}
-
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -421,20 +404,11 @@ void WindowHelper::init() {
 		return ::Platform::IsWindows11OrGreater();
 	}) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
 		request->result = [=] {
-			RECT r{};
-			const auto style = GetWindowLongPtr(_handle, GWL_STYLE)
-				& ~WS_CAPTION;
-			const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-			const auto dpi = style::ConvertScale(
-				96 * style::DevicePixelRatio());
-			if (AdjustWindowRectExForDpiSupported() && dpi) {
-				AdjustWindowRectExForDpi(&r, style, false, styleEx, dpi);
-			} else {
-				AdjustWindowRectEx(&r, style, false, styleEx);
-			}
 			const auto maximized = window()->isMaximized()
 				|| window()->isFullScreen();
-			return (!maximized && (request->point.y() < -r.top))
+			const auto px = int(std::ceil(
+				st::windowTitleHeight * style::DevicePixelRatio() / 10.));
+			return (!maximized && (request->point.y() < px))
 				? HitTestResult::Top
 				: HitTestResult::Client;
 		}();

From eeb2cbc69cd581f3bc4d1358afbb0308df4d14ab Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 11 Aug 2023 01:31:20 +0400
Subject: [PATCH 455/635] Use QWindow's devicePixelRatio for top resize area

---
 ui/platform/win/ui_window_win.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 72058a0..c0d1381 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -407,7 +407,9 @@ void WindowHelper::init() {
 			const auto maximized = window()->isMaximized()
 				|| window()->isFullScreen();
 			const auto px = int(std::ceil(
-				st::windowTitleHeight * style::DevicePixelRatio() / 10.));
+				st::windowTitleHeight
+					* window()->windowHandle()->devicePixelRatio()
+					/ 10.));
 			return (!maximized && (request->point.y() < px))
 				? HitTestResult::Top
 				: HitTestResult::Client;

From 18ac9868bb24801c6d4bf7bd5d1e6197add2f4b4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 11 Aug 2023 10:21:53 +0200
Subject: [PATCH 456/635] Use https:// scheme by default.

---
 ui/basic_click_handlers.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/basic_click_handlers.cpp b/ui/basic_click_handlers.cpp
index 1421f5e..c68fbd5 100644
--- a/ui/basic_click_handlers.cpp
+++ b/ui/basic_click_handlers.cpp
@@ -73,7 +73,7 @@ QString UrlClickHandler::EncodeForOpening(const QString &originalUrl) {
 		&& !QRegularExpression(
 			QStringLiteral("^[a-zA-Z]+:")).match(result).hasMatch()) {
 		// No protocol.
-		return QStringLiteral("http://") + result;
+		return QStringLiteral("https://") + result;
 	}
 	return result;
 }

From 92cb6f680966ab828b67d7703cb968795310cd8e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 12 Aug 2023 03:39:39 +0400
Subject: [PATCH 457/635] Remove unused variables from
 WindowHelper::fixMaximizedWindow

---
 ui/platform/win/ui_window_win.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index c0d1381..03ceee6 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -921,11 +921,7 @@ void WindowHelper::updateMargins() {
 
 void WindowHelper::fixMaximizedWindow() {
 	if (::Platform::IsWindows11OrGreater()) return;
-	auto r = RECT();
-	GetClientRect(_handle, &r);
 	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
-	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-	AdjustWindowRectEx(&r, style, false, styleEx);
 	if (style & WS_MAXIMIZE) {
 		auto w = RECT();
 		GetWindowRect(_handle, &w);

From e66ad9c80c88a0efad81ad05b120709cbaf022c3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 12 Aug 2023 04:01:21 +0400
Subject: [PATCH 458/635] Avoid additional calculations in
 WindowHelper::updateMargins

---
 ui/platform/win/ui_window_win.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 03ceee6..dca46cf 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -851,19 +851,11 @@ void WindowHelper::updateMargins() {
 	_updatingMargins = true;
 	const auto guard = gsl::finally([&] { _updatingMargins = false; });
 
-	RECT r, a;
-
-	GetClientRect(_handle, &r);
-	a = r;
-
+	RECT r{};
 	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
 	AdjustWindowRectEx(&a, style, false, styleEx);
-	auto margins = QMargins(
-		a.left - r.left,
-		a.top - r.top,
-		r.right - a.right,
-		r.bottom - a.bottom);
+	auto margins = QMargins(r.left, r.top, -r.right, -r.bottom);
 	if (style & WS_MAXIMIZE) {
 		RECT w, m;
 		GetWindowRect(_handle , &w);

From cbb9e0bbde2f40c7b3827062049461757a4b458f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 12 Aug 2023 04:04:12 +0400
Subject: [PATCH 459/635] Make WindowHelper::updateMargins multi-screen DPI
 aware

---
 ui/platform/win/ui_window_win.cpp | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index dca46cf..3aba67d 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -48,6 +48,13 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	_In_ int nIndex,
 	_In_ UINT dpi);
 
+BOOL(__stdcall *AdjustWindowRectExForDpi)(
+	_Inout_ LPRECT lpRect,
+	_In_ DWORD dwStyle,
+	_In_ BOOL bMenu,
+	_In_ DWORD dwExStyle,
+	_In_ UINT dpi);
+
 [[nodiscard]] bool GetDpiForWindowSupported() {
 	static const auto Result = [&] {
 #define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
@@ -68,6 +75,16 @@ int(__stdcall *GetSystemMetricsForDpi)(
 	return Result;
 }
 
+[[nodiscard]] bool AdjustWindowRectExForDpiSupported() {
+	static const auto Result = [&] {
+#define LOAD_SYMBOL(lib, name) base::Platform::LoadMethod(lib, #name, name)
+		const auto user32 = base::Platform::SafeLoadLibrary(L"User32.dll");
+		return LOAD_SYMBOL(user32, AdjustWindowRectExForDpi);
+#undef LOAD_SYMBOL
+	}();
+	return Result;
+}
+
 [[nodiscard]] bool IsCompositionEnabled() {
 	auto result = BOOL(FALSE);
 	const auto success = (DwmIsCompositionEnabled(&result) == S_OK);
@@ -416,7 +433,9 @@ void WindowHelper::init() {
 		}();
 	}, window()->lifetime());
 
-	updateMargins();
+	_dpi.value() | rpl::start_with_next([=](uint dpi) {
+		updateMargins();
+	}, window()->lifetime());
 
 	if (!::Platform::IsWindows11OrGreater()) {
 		_shadow.emplace(window(), st::windowShadowFg->c);
@@ -854,7 +873,12 @@ void WindowHelper::updateMargins() {
 	RECT r{};
 	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 	const auto styleEx = GetWindowLongPtr(_handle, GWL_EXSTYLE);
-	AdjustWindowRectEx(&a, style, false, styleEx);
+	const auto dpi = _dpi.current();
+	if (AdjustWindowRectExForDpiSupported() && dpi) {
+		AdjustWindowRectExForDpi(&r, style, false, styleEx, dpi);
+	} else {
+		AdjustWindowRectEx(&r, style, false, styleEx);
+	}
 	auto margins = QMargins(r.left, r.top, -r.right, -r.bottom);
 	if (style & WS_MAXIMIZE) {
 		RECT w, m;

From fd55e9b71b03282de682e9b8ac01f1b6801d25a9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 12 Aug 2023 04:05:08 +0400
Subject: [PATCH 460/635] Adapt WindowHelper::updateMargins for Windows 11
 native resize

---
 ui/platform/win/ui_window_win.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 3aba67d..5fe828b 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -865,7 +865,7 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 }
 
 void WindowHelper::updateMargins() {
-	if (::Platform::IsWindows11OrGreater() || _updatingMargins) return;
+	if (_updatingMargins) return;
 
 	_updatingMargins = true;
 	const auto guard = gsl::finally([&] { _updatingMargins = false; });
@@ -879,7 +879,9 @@ void WindowHelper::updateMargins() {
 	} else {
 		AdjustWindowRectEx(&r, style, false, styleEx);
 	}
-	auto margins = QMargins(r.left, r.top, -r.right, -r.bottom);
+	auto margins = ::Platform::IsWindows11OrGreater()
+		? QMargins(0, r.top, 0, 0)
+		: QMargins(r.left, r.top, -r.right, -r.bottom);
 	if (style & WS_MAXIMIZE) {
 		RECT w, m;
 		GetWindowRect(_handle , &w);
@@ -936,7 +938,6 @@ void WindowHelper::updateMargins() {
 }
 
 void WindowHelper::fixMaximizedWindow() {
-	if (::Platform::IsWindows11OrGreater()) return;
 	const auto style = GetWindowLongPtr(_handle, GWL_STYLE);
 	if (style & WS_MAXIMIZE) {
 		auto w = RECT();

From 70867536a4f499f64c0efea18b870a24043c7ce0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 14 Aug 2023 21:15:33 +0300
Subject: [PATCH 461/635] Added util to generate path of complex rounded rect.

---
 ui/round_rect.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 ui/round_rect.h   |  7 +++++++
 2 files changed, 58 insertions(+)

diff --git a/ui/round_rect.cpp b/ui/round_rect.cpp
index 4118110..d539462 100644
--- a/ui/round_rect.cpp
+++ b/ui/round_rect.cpp
@@ -10,8 +10,59 @@
 #include "ui/image/image_prepare.h"
 #include "ui/ui_utility.h"
 
+#include <QPainterPath>
+
 namespace Ui {
 
+QPainterPath ComplexRoundedRectPath(
+		const QRect &rect,
+		int topLeftRadius,
+		int topRightRadius,
+		int bottomLeftRadius,
+		int bottomRightRadius) {
+	auto path = QPainterPath();
+	path.setFillRule(Qt::WindingFill);
+
+	const auto cornerPartSize = rect.size() / 4 * 3;
+	const auto cornerPartOffset = QPoint(
+		rect.width() - cornerPartSize.width(),
+		rect.height() - cornerPartSize.height());
+
+	path.addRoundedRect(
+		rect.x(),
+		rect.y(),
+		cornerPartSize.width(),
+		cornerPartSize.height(),
+		topLeftRadius,
+		topLeftRadius);
+
+	path.addRoundedRect(
+		rect.x() + cornerPartOffset.x(),
+		rect.y(),
+		cornerPartSize.width(),
+		cornerPartSize.height(),
+		topRightRadius,
+		topRightRadius);
+
+	path.addRoundedRect(
+		rect.x(),
+		rect.y() + cornerPartOffset.y(),
+		cornerPartSize.width(),
+		cornerPartSize.height(),
+		bottomLeftRadius,
+		bottomLeftRadius);
+
+	path.addRoundedRect(
+		rect.x() + cornerPartOffset.x(),
+		rect.y() + cornerPartOffset.y(),
+		cornerPartSize.width(),
+		cornerPartSize.height(),
+		bottomRightRadius,
+		bottomRightRadius);
+
+	return path.simplified();
+}
+
 void DrawRoundedRect(
 		QPainter &p,
 		const QRect &rect,
diff --git a/ui/round_rect.h b/ui/round_rect.h
index e2c184b..322fb5f 100644
--- a/ui/round_rect.h
+++ b/ui/round_rect.h
@@ -14,6 +14,13 @@ class QPainter;
 
 namespace Ui {
 
+[[nodiscard]] QPainterPath ComplexRoundedRectPath(
+	const QRect &rect,
+	int topLeftRadius,
+	int topRightRadius,
+	int bottomLeftRadius,
+	int bottomRightRadius);
+
 void DrawRoundedRect(
 	QPainter &p,
 	const QRect &rect,

From 0ea27ae051774047cc00b92778f98c2f243712e8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 15 Aug 2023 00:02:09 +0300
Subject: [PATCH 462/635] Ignored arrow keys with Ctrl modifier by scroll area.

---
 ui/widgets/scroll_area.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/scroll_area.cpp b/ui/widgets/scroll_area.cpp
index f885147..81fc8bf 100644
--- a/ui/widgets/scroll_area.cpp
+++ b/ui/widgets/scroll_area.cpp
@@ -664,7 +664,9 @@ void ScrollArea::moveEvent(QMoveEvent *e) {
 }
 
 void ScrollArea::keyPressEvent(QKeyEvent *e) {
-	if ((e->key() == Qt::Key_Up || e->key() == Qt::Key_Down) && e->modifiers().testFlag(Qt::AltModifier)) {
+	if ((e->key() == Qt::Key_Up || e->key() == Qt::Key_Down)
+		&& (e->modifiers().testFlag(Qt::AltModifier)
+			|| e->modifiers().testFlag(Qt::ControlModifier))) {
 		e->ignore();
 	} else if(e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) {
 		((QObject*)widget())->event(e);

From 632626b1921e99aaea6d02a9f7ebbb6354161365 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 16 Aug 2023 14:52:43 +0400
Subject: [PATCH 463/635] Use QEvent::registerEventType for custom event types

---
 ui/main_queue_processor.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/main_queue_processor.cpp b/ui/main_queue_processor.cpp
index 3915fb5..76e36a9 100644
--- a/ui/main_queue_processor.cpp
+++ b/ui/main_queue_processor.cpp
@@ -18,8 +18,10 @@
 namespace Ui {
 namespace {
 
-constexpr auto kProcessorEvent = QEvent::Type(QEvent::User + 1);
-static_assert(kProcessorEvent < QEvent::MaxUser);
+auto ProcessorEventType() {
+	static const auto Result = QEvent::Type(QEvent::registerEventType());
+	return Result;
+}
 
 QMutex ProcessorMutex;
 MainQueueProcessor *ProcessorInstance/* = nullptr*/;
@@ -47,7 +49,7 @@ void PushToMainQueueGeneric(void (*callable)(void*), void *argument) {
 		MainQueueProcessState.store(ProcessState::Waiting);
 	}
 
-	auto event = std::make_unique<QEvent>(kProcessorEvent);
+	auto event = std::make_unique<QEvent>(ProcessorEventType());
 
 	QMutexLocker lock(&ProcessorMutex);
 	if (ProcessorInstance) {
@@ -94,7 +96,7 @@ MainQueueProcessor::MainQueueProcessor() {
 
 bool MainQueueProcessor::event(QEvent *event) {
 	if constexpr (Platform::UseMainQueueGeneric()) {
-		if (event->type() == kProcessorEvent) {
+		if (event->type() == ProcessorEventType()) {
 			DrainMainQueueGeneric();
 			return true;
 		}

From b3580f7987d81b0c7aecee99f7f70f7873f6b35c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Aug 2023 13:54:01 +0200
Subject: [PATCH 464/635] Use FlatLabel::textMaxWidth.

---
 ui/layers/box_layer_widget.cpp            | 10 +++++-----
 ui/rp_widget.h                            |  4 ++--
 ui/widgets/menu/menu_multiline_action.cpp |  4 ++--
 ui/widgets/tooltip.cpp                    |  7 +++++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index e0b90a4..6f356f9 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -250,11 +250,11 @@ void BoxLayerWidget::updateTitlePosition() {
 	_titleLeft = st::boxTitlePosition.x();
 	_titleTop = st::boxTitlePosition.y();
 	if (_title) {
-		const auto topButtonSkip = _topButton ? (_topButton->width() / 2) : 0;
-		_title->resizeToWidth(
-			std::min(
-				_title->naturalWidth(),
-				width() - _titleLeft * 2 - topButtonSkip));
+		const auto topButtonSkip = _topButton
+			? (_topButton->width() / 2)
+			: 0;
+		_title->resizeToNaturalWidth(
+			width() - _titleLeft * 2 - topButtonSkip);
 		_title->moveToLeft(_titleLeft, _titleTop);
 	}
 }
diff --git a/ui/rp_widget.h b/ui/rp_widget.h
index 232affb..a00282e 100644
--- a/ui/rp_widget.h
+++ b/ui/rp_widget.h
@@ -199,8 +199,8 @@ public:
 
 	// Resize to minimum of natural width and available width.
 	void resizeToNaturalWidth(int newWidth) {
-		auto maxWidth = naturalWidth();
-		resizeToWidth((maxWidth >= 0) ? qMin(newWidth, maxWidth) : newWidth);
+		const auto natural = naturalWidth();
+		resizeToWidth((natural >= 0) ? qMin(newWidth, natural) : newWidth);
 	}
 
 	QRect rectNoMargins() const {
diff --git a/ui/widgets/menu/menu_multiline_action.cpp b/ui/widgets/menu/menu_multiline_action.cpp
index c4f3dbd..320ae10 100644
--- a/ui/widgets/menu/menu_multiline_action.cpp
+++ b/ui/widgets/menu/menu_multiline_action.cpp
@@ -65,8 +65,8 @@ void MultilineAction::paintEvent(QPaintEvent *e) {
 
 void MultilineAction::updateMinWidth() {
 	const auto skip = _labelPosition.x();
-	auto min = _text->naturalWidth() / 2;
-	auto max = _icon ? _st.widthMax : (_text->naturalWidth() - skip);
+	auto min = _text->textMaxWidth() / 2;
+	auto max = _icon ? _st.widthMax : (_text->textMaxWidth() - skip);
 	_text->resizeToWidth(max);
 	const auto height = _icon
 		? ((_st.itemIconPosition.y() * 2) + _icon->height())
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index 1613af3..bd05590 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -446,10 +446,13 @@ object_ptr<FlatLabel> MakeNiceTooltipLabel(
 		stMenu);
 	const auto raw = result.data();
 	std::move(text) | rpl::start_with_next([=, &st] {
-		raw->resizeToNaturalWidth(maxWidth);
-		if (raw->naturalWidth() <= maxWidth) {
+		raw->resizeToWidth(qMin(maxWidth, raw->textMaxWidth()));
+		const auto desired = raw->textMaxWidth();
+		if (desired <= maxWidth) {
+			raw->resizeToWidth(desired);
 			return;
 		}
+		raw->resizeToWidth(maxWidth);
 		const auto niceWidth = FindNiceTooltipWidth(
 			st.minWidth,
 			maxWidth,

From a6d7e3f5457b29b563941b24cd844ca26ac0d077 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Aug 2023 18:03:35 +0200
Subject: [PATCH 465/635] Fix possible render glitch.

In some rare cases opening main menu was leading to some
widgets showing "over" the background darkening filling.
The glitch disappeared on the next repaint, so we trigger
this repaint explicitly.

The case it was reproducing with 100% rate: in TDesktop with
disabled interface animations after showing and hiding of bot
keyboard the message input field (widget with OpaquePaintEvent)
was painted on top of the backround dark filling below main menu.
---
 ui/layers/layer_widget.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/layers/layer_widget.cpp b/ui/layers/layer_widget.cpp
index 2dbab88..b91c2f5 100644
--- a/ui/layers/layer_widget.cpp
+++ b/ui/layers/layer_widget.cpp
@@ -72,6 +72,7 @@ private:
 
 	bool _wasAnimating = false;
 	bool _inPaintEvent = false;
+	bool _repaintIssued = false;
 	Ui::Animations::Simple _a_shown;
 	Ui::Animations::Simple _a_mainMenuShown;
 	Ui::Animations::Simple _a_specialLayerShown;
@@ -98,6 +99,7 @@ void LayerStackWidget::BackgroundWidget::setCacheImages(
 	_layerCache = std::move(layerCache);
 	_specialLayerCacheBox = _specialLayerBox;
 	_layerCacheBox = _layerBox;
+	_repaintIssued = false;
 	setAttribute(Qt::WA_OpaquePaintEvent, !_bodyCache.isNull());
 }
 
@@ -143,6 +145,7 @@ void LayerStackWidget::BackgroundWidget::startAnimation(Action action) {
 }
 
 void LayerStackWidget::BackgroundWidget::skipAnimation(Action action) {
+	_repaintIssued = false;
 	startAnimation(action);
 	finishAnimating();
 }
@@ -310,6 +313,10 @@ void LayerStackWidget::BackgroundWidget::paintEvent(QPaintEvent *e) {
 		auto sourceRect = style::rtlrect(_mainMenuCache.width() - sourceWidth, 0, sourceWidth, _mainMenuCache.height(), _mainMenuCache.width());
 		p.drawPixmapLeft(0, 0, shownWidth, height(), width(), _mainMenuCache, sourceRect);
 	}
+	if (!_repaintIssued && !_a_shown.animating()) {
+		_repaintIssued = true;
+		update();
+	}
 }
 
 void LayerStackWidget::BackgroundWidget::finishAnimating() {

From a3c52c2cfe7ee5c3382ac0579eb96ec6962b7f47 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Aug 2023 11:32:52 +0200
Subject: [PATCH 466/635] Make box content divider smaller.

---
 ui/layers/layers.style | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 4f487ef..1a3caa7 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -156,7 +156,7 @@ boxLoadingSize: 20px;
 
 boxDividerTop: icon {{ "box_divider_top", boxDividerFg }};
 boxDividerBottom: icon {{ "box_divider_bottom", boxDividerFg }};
-boxDividerHeight: 10px;
+boxDividerHeight: 8px;
 
 separatePanelBorderCacheSize: 60px;
 separatePanelTitleHeight: 62px;

From 552db4b24f4542dcb6d19302d7e29ff00349b156 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Aug 2023 11:22:34 +0200
Subject: [PATCH 467/635] Allow setting heightMin in ResizeFitChild.

---
 ui/rp_widget.cpp | 5 +++--
 ui/rp_widget.h   | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index 35fbe2f..a59cb63 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -80,7 +80,8 @@ void ToggleChildrenVisibility(not_null<QWidget*> widget, bool visible) {
 
 void ResizeFitChild(
 		not_null<RpWidget*> parent,
-		not_null<RpWidget*> child) {
+		not_null<RpWidget*> child,
+		int heightMin) {
 	parent->widthValue(
 	) | rpl::start_with_next([=](int width) {
 		child->resizeToWidth(width);
@@ -88,7 +89,7 @@ void ResizeFitChild(
 
 	child->heightValue(
 	) | rpl::start_with_next([=](int height) {
-		parent->resize(parent->width(), height);
+		parent->resize(parent->width(), std::max(height, heightMin));
 	}, child->lifetime());
 }
 
diff --git a/ui/rp_widget.h b/ui/rp_widget.h
index a00282e..347963a 100644
--- a/ui/rp_widget.h
+++ b/ui/rp_widget.h
@@ -261,7 +261,10 @@ namespace Ui {
 
 class RpWidget;
 
-void ResizeFitChild(not_null<RpWidget*> parent, not_null<RpWidget*> child);
+void ResizeFitChild(
+	not_null<RpWidget*> parent,
+	not_null<RpWidget*> child,
+	int heightMin = 0);
 
 template <typename Widget>
 using RpWidgetParent = std::conditional_t<

From bcfce982c851e16f10ec7a3c360404ad37975b50 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Aug 2023 18:01:55 +0200
Subject: [PATCH 468/635] Move inline image/path expanding here.

---
 ui/image/image_prepare.cpp | 254 +++++++++++++++++++++++++++++++++++++
 ui/image/image_prepare.h   |   4 +
 2 files changed, 258 insertions(+)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index d5e9f16..5559aef 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1366,4 +1366,258 @@ QByteArray MakeProgressiveJpeg(const QByteArray &bytes) {
 	}
 }
 
+QByteArray ExpandInlineBytes(const QByteArray &bytes) {
+	if (bytes.size() < 3 || bytes[0] != '\x01') {
+		return QByteArray();
+	}
+	const char header[] = "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49"
+		"\x46\x00\x01\x01\x00\x00\x01\x00\x01\x00\x00\xff\xdb\x00\x43\x00\x28\x1c"
+		"\x1e\x23\x1e\x19\x28\x23\x21\x23\x2d\x2b\x28\x30\x3c\x64\x41\x3c\x37\x37"
+		"\x3c\x7b\x58\x5d\x49\x64\x91\x80\x99\x96\x8f\x80\x8c\x8a\xa0\xb4\xe6\xc3"
+		"\xa0\xaa\xda\xad\x8a\x8c\xc8\xff\xcb\xda\xee\xf5\xff\xff\xff\x9b\xc1\xff"
+		"\xff\xff\xfa\xff\xe6\xfd\xff\xf8\xff\xdb\x00\x43\x01\x2b\x2d\x2d\x3c\x35"
+		"\x3c\x76\x41\x41\x76\xf8\xa5\x8c\xa5\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8"
+		"\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8"
+		"\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8\xf8"
+		"\xf8\xf8\xf8\xf8\xf8\xff\xc0\x00\x11\x08\x00\x00\x00\x00\x03\x01\x22\x00"
+		"\x02\x11\x01\x03\x11\x01\xff\xc4\x00\x1f\x00\x00\x01\x05\x01\x01\x01\x01"
+		"\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x01\x02\x03\x04\x05\x06\x07\x08"
+		"\x09\x0a\x0b\xff\xc4\x00\xb5\x10\x00\x02\x01\x03\x03\x02\x04\x03\x05\x05"
+		"\x04\x04\x00\x00\x01\x7d\x01\x02\x03\x00\x04\x11\x05\x12\x21\x31\x41\x06"
+		"\x13\x51\x61\x07\x22\x71\x14\x32\x81\x91\xa1\x08\x23\x42\xb1\xc1\x15\x52"
+		"\xd1\xf0\x24\x33\x62\x72\x82\x09\x0a\x16\x17\x18\x19\x1a\x25\x26\x27\x28"
+		"\x29\x2a\x34\x35\x36\x37\x38\x39\x3a\x43\x44\x45\x46\x47\x48\x49\x4a\x53"
+		"\x54\x55\x56\x57\x58\x59\x5a\x63\x64\x65\x66\x67\x68\x69\x6a\x73\x74\x75"
+		"\x76\x77\x78\x79\x7a\x83\x84\x85\x86\x87\x88\x89\x8a\x92\x93\x94\x95\x96"
+		"\x97\x98\x99\x9a\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xb2\xb3\xb4\xb5\xb6"
+		"\xb7\xb8\xb9\xba\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xd2\xd3\xd4\xd5\xd6"
+		"\xd7\xd8\xd9\xda\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xf1\xf2\xf3\xf4"
+		"\xf5\xf6\xf7\xf8\xf9\xfa\xff\xc4\x00\x1f\x01\x00\x03\x01\x01\x01\x01\x01"
+		"\x01\x01\x01\x01\x00\x00\x00\x00\x00\x00\x01\x02\x03\x04\x05\x06\x07\x08"
+		"\x09\x0a\x0b\xff\xc4\x00\xb5\x11\x00\x02\x01\x02\x04\x04\x03\x04\x07\x05"
+		"\x04\x04\x00\x01\x02\x77\x00\x01\x02\x03\x11\x04\x05\x21\x31\x06\x12\x41"
+		"\x51\x07\x61\x71\x13\x22\x32\x81\x08\x14\x42\x91\xa1\xb1\xc1\x09\x23\x33"
+		"\x52\xf0\x15\x62\x72\xd1\x0a\x16\x24\x34\xe1\x25\xf1\x17\x18\x19\x1a\x26"
+		"\x27\x28\x29\x2a\x35\x36\x37\x38\x39\x3a\x43\x44\x45\x46\x47\x48\x49\x4a"
+		"\x53\x54\x55\x56\x57\x58\x59\x5a\x63\x64\x65\x66\x67\x68\x69\x6a\x73\x74"
+		"\x75\x76\x77\x78\x79\x7a\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x92\x93\x94"
+		"\x95\x96\x97\x98\x99\x9a\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xb2\xb3\xb4"
+		"\xb5\xb6\xb7\xb8\xb9\xba\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xd2\xd3\xd4"
+		"\xd5\xd6\xd7\xd8\xd9\xda\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xf2\xf3\xf4"
+		"\xf5\xf6\xf7\xf8\xf9\xfa\xff\xda\x00\x0c\x03\x01\x00\x02\x11\x03\x11\x00"
+		"\x3f\x00";
+	const char footer[] = "\xff\xd9";
+	auto real = QByteArray(header, sizeof(header) - 1);
+	real[164] = bytes[1];
+	real[166] = bytes[2];
+	return real
+		+ bytes.mid(3)
+		+ QByteArray::fromRawData(footer, sizeof(footer) - 1);
+}
+
+QImage FromInlineBytes(const QByteArray &bytes) {
+	return Read({ .content = ExpandInlineBytes(bytes) }).image;
+}
+
+// Thanks TDLib for code.
+QByteArray ExpandPathInlineBytes(const QByteArray &bytes) {
+	auto result = QByteArray();
+	result.reserve(3 * (bytes.size() + 1));
+	result.append('M');
+	for (unsigned char c : bytes) {
+		if (c >= 128 + 64) {
+			result.append("AACAAAAHAAALMAAAQASTAVAAAZ"
+				"aacaaaahaaalmaaaqastava.az0123456789-,"[c - 128 - 64]);
+		} else {
+			if (c >= 128) {
+				result.append(',');
+			} else if (c >= 64) {
+				result.append('-');
+			}
+			//char buffer[3] = { 0 }; // Unavailable on macOS < 10.15.
+			//std::to_chars(buffer, buffer + 3, (c & 63));
+			//result.append(buffer);
+			result.append(QByteArray::number(c & 63));
+		}
+	}
+	result.append('z');
+	return result;
+}
+
+QPainterPath PathFromInlineBytes(const QByteArray &bytes) {
+	if (bytes.isEmpty()) {
+		return QPainterPath();
+	}
+	const auto expanded = ExpandPathInlineBytes(bytes);
+	const auto path = expanded.data(); // Allows checking for '\0' by index.
+	auto position = 0;
+
+	const auto isAlpha = [](char c) {
+		c |= 0x20;
+		return 'a' <= c && c <= 'z';
+	};
+	const auto isDigit = [](char c) {
+		return '0' <= c && c <= '9';
+	};
+	const auto skipCommas = [&] {
+		while (path[position] == ',') {
+			++position;
+		}
+	};
+	const auto getNumber = [&] {
+		skipCommas();
+		auto sign = 1;
+		if (path[position] == '-') {
+			sign = -1;
+			++position;
+		}
+		double res = 0;
+		while (isDigit(path[position])) {
+			res = res * 10 + path[position++] - '0';
+		}
+		if (path[position] == '.') {
+			++position;
+			double mul = 0.1;
+			while (isDigit(path[position])) {
+				res += (path[position] - '0') * mul;
+				mul *= 0.1;
+				++position;
+			}
+		}
+		return sign * res;
+	};
+
+	auto result = QPainterPath();
+	auto x = 0.;
+	auto y = 0.;
+	while (path[position] != '\0') {
+		skipCommas();
+		if (path[position] == '\0') {
+			break;
+		}
+
+		while (path[position] == 'm' || path[position] == 'M') {
+			auto command = path[position++];
+			do {
+				if (command == 'm') {
+					x += getNumber();
+					y += getNumber();
+				} else {
+					x = getNumber();
+					y = getNumber();
+				}
+				skipCommas();
+			} while (path[position] != '\0' && !isAlpha(path[position]));
+		}
+
+		auto xStart = x;
+		auto yStart = y;
+		result.moveTo(xStart, yStart);
+		auto haveLastEndControlPoint = false;
+		auto xLastEndControlPoint = 0.;
+		auto yLastEndControlPoint = 0.;
+		auto isClosed = false;
+		auto command = '-';
+		while (!isClosed) {
+			skipCommas();
+			if (path[position] == '\0') {
+				LOG(("SVG Error: Receive unclosed path: %1"
+					).arg(QString::fromLatin1(path)));
+				return QPainterPath();
+			}
+			if (isAlpha(path[position])) {
+				command = path[position++];
+			}
+			switch (command) {
+			case 'l':
+			case 'L':
+			case 'h':
+			case 'H':
+			case 'v':
+			case 'V':
+				if (command == 'l' || command == 'h') {
+					x += getNumber();
+				} else if (command == 'L' || command == 'H') {
+					x = getNumber();
+				}
+				if (command == 'l' || command == 'v') {
+					y += getNumber();
+				} else if (command == 'L' || command == 'V') {
+					y = getNumber();
+				}
+				result.lineTo(x, y);
+				haveLastEndControlPoint = false;
+				break;
+			case 'C':
+			case 'c':
+			case 'S':
+			case 's': {
+				auto xStartControlPoint = 0.;
+				auto yStartControlPoint = 0.;
+				if (command == 'S' || command == 's') {
+					if (haveLastEndControlPoint) {
+						xStartControlPoint = 2 * x - xLastEndControlPoint;
+						yStartControlPoint = 2 * y - yLastEndControlPoint;
+					} else {
+						xStartControlPoint = x;
+						yStartControlPoint = y;
+					}
+				} else {
+					xStartControlPoint = getNumber();
+					yStartControlPoint = getNumber();
+					if (command == 'c') {
+						xStartControlPoint += x;
+						yStartControlPoint += y;
+					}
+				}
+
+				xLastEndControlPoint = getNumber();
+				yLastEndControlPoint = getNumber();
+				if (command == 'c' || command == 's') {
+					xLastEndControlPoint += x;
+					yLastEndControlPoint += y;
+				}
+				haveLastEndControlPoint = true;
+
+				if (command == 'c' || command == 's') {
+					x += getNumber();
+					y += getNumber();
+				} else {
+					x = getNumber();
+					y = getNumber();
+				}
+				result.cubicTo(
+					xStartControlPoint,
+					yStartControlPoint,
+					xLastEndControlPoint,
+					yLastEndControlPoint,
+					x,
+					y);
+				break;
+			}
+			case 'm':
+			case 'M':
+				--position;
+				[[fallthrough]];
+			case 'z':
+			case 'Z':
+				if (x != xStart || y != yStart) {
+					x = xStart;
+					y = yStart;
+					result.lineTo(x, y);
+				}
+				isClosed = true;
+				break;
+			default:
+				LOG(("SVG Error: Receive invalid command %1 at pos %2: %3"
+					).arg(command
+					).arg(position
+					).arg(QString::fromLatin1(path)));
+				return QPainterPath();
+			}
+		}
+	}
+	return result;
+}
+
 } // namespace Images
diff --git a/ui/image/image_prepare.h b/ui/image/image_prepare.h
index c312a02..6368c0e 100644
--- a/ui/image/image_prepare.h
+++ b/ui/image/image_prepare.h
@@ -206,4 +206,8 @@ struct PrepareArgs {
 [[nodiscard]] bool IsProgressiveJpeg(const QByteArray &bytes);
 [[nodiscard]] QByteArray MakeProgressiveJpeg(const QByteArray &bytes);
 
+[[nodiscard]] QByteArray ExpandInlineBytes(const QByteArray &bytes);
+[[nodiscard]] QImage FromInlineBytes(const QByteArray &bytes);
+[[nodiscard]] QPainterPath PathFromInlineBytes(const QByteArray &bytes);
+
 } // namespace Images

From 2dd3add5b342b9defbfe369425e28c46d762dc0d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 24 Aug 2023 08:18:48 +0400
Subject: [PATCH 469/635] Move code not really depending on Wayland-specific
 dependencies out of WaylandIntegration

---
 .../linux/ui_linux_wayland_integration.cpp    | 32 ------------
 .../linux/ui_linux_wayland_integration.h      |  3 --
 .../ui_linux_wayland_integration_dummy.cpp    | 12 -----
 ui/platform/linux/ui_utility_linux.cpp        | 50 +++++++++++++------
 4 files changed, 36 insertions(+), 61 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index b01f2f7..455341b 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -85,38 +85,6 @@ bool WaylandIntegration::xdgDecorationSupported() {
 	return _private->xdgDecoration.has_value();
 }
 
-bool WaylandIntegration::windowExtentsSupported() {
-	QWindow window;
-	window.create();
-	return window.nativeInterface<QWaylandWindow>();
-}
-
-void WaylandIntegration::setWindowExtents(
-		not_null<QWidget*> widget,
-		const QMargins &extents) {
-	const auto window = widget->windowHandle();
-	Expects(window != nullptr);
-
-	const auto native = window->nativeInterface<QWaylandWindow>();
-	if (!native) {
-		return;
-	}
-
-	native->setCustomMargins(extents);
-}
-
-void WaylandIntegration::unsetWindowExtents(not_null<QWidget*> widget) {
-	const auto window = widget->windowHandle();
-	Expects(window != nullptr);
-
-	const auto native = window->nativeInterface<QWaylandWindow>();
-	if (!native) {
-		return;
-	}
-
-	native->setCustomMargins(QMargins());
-}
-
 void WaylandIntegration::showWindowMenu(
 		not_null<QWidget*> widget,
 		const QPoint &point) {
diff --git a/ui/platform/linux/ui_linux_wayland_integration.h b/ui/platform/linux/ui_linux_wayland_integration.h
index 4ce6a8a..7d13631 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.h
+++ b/ui/platform/linux/ui_linux_wayland_integration.h
@@ -20,9 +20,6 @@ public:
 	[[nodiscard]] static WaylandIntegration *Instance();
 
 	[[nodiscard]] bool xdgDecorationSupported();
-	[[nodiscard]] bool windowExtentsSupported();
-	void setWindowExtents(not_null<QWidget*> widget, const QMargins &extents);
-	void unsetWindowExtents(not_null<QWidget*> widget);
 	void showWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 private:
diff --git a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
index 87b6203..171fc48 100644
--- a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
@@ -30,18 +30,6 @@ bool WaylandIntegration::xdgDecorationSupported() {
 	return false;
 }
 
-bool WaylandIntegration::windowExtentsSupported() {
-	return false;
-}
-
-void WaylandIntegration::setWindowExtents(
-		not_null<QWidget*> widget,
-		const QMargins &extents) {
-}
-
-void WaylandIntegration::unsetWindowExtents(not_null<QWidget*> widget) {
-}
-
 void WaylandIntegration::showWindowMenu(
 		not_null<QWidget*> widget,
 		const QPoint &point) {
diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 53d04a3..956317d 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -17,6 +17,7 @@
 #include <QtCore/QPoint>
 #include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
+#include <qpa/qplatformwindow_p.h>
 
 namespace Ui {
 namespace Platform {
@@ -467,9 +468,14 @@ std::optional<bool> IsOverlapped(
 }
 
 bool WindowExtentsSupported() {
-	if (const auto integration = WaylandIntegration::Instance()) {
-		return integration->windowExtentsSupported();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+	using namespace QNativeInterface::Private;
+	QWindow window;
+	window.create();
+	if (window.nativeInterface<QWaylandWindow>()) {
+		return true;
 	}
+#endif // Qt >= 6.5.0
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 	namespace XCB = base::Platform::XCB;
@@ -485,23 +491,39 @@ bool WindowExtentsSupported() {
 }
 
 void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents) {
-	if (const auto integration = WaylandIntegration::Instance()) {
-		integration->setWindowExtents(widget, extents);
-	} else if (::Platform::IsX11()) {
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-		SetXCBFrameExtents(widget, extents);
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+	using namespace QNativeInterface::Private;
+	if (const auto native = not_null(widget->windowHandle())
+			->nativeInterface<QWaylandWindow>()) {
+		native->setCustomMargins(extents);
+		return;
 	}
+#endif // Qt >= 6.5.0
+
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+	if (::Platform::IsX11()) {
+		SetXCBFrameExtents(widget, extents);
+		return;
+	}
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 }
 
 void UnsetWindowExtents(not_null<QWidget*> widget) {
-	if (const auto integration = WaylandIntegration::Instance()) {
-		integration->unsetWindowExtents(widget);
-	} else if (::Platform::IsX11()) {
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-		UnsetXCBFrameExtents(widget);
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+	using namespace QNativeInterface::Private;
+	if (const auto native = not_null(widget->windowHandle())
+			->nativeInterface<QWaylandWindow>()) {
+		native->setCustomMargins(QMargins());
+		return;
 	}
+#endif // Qt >= 6.5.0
+
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+	if (::Platform::IsX11()) {
+		UnsetXCBFrameExtents(widget);
+		return;
+	}
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 }
 
 void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {

From bcf88b90658c7e0925c11c486732d874477baf0d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 27 Aug 2023 01:30:52 +0400
Subject: [PATCH 470/635] Fix window extents terminology

Extents is a synonym of size but we're setting not window size.
---
 ui/platform/linux/ui_utility_linux.cpp | 10 ++--
 ui/platform/mac/ui_utility_mac.h       |  6 +--
 ui/platform/ui_platform_utility.h      |  6 +--
 ui/platform/ui_platform_window.cpp     | 18 ++++----
 ui/platform/ui_platform_window.h       |  4 +-
 ui/platform/win/ui_utility_win.h       |  6 +--
 ui/widgets/popup_menu.cpp              | 64 +++++++++++++-------------
 ui/widgets/popup_menu.h                |  8 ++--
 8 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 956317d..da9fb4b 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -467,7 +467,7 @@ std::optional<bool> IsOverlapped(
 	return std::nullopt;
 }
 
-bool WindowExtentsSupported() {
+bool WindowMarginsSupported() {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
 	using namespace QNativeInterface::Private;
 	QWindow window;
@@ -490,25 +490,25 @@ bool WindowExtentsSupported() {
 	return false;
 }
 
-void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents) {
+void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
 	using namespace QNativeInterface::Private;
 	if (const auto native = not_null(widget->windowHandle())
 			->nativeInterface<QWaylandWindow>()) {
-		native->setCustomMargins(extents);
+		native->setCustomMargins(margins);
 		return;
 	}
 #endif // Qt >= 6.5.0
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 	if (::Platform::IsX11()) {
-		SetXCBFrameExtents(widget, extents);
+		SetXCBFrameExtents(widget, margins);
 		return;
 	}
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 }
 
-void UnsetWindowExtents(not_null<QWidget*> widget) {
+void UnsetWindowMargins(not_null<QWidget*> widget) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
 	using namespace QNativeInterface::Private;
 	if (const auto native = not_null(widget->windowHandle())
diff --git a/ui/platform/mac/ui_utility_mac.h b/ui/platform/mac/ui_utility_mac.h
index 04170f3..339cb0a 100644
--- a/ui/platform/mac/ui_utility_mac.h
+++ b/ui/platform/mac/ui_utility_mac.h
@@ -27,14 +27,14 @@ inline constexpr bool UseMainQueueGeneric() {
 	return ::Platform::IsMacStoreBuild();
 }
 
-inline bool WindowExtentsSupported() {
+inline bool WindowMarginsSupported() {
 	return false;
 }
 
-inline void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents) {
+inline void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) {
 }
 
-inline void UnsetWindowExtents(not_null<QWidget*> widget) {
+inline void UnsetWindowMargins(not_null<QWidget*> widget) {
 }
 
 inline void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index d9adad4..f51f49e 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -38,9 +38,9 @@ void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio);
 [[nodiscard]] constexpr bool UseMainQueueGeneric();
 void DrainMainQueue(); // Needed only if UseMainQueueGeneric() is false.
 
-[[nodiscard]] bool WindowExtentsSupported();
-void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents);
-void UnsetWindowExtents(not_null<QWidget*> widget);
+[[nodiscard]] bool WindowMarginsSupported();
+void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins);
+void UnsetWindowMargins(not_null<QWidget*> widget);
 void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index e3bcff0..49d0c7a 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -286,7 +286,7 @@ DefaultWindowHelper::DefaultWindowHelper(not_null<RpWidget*> window)
 }
 
 void DefaultWindowHelper::init() {
-	if (WindowExtentsSupported()) {
+	if (WindowMarginsSupported()) {
 		window()->setAttribute(Qt::WA_TranslucentBackground);
 	}
 
@@ -356,7 +356,7 @@ void DefaultWindowHelper::init() {
 			bool titleShown,
 			Qt::WindowStates windowState) {
 		window()->windowHandle()->setFlag(Qt::FramelessWindowHint, titleShown);
-		updateWindowExtents();
+		updateWindowMargins();
 	}, window()->lifetime());
 
 	window()->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
@@ -437,7 +437,7 @@ QMargins DefaultWindowHelper::frameMargins() {
 }
 
 bool DefaultWindowHelper::hasShadow() const {
-	return WindowExtentsSupported() && TranslucentWindowsSupported();
+	return WindowMarginsSupported() && TranslucentWindowsSupported();
 }
 
 QMargins DefaultWindowHelper::resizeArea() const {
@@ -588,13 +588,13 @@ void DefaultWindowHelper::paintBorders(QPainter &p) {
 		borderColor);
 }
 
-void DefaultWindowHelper::updateWindowExtents() {
+void DefaultWindowHelper::updateWindowMargins() {
 	if (hasShadow() && !_title->isHidden()) {
-		SetWindowExtents(window(), resizeArea());
-		_extentsSet = true;
-	} else if (_extentsSet) {
-		UnsetWindowExtents(window());
-		_extentsSet = false;
+		SetWindowMargins(window(), resizeArea());
+		_marginsSet = true;
+	} else if (_marginsSet) {
+		UnsetWindowMargins(window());
+		_marginsSet = false;
 	}
 }
 
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index e1e8514..f0dc391 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -107,7 +107,7 @@ private:
 	[[nodiscard]] QMargins resizeArea() const;
 	[[nodiscard]] Qt::Edges edgesFromPos(const QPoint &pos) const;
 	void paintBorders(QPainter &p);
-	void updateWindowExtents();
+	void updateWindowMargins();
 	void updateCursor(Qt::Edges edges);
 	[[nodiscard]] int titleHeight() const;
 	[[nodiscard]] QMargins bodyPadding() const;
@@ -118,7 +118,7 @@ private:
 	std::array<QImage, 4> _sides;
 	std::array<QImage, 4> _corners;
 	object_ptr<RpWidget> _roundingOverlay = { nullptr };
-	bool _extentsSet = false;
+	bool _marginsSet = false;
 	rpl::variable<Qt::WindowStates> _windowState = Qt::WindowNoState;
 
 };
diff --git a/ui/platform/win/ui_utility_win.h b/ui/platform/win/ui_utility_win.h
index b03df5c..26def3f 100644
--- a/ui/platform/win/ui_utility_win.h
+++ b/ui/platform/win/ui_utility_win.h
@@ -42,14 +42,14 @@ inline constexpr bool UseMainQueueGeneric() {
 	return true;
 }
 
-inline bool WindowExtentsSupported() {
+inline bool WindowMarginsSupported() {
 	return false;
 }
 
-inline void SetWindowExtents(not_null<QWidget*> widget, const QMargins &extents) {
+inline void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) {
 }
 
-inline void UnsetWindowExtents(not_null<QWidget*> widget) {
+inline void UnsetWindowMargins(not_null<QWidget*> widget) {
 }
 
 } // namespace Platform
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 049455d..5a6884e 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -314,19 +314,19 @@ void PopupMenu::validateCompositingSupport() {
 			std::max(line, additional.top()),
 			std::max(line, additional.right()),
 			std::max(line, additional.bottom()));
-		_extents = QMargins();
+		_margins = QMargins();
 	} else {
 		_padding = QMargins(
 			std::max(_st.shadow.extend.left(), additional.left()),
 			std::max(_st.shadow.extend.top(), additional.top()),
 			std::max(_st.shadow.extend.right(), additional.right()),
 			std::max(_st.shadow.extend.bottom(), additional.bottom()));
-		_extents = _padding - (additional - _additionalMenuExtents);
+		_margins = _padding - (additional - _additionalMenuMargins);
 	}
-	if (_extents.isNull()) {
-		Platform::UnsetWindowExtents(this);
+	if (_margins.isNull()) {
+		Platform::UnsetWindowMargins(this);
 	} else {
-		Platform::SetWindowExtents(this, _extents);
+		Platform::SetWindowMargins(this, _margins);
 	}
 	_scroll->moveToLeft(_padding.left(), _padding.top());
 	handleMenuResize();
@@ -722,16 +722,16 @@ void PopupMenu::setForcedVerticalOrigin(VerticalOrigin origin) {
 
 void PopupMenu::setAdditionalMenuPadding(
 		QMargins padding,
-		QMargins extents) {
-	Expects(padding.left() >= extents.left()
-		&& padding.right() >= extents.right()
-		&& padding.top() >= extents.top()
-		&& padding.bottom() >= extents.bottom());
+		QMargins margins) {
+	Expects(padding.left() >= margins.left()
+		&& padding.right() >= margins.right()
+		&& padding.top() >= margins.top()
+		&& padding.bottom() >= margins.bottom());
 
 	if (_additionalMenuPadding != padding
-		|| _additionalMenuExtents != extents) {
+		|| _additionalMenuMargins != margins) {
 		_additionalMenuPadding = padding;
-		_additionalMenuExtents = extents;
+		_additionalMenuMargins = margins;
 		_roundingOverlay = nullptr;
 	}
 }
@@ -937,8 +937,8 @@ QMargins PopupMenu::preparedPadding() const {
 	return _padding;
 }
 
-QMargins PopupMenu::preparedExtents() const {
-	return _extents;
+QMargins PopupMenu::preparedMargins() const {
+	return _margins;
 }
 
 bool PopupMenu::useTransparency() const {
@@ -1010,21 +1010,21 @@ bool PopupMenu::prepareGeometryFor(const QPoint &p, PopupMenu *parent) {
 	auto r = screen ? screen->availableGeometry() : QRect();
 	const auto parentWidth = _parent ? _parent->inner().width() : 0;
 	if (style::RightToLeft()) {
-		const auto badLeft = !r.isNull() && w.x() - width() < r.x() - _extents.left();
+		const auto badLeft = !r.isNull() && w.x() - width() < r.x() - _margins.left();
 		if (forceRight || (badLeft && !forceLeft)) {
-			if (_parent && (r.isNull() || w.x() + parentWidth - _extents.left() - _extents.right() + width() - _extents.right() <= r.x() + r.width())) {
-				w.setX(w.x() + parentWidth - _extents.left() - _extents.right());
+			if (_parent && (r.isNull() || w.x() + parentWidth - _margins.left() - _margins.right() + width() - _margins.right() <= r.x() + r.width())) {
+				w.setX(w.x() + parentWidth - _margins.left() - _margins.right());
 			} else {
-				w.setX(r.x() - _extents.left());
+				w.setX(r.x() - _margins.left());
 			}
 		} else {
 			w.setX(w.x() - width());
 		}
 	} else {
-		const auto badLeft = !r.isNull() && w.x() + width() - _extents.right() > r.x() + r.width();
+		const auto badLeft = !r.isNull() && w.x() + width() - _margins.right() > r.x() + r.width();
 		if (forceRight || (badLeft && !forceLeft)) {
-			if (_parent && (r.isNull() || w.x() - parentWidth + _extents.left() + _extents.right() - width() + _extents.right() >= r.x() - _extents.left())) {
-				w.setX(w.x() + _extents.left() + _extents.right() - parentWidth - width() + _extents.left() + _extents.right());
+			if (_parent && (r.isNull() || w.x() - parentWidth + _margins.left() + _margins.right() - width() + _margins.right() >= r.x() - _margins.left())) {
+				w.setX(w.x() + _margins.left() + _margins.right() - parentWidth - width() + _margins.left() + _margins.right());
 			} else {
 				w.setX(p.x() - width() + std::max(
 					_additionalMenuPadding.right() - _st.shadow.extend.right(),
@@ -1033,29 +1033,29 @@ bool PopupMenu::prepareGeometryFor(const QPoint &p, PopupMenu *parent) {
 			origin = PanelAnimation::Origin::TopRight;
 		}
 	}
-	const auto badTop = !r.isNull() && w.y() + height() - _extents.bottom() > r.y() + r.height();
+	const auto badTop = !r.isNull() && w.y() + height() - _margins.bottom() > r.y() + r.height();
 	if (forceBottom || (badTop && !forceTop)) {
 		if (_parent) {
-			w.setY(r.y() + r.height() - height() + _extents.bottom());
+			w.setY(r.y() + r.height() - height() + _margins.bottom());
 		} else {
-			w.setY(p.y() - height() + _extents.bottom());
+			w.setY(p.y() - height() + _margins.bottom());
 			origin = (origin == PanelAnimation::Origin::TopRight)
 				? PanelAnimation::Origin::BottomRight
 				: PanelAnimation::Origin::BottomLeft;
 		}
 	}
 	if (!r.isNull()) {
-		if (w.x() + width() - _extents.right() > r.x() + r.width()) {
-			w.setX(r.x() + r.width() + _extents.right() - width());
+		if (w.x() + width() - _margins.right() > r.x() + r.width()) {
+			w.setX(r.x() + r.width() + _margins.right() - width());
 		}
-		if (w.x() + _extents.left() < r.x()) {
-			w.setX(r.x() - _extents.left());
+		if (w.x() + _margins.left() < r.x()) {
+			w.setX(r.x() - _margins.left());
 		}
-		if (w.y() + height() - _extents.bottom() > r.y() + r.height()) {
-			w.setY(r.y() + r.height() + _extents.bottom() - height());
+		if (w.y() + height() - _margins.bottom() > r.y() + r.height()) {
+			w.setY(r.y() + r.height() + _margins.bottom() - height());
 		}
-		if (w.y() + _extents.top() < r.y()) {
-			w.setY(r.y() - _extents.top());
+		if (w.y() + _margins.top() < r.y()) {
+			w.setY(r.y() - _margins.top());
 		}
 	}
 	move(w);
diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h
index 5908d58..d92650d 100644
--- a/ui/widgets/popup_menu.h
+++ b/ui/widgets/popup_menu.h
@@ -86,11 +86,11 @@ public:
 	void setForceWidth(int forceWidth);
 	void setForcedOrigin(PanelAnimation::Origin origin);
 	void setForcedVerticalOrigin(VerticalOrigin origin);
-	void setAdditionalMenuPadding(QMargins padding, QMargins extents);
+	void setAdditionalMenuPadding(QMargins padding, QMargins margins);
 
 	[[nodiscard]] PanelAnimation::Origin preparedOrigin() const;
 	[[nodiscard]] QMargins preparedPadding() const;
-	[[nodiscard]] QMargins preparedExtents() const;
+	[[nodiscard]] QMargins preparedMargins() const;
 	[[nodiscard]] bool useTransparency() const;
 
 	[[nodiscard]] int scrollTop() const;
@@ -197,9 +197,9 @@ private:
 
 	QRect _inner;
 	QMargins _padding;
-	QMargins _extents;
+	QMargins _margins;
 	QMargins _additionalMenuPadding;
-	QMargins _additionalMenuExtents;
+	QMargins _additionalMenuMargins;
 
 	QPointer<PopupMenu> _activeSubmenu;
 

From 89b60c01a6ce5b49736254841714c3528b873744 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Aug 2023 21:34:53 +0400
Subject: [PATCH 471/635] Add some phrases to UI integration.

---
 ui/integration.cpp | 14 ++++++++++++--
 ui/integration.h   |  5 +++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index 722b433..7de629b 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -180,7 +180,6 @@ QString Integration::phrasePanelCloseAnyway() {
 	return "Close anyway";
 }
 
-#if 0 // disabled for now
 QString Integration::phraseBotSharePhone() {
 	return "Do you want to share your phone number with this bot?";
 }
@@ -192,6 +191,17 @@ QString Integration::phraseBotSharePhoneTitle() {
 QString Integration::phraseBotSharePhoneConfirm() {
 	return "Share";
 }
-#endif
+
+QString Integration::phraseBotAllowWrite() {
+	return "Do you want to allow this bot to write you?";
+}
+
+QString Integration::phraseBotAllowWriteTitle() {
+	return "Allow write";
+}
+
+QString Integration::phraseBotAllowWriteConfirm() {
+	return "Allow";
+}
 
 } // namespace Ui
diff --git a/ui/integration.h b/ui/integration.h
index 93603ef..77f5f80 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -91,11 +91,12 @@ public:
 	[[nodiscard]] virtual QString phrasePanelCloseWarning();
 	[[nodiscard]] virtual QString phrasePanelCloseUnsaved();
 	[[nodiscard]] virtual QString phrasePanelCloseAnyway();
-#if 0 // disabled for now
 	[[nodiscard]] virtual QString phraseBotSharePhone();
 	[[nodiscard]] virtual QString phraseBotSharePhoneTitle();
 	[[nodiscard]] virtual QString phraseBotSharePhoneConfirm();
-#endif
+	[[nodiscard]] virtual QString phraseBotAllowWrite();
+	[[nodiscard]] virtual QString phraseBotAllowWriteTitle();
+	[[nodiscard]] virtual QString phraseBotAllowWriteConfirm();
 
 };
 

From 4389f1712022fed77415994a76178c9ce786dc94 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 13:25:25 +0300
Subject: [PATCH 472/635] Removed unused InputField::commitMarkdownReplacement
 method.

---
 ui/widgets/input_fields.cpp | 2 ++
 ui/widgets/input_fields.h   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 1df821b..06f0f62 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -3257,6 +3257,7 @@ void InputField::commitInstantReplacement(
 	cursor.insertText(replacement, format);
 }
 
+#if 0
 bool InputField::commitMarkdownReplacement(
 		int from,
 		int till,
@@ -3368,6 +3369,7 @@ bool InputField::commitMarkdownReplacement(
 
 	return true;
 }
+#endif
 
 void InputField::addMarkdownTag(
 		int from,
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index b6b8dad..25dad1d 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -431,11 +431,13 @@ private:
 		const QString &customEmojiData,
 		std::optional<QString> checkOriginal,
 		bool checkIfInMonospace);
+#if 0
 	bool commitMarkdownReplacement(
 		int from,
 		int till,
 		const QString &tag,
 		const QString &edge = QString());
+#endif
 	void addMarkdownTag(int from, int till, const QString &tag);
 	void removeMarkdownTag(int from, int till, const QString &tag);
 	void finishMarkdownTagChange(

From 225380044e0eb1c38635f77dfe4548ee3d3747b7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 14:20:20 +0300
Subject: [PATCH 473/635] Moved out PasswordInput to separate module.

---
 CMakeLists.txt                       |  2 ++
 ui/widgets/fields/password_input.cpp | 20 ++++++++++++++++++++
 ui/widgets/fields/password_input.h   | 27 +++++++++++++++++++++++++++
 ui/widgets/input_fields.cpp          |  9 ---------
 ui/widgets/input_fields.h            |  6 ------
 5 files changed, 49 insertions(+), 15 deletions(-)
 create mode 100644 ui/widgets/fields/password_input.cpp
 create mode 100644 ui/widgets/fields/password_input.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9073bcb..a9dc2d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,8 @@ PRIVATE
     ui/widgets/input_fields.h
     ui/widgets/labels.cpp
     ui/widgets/labels.h
+    ui/widgets/fields/password_input.cpp
+    ui/widgets/fields/password_input.h
     ui/widgets/fields/time_part_input.cpp
     ui/widgets/fields/time_part_input.h
     ui/widgets/menu/menu.cpp
diff --git a/ui/widgets/fields/password_input.cpp b/ui/widgets/fields/password_input.cpp
new file mode 100644
index 0000000..b0cbd70
--- /dev/null
+++ b/ui/widgets/fields/password_input.cpp
@@ -0,0 +1,20 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/widgets/fields/password_input.h"
+
+namespace Ui {
+
+PasswordInput::PasswordInput(
+	QWidget *parent,
+	const style::InputField &st,
+	rpl::producer<QString> placeholder,
+	const QString &val)
+: MaskedInputField(parent, st, std::move(placeholder), val) {
+	QLineEdit::setEchoMode(QLineEdit::Password);
+}
+
+} // namespace Ui
diff --git a/ui/widgets/fields/password_input.h b/ui/widgets/fields/password_input.h
new file mode 100644
index 0000000..30680b7
--- /dev/null
+++ b/ui/widgets/fields/password_input.h
@@ -0,0 +1,27 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/widgets/input_fields.h"
+
+namespace style {
+struct InputField;
+} // namespace style
+
+namespace Ui {
+
+class PasswordInput final : public MaskedInputField {
+public:
+	PasswordInput(
+		QWidget *parent,
+		const style::InputField &st,
+		rpl::producer<QString> placeholder = nullptr,
+		const QString &val = QString());
+
+};
+
+} // namespace Ui
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 06f0f62..0458a70 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -4349,15 +4349,6 @@ void MaskedInputField::onCursorPositionChanged(int oldPosition, int position) {
 	_oldcursor = position;
 }
 
-PasswordInput::PasswordInput(
-	QWidget *parent,
-	const style::InputField &st,
-	rpl::producer<QString> placeholder,
-	const QString &val)
-: MaskedInputField(parent, st, std::move(placeholder), val) {
-	setEchoMode(QLineEdit::Password);
-}
-
 NumberInput::NumberInput(
 	QWidget *parent,
 	const style::InputField &st,
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index 25dad1d..fd7a832 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -718,12 +718,6 @@ private:
 
 };
 
-class PasswordInput : public MaskedInputField {
-public:
-	PasswordInput(QWidget *parent, const style::InputField &st, rpl::producer<QString> placeholder = nullptr, const QString &val = QString());
-
-};
-
 class NumberInput : public MaskedInputField {
 public:
 	NumberInput(

From 26b72fedc719f9e02fbdae3bab7824358dd9c4e6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 14:25:02 +0300
Subject: [PATCH 474/635] Moved out NumberInput to separate module.

---
 CMakeLists.txt                     |  2 ++
 ui/widgets/fields/number_input.cpp | 49 ++++++++++++++++++++++++++++++
 ui/widgets/fields/number_input.h   | 38 +++++++++++++++++++++++
 ui/widgets/input_fields.cpp        | 38 -----------------------
 ui/widgets/input_fields.h          | 21 -------------
 5 files changed, 89 insertions(+), 59 deletions(-)
 create mode 100644 ui/widgets/fields/number_input.cpp
 create mode 100644 ui/widgets/fields/number_input.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9dc2d7..b9f8549 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,8 @@ PRIVATE
     ui/widgets/input_fields.h
     ui/widgets/labels.cpp
     ui/widgets/labels.h
+    ui/widgets/fields/number_input.cpp
+    ui/widgets/fields/number_input.h
     ui/widgets/fields/password_input.cpp
     ui/widgets/fields/password_input.h
     ui/widgets/fields/time_part_input.cpp
diff --git a/ui/widgets/fields/number_input.cpp b/ui/widgets/fields/number_input.cpp
new file mode 100644
index 0000000..293cae0
--- /dev/null
+++ b/ui/widgets/fields/number_input.cpp
@@ -0,0 +1,49 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/widgets/fields/number_input.h"
+
+namespace Ui {
+
+NumberInput::NumberInput(
+	QWidget *parent,
+	const style::InputField &st,
+	rpl::producer<QString> placeholder,
+	const QString &value,
+	int limit)
+: MaskedInputField(parent, st, std::move(placeholder), value)
+, _limit(limit) {
+	if (!value.toInt() || (limit > 0 && value.toInt() > limit)) {
+		setText(QString());
+	}
+}
+
+void NumberInput::correctValue(
+		const QString &was,
+		int wasCursor,
+		QString &now,
+		int &nowCursor) {
+	QString newText;
+	newText.reserve(now.size());
+	auto newPos = nowCursor;
+	for (auto i = 0, l = int(now.size()); i < l; ++i) {
+		if (now.at(i).isDigit()) {
+			newText.append(now.at(i));
+		} else if (i < nowCursor) {
+			--newPos;
+		}
+	}
+	if (!newText.toInt()) {
+		newText = QString();
+		newPos = 0;
+	} else if (_limit > 0 && newText.toInt() > _limit) {
+		newText = was;
+		newPos = wasCursor;
+	}
+	setCorrectedText(now, nowCursor, newText, newPos);
+}
+
+} // namespace Ui
diff --git a/ui/widgets/fields/number_input.h b/ui/widgets/fields/number_input.h
new file mode 100644
index 0000000..bf10abf
--- /dev/null
+++ b/ui/widgets/fields/number_input.h
@@ -0,0 +1,38 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/widgets/input_fields.h"
+
+namespace style {
+struct InputField;
+} // namespace style
+
+namespace Ui {
+
+class NumberInput final : public MaskedInputField {
+public:
+	NumberInput(
+		QWidget *parent,
+		const style::InputField &st,
+		rpl::producer<QString> placeholder,
+		const QString &value,
+		int limit);
+
+protected:
+	void correctValue(
+		const QString &was,
+		int wasCursor,
+		QString &now,
+		int &nowCursor) override;
+
+private:
+	int _limit = 0;
+
+};
+
+} // namespace Ui
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 0458a70..87338df 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -4349,44 +4349,6 @@ void MaskedInputField::onCursorPositionChanged(int oldPosition, int position) {
 	_oldcursor = position;
 }
 
-NumberInput::NumberInput(
-	QWidget *parent,
-	const style::InputField &st,
-	rpl::producer<QString> placeholder,
-	const QString &value,
-	int limit)
-: MaskedInputField(parent, st, std::move(placeholder), value)
-, _limit(limit) {
-	if (!value.toInt() || (limit > 0 && value.toInt() > limit)) {
-		setText(QString());
-	}
-}
-
-void NumberInput::correctValue(
-		const QString &was,
-		int wasCursor,
-		QString &now,
-		int &nowCursor) {
-	QString newText;
-	newText.reserve(now.size());
-	auto newPos = nowCursor;
-	for (auto i = 0, l = int(now.size()); i < l; ++i) {
-		if (now.at(i).isDigit()) {
-			newText.append(now.at(i));
-		} else if (i < nowCursor) {
-			--newPos;
-		}
-	}
-	if (!newText.toInt()) {
-		newText = QString();
-		newPos = 0;
-	} else if (_limit > 0 && newText.toInt() > _limit) {
-		newText = was;
-		newPos = wasCursor;
-	}
-	setCorrectedText(now, nowCursor, newText, newPos);
-}
-
 HexInput::HexInput(
 	QWidget *parent,
 	const style::InputField &st,
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index fd7a832..aa62d84 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -718,27 +718,6 @@ private:
 
 };
 
-class NumberInput : public MaskedInputField {
-public:
-	NumberInput(
-		QWidget *parent,
-		const style::InputField &st,
-		rpl::producer<QString> placeholder,
-		const QString &value,
-		int limit);
-
-protected:
-	void correctValue(
-		const QString &was,
-		int wasCursor,
-		QString &now,
-		int &nowCursor) override;
-
-private:
-	int _limit = 0;
-
-};
-
 class HexInput : public MaskedInputField {
 public:
 	HexInput(QWidget *parent, const style::InputField &st, rpl::producer<QString> placeholder, const QString &val);

From 2c5923dc79a5d7351d4fa92e4be0b06bf30ef437 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 14:25:25 +0300
Subject: [PATCH 475/635] Removed unused HexInput class.

---
 ui/widgets/input_fields.cpp | 32 --------------------------------
 ui/widgets/input_fields.h   | 13 -------------
 2 files changed, 45 deletions(-)

diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 87338df..3839769 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -4349,36 +4349,4 @@ void MaskedInputField::onCursorPositionChanged(int oldPosition, int position) {
 	_oldcursor = position;
 }
 
-HexInput::HexInput(
-	QWidget *parent,
-	const style::InputField &st,
-	rpl::producer<QString> placeholder,
-	const QString &val)
-: MaskedInputField(parent, st, std::move(placeholder), val) {
-	if (!QRegularExpression("^[a-fA-F0-9]+$").match(val).hasMatch()) {
-		setText(QString());
-	}
-}
-
-void HexInput::correctValue(
-		const QString &was,
-		int wasCursor,
-		QString &now,
-		int &nowCursor) {
-	QString newText;
-	newText.reserve(now.size());
-	auto newPos = nowCursor;
-	for (auto i = 0, l = int(now.size()); i < l; ++i) {
-		const auto ch = now[i];
-		if ((ch >= '0' && ch <= '9')
-			|| (ch >= 'a' && ch <= 'f')
-			|| (ch >= 'A' && ch <= 'F')) {
-			newText.append(ch);
-		} else if (i < nowCursor) {
-			--newPos;
-		}
-	}
-	setCorrectedText(now, nowCursor, newText, newPos);
-}
-
 } // namespace Ui
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index aa62d84..e244a0e 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -718,17 +718,4 @@ private:
 
 };
 
-class HexInput : public MaskedInputField {
-public:
-	HexInput(QWidget *parent, const style::InputField &st, rpl::producer<QString> placeholder, const QString &val);
-
-protected:
-	void correctValue(
-		const QString &was,
-		int wasCursor,
-		QString &now,
-		int &nowCursor) override;
-
-};
-
 } // namespace Ui

From faa67d73c5de92f5731ad64605f2e03242237390 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 14:42:11 +0300
Subject: [PATCH 476/635] Moved out MaskedInputField to separate module.

---
 CMakeLists.txt                           |   2 +
 ui/widgets/fields/masked_input_field.cpp | 546 +++++++++++++++++++++++
 ui/widgets/fields/masked_input_field.h   | 174 ++++++++
 ui/widgets/fields/number_input.h         |   2 +-
 ui/widgets/fields/password_input.h       |   2 +-
 ui/widgets/fields/time_part_input.cpp    |   1 +
 ui/widgets/fields/time_part_input.h      |   2 +-
 ui/widgets/input_fields.cpp              | 504 ---------------------
 ui/widgets/input_fields.h                | 155 -------
 9 files changed, 726 insertions(+), 662 deletions(-)
 create mode 100644 ui/widgets/fields/masked_input_field.cpp
 create mode 100644 ui/widgets/fields/masked_input_field.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9f8549..66e83c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,8 @@ PRIVATE
     ui/widgets/input_fields.h
     ui/widgets/labels.cpp
     ui/widgets/labels.h
+    ui/widgets/fields/masked_input_field.cpp
+    ui/widgets/fields/masked_input_field.h
     ui/widgets/fields/number_input.cpp
     ui/widgets/fields/number_input.h
     ui/widgets/fields/password_input.cpp
diff --git a/ui/widgets/fields/masked_input_field.cpp b/ui/widgets/fields/masked_input_field.cpp
new file mode 100644
index 0000000..4e1b8da
--- /dev/null
+++ b/ui/widgets/fields/masked_input_field.cpp
@@ -0,0 +1,546 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/widgets/fields/masked_input_field.h"
+
+#include "base/qt/qt_common_adapters.h"
+#include "ui/painter.h"
+#include "ui/widgets/popup_menu.h"
+#include "styles/palette.h"
+#include "styles/style_widgets.h"
+
+#include <QtWidgets/QCommonStyle>
+#include <QtWidgets/QApplication>
+#include <QtGui/QClipboard>
+
+namespace Ui {
+namespace {
+
+class InputStyle final : public QCommonStyle {
+public:
+	InputStyle() {
+		setParent(QCoreApplication::instance());
+	}
+
+	void drawPrimitive(
+		PrimitiveElement element,
+		const QStyleOption *option,
+		QPainter *painter,
+		const QWidget *widget = nullptr) const override {
+	}
+
+	static InputStyle *instance() {
+		if (!_instance) {
+			if (!QGuiApplication::instance()) {
+				return nullptr;
+			}
+			_instance = new InputStyle();
+		}
+		return _instance;
+	}
+
+	~InputStyle() {
+		_instance = nullptr;
+	}
+
+private:
+	static InputStyle *_instance;
+
+};
+
+InputStyle *InputStyle::_instance = nullptr;
+
+} // namespace
+
+MaskedInputField::MaskedInputField(
+	QWidget *parent,
+	const style::InputField &st,
+	rpl::producer<QString> placeholder,
+	const QString &val)
+: Parent(val, parent)
+, _st(st)
+, _oldtext(val)
+, _placeholderFull(std::move(placeholder)) {
+	resize(_st.width, _st.heightMin);
+
+	setFont(_st.font);
+	setAlignment(_st.textAlign);
+
+	_placeholderFull.value(
+	) | rpl::start_with_next([=](const QString &text) {
+		refreshPlaceholder(text);
+	}, lifetime());
+
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		updatePalette();
+	}, lifetime());
+	updatePalette();
+
+	setAttribute(Qt::WA_OpaquePaintEvent);
+
+	connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChange(const QString&)));
+	connect(this, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(onCursorPositionChanged(int,int)));
+
+	connect(this, SIGNAL(textEdited(const QString&)), this, SLOT(onTextEdited()));
+	connect(this, &MaskedInputField::selectionChanged, [] {
+		Integration::Instance().textActionsUpdated();
+	});
+
+	setStyle(InputStyle::instance());
+	QLineEdit::setTextMargins(0, 0, 0, 0);
+	setContentsMargins(_textMargins + QMargins(-2, -1, -2, -1));
+	setFrame(false);
+
+	setAttribute(Qt::WA_AcceptTouchEvents);
+	_touchTimer.setSingleShot(true);
+	connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer()));
+
+	setTextMargins(_st.textMargins);
+
+	startPlaceholderAnimation();
+	startBorderAnimation();
+	finishAnimating();
+}
+
+void MaskedInputField::updatePalette() {
+	auto p = palette();
+	p.setColor(QPalette::Text, _st.textFg->c);
+	p.setColor(QPalette::Highlight, st::msgInBgSelected->c);
+	p.setColor(QPalette::HighlightedText, st::historyTextInFgSelected->c);
+	setPalette(p);
+}
+
+void MaskedInputField::setCorrectedText(QString &now, int &nowCursor, const QString &newText, int newPos) {
+	if (newPos < 0 || newPos > newText.size()) {
+		newPos = newText.size();
+	}
+	auto updateText = (newText != now);
+	if (updateText) {
+		now = newText;
+		setText(now);
+		startPlaceholderAnimation();
+	}
+	auto updateCursorPosition = (newPos != nowCursor) || updateText;
+	if (updateCursorPosition) {
+		nowCursor = newPos;
+		setCursorPosition(nowCursor);
+	}
+}
+
+void MaskedInputField::customUpDown(bool custom) {
+	_customUpDown = custom;
+}
+
+int MaskedInputField::borderAnimationStart() const {
+	return _borderAnimationStart;
+}
+
+void MaskedInputField::setTextMargins(const QMargins &mrg) {
+	_textMargins = mrg;
+	setContentsMargins(_textMargins + QMargins(-2, -1, -2, -1));
+	refreshPlaceholder(_placeholderFull.current());
+}
+
+void MaskedInputField::onTouchTimer() {
+	_touchRightButton = true;
+}
+
+bool MaskedInputField::eventHook(QEvent *e) {
+	auto type = e->type();
+	if (type == QEvent::TouchBegin
+		|| type == QEvent::TouchUpdate
+		|| type == QEvent::TouchEnd
+		|| type == QEvent::TouchCancel) {
+		auto event = static_cast<QTouchEvent*>(e);
+		if (event->device()->type() == base::TouchDevice::TouchScreen) {
+			touchEvent(event);
+		}
+	}
+	return Parent::eventHook(e);
+}
+
+void MaskedInputField::touchEvent(QTouchEvent *e) {
+	switch (e->type()) {
+	case QEvent::TouchBegin: {
+		if (_touchPress || e->touchPoints().isEmpty()) {
+			return;
+		}
+		_touchTimer.start(QApplication::startDragTime());
+		_touchPress = true;
+		_touchMove = _touchRightButton = _mousePressedInTouch = false;
+		_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
+	} break;
+
+	case QEvent::TouchUpdate: {
+		if (!e->touchPoints().isEmpty()) {
+			touchUpdate(e->touchPoints().cbegin()->screenPos().toPoint());
+		}
+	} break;
+
+	case QEvent::TouchEnd: {
+		touchFinish();
+	} break;
+
+	case QEvent::TouchCancel: {
+		_touchPress = false;
+		_touchTimer.stop();
+	} break;
+	}
+}
+
+void MaskedInputField::touchUpdate(QPoint globalPosition) {
+	if (_touchPress
+		&& !_touchMove
+		&& ((globalPosition - _touchStart).manhattanLength()
+			>= QApplication::startDragDistance())) {
+		_touchMove = true;
+	}
+}
+
+void MaskedInputField::touchFinish() {
+	if (!_touchPress) {
+		return;
+	}
+	const auto weak = MakeWeak(this);
+	if (!_touchMove && window()) {
+		QPoint mapped(mapFromGlobal(_touchStart));
+
+		if (_touchRightButton) {
+			QContextMenuEvent contextEvent(
+				QContextMenuEvent::Mouse,
+				mapped,
+				_touchStart);
+			contextMenuEvent(&contextEvent);
+		} else {
+			QGuiApplication::inputMethod()->show();
+		}
+	}
+	if (weak) {
+		_touchTimer.stop();
+		_touchPress
+			= _touchMove
+			= _touchRightButton
+			= _mousePressedInTouch = false;
+	}
+}
+
+void MaskedInputField::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	auto r = rect().intersected(e->rect());
+	p.fillRect(r, _st.textBg);
+	if (_st.border) {
+		p.fillRect(0, height() - _st.border, width(), _st.border, _st.borderFg->b);
+	}
+	auto errorDegree = _a_error.value(_error ? 1. : 0.);
+	auto focusedDegree = _a_focused.value(_focused ? 1. : 0.);
+	auto borderShownDegree = _a_borderShown.value(1.);
+	auto borderOpacity = _a_borderOpacity.value(_borderVisible ? 1. : 0.);
+	if (_st.borderActive && (borderOpacity > 0.)) {
+		auto borderStart = std::clamp(_borderAnimationStart, 0, width());
+		auto borderFrom = qRound(borderStart * (1. - borderShownDegree));
+		auto borderTo = borderStart + qRound((width() - borderStart) * borderShownDegree);
+		if (borderTo > borderFrom) {
+			auto borderFg = anim::brush(_st.borderFgActive, _st.borderFgError, errorDegree);
+			p.setOpacity(borderOpacity);
+			p.fillRect(borderFrom, height() - _st.borderActive, borderTo - borderFrom, _st.borderActive, borderFg);
+			p.setOpacity(1);
+		}
+	}
+
+	p.setClipRect(r);
+	if (_st.placeholderScale > 0. && !_placeholderPath.isEmpty()) {
+		auto placeholderShiftDegree = _a_placeholderShifted.value(_placeholderShifted ? 1. : 0.);
+		p.save();
+		p.setClipRect(r);
+
+		auto placeholderTop = anim::interpolate(0, _st.placeholderShift, placeholderShiftDegree);
+
+		QRect r(rect().marginsRemoved(_textMargins + _st.placeholderMargins));
+		r.moveTop(r.top() + placeholderTop);
+		if (style::RightToLeft()) r.moveLeft(width() - r.left() - r.width());
+
+		auto placeholderScale = 1. - (1. - _st.placeholderScale) * placeholderShiftDegree;
+		auto placeholderFg = anim::color(_st.placeholderFg, _st.placeholderFgActive, focusedDegree);
+		placeholderFg = anim::color(placeholderFg, _st.placeholderFgError, errorDegree);
+
+		PainterHighQualityEnabler hq(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(placeholderFg);
+		p.translate(r.topLeft());
+		p.scale(placeholderScale, placeholderScale);
+		p.drawPath(_placeholderPath);
+
+		p.restore();
+	} else if (!_placeholder.isEmpty()) {
+		auto placeholderHiddenDegree = _a_placeholderShifted.value(_placeholderShifted ? 1. : 0.);
+		if (placeholderHiddenDegree < 1.) {
+			p.setOpacity(1. - placeholderHiddenDegree);
+			p.save();
+			p.setClipRect(r);
+
+			auto placeholderLeft = anim::interpolate(0, -_st.placeholderShift, placeholderHiddenDegree);
+
+			QRect r(rect().marginsRemoved(_textMargins + _st.placeholderMargins));
+			r.moveLeft(r.left() + placeholderLeft);
+			if (style::RightToLeft()) r.moveLeft(width() - r.left() - r.width());
+
+			p.setFont(_st.placeholderFont);
+			p.setPen(anim::pen(_st.placeholderFg, _st.placeholderFgActive, focusedDegree));
+			p.drawText(r, _placeholder, _st.placeholderAlign);
+
+			p.restore();
+			p.setOpacity(1.);
+		}
+	}
+
+	paintAdditionalPlaceholder(p);
+	QLineEdit::paintEvent(e);
+}
+
+void MaskedInputField::mousePressEvent(QMouseEvent *e) {
+	if (_touchPress && e->button() == Qt::LeftButton) {
+		_mousePressedInTouch = true;
+		_touchStart = e->globalPos();
+	}
+	return QLineEdit::mousePressEvent(e);
+}
+
+void MaskedInputField::mouseReleaseEvent(QMouseEvent *e) {
+	if (_mousePressedInTouch) {
+		touchFinish();
+	}
+	return QLineEdit::mouseReleaseEvent(e);
+}
+
+void MaskedInputField::mouseMoveEvent(QMouseEvent *e) {
+	if (_mousePressedInTouch) {
+		touchUpdate(e->globalPos());
+	}
+	return QLineEdit::mouseMoveEvent(e);
+}
+
+QString MaskedInputField::getDisplayedText() const {
+	auto result = getLastText();
+	if (!_lastPreEditText.isEmpty()) {
+		result = result.mid(0, _oldcursor)
+			+ _lastPreEditText
+			+ result.mid(_oldcursor);
+	}
+	return result;
+}
+
+void MaskedInputField::startBorderAnimation() {
+	auto borderVisible = (_error || _focused);
+	if (_borderVisible != borderVisible) {
+		_borderVisible = borderVisible;
+		if (_borderVisible) {
+			if (_a_borderOpacity.animating()) {
+				_a_borderOpacity.start([this] { update(); }, 0., 1., _st.duration);
+			} else {
+				_a_borderShown.start([this] { update(); }, 0., 1., _st.duration);
+			}
+		} else if (qFuzzyCompare(_a_borderShown.value(1.), 0.)) {
+			_a_borderShown.stop();
+			_a_borderOpacity.stop();
+		} else {
+			_a_borderOpacity.start([this] { update(); }, 1., 0., _st.duration);
+		}
+	}
+}
+
+void MaskedInputField::focusInEvent(QFocusEvent *e) {
+	_borderAnimationStart = (e->reason() == Qt::MouseFocusReason) ? mapFromGlobal(QCursor::pos()).x() : (width() / 2);
+	setFocused(true);
+	QLineEdit::focusInEvent(e);
+	focused();
+}
+
+void MaskedInputField::focusOutEvent(QFocusEvent *e) {
+	setFocused(false);
+	QLineEdit::focusOutEvent(e);
+	blurred();
+}
+
+void MaskedInputField::setFocused(bool focused) {
+	if (_focused != focused) {
+		_focused = focused;
+		_a_focused.start([this] { update(); }, _focused ? 0. : 1., _focused ? 1. : 0., _st.duration);
+		startPlaceholderAnimation();
+		startBorderAnimation();
+	}
+}
+
+void MaskedInputField::resizeEvent(QResizeEvent *e) {
+	refreshPlaceholder(_placeholderFull.current());
+	_borderAnimationStart = width() / 2;
+	QLineEdit::resizeEvent(e);
+}
+
+void MaskedInputField::refreshPlaceholder(const QString &text) {
+	const auto availableWidth = width() - _textMargins.left() - _textMargins.right() - _st.placeholderMargins.left() - _st.placeholderMargins.right() - 1;
+	if (_st.placeholderScale > 0.) {
+		auto placeholderFont = _st.placeholderFont->f;
+		placeholderFont.setStyleStrategy(QFont::PreferMatch);
+		const auto metrics = QFontMetrics(placeholderFont);
+		_placeholder = metrics.elidedText(text, Qt::ElideRight, availableWidth);
+		_placeholderPath = QPainterPath();
+		if (!_placeholder.isEmpty()) {
+			_placeholderPath.addText(0, QFontMetrics(placeholderFont).ascent(), placeholderFont, _placeholder);
+		}
+	} else {
+		_placeholder = _st.placeholderFont->elided(text, availableWidth);
+	}
+	update();
+}
+
+void MaskedInputField::setPlaceholder(rpl::producer<QString> placeholder) {
+	_placeholderFull = std::move(placeholder);
+}
+
+void MaskedInputField::contextMenuEvent(QContextMenuEvent *e) {
+	if (const auto menu = createStandardContextMenu()) {
+		_contextMenu = base::make_unique_q<PopupMenu>(this, menu);
+		_contextMenu->popup(e->globalPos());
+	}
+}
+
+void MaskedInputField::inputMethodEvent(QInputMethodEvent *e) {
+	QLineEdit::inputMethodEvent(e);
+	_lastPreEditText = e->preeditString();
+	update();
+}
+
+void MaskedInputField::showError() {
+	showErrorNoFocus();
+	if (!hasFocus()) {
+		setFocus();
+	}
+}
+
+void MaskedInputField::showErrorNoFocus() {
+	setErrorShown(true);
+}
+
+void MaskedInputField::hideError() {
+	setErrorShown(false);
+}
+
+void MaskedInputField::setErrorShown(bool error) {
+	if (_error != error) {
+		_error = error;
+		_a_error.start([this] { update(); }, _error ? 0. : 1., _error ? 1. : 0., _st.duration);
+		startBorderAnimation();
+	}
+}
+
+QSize MaskedInputField::sizeHint() const {
+	return geometry().size();
+}
+
+QSize MaskedInputField::minimumSizeHint() const {
+	return geometry().size();
+}
+
+void MaskedInputField::setDisplayFocused(bool focused) {
+	setFocused(focused);
+	finishAnimating();
+}
+
+void MaskedInputField::finishAnimating() {
+	_a_focused.stop();
+	_a_error.stop();
+	_a_placeholderShifted.stop();
+	_a_borderShown.stop();
+	_a_borderOpacity.stop();
+	update();
+}
+
+void MaskedInputField::setPlaceholderHidden(bool forcePlaceholderHidden) {
+	_forcePlaceholderHidden = forcePlaceholderHidden;
+	startPlaceholderAnimation();
+}
+
+void MaskedInputField::startPlaceholderAnimation() {
+	auto placeholderShifted = _forcePlaceholderHidden || (_focused && _st.placeholderScale > 0.) || !getLastText().isEmpty();
+	if (_placeholderShifted != placeholderShifted) {
+		_placeholderShifted = placeholderShifted;
+		_a_placeholderShifted.start([this] { update(); }, _placeholderShifted ? 0. : 1., _placeholderShifted ? 1. : 0., _st.duration);
+	}
+}
+
+QRect MaskedInputField::placeholderRect() const {
+	return rect().marginsRemoved(_textMargins + _st.placeholderMargins);
+}
+
+style::font MaskedInputField::phFont() {
+	return _st.font;
+}
+
+void MaskedInputField::placeholderAdditionalPrepare(QPainter &p) {
+	p.setFont(_st.font);
+	p.setPen(_st.placeholderFg);
+}
+
+void MaskedInputField::keyPressEvent(QKeyEvent *e) {
+	QString wasText(_oldtext);
+	int32 wasCursor(_oldcursor);
+
+	if (_customUpDown && (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down || e->key() == Qt::Key_PageUp || e->key() == Qt::Key_PageDown)) {
+		e->ignore();
+	} else {
+		QLineEdit::keyPressEvent(e);
+	}
+
+	auto newText = text();
+	auto newCursor = cursorPosition();
+	if (wasText == newText && wasCursor == newCursor) { // call correct manually
+		correctValue(wasText, wasCursor, newText, newCursor);
+		_oldtext = newText;
+		_oldcursor = newCursor;
+		if (wasText != _oldtext) changed();
+		startPlaceholderAnimation();
+	}
+	if (e->key() == Qt::Key_Escape) {
+		e->ignore();
+		cancelled();
+	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
+		submitted(e->modifiers());
+#ifdef Q_OS_MAC
+	} else if (e->key() == Qt::Key_E && e->modifiers().testFlag(Qt::ControlModifier)) {
+		auto selected = selectedText();
+		if (!selected.isEmpty() && echoMode() == QLineEdit::Normal) {
+			QGuiApplication::clipboard()->setText(selected, QClipboard::FindBuffer);
+		}
+#endif // Q_OS_MAC
+	}
+}
+
+void MaskedInputField::onTextEdited() {
+	QString wasText(_oldtext), newText(text());
+	int32 wasCursor(_oldcursor), newCursor(cursorPosition());
+
+	correctValue(wasText, wasCursor, newText, newCursor);
+	_oldtext = newText;
+	_oldcursor = newCursor;
+	if (wasText != _oldtext) changed();
+	startPlaceholderAnimation();
+
+	Integration::Instance().textActionsUpdated();
+}
+
+void MaskedInputField::onTextChange(const QString &text) {
+	_oldtext = QLineEdit::text();
+	setErrorShown(false);
+	Integration::Instance().textActionsUpdated();
+}
+
+void MaskedInputField::onCursorPositionChanged(int oldPosition, int position) {
+	_oldcursor = position;
+}
+
+} // namespace Ui
diff --git a/ui/widgets/fields/masked_input_field.h b/ui/widgets/fields/masked_input_field.h
new file mode 100644
index 0000000..1b09430
--- /dev/null
+++ b/ui/widgets/fields/masked_input_field.h
@@ -0,0 +1,174 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "ui/rp_widget.h"
+#include "ui/effects/animations.h"
+
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QTimer>
+
+namespace style {
+struct InputField;
+} // namespace style
+
+namespace Ui {
+
+class PopupMenu;
+
+class MaskedInputField : public RpWidgetBase<QLineEdit> {
+	Q_OBJECT
+
+	using Parent = RpWidgetBase<QLineEdit>;
+public:
+	MaskedInputField(
+		QWidget *parent,
+		const style::InputField &st,
+		rpl::producer<QString> placeholder = nullptr,
+		const QString &val = QString());
+
+	void showError();
+	void showErrorNoFocus();
+	void hideError();
+
+	QSize sizeHint() const override;
+	QSize minimumSizeHint() const override;
+
+	void customUpDown(bool isCustom);
+	int borderAnimationStart() const;
+
+	const QString &getLastText() const {
+		return _oldtext;
+	}
+	void setPlaceholder(rpl::producer<QString> placeholder);
+	void setPlaceholderHidden(bool forcePlaceholderHidden);
+	void setDisplayFocused(bool focused);
+	void finishAnimating();
+	void setFocusFast() {
+		setDisplayFocused(true);
+		setFocus();
+	}
+
+	void setText(const QString &text) {
+		QLineEdit::setText(text);
+		startPlaceholderAnimation();
+	}
+	void clear() {
+		QLineEdit::clear();
+		startPlaceholderAnimation();
+	}
+
+public Q_SLOTS:
+	void onTextChange(const QString &text);
+	void onCursorPositionChanged(int oldPosition, int position);
+
+	void onTextEdited();
+
+	void onTouchTimer();
+
+Q_SIGNALS:
+	void changed();
+	void cancelled();
+	void submitted(Qt::KeyboardModifiers);
+	void focused();
+	void blurred();
+
+protected:
+	QString getDisplayedText() const;
+	void startBorderAnimation();
+	void startPlaceholderAnimation();
+
+	bool eventHook(QEvent *e) override;
+	void touchEvent(QTouchEvent *e);
+	void paintEvent(QPaintEvent *e) override;
+	void focusInEvent(QFocusEvent *e) override;
+	void focusOutEvent(QFocusEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
+	void resizeEvent(QResizeEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
+	void inputMethodEvent(QInputMethodEvent *e) override;
+
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+
+	virtual void correctValue(
+		const QString &was,
+		int wasCursor,
+		QString &now,
+		int &nowCursor) {
+	}
+	void setCorrectedText(
+		QString &now,
+		int &nowCursor,
+		const QString &newText,
+		int newPos);
+
+	virtual void paintAdditionalPlaceholder(QPainter &p) {
+	}
+
+	style::font phFont();
+
+	void placeholderAdditionalPrepare(QPainter &p);
+	QRect placeholderRect() const;
+
+	void setTextMargins(const QMargins &mrg);
+	const style::InputField &_st;
+
+private:
+	void updatePalette();
+	void refreshPlaceholder(const QString &text);
+	void setErrorShown(bool error);
+
+	void touchUpdate(QPoint globalPosition);
+	void touchFinish();
+
+	void setFocused(bool focused);
+
+	int _maxLength = -1;
+	bool _forcePlaceholderHidden = false;
+
+	QString _oldtext;
+	int _oldcursor = 0;
+	QString _lastPreEditText;
+
+	bool _undoAvailable = false;
+	bool _redoAvailable = false;
+
+	bool _customUpDown = false;
+
+	rpl::variable<QString> _placeholderFull;
+	QString _placeholder;
+	Animations::Simple _a_placeholderShifted;
+	bool _placeholderShifted = false;
+	QPainterPath _placeholderPath;
+
+	Animations::Simple _a_borderShown;
+	int _borderAnimationStart = 0;
+	Animations::Simple _a_borderOpacity;
+	bool _borderVisible = false;
+
+	Animations::Simple _a_focused;
+	Animations::Simple _a_error;
+
+	bool _focused = false;
+	bool _error = false;
+
+	style::margins _textMargins;
+
+	QTimer _touchTimer;
+	bool _touchPress = false;
+	bool _touchRightButton = false;
+	bool _touchMove = false;
+	bool _mousePressedInTouch = false;
+	QPoint _touchStart;
+
+	base::unique_qptr<PopupMenu> _contextMenu;
+
+};
+
+} // namespace Ui
diff --git a/ui/widgets/fields/number_input.h b/ui/widgets/fields/number_input.h
index bf10abf..3e24895 100644
--- a/ui/widgets/fields/number_input.h
+++ b/ui/widgets/fields/number_input.h
@@ -6,7 +6,7 @@
 //
 #pragma once
 
-#include "ui/widgets/input_fields.h"
+#include "ui/widgets/fields/masked_input_field.h"
 
 namespace style {
 struct InputField;
diff --git a/ui/widgets/fields/password_input.h b/ui/widgets/fields/password_input.h
index 30680b7..2ed6e6c 100644
--- a/ui/widgets/fields/password_input.h
+++ b/ui/widgets/fields/password_input.h
@@ -6,7 +6,7 @@
 //
 #pragma once
 
-#include "ui/widgets/input_fields.h"
+#include "ui/widgets/fields/masked_input_field.h"
 
 namespace style {
 struct InputField;
diff --git a/ui/widgets/fields/time_part_input.cpp b/ui/widgets/fields/time_part_input.cpp
index 8f6433a..3767574 100644
--- a/ui/widgets/fields/time_part_input.cpp
+++ b/ui/widgets/fields/time_part_input.cpp
@@ -6,6 +6,7 @@
 //
 #include "ui/widgets/fields/time_part_input.h"
 
+#include "base/qt/qt_string_view.h"
 #include "ui/ui_utility.h" // WheelDirection
 
 #include <QtCore/QRegularExpression>
diff --git a/ui/widgets/fields/time_part_input.h b/ui/widgets/fields/time_part_input.h
index bdd7d1b..306a471 100644
--- a/ui/widgets/fields/time_part_input.h
+++ b/ui/widgets/fields/time_part_input.h
@@ -6,7 +6,7 @@
 //
 #pragma once
 
-#include "ui/widgets/input_fields.h"
+#include "ui/widgets/fields/masked_input_field.h"
 
 namespace Ui {
 
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/input_fields.cpp
index 3839769..cdde5bf 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/input_fields.cpp
@@ -659,36 +659,6 @@ private:
 
 };
 
-class InputStyle : public QCommonStyle {
-public:
-	InputStyle() {
-		setParent(QCoreApplication::instance());
-	}
-
-	void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const override {
-	}
-
-	static InputStyle *instance() {
-		if (!_instance) {
-			if (!QGuiApplication::instance()) {
-				return nullptr;
-			}
-			_instance = new InputStyle();
-		}
-		return _instance;
-	}
-
-	~InputStyle() {
-		_instance = nullptr;
-	}
-
-private:
-	static InputStyle *_instance;
-
-};
-
-InputStyle *InputStyle::_instance = nullptr;
-
 template <typename Iterator>
 QString AccumulateText(Iterator begin, Iterator end) {
 	auto result = QString();
@@ -3875,478 +3845,4 @@ void InputField::setErrorShown(bool error) {
 
 InputField::~InputField() = default;
 
-MaskedInputField::MaskedInputField(
-	QWidget *parent,
-	const style::InputField &st,
-	rpl::producer<QString> placeholder,
-	const QString &val)
-: Parent(val, parent)
-, _st(st)
-, _oldtext(val)
-, _placeholderFull(std::move(placeholder)) {
-	resize(_st.width, _st.heightMin);
-
-	setFont(_st.font);
-	setAlignment(_st.textAlign);
-
-	_placeholderFull.value(
-	) | rpl::start_with_next([=](const QString &text) {
-		refreshPlaceholder(text);
-	}, lifetime());
-
-	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
-		updatePalette();
-	}, lifetime());
-	updatePalette();
-
-	setAttribute(Qt::WA_OpaquePaintEvent);
-
-	connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChange(const QString&)));
-	connect(this, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(onCursorPositionChanged(int,int)));
-
-	connect(this, SIGNAL(textEdited(const QString&)), this, SLOT(onTextEdited()));
-	connect(this, &MaskedInputField::selectionChanged, [] {
-		Integration::Instance().textActionsUpdated();
-	});
-
-	setStyle(InputStyle::instance());
-	QLineEdit::setTextMargins(0, 0, 0, 0);
-	setContentsMargins(_textMargins + QMargins(-2, -1, -2, -1));
-	setFrame(false);
-
-	setAttribute(Qt::WA_AcceptTouchEvents);
-	_touchTimer.setSingleShot(true);
-	connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer()));
-
-	setTextMargins(_st.textMargins);
-
-	startPlaceholderAnimation();
-	startBorderAnimation();
-	finishAnimating();
-}
-
-void MaskedInputField::updatePalette() {
-	auto p = palette();
-	p.setColor(QPalette::Text, _st.textFg->c);
-	p.setColor(QPalette::Highlight, st::msgInBgSelected->c);
-	p.setColor(QPalette::HighlightedText, st::historyTextInFgSelected->c);
-	setPalette(p);
-}
-
-void MaskedInputField::setCorrectedText(QString &now, int &nowCursor, const QString &newText, int newPos) {
-	if (newPos < 0 || newPos > newText.size()) {
-		newPos = newText.size();
-	}
-	auto updateText = (newText != now);
-	if (updateText) {
-		now = newText;
-		setText(now);
-		startPlaceholderAnimation();
-	}
-	auto updateCursorPosition = (newPos != nowCursor) || updateText;
-	if (updateCursorPosition) {
-		nowCursor = newPos;
-		setCursorPosition(nowCursor);
-	}
-}
-
-void MaskedInputField::customUpDown(bool custom) {
-	_customUpDown = custom;
-}
-
-int MaskedInputField::borderAnimationStart() const {
-	return _borderAnimationStart;
-}
-
-void MaskedInputField::setTextMargins(const QMargins &mrg) {
-	_textMargins = mrg;
-	setContentsMargins(_textMargins + QMargins(-2, -1, -2, -1));
-	refreshPlaceholder(_placeholderFull.current());
-}
-
-void MaskedInputField::onTouchTimer() {
-	_touchRightButton = true;
-}
-
-bool MaskedInputField::eventHook(QEvent *e) {
-	auto type = e->type();
-	if (type == QEvent::TouchBegin
-		|| type == QEvent::TouchUpdate
-		|| type == QEvent::TouchEnd
-		|| type == QEvent::TouchCancel) {
-		auto event = static_cast<QTouchEvent*>(e);
-		if (event->device()->type() == base::TouchDevice::TouchScreen) {
-			touchEvent(event);
-		}
-	}
-	return Parent::eventHook(e);
-}
-
-void MaskedInputField::touchEvent(QTouchEvent *e) {
-	switch (e->type()) {
-	case QEvent::TouchBegin: {
-		if (_touchPress || e->touchPoints().isEmpty()) {
-			return;
-		}
-		_touchTimer.start(QApplication::startDragTime());
-		_touchPress = true;
-		_touchMove = _touchRightButton = _mousePressedInTouch = false;
-		_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
-	} break;
-
-	case QEvent::TouchUpdate: {
-		if (!e->touchPoints().isEmpty()) {
-			touchUpdate(e->touchPoints().cbegin()->screenPos().toPoint());
-		}
-	} break;
-
-	case QEvent::TouchEnd: {
-		touchFinish();
-	} break;
-
-	case QEvent::TouchCancel: {
-		_touchPress = false;
-		_touchTimer.stop();
-	} break;
-	}
-}
-
-void MaskedInputField::touchUpdate(QPoint globalPosition) {
-	if (_touchPress
-		&& !_touchMove
-		&& ((globalPosition - _touchStart).manhattanLength()
-			>= QApplication::startDragDistance())) {
-		_touchMove = true;
-	}
-}
-
-void MaskedInputField::touchFinish() {
-	if (!_touchPress) {
-		return;
-	}
-	const auto weak = MakeWeak(this);
-	if (!_touchMove && window()) {
-		QPoint mapped(mapFromGlobal(_touchStart));
-
-		if (_touchRightButton) {
-			QContextMenuEvent contextEvent(
-				QContextMenuEvent::Mouse,
-				mapped,
-				_touchStart);
-			contextMenuEvent(&contextEvent);
-		} else {
-			QGuiApplication::inputMethod()->show();
-		}
-	}
-	if (weak) {
-		_touchTimer.stop();
-		_touchPress
-			= _touchMove
-			= _touchRightButton
-			= _mousePressedInTouch = false;
-	}
-}
-
-void MaskedInputField::paintEvent(QPaintEvent *e) {
-	auto p = QPainter(this);
-
-	auto r = rect().intersected(e->rect());
-	p.fillRect(r, _st.textBg);
-	if (_st.border) {
-		p.fillRect(0, height() - _st.border, width(), _st.border, _st.borderFg->b);
-	}
-	auto errorDegree = _a_error.value(_error ? 1. : 0.);
-	auto focusedDegree = _a_focused.value(_focused ? 1. : 0.);
-	auto borderShownDegree = _a_borderShown.value(1.);
-	auto borderOpacity = _a_borderOpacity.value(_borderVisible ? 1. : 0.);
-	if (_st.borderActive && (borderOpacity > 0.)) {
-		auto borderStart = std::clamp(_borderAnimationStart, 0, width());
-		auto borderFrom = qRound(borderStart * (1. - borderShownDegree));
-		auto borderTo = borderStart + qRound((width() - borderStart) * borderShownDegree);
-		if (borderTo > borderFrom) {
-			auto borderFg = anim::brush(_st.borderFgActive, _st.borderFgError, errorDegree);
-			p.setOpacity(borderOpacity);
-			p.fillRect(borderFrom, height() - _st.borderActive, borderTo - borderFrom, _st.borderActive, borderFg);
-			p.setOpacity(1);
-		}
-	}
-
-	p.setClipRect(r);
-	if (_st.placeholderScale > 0. && !_placeholderPath.isEmpty()) {
-		auto placeholderShiftDegree = _a_placeholderShifted.value(_placeholderShifted ? 1. : 0.);
-		p.save();
-		p.setClipRect(r);
-
-		auto placeholderTop = anim::interpolate(0, _st.placeholderShift, placeholderShiftDegree);
-
-		QRect r(rect().marginsRemoved(_textMargins + _st.placeholderMargins));
-		r.moveTop(r.top() + placeholderTop);
-		if (style::RightToLeft()) r.moveLeft(width() - r.left() - r.width());
-
-		auto placeholderScale = 1. - (1. - _st.placeholderScale) * placeholderShiftDegree;
-		auto placeholderFg = anim::color(_st.placeholderFg, _st.placeholderFgActive, focusedDegree);
-		placeholderFg = anim::color(placeholderFg, _st.placeholderFgError, errorDegree);
-
-		PainterHighQualityEnabler hq(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(placeholderFg);
-		p.translate(r.topLeft());
-		p.scale(placeholderScale, placeholderScale);
-		p.drawPath(_placeholderPath);
-
-		p.restore();
-	} else if (!_placeholder.isEmpty()) {
-		auto placeholderHiddenDegree = _a_placeholderShifted.value(_placeholderShifted ? 1. : 0.);
-		if (placeholderHiddenDegree < 1.) {
-			p.setOpacity(1. - placeholderHiddenDegree);
-			p.save();
-			p.setClipRect(r);
-
-			auto placeholderLeft = anim::interpolate(0, -_st.placeholderShift, placeholderHiddenDegree);
-
-			QRect r(rect().marginsRemoved(_textMargins + _st.placeholderMargins));
-			r.moveLeft(r.left() + placeholderLeft);
-			if (style::RightToLeft()) r.moveLeft(width() - r.left() - r.width());
-
-			p.setFont(_st.placeholderFont);
-			p.setPen(anim::pen(_st.placeholderFg, _st.placeholderFgActive, focusedDegree));
-			p.drawText(r, _placeholder, _st.placeholderAlign);
-
-			p.restore();
-			p.setOpacity(1.);
-		}
-	}
-
-	paintAdditionalPlaceholder(p);
-	QLineEdit::paintEvent(e);
-}
-
-void MaskedInputField::mousePressEvent(QMouseEvent *e) {
-	if (_touchPress && e->button() == Qt::LeftButton) {
-		_mousePressedInTouch = true;
-		_touchStart = e->globalPos();
-	}
-	return QLineEdit::mousePressEvent(e);
-}
-
-void MaskedInputField::mouseReleaseEvent(QMouseEvent *e) {
-	if (_mousePressedInTouch) {
-		touchFinish();
-	}
-	return QLineEdit::mouseReleaseEvent(e);
-}
-
-void MaskedInputField::mouseMoveEvent(QMouseEvent *e) {
-	if (_mousePressedInTouch) {
-		touchUpdate(e->globalPos());
-	}
-	return QLineEdit::mouseMoveEvent(e);
-}
-
-void MaskedInputField::startBorderAnimation() {
-	auto borderVisible = (_error || _focused);
-	if (_borderVisible != borderVisible) {
-		_borderVisible = borderVisible;
-		if (_borderVisible) {
-			if (_a_borderOpacity.animating()) {
-				_a_borderOpacity.start([this] { update(); }, 0., 1., _st.duration);
-			} else {
-				_a_borderShown.start([this] { update(); }, 0., 1., _st.duration);
-			}
-		} else if (qFuzzyCompare(_a_borderShown.value(1.), 0.)) {
-			_a_borderShown.stop();
-			_a_borderOpacity.stop();
-		} else {
-			_a_borderOpacity.start([this] { update(); }, 1., 0., _st.duration);
-		}
-	}
-}
-
-void MaskedInputField::focusInEvent(QFocusEvent *e) {
-	_borderAnimationStart = (e->reason() == Qt::MouseFocusReason) ? mapFromGlobal(QCursor::pos()).x() : (width() / 2);
-	setFocused(true);
-	QLineEdit::focusInEvent(e);
-	focused();
-}
-
-void MaskedInputField::focusOutEvent(QFocusEvent *e) {
-	setFocused(false);
-	QLineEdit::focusOutEvent(e);
-	blurred();
-}
-
-void MaskedInputField::setFocused(bool focused) {
-	if (_focused != focused) {
-		_focused = focused;
-		_a_focused.start([this] { update(); }, _focused ? 0. : 1., _focused ? 1. : 0., _st.duration);
-		startPlaceholderAnimation();
-		startBorderAnimation();
-	}
-}
-
-void MaskedInputField::resizeEvent(QResizeEvent *e) {
-	refreshPlaceholder(_placeholderFull.current());
-	_borderAnimationStart = width() / 2;
-	QLineEdit::resizeEvent(e);
-}
-
-void MaskedInputField::refreshPlaceholder(const QString &text) {
-	const auto availableWidth = width() - _textMargins.left() - _textMargins.right() - _st.placeholderMargins.left() - _st.placeholderMargins.right() - 1;
-	if (_st.placeholderScale > 0.) {
-		auto placeholderFont = _st.placeholderFont->f;
-		placeholderFont.setStyleStrategy(QFont::PreferMatch);
-		const auto metrics = QFontMetrics(placeholderFont);
-		_placeholder = metrics.elidedText(text, Qt::ElideRight, availableWidth);
-		_placeholderPath = QPainterPath();
-		if (!_placeholder.isEmpty()) {
-			_placeholderPath.addText(0, QFontMetrics(placeholderFont).ascent(), placeholderFont, _placeholder);
-		}
-	} else {
-		_placeholder = _st.placeholderFont->elided(text, availableWidth);
-	}
-	update();
-}
-
-void MaskedInputField::setPlaceholder(rpl::producer<QString> placeholder) {
-	_placeholderFull = std::move(placeholder);
-}
-
-void MaskedInputField::contextMenuEvent(QContextMenuEvent *e) {
-	if (const auto menu = createStandardContextMenu()) {
-		_contextMenu = base::make_unique_q<PopupMenu>(this, menu);
-		_contextMenu->popup(e->globalPos());
-	}
-}
-
-void MaskedInputField::inputMethodEvent(QInputMethodEvent *e) {
-	QLineEdit::inputMethodEvent(e);
-	_lastPreEditText = e->preeditString();
-	update();
-}
-
-void MaskedInputField::showError() {
-	showErrorNoFocus();
-	if (!hasFocus()) {
-		setFocus();
-	}
-}
-
-void MaskedInputField::showErrorNoFocus() {
-	setErrorShown(true);
-}
-
-void MaskedInputField::hideError() {
-	setErrorShown(false);
-}
-
-void MaskedInputField::setErrorShown(bool error) {
-	if (_error != error) {
-		_error = error;
-		_a_error.start([this] { update(); }, _error ? 0. : 1., _error ? 1. : 0., _st.duration);
-		startBorderAnimation();
-	}
-}
-
-QSize MaskedInputField::sizeHint() const {
-	return geometry().size();
-}
-
-QSize MaskedInputField::minimumSizeHint() const {
-	return geometry().size();
-}
-
-void MaskedInputField::setDisplayFocused(bool focused) {
-	setFocused(focused);
-	finishAnimating();
-}
-
-void MaskedInputField::finishAnimating() {
-	_a_focused.stop();
-	_a_error.stop();
-	_a_placeholderShifted.stop();
-	_a_borderShown.stop();
-	_a_borderOpacity.stop();
-	update();
-}
-
-void MaskedInputField::setPlaceholderHidden(bool forcePlaceholderHidden) {
-	_forcePlaceholderHidden = forcePlaceholderHidden;
-	startPlaceholderAnimation();
-}
-
-void MaskedInputField::startPlaceholderAnimation() {
-	auto placeholderShifted = _forcePlaceholderHidden || (_focused && _st.placeholderScale > 0.) || !getLastText().isEmpty();
-	if (_placeholderShifted != placeholderShifted) {
-		_placeholderShifted = placeholderShifted;
-		_a_placeholderShifted.start([this] { update(); }, _placeholderShifted ? 0. : 1., _placeholderShifted ? 1. : 0., _st.duration);
-	}
-}
-
-QRect MaskedInputField::placeholderRect() const {
-	return rect().marginsRemoved(_textMargins + _st.placeholderMargins);
-}
-
-void MaskedInputField::placeholderAdditionalPrepare(QPainter &p) {
-	p.setFont(_st.font);
-	p.setPen(_st.placeholderFg);
-}
-
-void MaskedInputField::keyPressEvent(QKeyEvent *e) {
-	QString wasText(_oldtext);
-	int32 wasCursor(_oldcursor);
-
-	if (_customUpDown && (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down || e->key() == Qt::Key_PageUp || e->key() == Qt::Key_PageDown)) {
-		e->ignore();
-	} else {
-		QLineEdit::keyPressEvent(e);
-	}
-
-	auto newText = text();
-	auto newCursor = cursorPosition();
-	if (wasText == newText && wasCursor == newCursor) { // call correct manually
-		correctValue(wasText, wasCursor, newText, newCursor);
-		_oldtext = newText;
-		_oldcursor = newCursor;
-		if (wasText != _oldtext) changed();
-		startPlaceholderAnimation();
-	}
-	if (e->key() == Qt::Key_Escape) {
-		e->ignore();
-		cancelled();
-	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
-		submitted(e->modifiers());
-#ifdef Q_OS_MAC
-	} else if (e->key() == Qt::Key_E && e->modifiers().testFlag(Qt::ControlModifier)) {
-		auto selected = selectedText();
-		if (!selected.isEmpty() && echoMode() == QLineEdit::Normal) {
-			QGuiApplication::clipboard()->setText(selected, QClipboard::FindBuffer);
-		}
-#endif // Q_OS_MAC
-	}
-}
-
-void MaskedInputField::onTextEdited() {
-	QString wasText(_oldtext), newText(text());
-	int32 wasCursor(_oldcursor), newCursor(cursorPosition());
-
-	correctValue(wasText, wasCursor, newText, newCursor);
-	_oldtext = newText;
-	_oldcursor = newCursor;
-	if (wasText != _oldtext) changed();
-	startPlaceholderAnimation();
-
-	Integration::Instance().textActionsUpdated();
-}
-
-void MaskedInputField::onTextChange(const QString &text) {
-	_oldtext = QLineEdit::text();
-	setErrorShown(false);
-	Integration::Instance().textActionsUpdated();
-}
-
-void MaskedInputField::onCursorPositionChanged(int oldPosition, int position) {
-	_oldcursor = position;
-}
-
 } // namespace Ui
diff --git a/ui/widgets/input_fields.h b/ui/widgets/input_fields.h
index e244a0e..f371454 100644
--- a/ui/widgets/input_fields.h
+++ b/ui/widgets/input_fields.h
@@ -563,159 +563,4 @@ private:
 
 };
 
-class MaskedInputField : public RpWidgetBase<QLineEdit> {
-	Q_OBJECT
-
-	using Parent = RpWidgetBase<QLineEdit>;
-public:
-	MaskedInputField(
-		QWidget *parent,
-		const style::InputField &st,
-		rpl::producer<QString> placeholder = nullptr,
-		const QString &val = QString());
-
-	void showError();
-	void showErrorNoFocus();
-	void hideError();
-
-	QSize sizeHint() const override;
-	QSize minimumSizeHint() const override;
-
-	void customUpDown(bool isCustom);
-	int borderAnimationStart() const;
-
-	const QString &getLastText() const {
-		return _oldtext;
-	}
-	void setPlaceholder(rpl::producer<QString> placeholder);
-	void setPlaceholderHidden(bool forcePlaceholderHidden);
-	void setDisplayFocused(bool focused);
-	void finishAnimating();
-	void setFocusFast() {
-		setDisplayFocused(true);
-		setFocus();
-	}
-
-	void setText(const QString &text) {
-		QLineEdit::setText(text);
-		startPlaceholderAnimation();
-	}
-	void clear() {
-		QLineEdit::clear();
-		startPlaceholderAnimation();
-	}
-
-public Q_SLOTS:
-	void onTextChange(const QString &text);
-	void onCursorPositionChanged(int oldPosition, int position);
-
-	void onTextEdited();
-
-	void onTouchTimer();
-
-Q_SIGNALS:
-	void changed();
-	void cancelled();
-	void submitted(Qt::KeyboardModifiers);
-	void focused();
-	void blurred();
-
-protected:
-	QString getDisplayedText() const {
-		auto result = getLastText();
-		if (!_lastPreEditText.isEmpty()) {
-			result = result.mid(0, _oldcursor) + _lastPreEditText + result.mid(_oldcursor);
-		}
-		return result;
-	}
-	void startBorderAnimation();
-	void startPlaceholderAnimation();
-
-	bool eventHook(QEvent *e) override;
-	void touchEvent(QTouchEvent *e);
-	void paintEvent(QPaintEvent *e) override;
-	void focusInEvent(QFocusEvent *e) override;
-	void focusOutEvent(QFocusEvent *e) override;
-	void keyPressEvent(QKeyEvent *e) override;
-	void resizeEvent(QResizeEvent *e) override;
-	void contextMenuEvent(QContextMenuEvent *e) override;
-	void inputMethodEvent(QInputMethodEvent *e) override;
-
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-	void mouseMoveEvent(QMouseEvent *e) override;
-
-	virtual void correctValue(
-		const QString &was,
-		int wasCursor,
-		QString &now,
-		int &nowCursor) {
-	}
-	void setCorrectedText(QString &now, int &nowCursor, const QString &newText, int newPos);
-
-	virtual void paintAdditionalPlaceholder(QPainter &p) {
-	}
-
-	style::font phFont() {
-		return _st.font;
-	}
-
-	void placeholderAdditionalPrepare(QPainter &p);
-	QRect placeholderRect() const;
-
-	void setTextMargins(const QMargins &mrg);
-	const style::InputField &_st;
-
-private:
-	void updatePalette();
-	void refreshPlaceholder(const QString &text);
-	void setErrorShown(bool error);
-
-	void touchUpdate(QPoint globalPosition);
-	void touchFinish();
-
-	void setFocused(bool focused);
-
-	int _maxLength = -1;
-	bool _forcePlaceholderHidden = false;
-
-	QString _oldtext;
-	int _oldcursor = 0;
-	QString _lastPreEditText;
-
-	bool _undoAvailable = false;
-	bool _redoAvailable = false;
-
-	bool _customUpDown = false;
-
-	rpl::variable<QString> _placeholderFull;
-	QString _placeholder;
-	Animations::Simple _a_placeholderShifted;
-	bool _placeholderShifted = false;
-	QPainterPath _placeholderPath;
-
-	Animations::Simple _a_borderShown;
-	int _borderAnimationStart = 0;
-	Animations::Simple _a_borderOpacity;
-	bool _borderVisible = false;
-
-	Animations::Simple _a_focused;
-	Animations::Simple _a_error;
-
-	bool _focused = false;
-	bool _error = false;
-
-	style::margins _textMargins;
-
-	QTimer _touchTimer;
-	bool _touchPress = false;
-	bool _touchRightButton = false;
-	bool _touchMove = false;
-	bool _mousePressedInTouch = false;
-	QPoint _touchStart;
-
-	base::unique_qptr<PopupMenu> _contextMenu;
-
-};
-
 } // namespace Ui

From 7a245fee51131b43a3156af8c4ebde30549871cc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 14:45:07 +0300
Subject: [PATCH 477/635] Moved out InputField files to subfolder.

---
 CMakeLists.txt                                          | 8 ++++----
 ui/text/text_entity.cpp                                 | 2 +-
 ui/widgets/{input_fields.cpp => fields/input_field.cpp} | 2 +-
 ui/widgets/{input_fields.h => fields/input_field.h}     | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename ui/widgets/{input_fields.cpp => fields/input_field.cpp} (99%)
 rename ui/widgets/{input_fields.h => fields/input_field.h} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66e83c1..6e207cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,10 +198,8 @@ PRIVATE
     ui/widgets/icon_button_with_text.h
     ui/widgets/inner_dropdown.cpp
     ui/widgets/inner_dropdown.h
-    ui/widgets/input_fields.cpp
-    ui/widgets/input_fields.h
-    ui/widgets/labels.cpp
-    ui/widgets/labels.h
+    ui/widgets/fields/input_field.cpp
+    ui/widgets/fields/input_field.h
     ui/widgets/fields/masked_input_field.cpp
     ui/widgets/fields/masked_input_field.h
     ui/widgets/fields/number_input.cpp
@@ -210,6 +208,8 @@ PRIVATE
     ui/widgets/fields/password_input.h
     ui/widgets/fields/time_part_input.cpp
     ui/widgets/fields/time_part_input.h
+    ui/widgets/labels.cpp
+    ui/widgets/labels.h
     ui/widgets/menu/menu.cpp
     ui/widgets/menu/menu.h
     ui/widgets/menu/menu_action.cpp
diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 4844392..3945774 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -10,7 +10,7 @@
 #include "base/qthelp_regex.h"
 #include "base/crc32hash.h"
 #include "ui/text/text.h"
-#include "ui/widgets/input_fields.h"
+#include "ui/widgets/fields/input_field.h"
 #include "ui/emoji_config.h"
 #include "ui/basic_click_handlers.h"
 #include "base/qt/qt_common_adapters.h"
diff --git a/ui/widgets/input_fields.cpp b/ui/widgets/fields/input_field.cpp
similarity index 99%
rename from ui/widgets/input_fields.cpp
rename to ui/widgets/fields/input_field.cpp
index cdde5bf..fbf209b 100644
--- a/ui/widgets/input_fields.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -4,7 +4,7 @@
 // For license and copyright information please follow this link:
 // https://github.com/desktop-app/legal/blob/master/LEGAL
 //
-#include "ui/widgets/input_fields.h"
+#include "ui/widgets/fields/input_field.h"
 
 #include "ui/widgets/popup_menu.h"
 #include "ui/text/text.h"
diff --git a/ui/widgets/input_fields.h b/ui/widgets/fields/input_field.h
similarity index 100%
rename from ui/widgets/input_fields.h
rename to ui/widgets/fields/input_field.h

From 6a7718ae9637ffa817bc4e6d89295a5b2503b047 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 14:54:14 +0300
Subject: [PATCH 478/635] Replaced Qt signals in InputField with rpl.

---
 ui/widgets/fields/input_field.cpp | 38 +++++++++++++++++++++++++------
 ui/widgets/fields/input_field.h   | 23 +++++++++++--------
 2 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index fbf209b..a23060b 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -1538,7 +1538,7 @@ bool InputField::heightAutoupdated() {
 
 void InputField::checkContentHeight() {
 	if (heightAutoupdated()) {
-		resized();
+		_heightChanges.fire({});
 	}
 }
 
@@ -1812,13 +1812,13 @@ void InputField::focusInEventInner(QFocusEvent *e) {
 		: (width() / 2);
 	setFocused(true);
 	_inner->QTextEdit::focusInEvent(e);
-	focused();
+	_focusedChanges.fire(true);
 }
 
 void InputField::focusOutEventInner(QFocusEvent *e) {
 	setFocused(false);
 	_inner->QTextEdit::focusOutEvent(e);
-	blurred();
+	_focusedChanges.fire(false);
 }
 
 void InputField::setFocused(bool focused) {
@@ -2401,7 +2401,7 @@ void InputField::handleContentsChanged() {
 	if (tagsChanged || (_lastTextWithTags.text != currentText)) {
 		_lastTextWithTags.text = currentText;
 		const auto weak = MakeWeak(this);
-		changed();
+		_changes.fire({});
 		if (!weak) {
 			return;
 		}
@@ -2765,15 +2765,15 @@ void InputField::keyPressEventInner(QKeyEvent *e) {
 		&& revertFormatReplace()) {
 		e->accept();
 	} else if (enter && enterSubmit) {
-		submitted(e->modifiers());
+		_submits.fire(e->modifiers());
 	} else if (e->key() == Qt::Key_Escape) {
 		e->ignore();
-		cancelled();
+		_cancelled.fire({});
 	} else if (e->key() == Qt::Key_Tab || e->key() == Qt::Key_Backtab) {
 		if (alt || ctrl) {
 			e->ignore();
 		} else if (_customTab) {
-			tabbed();
+			_tabbed.fire({});
 		} else if (!focusNextPrevChild(e->key() == Qt::Key_Tab && !shift)) {
 			e->ignore();
 		}
@@ -3843,6 +3843,30 @@ void InputField::setErrorShown(bool error) {
 	}
 }
 
+rpl::producer<> InputField::heightChanges() const {
+	return _heightChanges.events();
+}
+
+rpl::producer<bool> InputField::focusedChanges() const {
+	return _focusedChanges.events();
+}
+
+rpl::producer<> InputField::tabbed() const {
+	return _tabbed.events();
+}
+
+rpl::producer<> InputField::cancelled() const {
+	return _cancelled.events();
+}
+
+rpl::producer<> InputField::changes() const {
+	return _changes.events();
+}
+
+rpl::producer<Qt::KeyboardModifiers> InputField::submits() const {
+	return _submits.events();
+}
+
 InputField::~InputField() = default;
 
 } // namespace Ui
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index f371454..b1a5aa7 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -315,6 +315,13 @@ public:
 	[[nodiscard]] bool menuShown() const;
 	[[nodiscard]] rpl::producer<bool> menuShownValue() const;
 
+	[[nodiscard]] rpl::producer<> heightChanges() const;
+	[[nodiscard]] rpl::producer<bool> focusedChanges() const;
+	[[nodiscard]] rpl::producer<> tabbed() const;
+	[[nodiscard]] rpl::producer<> cancelled() const;
+	[[nodiscard]] rpl::producer<> changes() const;
+	[[nodiscard]] rpl::producer<Qt::KeyboardModifiers> submits() const;
+
 	~InputField();
 
 private Q_SLOTS:
@@ -328,15 +335,6 @@ private Q_SLOTS:
 
 	void onFocusInner();
 
-Q_SIGNALS:
-	void changed();
-	void submitted(Qt::KeyboardModifiers);
-	void cancelled();
-	void tabbed();
-	void focused();
-	void blurred();
-	void resized();
-
 protected:
 	void startPlaceholderAnimation();
 	void startBorderAnimation();
@@ -561,6 +559,13 @@ private:
 	rpl::event_stream<DocumentChangeInfo> _documentContentsChanges;
 	rpl::event_stream<MarkdownTag> _markdownTagApplies;
 
+	rpl::event_stream<bool> _focusedChanges;
+	rpl::event_stream<> _heightChanges;
+	rpl::event_stream<> _tabbed;
+	rpl::event_stream<> _cancelled;
+	rpl::event_stream<> _changes;
+	rpl::event_stream<Qt::KeyboardModifiers> _submits;
+
 };
 
 } // namespace Ui

From dfbf0099041cedfb87f1464bbb8cd5670131d1dd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 16:41:04 +0300
Subject: [PATCH 479/635] Replaced QTimer with base::Timer in InputField.

---
 ui/widgets/fields/input_field.cpp | 14 +++++---------
 ui/widgets/fields/input_field.h   |  5 ++---
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index a23060b..b8c94b8 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -1207,8 +1207,8 @@ InputField::InputField(
 
 	setAttribute(Qt::WA_AcceptTouchEvents);
 	_inner->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
-	_touchTimer.setSingleShot(true);
-	connect(&_touchTimer, SIGNAL(timeout()), this, SLOT(onTouchTimer()));
+
+	_touchTimer.setCallback([=] { _touchRightButton = true; });
 
 	connect(_inner->document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(onDocumentContentsChange(int,int,int)));
 	connect(_inner.get(), SIGNAL(undoAvailable(bool)), this, SLOT(onUndoAvailable(bool)));
@@ -1322,10 +1322,6 @@ void InputField::updatePalette() {
 	}
 }
 
-void InputField::onTouchTimer() {
-	_touchRightButton = true;
-}
-
 void InputField::setExtendedContextMenu(
 	rpl::producer<ExtendedContextMenu> value) {
 	std::move(
@@ -1548,7 +1544,7 @@ void InputField::handleTouchEvent(QTouchEvent *e) {
 		if (_touchPress || e->touchPoints().isEmpty()) {
 			return;
 		}
-		_touchTimer.start(QApplication::startDragTime());
+		_touchTimer.callOnce(QApplication::startDragTime());
 		_touchPress = true;
 		_touchMove = _touchRightButton = false;
 		_touchStart = e->touchPoints().cbegin()->screenPos().toPoint();
@@ -1566,7 +1562,7 @@ void InputField::handleTouchEvent(QTouchEvent *e) {
 
 	case QEvent::TouchCancel: {
 		_touchPress = false;
-		_touchTimer.stop();
+		_touchTimer.cancel();
 	} break;
 	}
 }
@@ -1599,7 +1595,7 @@ void InputField::touchFinish() {
 		}
 	}
 	if (weak) {
-		_touchTimer.stop();
+		_touchTimer.cancel();
 		_touchPress
 			= _touchMove
 			= _touchRightButton
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index b1a5aa7..854fe73 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "base/timer.h"
 #include "ui/emoji_config.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
@@ -17,7 +18,6 @@
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QTextEdit>
 #include <QtGui/QTextObjectInterface>
-#include <QtCore/QTimer>
 
 #include <rpl/variable.h>
 
@@ -325,7 +325,6 @@ public:
 	~InputField();
 
 private Q_SLOTS:
-	void onTouchTimer();
 
 	void onDocumentContentsChange(int position, int charsRemoved, int charsAdded);
 	void onCursorPositionChanged();
@@ -537,7 +536,7 @@ private:
 	bool _focused = false;
 	bool _error = false;
 
-	QTimer _touchTimer;
+	base::Timer _touchTimer;
 	bool _touchPress = false;
 	bool _touchRightButton = false;
 	bool _touchMove = false;

From 9d2f648a110b46bf6c896770dcd23b0582ae8d4a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 16:41:50 +0300
Subject: [PATCH 480/635] Replaced Qt slots in InputField and removed Q_OBJECT
 macro.

---
 ui/widgets/fields/input_field.cpp | 72 +++++++++++++++++++------------
 ui/widgets/fields/input_field.h   | 18 +++-----
 2 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index b8c94b8..83c86aa 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -14,6 +14,7 @@
 #include "base/invoke_queued.h"
 #include "base/random.h"
 #include "base/platform/base_platform_info.h"
+#include "base/qt_signal_producer.h"
 #include "emoji_suggestions_helper.h"
 #include "base/qthelp_regex.h"
 #include "base/qt/qt_common_adapters.h"
@@ -1210,13 +1211,42 @@ InputField::InputField(
 
 	_touchTimer.setCallback([=] { _touchRightButton = true; });
 
-	connect(_inner->document(), SIGNAL(contentsChange(int,int,int)), this, SLOT(onDocumentContentsChange(int,int,int)));
-	connect(_inner.get(), SIGNAL(undoAvailable(bool)), this, SLOT(onUndoAvailable(bool)));
-	connect(_inner.get(), SIGNAL(redoAvailable(bool)), this, SLOT(onRedoAvailable(bool)));
-	connect(_inner.get(), SIGNAL(cursorPositionChanged()), this, SLOT(onCursorPositionChanged()));
-	connect(_inner.get(), &Inner::selectionChanged, [] {
+	base::qt_signal_producer(
+		_inner->document(),
+		&QTextDocument::contentsChange
+	) | rpl::start_with_next([=](int position, int removed, int added) {
+		documentContentsChanged(position, removed, added);
+	}, lifetime());
+	base::qt_signal_producer(
+		_inner.get(),
+		&QTextEdit::undoAvailable
+	) | rpl::start_with_next([=](bool undoAvailable) {
+		_undoAvailable = undoAvailable;
 		Integration::Instance().textActionsUpdated();
-	});
+	}, lifetime());
+	base::qt_signal_producer(
+		_inner.get(),
+		&QTextEdit::redoAvailable
+	) | rpl::start_with_next([=](bool redoAvailable) {
+		_redoAvailable = redoAvailable;
+		Integration::Instance().textActionsUpdated();
+	}, lifetime());
+	base::qt_signal_producer(
+		_inner.get(),
+		&QTextEdit::cursorPositionChanged
+	) | rpl::start_with_next([=] {
+		auto cursor = textCursor();
+		if (!cursor.hasSelection() && !cursor.position()) {
+			cursor.setCharFormat(_defaultCharFormat);
+			setTextCursor(cursor);
+		}
+	}, lifetime());
+	base::qt_signal_producer(
+		_inner.get(),
+		&Inner::selectionChanged
+	) | rpl::start_with_next([] {
+		Integration::Instance().textActionsUpdated();
+	}, lifetime());
 
 	const auto bar = _inner->verticalScrollBar();
 	_scrollTop = bar->value();
@@ -1757,12 +1787,16 @@ void InputField::focusInEvent(QFocusEvent *e) {
 	_borderAnimationStart = (e->reason() == Qt::MouseFocusReason)
 		? mapFromGlobal(QCursor::pos()).x()
 		: (width() / 2);
-	InvokeQueued(this, [=] { if (hasFocus()) onFocusInner(); });
+	InvokeQueued(this, [=] {
+		if (hasFocus()) {
+			focusInner();
+		}
+	});
 }
 
 void InputField::mousePressEvent(QMouseEvent *e) {
 	_borderAnimationStart = e->pos().x();
-	InvokeQueued(this, [=] { onFocusInner(); });
+	InvokeQueued(this, [=] { focusInner(); });
 }
 
 void InputField::mousePressEventInner(QMouseEvent *e) {
@@ -1788,7 +1822,7 @@ void InputField::mouseMoveEventInner(QMouseEvent *e) {
 	_inner->QTextEdit::mouseMoveEvent(e);
 }
 
-void InputField::onFocusInner() {
+void InputField::focusInner() {
 	auto borderStart = _borderAnimationStart;
 	_inner->setFocus();
 	_borderAnimationStart = borderStart;
@@ -2271,7 +2305,7 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 	}
 }
 
-void InputField::onDocumentContentsChange(
+void InputField::documentContentsChanged(
 		int position,
 		int charsRemoved,
 		int charsAdded) {
@@ -2339,14 +2373,6 @@ void InputField::onDocumentContentsChange(
 	}
 }
 
-void InputField::onCursorPositionChanged() {
-	auto cursor = textCursor();
-	if (!cursor.hasSelection() && !cursor.position()) {
-		cursor.setCharFormat(_defaultCharFormat);
-		setTextCursor(cursor);
-	}
-}
-
 void InputField::chopByMaxLength(int insertPosition, int insertLength) {
 	Expects(_correcting);
 
@@ -2445,16 +2471,6 @@ void InputField::highlightMarkdown() {
 	}
 }
 
-void InputField::onUndoAvailable(bool avail) {
-	_undoAvailable = avail;
-	Integration::Instance().textActionsUpdated();
-}
-
-void InputField::onRedoAvailable(bool avail) {
-	_redoAvailable = avail;
-	Integration::Instance().textActionsUpdated();
-}
-
 void InputField::setDisplayFocused(bool focused) {
 	setFocused(focused);
 	finishAnimating();
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index 854fe73..0e49f71 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -103,8 +103,6 @@ private:
 };
 
 class InputField : public RpWidget {
-	Q_OBJECT
-
 public:
 	enum class Mode {
 		SingleLine,
@@ -324,16 +322,6 @@ public:
 
 	~InputField();
 
-private Q_SLOTS:
-
-	void onDocumentContentsChange(int position, int charsRemoved, int charsAdded);
-	void onCursorPositionChanged();
-
-	void onUndoAvailable(bool avail);
-	void onRedoAvailable(bool avail);
-
-	void onFocusInner();
-
 protected:
 	void startPlaceholderAnimation();
 	void startBorderAnimation();
@@ -378,6 +366,12 @@ private:
 	void insertFromMimeDataInner(const QMimeData *source);
 	TextWithTags getTextWithTagsSelected() const;
 
+	void documentContentsChanged(
+		int position,
+		int charsRemoved,
+		int charsAdded);
+	void focusInner();
+
 	// "start" and "end" are in coordinates of text where emoji are replaced
 	// by ObjectReplacementCharacter. If "end" = -1 means get text till the end.
 	QString getTextPart(

From 5a2402ad5d7e41a48c84d56c45df6b5d49e8b176 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 31 Aug 2023 16:50:32 +0300
Subject: [PATCH 481/635] Slightly optimized include directives in InputField.

---
 ui/widgets/fields/input_field.cpp | 12 +++++++-----
 ui/widgets/fields/input_field.h   | 10 ++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 83c86aa..2bccfcb 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -18,16 +18,18 @@
 #include "emoji_suggestions_helper.h"
 #include "base/qthelp_regex.h"
 #include "base/qt/qt_common_adapters.h"
+#include "styles/style_widgets.h"
 #include "styles/palette.h"
 
-#include <QtWidgets/QCommonStyle>
-#include <QtWidgets/QScrollBar>
-#include <QtWidgets/QApplication>
+#include <QtCore/QMimeData>
+#include <QtCore/QRegularExpression>
 #include <QtGui/QClipboard>
 #include <QtGui/QTextBlock>
 #include <QtGui/QTextDocumentFragment>
-#include <QtCore/QMimeData>
-#include <QtCore/QRegularExpression>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QCommonStyle>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QTextEdit>
 
 namespace Ui {
 namespace {
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index 0e49f71..a468eac 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -12,22 +12,24 @@
 #include "ui/effects/animations.h"
 #include "ui/text/text_entity.h"
 #include "ui/text/text_custom_emoji.h"
-#include "styles/style_widgets.h"
 
-#include <QContextMenuEvent>
-#include <QtWidgets/QLineEdit>
-#include <QtWidgets/QTextEdit>
 #include <QtGui/QTextObjectInterface>
 
 #include <rpl/variable.h>
 
+class QTextEdit;
 class QTouchEvent;
+class QContextMenuEvent;
 class Painter;
 
 namespace Ui::Text {
 class CustomEmoji;
 } // namespace Ui::Text
 
+namespace style {
+struct InputField;
+} // namespace style
+
 namespace Ui {
 
 const auto kClearFormatSequence = QKeySequence("ctrl+shift+n");

From 2107f5a1647e8fc7b509313630ab9012257715ba Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Sep 2023 12:05:12 +0400
Subject: [PATCH 482/635] Fix build with MSVC.

---
 ui/widgets/fields/input_field.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index a468eac..65692e0 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -17,6 +17,7 @@
 
 #include <rpl/variable.h>
 
+class QMenu;
 class QTextEdit;
 class QTouchEvent;
 class QContextMenuEvent;

From b571c8adfe94ac6e138329f538c40a583b2d4342 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Sep 2023 13:39:36 +0400
Subject: [PATCH 483/635] By default use Real overscroll in ElasticScroll.

---
 ui/widgets/elastic_scroll.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index af74ec4..fb6aec3 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -257,8 +257,8 @@ private:
 	int _overscroll = 0;
 	int _overscrollDefaultFrom = 0;
 	int _overscrollDefaultTill = 0;
-	OverscrollType _overscrollTypeFrom = OverscrollType::None;
-	OverscrollType _overscrollTypeTill = OverscrollType::None;
+	OverscrollType _overscrollTypeFrom = OverscrollType::Real;
+	OverscrollType _overscrollTypeTill = OverscrollType::Real;
 	std::optional<QColor> _overscrollBg;
 	Ui::Animations::Simple _overscrollReturnAnimation;
 	rpl::variable<Position> _position;

From 9a17d4bd155abcf010493b119626945dc809d7b0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Sep 2023 13:40:01 +0400
Subject: [PATCH 484/635] Add a checkbox helper for terms accept check.

---
 ui/widgets/checkbox.cpp | 42 +++++++++++++++++++++++++++++++++++++++++
 ui/widgets/checkbox.h   |  4 ++++
 2 files changed, 46 insertions(+)

diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 450810a..c589dcf 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -10,6 +10,7 @@
 #include "ui/basic_click_handlers.h"
 #include "ui/ui_utility.h"
 #include "ui/painter.h"
+#include "styles/palette.h"
 
 #include <QtGui/QtEvents>
 #include <QtCore/QtMath>
@@ -290,6 +291,47 @@ void CheckView::setUntoggledOverride(
 	update();
 }
 
+Fn<void()> CheckView::PrepareNonToggledError(
+		not_null<CheckView*> view,
+		rpl::lifetime &lifetime) {
+	struct State {
+		bool error = false;
+		Ui::Animations::Simple errorAnimation;
+	};
+	const auto state = lifetime.make_state<State>();
+
+	view->checkedChanges(
+	) | rpl::filter([=](bool checked) {
+		return checked;
+	}) | rpl::start_with_next([=] {
+		state->error = false;
+		view->setUntoggledOverride(std::nullopt);
+	}, lifetime);
+
+	return [=] {
+		const auto callback = [=] {
+			const auto error = state->errorAnimation.value(
+				state->error ? 1. : 0.);
+			if (error == 0.) {
+				view->setUntoggledOverride(std::nullopt);
+			} else {
+				const auto color = anim::color(
+					st::defaultCheck.untoggledFg,
+					st::boxTextFgError,
+					error);
+				view->setUntoggledOverride(color);
+			}
+		};
+		state->error = true;
+		state->errorAnimation.stop();
+		state->errorAnimation.start(
+			callback,
+			0.,
+			1.,
+			st::defaultCheck.duration);
+	};
+}
+
 RadioView::RadioView(
 	const style::Radio &st,
 	bool checked,
diff --git a/ui/widgets/checkbox.h b/ui/widgets/checkbox.h
index 5ec517f..79fa5f4 100644
--- a/ui/widgets/checkbox.h
+++ b/ui/widgets/checkbox.h
@@ -75,6 +75,10 @@ public:
 	void setUntoggledOverride(
 		std::optional<QColor> untoggledOverride);
 
+	[[nodiscard]] static Fn<void()> PrepareNonToggledError(
+		not_null<CheckView*> view,
+		rpl::lifetime &lifetime);
+
 private:
 	QSize rippleSize() const;
 

From ae8a74ea98bfa7cc10aa833f278cc34f9100f5a6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 7 Sep 2023 11:38:45 +0400
Subject: [PATCH 485/635] Remove Q_OBJECT from CustomEmojiObject

---
 ui/widgets/fields/input_field.cpp | 7 +++++++
 ui/widgets/fields/input_field.h   | 5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 2bccfcb..795228e 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -1075,6 +1075,13 @@ CustomEmojiObject::CustomEmojiObject(Factory factory, Fn<bool()> paused)
 
 CustomEmojiObject::~CustomEmojiObject() = default;
 
+void *CustomEmojiObject::qt_metacast(const char *iid) {
+	if (QLatin1String(iid) == qobject_interface_iid<QTextObjectInterface*>()) {
+		return static_cast<QTextObjectInterface*>(this);
+	}
+	return QObject::qt_metacast(iid);
+}
+
 QSizeF CustomEmojiObject::intrinsicSize(
 		QTextDocument *doc,
 		int posInDocument,
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index 65692e0..13a5603 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -73,15 +73,14 @@ enum class InputSubmitSettings {
 };
 
 class CustomEmojiObject : public QObject, public QTextObjectInterface {
-	Q_OBJECT
-	Q_INTERFACES(QTextObjectInterface)
-
 public:
 	using Factory = Fn<std::unique_ptr<Text::CustomEmoji>(QStringView)>;
 
 	CustomEmojiObject(Factory factory, Fn<bool()> paused);
 	~CustomEmojiObject();
 
+	void *qt_metacast(const char *iid) override;
+
 	QSizeF intrinsicSize(
 		QTextDocument *doc,
 		int posInDocument,

From 9af842571d2a9c8fe14f0485e2689803325a4306 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 31 Aug 2023 14:14:35 +0400
Subject: [PATCH 486/635] Don't call xdg-shell code generation just for
 xdg_toplevel_show_window_menu

---
 CMakeLists.txt                                     | 1 -
 ui/platform/linux/ui_linux_wayland_integration.cpp | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e207cc..e335b76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,7 +317,6 @@ elseif(LINUX)
     qt_generate_wayland_protocol_client_sources(lib_ui
     FILES
         ${third_party_loc}/wayland/protocol/wayland.xml
-        ${third_party_loc}/wayland-protocols/stable/xdg-shell/xdg-shell.xml
     )
 
     target_link_libraries(lib_ui
diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 455341b..461c29b 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qt_signal_producer.h"
 
 #include "qwayland-wayland.h"
-#include "qwayland-xdg-shell.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
@@ -22,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 using namespace QNativeInterface;
 using namespace QNativeInterface::Private;
 using namespace base::Platform::Wayland;
+struct xdg_toplevel;
 
 namespace Ui {
 namespace Platform {
@@ -103,8 +103,9 @@ void WaylandIntegration::showWindowMenu(
 		return;
 	}
 
-	xdg_toplevel_show_window_menu(
-		toplevel,
+	wl_proxy_marshal(
+		reinterpret_cast<wl_proxy*>(toplevel),
+		4, // XDG_TOPLEVEL_SHOW_WINDOW_MENU
 		seat,
 		native->lastInputSerial(),
 		point.x(),

From dce16a3de215177c04f02b30d9151d632ad597a5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 31 Aug 2023 14:15:18 +0400
Subject: [PATCH 487/635] Use not_null for WaylandIntegration::showWindowMenu
 window handle

---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 461c29b..1d8c10c 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -88,9 +88,7 @@ bool WaylandIntegration::xdgDecorationSupported() {
 void WaylandIntegration::showWindowMenu(
 		not_null<QWidget*> widget,
 		const QPoint &point) {
-	const auto window = widget->windowHandle();
-	Expects(window != nullptr);
-
+	const auto window = not_null(widget->windowHandle());
 	const auto native = qApp->nativeInterface<QWaylandApplication>();
 	const auto nativeWindow = window->nativeInterface<QWaylandWindow>();
 	if (!native || !nativeWindow) {

From b2293c86e12537941d98e464748a060760377914 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 7 Sep 2023 23:01:14 +0400
Subject: [PATCH 488/635] Use brackets include for QtWaylandScanner-generated
 headers

---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 1d8c10c..4e40538 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -11,12 +11,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/platform/base_platform_info.h"
 #include "base/qt_signal_producer.h"
 
-#include "qwayland-wayland.h"
-
 #include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformwindow_p.h>
+#include <qwayland-wayland.h>
 
 using namespace QNativeInterface;
 using namespace QNativeInterface::Private;

From 1ba24ed5115c0ab442962b1bd28be483fc43eb42 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Sep 2023 11:25:35 +0400
Subject: [PATCH 489/635] Allow repainting SeparatePanel title.

---
 ui/widgets/buttons.cpp        |   4 +
 ui/widgets/buttons.h          |   2 +
 ui/widgets/separate_panel.cpp | 263 +++++++++++++++++++++++++---------
 ui/widgets/separate_panel.h   |  21 ++-
 4 files changed, 219 insertions(+), 71 deletions(-)

diff --git a/ui/widgets/buttons.cpp b/ui/widgets/buttons.cpp
index fc5e1aa..389f957 100644
--- a/ui/widgets/buttons.cpp
+++ b/ui/widgets/buttons.cpp
@@ -469,6 +469,10 @@ IconButton::IconButton(QWidget *parent, const style::IconButton &st) : RippleBut
 	resize(_st.width, _st.height);
 }
 
+const style::IconButton &IconButton::st() const {
+	return _st;
+}
+
 void IconButton::setIconOverride(const style::icon *iconOverride, const style::icon *iconOverOverride) {
 	_iconOverride = iconOverride;
 	_iconOverrideOver = iconOverOverride;
diff --git a/ui/widgets/buttons.h b/ui/widgets/buttons.h
index cdc9040..d39f65e 100644
--- a/ui/widgets/buttons.h
+++ b/ui/widgets/buttons.h
@@ -184,6 +184,8 @@ class IconButton : public RippleButton {
 public:
 	IconButton(QWidget *parent, const style::IconButton &st);
 
+	[[nodiscard]] const style::IconButton &st() const;
+
 	// Pass nullptr to restore the default icon.
 	void setIconOverride(const style::icon *iconOverride, const style::icon *iconOverOverride = nullptr);
 	void setRippleColorOverride(const style::color *colorOverride);
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 60a7cbe..9a1e3ac 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/box_content.h"
 #include "ui/layers/layer_widget.h"
 #include "ui/layers/show.h"
+#include "ui/style/style_core_palette.h"
 #include "ui/painter.h"
 #include "base/debug_log.h"
 #include "styles/style_widgets.h"
@@ -54,6 +55,44 @@ private:
 
 };
 
+[[nodiscard]] std::unique_ptr<style::palette> MakeAdjustedPalette(
+		QColor color) {
+	auto result = std::make_unique<style::palette>();
+	*result = *style::main_palette::get();
+
+	const auto set = [](const style::color &color, QColor value) {
+		color.set(
+			uchar(value.red()),
+			uchar(value.green()),
+			uchar(value.blue()),
+			uchar(value.alpha()));
+	};
+
+	const auto contrast = 2.5;
+	const auto luminance = 0.2126 * color.redF()
+		+ 0.7152 * color.greenF()
+		+ 0.0722 * color.blueF();
+	const auto textColor = (luminance > 0.5)
+		? QColor(0, 0, 0)
+		: QColor(255, 255, 255);
+	const auto textLuminance = (luminance > 0.5) ? 0 : 1;
+	const auto adaptiveOpacity = (luminance - textLuminance + contrast)
+		/ contrast;
+	const auto opacity = std::clamp(adaptiveOpacity, 0.5, 0.64);
+	auto buttonColor = textColor;
+	buttonColor.setAlphaF(opacity);
+	auto rippleColor = textColor;
+	rippleColor.setAlphaF(opacity * 0.1);
+
+	set(result->windowFg(), textColor);
+	set(result->boxTitleCloseFg(), buttonColor);
+	set(result->boxTitleCloseFgOver(), buttonColor);
+	set(result->windowBgOver(), rippleColor);
+
+	result->finalize();
+	return result;
+}
+
 PanelShow::PanelShow(not_null<SeparatePanel*> panel)
 : _panel(panel.get()) {
 }
@@ -102,7 +141,7 @@ PanelShow::operator bool() const {
 SeparatePanel::SeparatePanel(SeparatePanelArgs &&args)
 : RpWidget(args.parent)
 , _close(this, st::separatePanelClose)
-, _back(this, object_ptr<Ui::IconButton>(this, st::separatePanelBack))
+, _back(this, object_ptr<IconButton>(this, st::separatePanelBack))
 , _body(this)
 , _titleHeight(st::separatePanelTitleHeight) {
 	setMouseTracking(true);
@@ -111,8 +150,11 @@ SeparatePanel::SeparatePanel(SeparatePanelArgs &&args)
 	initLayout(args);
 }
 
+SeparatePanel::~SeparatePanel() = default;
+
 void SeparatePanel::setTitle(rpl::producer<QString> title) {
 	_title.create(this, std::move(title), st::separatePanelTitle);
+	updateTitleColors();
 	_title->setAttribute(Qt::WA_TransparentForMouseEvents);
 	_title->show();
 	updateTitleGeometry(width());
@@ -148,6 +190,54 @@ void SeparatePanel::initControls() {
 	_close->raise();
 }
 
+void SeparatePanel::updateTitleButtonColors(not_null<IconButton*> button) {
+	if (!_titleOverridePalette) {
+		_titleOverrideStyles.remove(button);
+		button->setIconOverride(nullptr, nullptr);
+		button->setRippleColorOverride(nullptr);
+		return;
+	}
+	const auto &st = button->st();
+	auto &updated = _titleOverrideStyles[button];
+	updated = std::make_unique<style::IconButton>(st);
+	updated->icon = st.icon.withPalette(*_titleOverridePalette);
+	updated->iconOver = st.iconOver.withPalette(*_titleOverridePalette);
+	updated->ripple.color = _titleOverridePalette->windowBgOver();
+	button->setIconOverride(&updated->icon, &updated->iconOver);
+	button->setRippleColorOverride(&updated->ripple.color);
+}
+
+void SeparatePanel::updateTitleColors() {
+	_title->setTextColorOverride(_titleOverridePalette
+		? _titleOverridePalette->windowFg()->c
+		: std::optional<QColor>());
+}
+
+void SeparatePanel::overrideTitleColor(std::optional<QColor> color) {
+	if (_titleOverrideColor == color) {
+		return;
+	}
+	_titleOverrideColor = color;
+	_titleOverrideBorderParts = _titleOverrideColor
+		? createBorderImage(*_titleOverrideColor)
+		: QPixmap();
+	_titleOverridePalette = color
+		? MakeAdjustedPalette(*color)
+		: nullptr;
+	updateTitleButtonColors(_back->entity());
+	updateTitleButtonColors(_close.data());
+	if (_menuToggle) {
+		updateTitleButtonColors(_menuToggle.data());
+	}
+	if (_title) {
+		updateTitleColors();
+	}
+	if (!_titleOverridePalette) {
+		_titleOverrideStyles.clear();
+	}
+	update();
+}
+
 void SeparatePanel::updateTitleGeometry(int newWidth) {
 	_title->resizeToWidth(newWidth
 		- _padding.left() - _back->width()
@@ -195,6 +285,7 @@ void SeparatePanel::setBackAllowed(bool allowed) {
 void SeparatePanel::setMenuAllowed(
 		Fn<void(const Menu::MenuCallback&)> fill) {
 	_menuToggle.create(this, st::separatePanelMenu);
+	updateTitleButtonColors(_menuToggle.data());
 	_menuToggle->show();
 	_menuToggle->setClickedCallback([=] { showMenu(fill); });
 
@@ -231,8 +322,8 @@ bool SeparatePanel::createMenu(not_null<IconButton*> button) {
 	}
 	_menu = base::make_unique_q<PopupMenu>(this, st::popupMenuWithIcons);
 	_menu->setDestroyedCallback([
-		weak = Ui::MakeWeak(this),
-			weakButton = Ui::MakeWeak(button),
+		weak = MakeWeak(this),
+			weakButton = MakeWeak(button),
 			menu = _menu.get()]{
 		if (weak && weak->_menu == menu) {
 			if (weakButton) {
@@ -299,19 +390,23 @@ void SeparatePanel::initLayout(const SeparatePanelArgs &args) {
 	setAttribute(Qt::WA_NoSystemBackground, true);
 	setAttribute(Qt::WA_TranslucentBackground, true);
 
-	createBorderImage();
+	validateBorderImage();
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
-		createBorderImage();
-		Ui::ForceFullRepaint(this);
+		validateBorderImage();
+		ForceFullRepaint(this);
 	}, lifetime());
 
 	if (args.onAllSpaces) {
-		Ui::Platform::InitOnTopPanel(this);
+		Platform::InitOnTopPanel(this);
 	}
 }
 
-void SeparatePanel::createBorderImage() {
+void SeparatePanel::validateBorderImage() {
+	_borderParts = createBorderImage(st::windowBg->c);
+}
+
+QPixmap SeparatePanel::createBorderImage(QColor color) const {
 	const auto shadowPadding = st::callShadow.extend;
 	const auto cacheSize = st::separatePanelBorderCacheSize;
 	auto cache = QImage(
@@ -324,9 +419,9 @@ void SeparatePanel::createBorderImage() {
 		auto p = QPainter(&cache);
 		auto inner = QRect(0, 0, cacheSize, cacheSize).marginsRemoved(
 			shadowPadding);
-		Ui::Shadow::paint(p, inner, cacheSize, st::callShadow);
+		Shadow::paint(p, inner, cacheSize, st::callShadow);
 		p.setCompositionMode(QPainter::CompositionMode_Source);
-		p.setBrush(st::windowBg);
+		p.setBrush(color);
 		p.setPen(Qt::NoPen);
 		PainterHighQualityEnabler hq(p);
 		p.drawRoundedRect(
@@ -334,7 +429,7 @@ void SeparatePanel::createBorderImage() {
 			st::callRadius,
 			st::callRadius);
 	}
-	_borderParts = Ui::PixmapFromImage(std::move(cache));
+	return PixmapFromImage(std::move(cache));
 }
 
 void SeparatePanel::toggleOpacityAnimation(bool visible) {
@@ -346,7 +441,7 @@ void SeparatePanel::toggleOpacityAnimation(bool visible) {
 	if (_useTransparency) {
 		if (_animationCache.isNull()) {
 			showControls();
-			_animationCache = Ui::GrabWidget(this);
+			_animationCache = GrabWidget(this);
 			hideChildren();
 		}
 		_opacityAnimation.start(
@@ -458,7 +553,7 @@ void SeparatePanel::ensureLayerCreated() {
 	if (_layer) {
 		return;
 	}
-	_layer = base::make_unique_q<Ui::LayerStackWidget>(
+	_layer = base::make_unique_q<LayerStackWidget>(
 		_body,
 		crl::guard(this, [=] { return std::make_shared<PanelShow>(this); }));
 	_layer->setHideByBackgroundClick(false);
@@ -481,14 +576,14 @@ void SeparatePanel::destroyLayer() {
 	}
 
 	auto layer = base::take(_layer);
-	const auto resetFocus = Ui::InFocusChain(layer);
+	const auto resetFocus = InFocusChain(layer);
 	if (resetFocus) {
 		setFocus();
 	}
 	layer = nullptr;
 }
 
-void SeparatePanel::showInner(base::unique_qptr<Ui::RpWidget> inner) {
+void SeparatePanel::showInner(base::unique_qptr<RpWidget> inner) {
 	Expects(!size().isEmpty());
 
 	_inner = std::move(inner);
@@ -562,7 +657,7 @@ void SeparatePanel::initGeometry(QSize size) {
 	if (center.y() - size.height() / 2 < available.y()) {
 		center.setY(available.y() + size.height() / 2);
 	}
-	_useTransparency = Ui::Platform::TranslucentWindowsSupported();
+	_useTransparency = Platform::TranslucentWindowsSupported();
 	_padding = _useTransparency
 		? st::callShadow.extend
 		: style::margins(
@@ -647,15 +742,24 @@ void SeparatePanel::paintShadowBorder(QPainter &p) const {
 	const auto part1 = size / 3;
 	const auto part2 = size - part1;
 	const auto corner = QSize(part1, part1) * factor;
+	const auto radius = st::callRadius;
 
+	const auto &header = _titleOverrideColor
+		? _titleOverrideBorderParts
+		: _borderParts;
 	const auto topleft = QRect(QPoint(0, 0), corner);
-	p.drawPixmap(QRect(0, 0, part1, part1), _borderParts, topleft);
+	p.drawPixmap(QRect(0, 0, part1, part1), header, topleft);
 
 	const auto topright = QRect(QPoint(part2, 0) * factor, corner);
+	p.drawPixmap(QRect(width() - part1, 0, part1, part1), header, topright);
+
+	const auto top = QRect(
+		QPoint(part1, 0) * factor,
+		QSize(part2 - part1, _padding.top() + radius) * factor);
 	p.drawPixmap(
-		QRect(width() - part1, 0, part1, part1),
-		_borderParts,
-		topright);
+		QRect(part1, 0, width() - 2 * part1, _padding.top() + radius),
+		header,
+		top);
 
 	const auto bottomleft = QRect(QPoint(0, part2) * factor, corner);
 	p.drawPixmap(
@@ -669,56 +773,65 @@ void SeparatePanel::paintShadowBorder(QPainter &p) const {
 		_borderParts,
 		bottomright);
 
-	const auto left = QRect(
-		QPoint(0, part1) * factor,
-		QSize(_padding.left(), part2 - part1) * factor);
-	p.drawPixmap(
-		QRect(0, part1, _padding.left(), height() - 2 * part1),
-		_borderParts,
-		left);
-
-	const auto top = QRect(
-		QPoint(part1, 0) * factor,
-		QSize(part2 - part1, _padding.top() + st::callRadius) * factor);
-	p.drawPixmap(
-		QRect(
-			part1,
-			0,
-			width() - 2 * part1,
-			_padding.top() + st::callRadius),
-		_borderParts,
-		top);
-
-	const auto right = QRect(
-		QPoint(size - _padding.right(), part1) * factor,
-		QSize(_padding.right(), part2 - part1) * factor);
-	p.drawPixmap(
-		QRect(
-			width() - _padding.right(),
-			part1,
-			_padding.right(),
-			height() - 2 * part1),
-		_borderParts,
-		right);
-
 	const auto bottom = QRect(
-		QPoint(part1, size - _padding.bottom() - st::callRadius) * factor,
-		QSize(part2 - part1, _padding.bottom() + st::callRadius) * factor);
+		QPoint(part1, size - _padding.bottom() - radius) * factor,
+		QSize(part2 - part1, _padding.bottom() + radius) * factor);
 	p.drawPixmap(
 		QRect(
 			part1,
-			height() - _padding.bottom() - st::callRadius,
+			height() - _padding.bottom() - radius,
 			width() - 2 * part1,
-			_padding.bottom() + st::callRadius),
+			_padding.bottom() + radius),
 		_borderParts,
 		bottom);
 
-	p.fillRect(
-		_padding.left(),
-		_padding.top() + st::callRadius,
-		width() - _padding.left() - _padding.right(),
-		height() - _padding.top() - _padding.bottom() - 2 * st::callRadius,
-		st::windowBg);
+	const auto fillLeft = [&](int from, int till, const auto &parts) {
+		const auto left = QRect(
+			QPoint(0, part1) * factor,
+			QSize(_padding.left(), part2 - part1) * factor);
+		p.drawPixmap(
+			QRect(0, from, _padding.left(), till - from),
+			parts,
+			left);
+	};
+	const auto fillRight = [&](int from, int till, const auto &parts) {
+		const auto right = QRect(
+			QPoint(size - _padding.right(), part1) * factor,
+			QSize(_padding.right(), part2 - part1) * factor);
+		p.drawPixmap(
+			QRect(
+				width() - _padding.right(),
+				from,
+				_padding.right(),
+				till - from),
+			parts,
+			right);
+	};
+	const auto fillBody = [&](int from, int till, QColor color) {
+		p.fillRect(
+			_padding.left(),
+			from,
+			width() - _padding.left() - _padding.right(),
+			till - from,
+			color);
+	};
+	const auto bg = st::windowBg->c;
+	if (_titleOverrideColor) {
+		const auto half = height() / 2;
+		fillLeft(part1, half, _titleOverrideBorderParts);
+		fillLeft(half, height() - part1, _borderParts);
+		fillRight(part1, half, _titleOverrideBorderParts);
+		fillRight(half, height() - part1, _borderParts);
+		fillBody(_padding.top() + radius, half, *_titleOverrideColor);
+		fillBody(half, height() - _padding.bottom() - radius, bg);
+	} else {
+		fillLeft(part1, height() - part1, _borderParts);
+		fillRight(part1, height() - part1, _borderParts);
+		fillBody(
+			_padding.top() + radius,
+			height() - _padding.bottom() - radius,
+			bg);
+	}
 }
 
 void SeparatePanel::paintOpaqueBorder(QPainter &p) const {
@@ -745,12 +858,22 @@ void SeparatePanel::paintOpaqueBorder(QPainter &p) const {
 		_padding.bottom(),
 		border);
 
-	p.fillRect(
-		_padding.left(),
-		_padding.top(),
-		width() - _padding.left() - _padding.right(),
-		height() - _padding.top() - _padding.bottom(),
-		st::windowBg);
+	const auto fillBody = [&](int from, int till, QColor color) {
+		p.fillRect(
+			_padding.left(),
+			from,
+			width() - _padding.left() - _padding.right(),
+			till - from,
+			color);
+	};
+	const auto bg = st::windowBg->c;
+	if (_titleOverrideColor) {
+		const auto half = height() / 2;
+		fillBody(_padding.top(), half, *_titleOverrideColor);
+		fillBody(half, height() - _padding.bottom(), bg);
+	} else {
+		fillBody(_padding.top(), height() - _padding.bottom(), bg);
+	}
 }
 
 void SeparatePanel::closeEvent(QCloseEvent *e) {
@@ -806,11 +929,11 @@ void SeparatePanel::mouseReleaseEvent(QMouseEvent *e) {
 }
 
 void SeparatePanel::leaveEventHook(QEvent *e) {
-	Ui::Tooltip::Hide();
+	Tooltip::Hide();
 }
 
 void SeparatePanel::leaveToChildEvent(QEvent *e, QWidget *child) {
-	Ui::Tooltip::Hide();
+	Tooltip::Hide();
 }
 
 } // namespace Ui
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 12070b1..5160f2b 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/flat_map.h"
 #include "base/weak_ptr.h"
 #include "ui/rp_widget.h"
 #include "ui/effects/animations.h"
@@ -15,6 +16,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class Painter;
 
+namespace style {
+struct IconButton;
+} // namespace style
+
 namespace Ui::Menu {
 struct MenuCallback;
 } // namespace Ui::Menu
@@ -45,6 +50,7 @@ struct SeparatePanelArgs {
 class SeparatePanel final : public RpWidget {
 public:
 	explicit SeparatePanel(SeparatePanelArgs &&args = {});
+	~SeparatePanel();
 
 	void setTitle(rpl::producer<QString> title);
 	void setTitleHeight(int height);
@@ -73,6 +79,8 @@ public:
 
 	void setMenuAllowed(Fn<void(const Menu::MenuCallback&)> fill);
 
+	void overrideTitleColor(std::optional<QColor> color);
+
 	base::weak_ptr<Toast::Instance> showToast(Toast::Config &&config);
 	base::weak_ptr<Toast::Instance> showToast(
 		TextWithEntities &&text,
@@ -103,7 +111,8 @@ private:
 	void updateGeometry(QSize size);
 	void showControls();
 	void updateControlsGeometry();
-	void createBorderImage();
+	void validateBorderImage();
+	[[nodiscard]] QPixmap createBorderImage(QColor color) const;
 	void opacityCallback();
 	void ensureLayerCreated();
 	void destroyLayer();
@@ -120,6 +129,9 @@ private:
 	void showMenu(Fn<void(const Menu::MenuCallback&)> fill);
 	[[nodiscard]] bool createMenu(not_null<IconButton*> button);
 
+	void updateTitleButtonColors(not_null<IconButton*> button);
+	void updateTitleColors();
+
 	object_ptr<IconButton> _close;
 	object_ptr<IconButton> _menuToggle = { nullptr };
 	object_ptr<FlatLabel> _title = { nullptr };
@@ -148,6 +160,13 @@ private:
 	QPixmap _animationCache;
 	QPixmap _borderParts;
 
+	std::optional<QColor> _titleOverrideColor;
+	QPixmap _titleOverrideBorderParts;
+	std::unique_ptr<style::palette> _titleOverridePalette;
+	base::flat_map<
+		not_null<IconButton*>,
+		std::unique_ptr<style::IconButton>> _titleOverrideStyles;
+
 	Fn<bool(int zorder)> _animationsPaused;
 
 };

From e24eaa6b32799119caa78caacd57216f81d3e1a7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 11 Sep 2023 08:04:41 +0400
Subject: [PATCH 490/635] Produce a nice terminal warning about lack of patched
 fonts

---
 ui/style/style_core_font.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index 4ca722c..4ed7089 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -18,6 +18,10 @@
 #include <QtGui/QFontDatabase>
 #include <QtWidgets/QApplication>
 
+#if __has_include(<glib.h>)
+#include <glib.h>
+#endif
+
 void style_InitFontsResource() {
 #ifdef Q_OS_MAC // Use resources from the .app bundle on macOS.
 
@@ -223,7 +227,11 @@ void StartFonts() {
 		QFont::insertSubstitutions(name, list);
 	}
 #endif // Q_OS_MAC
-#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
+#elif __has_include(<glib.h>) // !DESKTOP_APP_USE_PACKAGED_FONTS
+	g_warning(
+		"Unable to load patched fonts with Qt workarounds, "
+		"expect font issues.");
+#endif // DESKTOP_APP_USE_PACKAGED_FONTS
 
 	auto appFont = QApplication::font();
 	appFont.setStyleStrategy(QFont::PreferQuality);

From aaa88be9d7eaba529b31d742444e80846a2aa003 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 11 Sep 2023 13:39:58 +0300
Subject: [PATCH 491/635] Fixed minimal height of menu item with multiline
 text.

---
 ui/widgets/menu/menu_multiline_action.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/menu/menu_multiline_action.cpp b/ui/widgets/menu/menu_multiline_action.cpp
index 320ae10..c1bddfc 100644
--- a/ui/widgets/menu/menu_multiline_action.cpp
+++ b/ui/widgets/menu/menu_multiline_action.cpp
@@ -50,7 +50,9 @@ bool MultilineAction::isEnabled() const {
 
 int MultilineAction::contentHeight() const {
 	const auto skip = _labelPosition.y();
-	return skip + _text->height() + skip;
+	return skip
+		+ std::max(_text->height(), _icon ? _icon->height() : 0)
+		+ skip;
 }
 
 void MultilineAction::paintEvent(QPaintEvent *e) {

From 3542f5e913b4a3009e7eb6fbb05a62bbfd5643f5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Sep 2023 11:37:15 +0400
Subject: [PATCH 492/635] Force sRGB color space for windows on macOS.

---
 ui/rp_widget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index a59cb63..49b1394 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -12,6 +12,7 @@
 
 #include <QtGui/QWindow>
 #include <QtGui/QtEvents>
+#include <QtGui/QColorSpace>
 #include <private/qwidget_p.h>
 
 class TWidgetPrivate : public QWidgetPrivate {
@@ -47,6 +48,9 @@ TWidget::TWidget(QWidget *parent)
 	[[maybe_unused]] static const auto Once = [] {
 		auto format = QSurfaceFormat::defaultFormat();
 		format.setSwapInterval(0);
+		if (Platform::IsMac()) {
+			format.setColorSpace(QColorSpace::SRgb);
+		}
 		QSurfaceFormat::setDefaultFormat(format);
 		return true;
 	}();

From c538357107cd07005e01711f07ba5cb608db8718 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Sep 2023 11:38:06 +0400
Subject: [PATCH 493/635] Implement QOpenGLWidget wrong fbo size workaround.

---
 ui/gl/gl_surface.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui/gl/gl_surface.cpp b/ui/gl/gl_surface.cpp
index c9ac213..3900b07 100644
--- a/ui/gl/gl_surface.cpp
+++ b/ui/gl/gl_surface.cpp
@@ -32,6 +32,7 @@ private:
 	void resizeGL(int w, int h) override;
 	void paintEvent(QPaintEvent *e) override;
 	void paintGL() override;
+	bool eventHook(QEvent *e) override;
 	void callDeInit();
 
 	const std::unique_ptr<Renderer> _renderer;
@@ -109,6 +110,14 @@ void SurfaceOpenGL::paintGL() {
 	_renderer->paint(this, *f);
 }
 
+bool SurfaceOpenGL::eventHook(QEvent *e) {
+	const auto result = RpWidgetBase::eventHook(e);
+	if (e->type() == QEvent::ScreenChangeInternal) {
+		_deviceSize = size() * devicePixelRatio();
+	}
+	return result;
+}
+
 void SurfaceOpenGL::callDeInit() {
 	if (!_connection) {
 		return;

From 2fe9ec27b1d11a1f1f96a5ce31350226d8d99d3f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Sep 2023 20:14:37 +0400
Subject: [PATCH 494/635] Fix build for Windows, add BoxShowFinishes.

---
 ui/layers/generic_box.cpp | 13 +++++++++++++
 ui/layers/generic_box.h   |  2 ++
 ui/rp_widget.cpp          |  6 +++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index 380f172..d96a17a 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -70,4 +70,17 @@ not_null<Ui::VerticalLayout*> GenericBox::verticalLayout() {
 	return _content;
 }
 
+rpl::producer<> BoxShowFinishes(not_null<GenericBox*> box) {
+	const auto singleShot = box->lifetime().make_state<rpl::lifetime>();
+	const auto showFinishes = singleShot->make_state<rpl::event_stream<>>();
+
+	box->setShowFinishedCallback([=] {
+		showFinishes->fire({});
+		singleShot->destroy();
+		box->setShowFinishedCallback(nullptr);
+	});
+
+	return showFinishes->events();
+}
+
 } // namespace Ui
diff --git a/ui/layers/generic_box.h b/ui/layers/generic_box.h
index 9df6dae..dd54c70 100644
--- a/ui/layers/generic_box.h
+++ b/ui/layers/generic_box.h
@@ -192,4 +192,6 @@ inline GenericBox::GenericBox(
 , _content(_owned.data()) {
 }
 
+[[nodiscard]] rpl::producer<> BoxShowFinishes(not_null<GenericBox*> box);
+
 } // namespace Ui
diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index 49b1394..3301c9f 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -48,9 +48,9 @@ TWidget::TWidget(QWidget *parent)
 	[[maybe_unused]] static const auto Once = [] {
 		auto format = QSurfaceFormat::defaultFormat();
 		format.setSwapInterval(0);
-		if (Platform::IsMac()) {
-			format.setColorSpace(QColorSpace::SRgb);
-		}
+#ifdef Q_OS_MAC
+		format.setColorSpace(QColorSpace::SRgb);
+#endif // Q_OS_MAC
 		QSurfaceFormat::setDefaultFormat(format);
 		return true;
 	}();

From 8f7fe24ac49e5644749770f54e81fb5290c354d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 13 Sep 2023 09:03:59 +0400
Subject: [PATCH 495/635] Try title overscroll colors only on macOS.

---
 ui/widgets/separate_panel.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 9a1e3ac..e912181 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/show.h"
 #include "ui/style/style_core_palette.h"
 #include "ui/painter.h"
+#include "base/platform/base_platform_info.h"
 #include "base/debug_log.h"
 #include "styles/style_widgets.h"
 #include "styles/style_layers.h"
@@ -817,13 +818,16 @@ void SeparatePanel::paintShadowBorder(QPainter &p) const {
 	};
 	const auto bg = st::windowBg->c;
 	if (_titleOverrideColor) {
-		const auto half = height() / 2;
-		fillLeft(part1, half, _titleOverrideBorderParts);
-		fillLeft(half, height() - part1, _borderParts);
-		fillRight(part1, half, _titleOverrideBorderParts);
-		fillRight(half, height() - part1, _borderParts);
-		fillBody(_padding.top() + radius, half, *_titleOverrideColor);
-		fillBody(half, height() - _padding.bottom() - radius, bg);
+		const auto niceOverscroll = ::Platform::IsMac();
+		const auto top = niceOverscroll
+			? (height() / 2)
+			: (_padding.top() + _titleHeight);
+		fillLeft(part1, top, _titleOverrideBorderParts);
+		fillLeft(top, height() - part1, _borderParts);
+		fillRight(part1, top, _titleOverrideBorderParts);
+		fillRight(top, height() - part1, _borderParts);
+		fillBody(_padding.top() + radius, top, *_titleOverrideColor);
+		fillBody(top, height() - _padding.bottom() - radius, bg);
 	} else {
 		fillLeft(part1, height() - part1, _borderParts);
 		fillRight(part1, height() - part1, _borderParts);

From 8d005bc820ac2653d15c07d974ede1e17a6ce0fa Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 15 Sep 2023 09:52:54 +0400
Subject: [PATCH 496/635] Change #if-ery to be more in line with cmake logic
 (LINUX = NOT WIN32 AND NOT APPLE)

---
 ui/platform/ui_platform_utility.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index f51f49e..eb1aa48 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -55,10 +55,10 @@ void GotApplicationActivateEvent();
 
 // Platform dependent implementations.
 
-#ifdef Q_OS_MAC
-#include "ui/platform/mac/ui_utility_mac.h"
-#elif defined Q_OS_UNIX // Q_OS_MAC
-#include "ui/platform/linux/ui_utility_linux.h"
-#elif defined Q_OS_WINRT || defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX
+#if defined Q_OS_WINRT || defined Q_OS_WIN
 #include "ui/platform/win/ui_utility_win.h"
-#endif // Q_OS_MAC || Q_OS_UNIX || Q_OS_WINRT || Q_OS_WIN
+#elif defined Q_OS_MAC // Q_OS_WINRT || Q_OS_WIN
+#include "ui/platform/mac/ui_utility_mac.h"
+#else // Q_OS_WINRT || Q_OS_WIN || Q_OS_MAC
+#include "ui/platform/linux/ui_utility_linux.h"
+#endif // else for Q_OS_WINRT || Q_OS_WIN || Q_OS_MAC

From 94f9bbefd7f96e11bc19c4dc9f7c1cf36786e8f8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 16 Sep 2023 04:23:53 +0400
Subject: [PATCH 497/635] Re-use the Wayland AutoDestroyer's lifetime in
 WaylandIntegration::Private

---
 ui/platform/linux/ui_linux_wayland_integration.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index 4e40538..b44df9e 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -27,7 +27,6 @@ namespace Platform {
 
 struct WaylandIntegration::Private : public AutoDestroyer<QtWayland::wl_registry> {
 	std::optional<uint32_t> xdgDecoration;
-	rpl::lifetime lifetime;
 
 protected:
 	void registry_global(
@@ -73,7 +72,7 @@ WaylandIntegration *WaylandIntegration::Instance() {
 			&QObject::destroyed
 		) | rpl::start_with_next([] {
 			instance = std::nullopt;
-		}, instance->_private->lifetime);
+		}, instance->_private->lifetime());
 		return true;
 	}();
 	if (!instance) return nullptr;

From 725339be336732eba5d34af1a17368da6d204dbc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Sep 2023 10:00:17 +0400
Subject: [PATCH 498/635] Set dynamic box name to crash annotations.

---
 ui/layers/box_layer_widget.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index 6f356f9..4798162 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -10,6 +10,7 @@
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/painter.h"
+#include "base/integration.h"
 #include "base/timer.h"
 #include "styles/style_layers.h"
 #include "styles/palette.h"
@@ -41,6 +42,10 @@ BoxLayerWidget::BoxLayerWidget(
 	_content->setParent(this);
 	_content->setDelegate(this);
 
+	base::Integration::Instance().setCrashAnnotation(
+		"BoxName",
+		QString::fromUtf8(typeid(*_content).name()));
+
 	_additionalTitle.changes(
 	) | rpl::start_with_next([=] {
 		updateSize();

From 9bf89715b14c87cab4605684cd73d335ce38d1a0 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 17 Sep 2023 16:03:57 +0400
Subject: [PATCH 499/635] Make use of the new XDP::SettingWatcher constructor

---
 ui/platform/linux/ui_window_title_linux.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/ui/platform/linux/ui_window_title_linux.cpp b/ui/platform/linux/ui_window_title_linux.cpp
index 848e42f..cc07b6b 100644
--- a/ui/platform/linux/ui_window_title_linux.cpp
+++ b/ui/platform/linux/ui_window_title_linux.cpp
@@ -71,17 +71,11 @@ TitleControls::Layout TitleControlsLayout() {
 		}
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
-		using XDPSettingWatcher = base::Platform::XDP::SettingWatcher;
-		static const XDPSettingWatcher settingWatcher(
-			[=](
-				const Glib::ustring &group,
-				const Glib::ustring &key,
-				const Glib::VariantBase &value) {
-				if (group == "org.gnome.desktop.wm.preferences"
-					&& key == "button-layout") {
-					NotifyTitleControlsLayoutChanged();
-				}
-			});
+		namespace XDP = base::Platform::XDP;
+		static const XDP::SettingWatcher settingWatcher(
+			"org.gnome.desktop.wm.preferences",
+			"button-layout",
+			[] { NotifyTitleControlsLayoutChanged(); });
 
 		return true;
 	}();

From ba73905c117da8ba06de54c5d35a707603093815 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 18 Sep 2023 15:54:59 +0400
Subject: [PATCH 500/635] Make use of templated XDP::ReadSetting

---
 ui/platform/linux/ui_window_title_linux.cpp | 22 ++++++++-------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/ui/platform/linux/ui_window_title_linux.cpp b/ui/platform/linux/ui_window_title_linux.cpp
index cc07b6b..c89c0b4 100644
--- a/ui/platform/linux/ui_window_title_linux.cpp
+++ b/ui/platform/linux/ui_window_title_linux.cpp
@@ -102,24 +102,18 @@ TitleControls::Layout TitleControlsLayout() {
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 	const auto portalResult = []() -> std::optional<TitleControls::Layout> {
-		try {
-			using namespace base::Platform::XDP;
+		namespace XDP = base::Platform::XDP;
 
-			const auto decorationLayout = ReadSetting(
-				"org.gnome.desktop.wm.preferences",
-				"button-layout");
+		const auto decorationLayout = XDP::ReadSetting<Glib::ustring>(
+			"org.gnome.desktop.wm.preferences",
+			"button-layout");
 
-			if (!decorationLayout.has_value()) {
-				return std::nullopt;
-			}
-
-			return GtkKeywordsToTitleControlsLayout(
-				QString::fromStdString(
-					decorationLayout->get_dynamic<Glib::ustring>()));
-		} catch (...) {
+		if (!decorationLayout.has_value()) {
+			return std::nullopt;
 		}
 
-		return std::nullopt;
+		return GtkKeywordsToTitleControlsLayout(
+			QString::fromStdString(*decorationLayout));
 	}();
 
 	if (portalResult.has_value()) {

From de083a6e153004b047e682107488c1105cbbe503 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Sep 2023 22:50:10 +0400
Subject: [PATCH 501/635] Update emoji to Unicode 15.

---
 emoji.txt           |  26 +-
 emoji_old/data5.txt | 676 ++++++++++++++++++++++++++++++++++++++++++++
 ui/emoji_config.cpp |   2 +-
 3 files changed, 692 insertions(+), 12 deletions(-)
 create mode 100644 emoji_old/data5.txt

diff --git a/emoji.txt b/emoji.txt
index 05755f1..6e2ff47 100644
--- a/emoji.txt
+++ b/emoji.txt
@@ -1,4 +1,4 @@
-"😀","😃","😄","😁","😆","🥹","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🫣","🤭","🫢","🫡","🤫","🫠","🤥","😶","🫥","😐","🫤","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"😀","😃","😄","😁","😆","🥹","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🫣","🤭","🫢","🫡","🤫","🫠","🤥","😶","🫥","😐","🫤","😑","🫨","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
 "🫶","🫶🏻","🫶🏼","🫶🏽","🫶🏾","🫶🏿",
 "🤲","🤲🏻","🤲🏼","🤲🏽","🤲🏾","🤲🏿",
 "👐","👐🏻","👐🏼","👐🏽","👐🏾","👐🏿",
@@ -11,6 +11,8 @@
 "✊","✊🏻","✊🏼","✊🏽","✊🏾","✊🏿",
 "🤛","🤛🏻","🤛🏼","🤛🏽","🤛🏾","🤛🏿",
 "🤜","🤜🏻","🤜🏼","🤜🏽","🤜🏾","🤜🏿",
+"🫷","🫷🏻","🫷🏼","🫷🏽","🫷🏾","🫷🏿",
+"🫸","🫸🏻","🫸🏼","🫸🏽","🫸🏾","🫸🏿",
 "🤞","🤞🏻","🤞🏼","🤞🏽","🤞🏾","🤞🏿",
 "✌️","✌🏻","✌🏼","✌🏽","✌🏾","✌🏿",
 "🫰","🫰🏻","🫰🏼","🫰🏽","🫰🏾","🫰🏿",
@@ -264,10 +266,10 @@
 "👨‍👩‍👦","👨‍👩‍👧","👨‍👩‍👧‍👦","👨‍👩‍👦‍👦","👨‍👩‍👧‍👧","👩‍👩‍👦","👩‍👩‍👧","👩‍👩‍👧‍👦","👩‍👩‍👦‍👦","👩‍👩‍👧‍👧","👨‍👨‍👦","👨‍👨‍👧","👨‍👨‍👧‍👦","👨‍👨‍👦‍👦","👨‍👨‍👧‍👧","👩‍👦","👩‍👧","👩‍👧‍👦","👩‍👦‍👦","👩‍👧‍👧","👨‍👦","👨‍👧","👨‍👧‍👦","👨‍👦‍👦","👨‍👧‍👧","🪢","🧶","🧵","🪡","🧥","🥼","🦺","👚","👕","👖","🩲","🩳","👔","👗","👙","🩱","👘","🥻","🩴","🥿","👠","👡","👢","👞","👟","🥾","🧦","🧤","🧣","🎩","🧢","👒","🎓","⛑","🪖","👑","💍","👝","👛","👜","💼","🎒","🧳","👓","🕶","🥽","🌂"
 
 
-"🐶","🐱","🐭","🐹","🐰","🦊","🐻","🐼","🐻‍❄️","🐨","🐯","🦁","🐮","🐷","🐽","🐸","🐵","🙈","🙉","🙊","🐒","🐔","🐧","🐦","🐤","🐣","🐥","🦆","🦅","🦉","🦇","🐺","🐗","🐴","🦄","🐝","🪱","🐛","🦋","🐌","🐞","🐜","🪰","🪲","🪳","🦟","🦗","🕷","🕸","🦂","🐢","🐍","🦎","🦖","🦕","🐙","🦑","🦐","🦞","🦀","🐡","🐠","🐟","🐬","🐳","🐋","🦈","🦭","🐊","🐅","🐆","🦓","🦍","🦧","🦣","🐘","🦛","🦏","🐪","🐫","🦒","🦘","🦬","🐃","🐂","🐄","🐎","🐖","🐏","🐑","🦙","🐐","🦌","🐕","🐩","🦮","🐕‍🦺","🐈","🐈‍⬛","🪶","🐓","🦃","🦤","🦚","🦜","🦢","🦩","🕊","🐇","🦝","🦨","🦡","🦫","🦦","🦥","🐁","🐀","🐿","🦔","🐾","🐉","🐲","🌵","🎄","🌲","🌳","🌴","🪵","🌱","🌿","☘️","🍀","🎍","🪴","🎋","🍃","🍂","🍁","🪺","🪹","🍄","🐚","🪸","🪨","🌾","💐","🌷","🌹","🥀","🪷","🌺","🌸","🌼","🌻","🌞","🌝","🌛","🌜","🌚","🌕","🌖","🌗","🌘","🌑","🌒","🌓","🌔","🌙","🌎","🌍","🌏","🪐","💫","⭐️","🌟","✨","⚡️","☄️","💥","🔥","🌪","🌈","☀️","🌤","⛅️","🌥","☁️","🌦","🌧","⛈","🌩","🌨","❄️","☃️","⛄️","🌬","💨","💧","💦","🫧","☔️","☂️","🌊","🌫"
+"🐶","🐱","🐭","🐹","🐰","🦊","🐻","🐼","🐻‍❄️","🐨","🐯","🦁","🐮","🐷","🐽","🐸","🐵","🙈","🙉","🙊","🐒","🐔","🐧","🐦","🐤","🐣","🐥","🪿","🦆","🐦‍⬛️","🦅","🦉","🦇","🐺","🐗","🐴","🦄","🫎","🐝","🪱","🐛","🦋","🐌","🐞","🐜","🪰","🪲","🪳","🦟","🦗","🕷","🕸","🦂","🐢","🐍","🦎","🦖","🦕","🐙","🦑","🪼","🦐","🦞","🦀","🐡","🐠","🐟","🐬","🐳","🐋","🦈","🦭","🐊","🐅","🐆","🦓","🦍","🦧","🦣","🐘","🦛","🦏","🐪","🐫","🦒","🦘","🦬","🐃","🐂","🐄","🫏","🐎","🐖","🐏","🐑","🦙","🐐","🦌","🐕","🐩","🦮","🐕‍🦺","🐈","🐈‍⬛","🪶","🪽","🐓","🦃","🦤","🦚","🦜","🦢","🦩","🕊","🐇","🦝","🦨","🦡","🦫","🦦","🦥","🐁","🐀","🐿","🦔","🐾","🐉","🐲","🌵","🎄","🌲","🌳","🌴","🪵","🌱","🌿","☘️","🍀","🎍","🪴","🎋","🍃","🍂","🍁","🪺","🪹","🍄","🐚","🪸","🪨","🌾","💐","🌷","🌹","🥀","🪻","🪷","🌺","🌸","🌼","🌻","🌞","🌝","🌛","🌜","🌚","🌕","🌖","🌗","🌘","🌑","🌒","🌓","🌔","🌙","🌎","🌍","🌏","🪐","💫","⭐️","🌟","✨","⚡️","☄️","💥","🔥","🌪","🌈","☀️","🌤","⛅️","🌥","☁️","🌦","🌧","⛈","🌩","🌨","❄️","☃️","⛄️","🌬","💨","💧","💦","🫧","☔️","☂️","🌊","🌫"
 
 
-"🍏","🍎","🍐","🍊","🍋","🍌","🍉","🍇","🍓","🫐","🍈","🍒","🍑","🥭","🍍","🥥","🥝","🍅","🍆","🥑","🥦","🥬","🥒","🌶","🫑","🌽","🥕","🫒","🧄","🧅","🥔","🍠","🥐","🥯","🍞","🥖","🥨","🧀","🥚","🍳","🧈","🥞","🧇","🥓","🥩","🍗","🍖","🦴","🌭","🍔","🍟","🍕","🫓","🥪","🥙","🧆","🌮","🌯","🫔","🥗","🥘","🫕","🥫","🍝","🍜","🍲","🫙","🍛","🍣","🍱","🥟","🦪","🍤","🍙","🍚","🍘","🍥","🥠","🥮","🍢","🍡","🍧","🍨","🍦","🥧","🧁","🍰","🎂","🍮","🍭","🍬","🍫","🍿","🍩","🍪","🌰","🥜","🫘","🍯","🥛","🫗","🍼","🫖","☕️","🍵","🧃","🥤","🧋","🍶","🍺","🍻","🥂","🍷","🥃","🍸","🍹","🧉","🍾","🧊","🥄","🍴","🍽","🥣","🥡","🥢","🧂"
+"🍏","🍎","🍐","🍊","🍋","🍌","🍉","🍇","🍓","🫐","🍈","🍒","🍑","🥭","🍍","🥥","🥝","🍅","🍆","🥑","🫛","🥦","🥬","🥒","🌶","🫑","🌽","🥕","🫒","🧄","🧅","🥔","🍠","🫚","🥐","🥯","🍞","🥖","🥨","🧀","🥚","🍳","🧈","🥞","🧇","🥓","🥩","🍗","🍖","🦴","🌭","🍔","🍟","🍕","🫓","🥪","🥙","🧆","🌮","🌯","🫔","🥗","🥘","🫕","🥫","🍝","🍜","🍲","🫙","🍛","🍣","🍱","🥟","🦪","🍤","🍙","🍚","🍘","🍥","🥠","🥮","🍢","🍡","🍧","🍨","🍦","🥧","🧁","🍰","🎂","🍮","🍭","🍬","🍫","🍿","🍩","🍪","🌰","🥜","🫘","🍯","🥛","🫗","🍼","🫖","☕️","🍵","🧃","🥤","🧋","🍶","🍺","🍻","🥂","🍷","🥃","🍸","🍹","🧉","🍾","🧊","🥄","🍴","🍽","🥣","🥡","🥢","🧂"
 
 
 "⚽️","🏀","🏈","⚾️","🥎","🎾","🏐","🏉","🥏","🎱","🪀","🏓","🏸","🏒","🏑","🥍","🏏","🪃","🥅","⛳️","🪁","🛝","🏹","🎣","🤿","🥊","🥋","🎽","🛹","🛼","🛷","⛸","🥌","🎿","⛷","🏂","🪂",
@@ -317,7 +319,7 @@
 "🤹‍♀️","🤹🏻‍♀️","🤹🏼‍♀️","🤹🏽‍♀️","🤹🏾‍♀️","🤹🏿‍♀️",
 "🤹","🤹🏻","🤹🏼","🤹🏽","🤹🏾","🤹🏿",
 "🤹‍♂️","🤹🏻‍♂️","🤹🏼‍♂️","🤹🏽‍♂️","🤹🏾‍♂️","🤹🏿‍♂️",
-"🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🎲","♟","🎯","🎳","🎮","🎰","🧩"
+"🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🪇","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🪈","🎲","♟","🎯","🎳","🎮","🎰","🧩"
 
 
 "🚗","🚕","🚙","🚌","🚎","🏎","🚓","🚑","🚒","🚐","🛻","🚚","🚛","🚜","🦯","🦽","🦼","🩼","🛴","🚲","🛵","🏍","🛺","🛞","🚨","🚔","🚍","🚘","🚖","🚡","🚠","🚟","🚃","🚋","🚞","🚝","🚄","🚅","🚈","🚂","🚆","🚇","🚊","🚉","✈️","🛫","🛬","🛩","💺","🛰","🚀","🛸","🚁","🛶","⛵️","🚤","🛥","🛳","⛴","🚢","🛟","⚓️","🪝","⛽️","🚧","🚦","🚥","🚏","🗺","🗿","🗽","🗼","🏰","🏯","🏟","🎡","🎢","🎠","⛲️","⛱","🏖","🏝","🏜","🌋","⛰","🏔","🗻","🏕","⛺️","🛖","🏠","🏡","🏘","🏚","🏗","🏭","🏢","🏬","🏣","🏤","🏥","🏦","🏨","🏪","🏫","🏩","💒","🏛","⛪️","🕌","🕍","🛕","🕋","⛩","🛤","🛣","🗾","🎑","🏞","🌅","🌄","🌠","🎇","🎆","🌇","🌆","🏙","🌃","🌌","🌉","🌁"
@@ -326,11 +328,11 @@
 
 "⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🪫","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","🪪","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","🪬","💈","⚗️","🔭","🔬","🕳","🩻","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
 "🛀","🛀🏻","🛀🏼","🛀🏽","🛀🏾","🛀🏿",
-"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🪩","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
+"🧼","🪥","🪒","🪮","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🪭","🏮","🎐","🪩","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
 
 
 
-"❤️","🧡","💛","💚","💙","💜","🖤","🤍","🤎","💔","❤️‍🔥","❤️‍🩹","❣️","💕","💞","💓","💗","💖","💘","💝","💟","☮️","✝️","☪️","🕉","☸️","✡️","🔯","🕎","☯️","☦️","🛐","⛎","♈️","♉️","♊️","♋️","♌️","♍️","♎️","♏️","♐️","♑️","♒️","♓️","🆔","⚛️","🉑","☢️","☣️","📴","📳","🈶","🈚️","🈸","🈺","🈷️","✴️","🆚","💮","🉐","㊙️","㊗️","🈴","🈵","🈹","🈲","🅰️","🅱️","🆎","🆑","🅾️","🆘","❌","⭕️","🛑","⛔️","📛","🚫","💯","💢","♨️","🚷","🚯","🚳","🚱","🔞","📵","🚭","❗️","❕","❓","❔","‼️","⁉️","🔅","🔆","〽️","⚠️","🚸","🔱","⚜️","🔰","♻️","✅","🈯️","💹","❇️","✳️","❎","🌐","💠","Ⓜ️","🌀","💤","🏧","🚾","♿️","🅿️","🛗","🈳","🈂️","🛂","🛃","🛄","🛅","🚹","🚺","🚼","⚧","🚻","🚮","🎦","📶","🈁","🔣","ℹ️","🔤","🔡","🔠","🆖","🆗","🆙","🆒","🆕","🆓","0️⃣","1️⃣","2️⃣","3️⃣","4️⃣","5️⃣","6️⃣","7️⃣","8️⃣","9️⃣","🔟","🔢","#️⃣","*️⃣","⏏️","▶️","⏸","⏯","⏹","⏺","⏭","⏮","⏩","⏪","⏫","⏬","◀️","🔼","🔽","➡️","⬅️","⬆️","⬇️","↗️","↘️","↙️","↖️","↕️","↔️","↪️","↩️","⤴️","⤵️","🔀","🔁","🔂","🔄","🔃","🎵","🎶","➕","➖","➗", "✖️", "🟰", "♾", "💲","💱","™️","©️","®️","👁‍🗨","🔚","🔙","🔛","🔝","🔜","〰️","➰","➿","✔️","☑️","🔘","🔴","🟠","🟡","🟢","🔵","🟣","⚫️","⚪️","🟤","🔺","🔻","🔸","🔹","🔶","🔷","🔳","🔲","▪️","▫️","◾️","◽️","◼️","◻️","🟥","🟧","🟨","🟩","🟦","🟪","⬛️","⬜️","🟫","🔈","🔇","🔉","🔊","🔔","🔕","📣","📢","💬","💭","🗯","♠️","♣️","♥️","♦️","🃏","🎴","🀄️","🕐","🕑","🕒","🕓","🕔","🕕","🕖","🕗","🕘","🕙","🕚","🕛","🕜","🕝","🕞","🕟","🕠","🕡","🕢","🕣","🕤","🕥","🕦","🕧"
+"🩷","❤️","🧡","💛","💚","🩵","💙","💜","🖤","🩶","🤍","🤎","💔","❤️‍🔥","❤️‍🩹","❣️","💕","💞","💓","💗","💖","💘","💝","💟","☮️","✝️","☪️","🕉","☸️","🪯","✡️","🔯","🕎","☯️","☦️","🛐","⛎","♈️","♉️","♊️","♋️","♌️","♍️","♎️","♏️","♐️","♑️","♒️","♓️","🆔","⚛️","🉑","☢️","☣️","📴","📳","🈶","🈚️","🈸","🈺","🈷️","✴️","🆚","💮","🉐","㊙️","㊗️","🈴","🈵","🈹","🈲","🅰️","🅱️","🆎","🆑","🅾️","🆘","❌","⭕️","🛑","⛔️","📛","🚫","💯","💢","♨️","🚷","🚯","🚳","🚱","🔞","📵","🚭","❗️","❕","❓","❔","‼️","⁉️","🔅","🔆","〽️","⚠️","🚸","🔱","⚜️","🔰","♻️","✅","🈯️","💹","❇️","✳️","❎","🌐","💠","Ⓜ️","🌀","💤","🏧","🚾","♿️","🅿️","🛗","🈳","🈂️","🛂","🛃","🛄","🛅","🛜","🚹","🚺","🚼","⚧","🚻","🚮","🎦","📶","🈁","🔣","ℹ️","🔤","🔡","🔠","🆖","🆗","🆙","🆒","🆕","🆓","0️⃣","1️⃣","2️⃣","3️⃣","4️⃣","5️⃣","6️⃣","7️⃣","8️⃣","9️⃣","🔟","🔢","#️⃣","*️⃣","⏏️","▶️","⏸","⏯","⏹","⏺","⏭","⏮","⏩","⏪","⏫","⏬","◀️","🔼","🔽","➡️","⬅️","⬆️","⬇️","↗️","↘️","↙️","↖️","↕️","↔️","↪️","↩️","⤴️","⤵️","🔀","🔁","🔂","🔄","🔃","🎵","🎶","➕","➖","➗","✖️","🟰","♾","💲","💱","™️","©️","®️","👁‍🗨","🔚","🔙","🔛","🔝","🔜","〰️","➰","➿","✔️","☑️","🔘","🔴","🟠","🟡","🟢","🔵","🟣","⚫️","⚪️","🟤","🔺","🔻","🔸","🔹","🔶","🔷","🔳","🔲","▪️","▫️","◾️","◽️","◼️","◻️","🟥","🟧","🟨","🟩","🟦","🟪","⬛️","⬜️","🟫","🔈","🔇","🔉","🔊","🔔","🔕","📣","📢","💬","💭","🗯","♠️","♣️","♥️","♦️","🃏","🎴","🀄️","🕐","🕑","🕒","🕓","🕔","🕕","🕖","🕗","🕘","🕙","🕚","🕛","🕜","🕝","🕞","🕟","🕠","🕡","🕢","🕣","🕤","🕥","🕦","🕧"
 
 
 "🏳️","🏴","🏴‍☠️","🏁","🚩","🏳️‍🌈","🏳️‍⚧️","🇺🇳","🇦🇫","🇦🇽","🇦🇱","🇩🇿","🇦🇸","🇦🇩","🇦🇴","🇦🇮","🇦🇶","🇦🇬","🇦🇷","🇦🇲","🇦🇼","🇦🇺","🇦🇹","🇦🇿","🇧🇸","🇧🇭","🇧🇩","🇧🇧","🇧🇾","🇧🇪","🇧🇿","🇧🇯","🇧🇲","🇧🇹","🇧🇴","🇧🇦","🇧🇼","🇧🇷","🇻🇬","🇧🇳","🇧🇬","🇧🇫","🇧🇮","🇰🇭","🇨🇲","🇨🇦","🇮🇨","🇨🇻","🇧🇶","🇰🇾","🇨🇫","🇹🇩","🇮🇴","🇨🇱","🇨🇳","🇨🇽","🇨🇨","🇨🇴","🇰🇲","🇨🇬","🇨🇩","🇨🇰","🇨🇷","🇨🇮","🇭🇷","🇨🇺","🇨🇼","🇨🇾","🇨🇿","🇩🇰","🇩🇯","🇩🇲","🇩🇴","🇪🇨","🇪🇬","🇸🇻","🇬🇶","🇪🇷","🇪🇪","🇸🇿","🇪🇹","🇪🇺","🇫🇰","🇫🇴","🇫🇯","🇫🇮","🇫🇷","🇬🇫","🇵🇫","🇹🇫","🇬🇦","🇬🇲","🇬🇪","🇩🇪","🇬🇭","🇬🇮","🇬🇷","🇬🇱","🇬🇩","🇬🇵","🇬🇺","🇬🇹","🇬🇬","🇬🇳","🇬🇼","🇬🇾","🇭🇹","🇭🇳","🇭🇰","🇭🇺","🇮🇸","🇮🇳","🇮🇩","🇮🇷","🇮🇶","🇮🇪","🇮🇲","🇮🇱","🇮🇹","🇯🇲","🇯🇵","🎌","🇯🇪","🇯🇴","🇰🇿","🇰🇪","🇰🇮","🇽🇰","🇰🇼","🇰🇬","🇱🇦","🇱🇻","🇱🇧","🇱🇸","🇱🇷","🇱🇾","🇱🇮","🇱🇹","🇱🇺","🇲🇴","🇲🇬","🇲🇼","🇲🇾","🇲🇻","🇲🇱","🇲🇹","🇲🇭","🇲🇶","🇲🇷","🇲🇺","🇾🇹","🇲🇽","🇫🇲","🇲🇩","🇲🇨","🇲🇳","🇲🇪","🇲🇸","🇲🇦","🇲🇿","🇲🇲","🇳🇦","🇳🇷","🇳🇵","🇳🇱","🇳🇨","🇳🇿","🇳🇮","🇳🇪","🇳🇬","🇳🇺","🇳🇫","🇰🇵","🇲🇰","🇲🇵","🇳🇴","🇴🇲","🇵🇰","🇵🇼","🇵🇸","🇵🇦","🇵🇬","🇵🇾","🇵🇪","🇵🇭","🇵🇳","🇵🇱","🇵🇹","🇵🇷","🇶🇦","🇷🇪","🇷🇴","🇷🇺","🇷🇼","🇼🇸","🇸🇲","🇸🇹","🇸🇦","🇸🇳","🇷🇸","🇸🇨","🇸🇱","🇸🇬","🇸🇽","🇸🇰","🇸🇮","🇬🇸","🇸🇧","🇸🇴","🇿🇦","🇰🇷","🇸🇸","🇪🇸","🇱🇰","🇧🇱","🇸🇭","🇰🇳","🇱🇨","🇵🇲","🇻🇨","🇸🇩","🇸🇷","🇸🇪","🇨🇭","🇸🇾","🇹🇼","🇹🇯","🇹🇿","🇹🇭","🇹🇱","🇹🇬","🇹🇰","🇹🇴","🇹🇹","🇹🇳","🇹🇷","🇹🇲","🇹🇨","🇹🇻","🇺🇬","🇺🇦","🇦🇪","🇬🇧","🏴󠁧󠁢󠁥󠁮󠁧󠁿","🏴󠁧󠁢󠁳󠁣󠁴󠁿","🏴󠁧󠁢󠁷󠁬󠁳󠁿","🇺🇸","🇺🇾","🇻🇮","🇺🇿","🇻🇺","🇻🇦","🇻🇪","🇻🇳","🇼🇫","🇪🇭","🇾🇪","🇿🇲","🇿🇼"
@@ -340,7 +342,7 @@
 
 =========================================
 
-"😀","😃","😄","😁","😆","🥹","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🫣","🤭","🫢","🫡","🤫","🫠","🤥","😶","🫥","😐","🫤","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"😀","😃","😄","😁","😆","🥹","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🫣","🤭","🫢","🫡","🤫","🫠","🤥","😶","🫥","😐","🫤","😑","🫨","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
 "🫶",
 "🤲",
 "👐",
@@ -353,6 +355,8 @@
 "✊",
 "🤛",
 "🤜",
+"🫷",
+"🫸",
 "🤞",
 "✌️",
 "🫰",
@@ -653,19 +657,19 @@
 "🤹‍♀️",
 "🤹",
 "🤹‍♂️",
-"🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🎲","♟","🎯","🎳","🎮","🎰","🧩"
+"🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🪇","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🪈","🎲","♟","🎯","🎳","🎮","🎰","🧩"
 
 
 
 
 "⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🪫","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","🪪","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","🪬","💈","⚗️","🔭","🔬","🕳","🩻","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
 "🛀",
-"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🪩","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
+"🧼","🪥","🪒","🪮","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🪭","🏮","🎐","🪩","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
 
 
 
 =========================================
-"🫶","🤲","👐","🙌","👏","👍","👎","👊","✊","🤛","🤜","🤞","✌️","🫰","🤟","🤘","👌","🤌","🤏","🫳","🫴","👈","👉","👆","👇","☝️","✋","🤚","🖐","🖖","👋","🤙","🫲","🫱","💪","🖕","✍️","🙏","🫵","🦶","🦵","👂","🦻","👃","👶","👧","🧒","👦","👩","🧑","👨","👩‍🦱","🧑‍🦱","👨‍🦱","👩‍🦰","🧑‍🦰","👨‍🦰","👱‍♀️","👱","👱‍♂️","👩‍🦳","🧑‍🦳","👨‍🦳","👩‍🦲","🧑‍🦲","👨‍🦲","🧔‍♀️","🧔","🧔‍♂️","👵","🧓","👴","👲","👳‍♀️","👳","👳‍♂️","🧕","👮‍♀️","👮","👮‍♂️","👷‍♀️","👷","👷‍♂️","💂‍♀️","💂","💂‍♂️","🕵️‍♀️","🕵️","🕵️‍♂️","👩‍⚕️","🧑‍⚕️","👨‍⚕️","👩‍🌾","🧑‍🌾","👨‍🌾","👩‍🍳","🧑‍🍳","👨‍🍳","👩‍🎓","🧑‍🎓","👨‍🎓","👩‍🎤","🧑‍🎤","👨‍🎤","👩‍🏫","🧑‍🏫","👨‍🏫","👩‍🏭","🧑‍🏭","👨‍🏭","👩‍💻","🧑‍💻","👨‍💻","👩‍💼","🧑‍💼","👨‍💼","👩‍🔧","🧑‍🔧","👨‍🔧","👩‍🔬","🧑‍🔬","👨‍🔬","👩‍🎨","🧑‍🎨","👨‍🎨","👩‍🚒","🧑‍🚒","👨‍🚒","👩‍✈️","🧑‍✈️","👨‍✈️","👩‍🚀","🧑‍🚀","👨‍🚀","👩‍⚖️","🧑‍⚖️","👨‍⚖️","👰‍♀️","👰","👰‍♂️","🤵‍♀️","🤵","🤵‍♂️","👸","🫅","🤴","🥷","🦸‍♀️","🦸","🦸‍♂️","🦹‍♀️","🦹","🦹‍♂️","🤶","🧑‍🎄","🎅","🧙‍♀️","🧙","🧙‍♂️","🧝‍♀️","🧝","🧝‍♂️","🧛‍♀️","🧛","🧛‍♂️","🧜‍♀️","🧜","🧜‍♂️","🧚‍♀️","🧚","🧚‍♂️","👼","🤰","🫄","🫃","🤱","👩‍🍼","🧑‍🍼","👨‍🍼","🙇‍♀️","🙇","🙇‍♂️","💁‍♀️","💁","💁‍♂️","🙅‍♀️","🙅","🙅‍♂️","🙆‍♀️","🙆","🙆‍♂️","🙋‍♀️","🙋","🙋‍♂️","🧏‍♀️","🧏","🧏‍♂️","🤦‍♀️","🤦","🤦‍♂️","🤷‍♀️","🤷","🤷‍♂️","🙎‍♀️","🙎","🙎‍♂️","🙍‍♀️","🙍","🙍‍♂️","💇‍♀️","💇","💇‍♂️","💆‍♀️","💆","💆‍♂️","🧖‍♀️","🧖","🧖‍♂️","💅","🤳","💃","🕺","🕴","👩‍🦽","🧑‍🦽","👨‍🦽","👩‍🦼","🧑‍🦼","👨‍🦼","🚶‍♀️","🚶","🚶‍♂️","👩‍🦯","🧑‍🦯","👨‍🦯","🧎‍♀️","🧎","🧎‍♂️","🏃‍♀️","🏃","🏃‍♂️","🧍‍♀️","🧍","🧍‍♂️","🏋️‍♀️","🏋️","🏋️‍♂️","🤸‍♀️","🤸","🤸‍♂️","⛹️‍♀️","⛹️","⛹️‍♂️","🤾‍♀️","🤾","🤾‍♂️","🏌️‍♀️","🏌️","🏌️‍♂️","🏇","🧘‍♀️","🧘","🧘‍♂️","🏄‍♀️","🏄","🏄‍♂️","🏊‍♀️","🏊","🏊‍♂️","🤽‍♀️","🤽","🤽‍♂️","🚣‍♀️","🚣","🚣‍♂️","🧗‍♀️","🧗","🧗‍♂️","🚵‍♀️","🚵","🚵‍♂️","🚴‍♀️","🚴","🚴‍♂️","🤹‍♀️","🤹","🤹‍♂️","🛀"
+"🫶","🤲","👐","🙌","👏","👍","👎","👊","✊","🤛","🤜","🫷","🫸","🤞","✌️","🫰","🤟","🤘","👌","🤌","🤏","🫳","🫴","👈","👉","👆","👇","☝️","✋","🤚","🖐","🖖","👋","🤙","🫲","🫱","💪","🖕","✍️","🙏","🫵","🦶","🦵","👂","🦻","👃","👶","👧","🧒","👦","👩","🧑","👨","👩‍🦱","🧑‍🦱","👨‍🦱","👩‍🦰","🧑‍🦰","👨‍🦰","👱‍♀️","👱","👱‍♂️","👩‍🦳","🧑‍🦳","👨‍🦳","👩‍🦲","🧑‍🦲","👨‍🦲","🧔‍♀️","🧔","🧔‍♂️","👵","🧓","👴","👲","👳‍♀️","👳","👳‍♂️","🧕","👮‍♀️","👮","👮‍♂️","👷‍♀️","👷","👷‍♂️","💂‍♀️","💂","💂‍♂️","🕵️‍♀️","🕵️","🕵️‍♂️","👩‍⚕️","🧑‍⚕️","👨‍⚕️","👩‍🌾","🧑‍🌾","👨‍🌾","👩‍🍳","🧑‍🍳","👨‍🍳","👩‍🎓","🧑‍🎓","👨‍🎓","👩‍🎤","🧑‍🎤","👨‍🎤","👩‍🏫","🧑‍🏫","👨‍🏫","👩‍🏭","🧑‍🏭","👨‍🏭","👩‍💻","🧑‍💻","👨‍💻","👩‍💼","🧑‍💼","👨‍💼","👩‍🔧","🧑‍🔧","👨‍🔧","👩‍🔬","🧑‍🔬","👨‍🔬","👩‍🎨","🧑‍🎨","👨‍🎨","👩‍🚒","🧑‍🚒","👨‍🚒","👩‍✈️","🧑‍✈️","👨‍✈️","👩‍🚀","🧑‍🚀","👨‍🚀","👩‍⚖️","🧑‍⚖️","👨‍⚖️","👰‍♀️","👰","👰‍♂️","🤵‍♀️","🤵","🤵‍♂️","👸","🫅","🤴","🥷","🦸‍♀️","🦸","🦸‍♂️","🦹‍♀️","🦹","🦹‍♂️","🤶","🧑‍🎄","🎅","🧙‍♀️","🧙","🧙‍♂️","🧝‍♀️","🧝","🧝‍♂️","🧛‍♀️","🧛","🧛‍♂️","🧜‍♀️","🧜","🧜‍♂️","🧚‍♀️","🧚","🧚‍♂️","👼","🤰","🫄","🫃","🤱","👩‍🍼","🧑‍🍼","👨‍🍼","🙇‍♀️","🙇","🙇‍♂️","💁‍♀️","💁","💁‍♂️","🙅‍♀️","🙅","🙅‍♂️","🙆‍♀️","🙆","🙆‍♂️","🙋‍♀️","🙋","🙋‍♂️","🧏‍♀️","🧏","🧏‍♂️","🤦‍♀️","🤦","🤦‍♂️","🤷‍♀️","🤷","🤷‍♂️","🙎‍♀️","🙎","🙎‍♂️","🙍‍♀️","🙍","🙍‍♂️","💇‍♀️","💇","💇‍♂️","💆‍♀️","💆","💆‍♂️","🧖‍♀️","🧖","🧖‍♂️","💅","🤳","💃","🕺","🕴","👩‍🦽","🧑‍🦽","👨‍🦽","👩‍🦼","🧑‍🦼","👨‍🦼","🚶‍♀️","🚶","🚶‍♂️","👩‍🦯","🧑‍🦯","👨‍🦯","🧎‍♀️","🧎","🧎‍♂️","🏃‍♀️","🏃","🏃‍♂️","🧍‍♀️","🧍","🧍‍♂️","🏋️‍♀️","🏋️","🏋️‍♂️","🤸‍♀️","🤸","🤸‍♂️","⛹️‍♀️","⛹️","⛹️‍♂️","🤾‍♀️","🤾","🤾‍♂️","🏌️‍♀️","🏌️","🏌️‍♂️","🏇","🧘‍♀️","🧘","🧘‍♂️","🏄‍♀️","🏄","🏄‍♂️","🏊‍♀️","🏊","🏊‍♂️","🤽‍♀️","🤽","🤽‍♂️","🚣‍♀️","🚣","🚣‍♂️","🧗‍♀️","🧗","🧗‍♂️","🚵‍♀️","🚵","🚵‍♂️","🚴‍♀️","🚴","🚴‍♂️","🤹‍♀️","🤹","🤹‍♂️","🛀"
 
 
 "🤝","👫","👭","👬","👩‍❤️‍👨","👩‍❤️‍👩","💑","👨‍❤️‍👨","👩‍❤️‍💋‍👨","👩‍❤️‍💋‍👩","💏","👨‍❤️‍💋‍👨"
@@ -673,4 +677,4 @@
 =========================================
 
 
-"🗨", "👪"
\ No newline at end of file
+"🗨", "👪", "🇦🇨", "🇧🇻", "🇩🇬", "🇪🇦", "🇭🇲", "🇲🇫", "🇸🇯", "🇹🇦", "🇺🇲"
diff --git a/emoji_old/data5.txt b/emoji_old/data5.txt
new file mode 100644
index 0000000..05755f1
--- /dev/null
+++ b/emoji_old/data5.txt
@@ -0,0 +1,676 @@
+"😀","😃","😄","😁","😆","🥹","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🫣","🤭","🫢","🫡","🤫","🫠","🤥","😶","🫥","😐","🫤","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"🫶","🫶🏻","🫶🏼","🫶🏽","🫶🏾","🫶🏿",
+"🤲","🤲🏻","🤲🏼","🤲🏽","🤲🏾","🤲🏿",
+"👐","👐🏻","👐🏼","👐🏽","👐🏾","👐🏿",
+"🙌","🙌🏻","🙌🏼","🙌🏽","🙌🏾","🙌🏿",
+"👏","👏🏻","👏🏼","👏🏽","👏🏾","👏🏿",
+"🤝","🤝🏻","🫱🏻‍🫲🏼","🫱🏻‍🫲🏽","🫱🏻‍🫲🏾","🫱🏻‍🫲🏿","🫱🏼‍🫲🏻","🤝🏼","🫱🏼‍🫲🏽","🫱🏼‍🫲🏾","🫱🏼‍🫲🏿","🫱🏽‍🫲🏻","🫱🏽‍🫲🏼","🤝🏽","🫱🏽‍🫲🏾","🫱🏽‍🫲🏿","🫱🏾‍🫲🏻","🫱🏾‍🫲🏼","🫱🏾‍🫲🏽","🤝🏾","🫱🏾‍🫲🏿","🫱🏿‍🫲🏻","🫱🏿‍🫲🏼","🫱🏿‍🫲🏽","🫱🏿‍🫲🏾","🤝🏿",
+"👍","👍🏻","👍🏼","👍🏽","👍🏾","👍🏿",
+"👎","👎🏻","👎🏼","👎🏽","👎🏾","👎🏿",
+"👊","👊🏻","👊🏼","👊🏽","👊🏾","👊🏿",
+"✊","✊🏻","✊🏼","✊🏽","✊🏾","✊🏿",
+"🤛","🤛🏻","🤛🏼","🤛🏽","🤛🏾","🤛🏿",
+"🤜","🤜🏻","🤜🏼","🤜🏽","🤜🏾","🤜🏿",
+"🤞","🤞🏻","🤞🏼","🤞🏽","🤞🏾","🤞🏿",
+"✌️","✌🏻","✌🏼","✌🏽","✌🏾","✌🏿",
+"🫰","🫰🏻","🫰🏼","🫰🏽","🫰🏾","🫰🏿",
+"🤟","🤟🏻","🤟🏼","🤟🏽","🤟🏾","🤟🏿",
+"🤘","🤘🏻","🤘🏼","🤘🏽","🤘🏾","🤘🏿",
+"👌","👌🏻","👌🏼","👌🏽","👌🏾","👌🏿",
+"🤌","🤌🏻","🤌🏼","🤌🏽","🤌🏾","🤌🏿",
+"🤏","🤏🏻","🤏🏼","🤏🏽","🤏🏾","🤏🏿",
+"🫳","🫳🏻","🫳🏼","🫳🏽","🫳🏾","🫳🏿",
+"🫴","🫴🏻","🫴🏼","🫴🏽","🫴🏾","🫴🏿",
+"👈","👈🏻","👈🏼","👈🏽","👈🏾","👈🏿",
+"👉","👉🏻","👉🏼","👉🏽","👉🏾","👉🏿",
+"👆","👆🏻","👆🏼","👆🏽","👆🏾","👆🏿",
+"👇","👇🏻","👇🏼","👇🏽","👇🏾","👇🏿",
+"☝️","☝🏻","☝🏼","☝🏽","☝🏾","☝🏿",
+"✋","✋🏻","✋🏼","✋🏽","✋🏾","✋🏿",
+"🤚","🤚🏻","🤚🏼","🤚🏽","🤚🏾","🤚🏿",
+"🖐","🖐🏻","🖐🏼","🖐🏽","🖐🏾","🖐🏿",
+"🖖","🖖🏻","🖖🏼","🖖🏽","🖖🏾","🖖🏿",
+"👋","👋🏻","👋🏼","👋🏽","👋🏾","👋🏿",
+"🤙","🤙🏻","🤙🏼","🤙🏽","🤙🏾","🤙🏿",
+"🫲","🫲🏻","🫲🏼","🫲🏽","🫲🏾","🫲🏿",
+"🫱","🫱🏻","🫱🏼","🫱🏽","🫱🏾","🫱🏿",
+"💪","💪🏻","💪🏼","💪🏽","💪🏾","💪🏿",
+"🦾",
+"🖕","🖕🏻","🖕🏼","🖕🏽","🖕🏾","🖕🏿",
+"✍️","✍🏻","✍🏼","✍🏽","✍🏾","✍🏿",
+"🙏","🙏🏻","🙏🏼","🙏🏽","🙏🏾","🙏🏿",
+"🫵","🫵🏻","🫵🏼","🫵🏽","🫵🏾","🫵🏿",
+"🦶","🦶🏻","🦶🏼","🦶🏽","🦶🏾","🦶🏿",
+"🦵","🦵🏻","🦵🏼","🦵🏽","🦵🏾","🦵🏿",
+"🦿","💄","💋","👄","🫦","🦷","👅",
+"👂","👂🏻","👂🏼","👂🏽","👂🏾","👂🏿",
+"🦻","🦻🏻","🦻🏼","🦻🏽","🦻🏾","🦻🏿",
+"👃","👃🏻","👃🏼","👃🏽","👃🏾","👃🏿",
+"👣","👁","👀","🫀","🫁","🧠","🗣","👤","👥","🫂",
+"👶","👶🏻","👶🏼","👶🏽","👶🏾","👶🏿",
+"👧","👧🏻","👧🏼","👧🏽","👧🏾","👧🏿",
+"🧒","🧒🏻","🧒🏼","🧒🏽","🧒🏾","🧒🏿",
+"👦","👦🏻","👦🏼","👦🏽","👦🏾","👦🏿",
+"👩","👩🏻","👩🏼","👩🏽","👩🏾","👩🏿",
+"🧑","🧑🏻","🧑🏼","🧑🏽","🧑🏾","🧑🏿",
+"👨","👨🏻","👨🏼","👨🏽","👨🏾","👨🏿",
+"👩‍🦱","👩🏻‍🦱","👩🏼‍🦱","👩🏽‍🦱","👩🏾‍🦱","👩🏿‍🦱",
+"🧑‍🦱","🧑🏻‍🦱","🧑🏼‍🦱","🧑🏽‍🦱","🧑🏾‍🦱","🧑🏿‍🦱",
+"👨‍🦱","👨🏻‍🦱","👨🏼‍🦱","👨🏽‍🦱","👨🏾‍🦱","👨🏿‍🦱",
+"👩‍🦰","👩🏻‍🦰","👩🏼‍🦰","👩🏽‍🦰","👩🏾‍🦰","👩🏿‍🦰",
+"🧑‍🦰","🧑🏻‍🦰","🧑🏼‍🦰","🧑🏽‍🦰","🧑🏾‍🦰","🧑🏿‍🦰",
+"👨‍🦰","👨🏻‍🦰","👨🏼‍🦰","👨🏽‍🦰","👨🏾‍🦰","👨🏿‍🦰",
+"👱‍♀️","👱🏻‍♀️","👱🏼‍♀️","👱🏽‍♀️","👱🏾‍♀️","👱🏿‍♀️",
+"👱","👱🏻","👱🏼","👱🏽","👱🏾","👱🏿",
+"👱‍♂️","👱🏻‍♂️","👱🏼‍♂️","👱🏽‍♂️","👱🏾‍♂️","👱🏿‍♂️",
+"👩‍🦳","👩🏻‍🦳","👩🏼‍🦳","👩🏽‍🦳","👩🏾‍🦳","👩🏿‍🦳",
+"🧑‍🦳","🧑🏻‍🦳","🧑🏼‍🦳","🧑🏽‍🦳","🧑🏾‍🦳","🧑🏿‍🦳",
+"👨‍🦳","👨🏻‍🦳","👨🏼‍🦳","👨🏽‍🦳","👨🏾‍🦳","👨🏿‍🦳",
+"👩‍🦲","👩🏻‍🦲","👩🏼‍🦲","👩🏽‍🦲","👩🏾‍🦲","👩🏿‍🦲",
+"🧑‍🦲","🧑🏻‍🦲","🧑🏼‍🦲","🧑🏽‍🦲","🧑🏾‍🦲","🧑🏿‍🦲",
+"👨‍🦲","👨🏻‍🦲","👨🏼‍🦲","👨🏽‍🦲","👨🏾‍🦲","👨🏿‍🦲",
+"🧔‍♀️","🧔🏻‍♀️","🧔🏼‍♀️","🧔🏽‍♀️","🧔🏾‍♀️","🧔🏿‍♀️",
+"🧔","🧔🏻","🧔🏼","🧔🏽","🧔🏾","🧔🏿",
+"🧔‍♂️","🧔🏻‍♂️","🧔🏼‍♂️","🧔🏽‍♂️","🧔🏾‍♂️","🧔🏿‍♂️",
+"👵","👵🏻","👵🏼","👵🏽","👵🏾","👵🏿",
+"🧓","🧓🏻","🧓🏼","🧓🏽","🧓🏾","🧓🏿",
+"👴","👴🏻","👴🏼","👴🏽","👴🏾","👴🏿",
+"👲","👲🏻","👲🏼","👲🏽","👲🏾","👲🏿",
+"👳‍♀️","👳🏻‍♀️","👳🏼‍♀️","👳🏽‍♀️","👳🏾‍♀️","👳🏿‍♀️",
+"👳","👳🏻","👳🏼","👳🏽","👳🏾","👳🏿",
+"👳‍♂️","👳🏻‍♂️","👳🏼‍♂️","👳🏽‍♂️","👳🏾‍♂️","👳🏿‍♂️",
+"🧕","🧕🏻","🧕🏼","🧕🏽","🧕🏾","🧕🏿",
+"👮‍♀️","👮🏻‍♀️","👮🏼‍♀️","👮🏽‍♀️","👮🏾‍♀️","👮🏿‍♀️",
+"👮","👮🏻","👮🏼","👮🏽","👮🏾","👮🏿",
+"👮‍♂️","👮🏻‍♂️","👮🏼‍♂️","👮🏽‍♂️","👮🏾‍♂️","👮🏿‍♂️",
+"👷‍♀️","👷🏻‍♀️","👷🏼‍♀️","👷🏽‍♀️","👷🏾‍♀️","👷🏿‍♀️",
+"👷","👷🏻","👷🏼","👷🏽","👷🏾","👷🏿",
+"👷‍♂️","👷🏻‍♂️","👷🏼‍♂️","👷🏽‍♂️","👷🏾‍♂️","👷🏿‍♂️",
+"💂‍♀️","💂🏻‍♀️","💂🏼‍♀️","💂🏽‍♀️","💂🏾‍♀️","💂🏿‍♀️",
+"💂","💂🏻","💂🏼","💂🏽","💂🏾","💂🏿",
+"💂‍♂️","💂🏻‍♂️","💂🏼‍♂️","💂🏽‍♂️","💂🏾‍♂️","💂🏿‍♂️",
+"🕵️‍♀️","🕵🏻‍♀️","🕵🏼‍♀️","🕵🏽‍♀️","🕵🏾‍♀️","🕵🏿‍♀️",
+"🕵️","🕵🏻","🕵🏼","🕵🏽","🕵🏾","🕵🏿",
+"🕵️‍♂️","🕵🏻‍♂️","🕵🏼‍♂️","🕵🏽‍♂️","🕵🏾‍♂️","🕵🏿‍♂️",
+"👩‍⚕️","👩🏻‍⚕️","👩🏼‍⚕️","👩🏽‍⚕️","👩🏾‍⚕️","👩🏿‍⚕️",
+"🧑‍⚕️","🧑🏻‍⚕️","🧑🏼‍⚕️","🧑🏽‍⚕️","🧑🏾‍⚕️","🧑🏿‍⚕️",
+"👨‍⚕️","👨🏻‍⚕️","👨🏼‍⚕️","👨🏽‍⚕️","👨🏾‍⚕️","👨🏿‍⚕️",
+"👩‍🌾","👩🏻‍🌾","👩🏼‍🌾","👩🏽‍🌾","👩🏾‍🌾","👩🏿‍🌾",
+"🧑‍🌾","🧑🏻‍🌾","🧑🏼‍🌾","🧑🏽‍🌾","🧑🏾‍🌾","🧑🏿‍🌾",
+"👨‍🌾","👨🏻‍🌾","👨🏼‍🌾","👨🏽‍🌾","👨🏾‍🌾","👨🏿‍🌾",
+"👩‍🍳","👩🏻‍🍳","👩🏼‍🍳","👩🏽‍🍳","👩🏾‍🍳","👩🏿‍🍳",
+"🧑‍🍳","🧑🏻‍🍳","🧑🏼‍🍳","🧑🏽‍🍳","🧑🏾‍🍳","🧑🏿‍🍳",
+"👨‍🍳","👨🏻‍🍳","👨🏼‍🍳","👨🏽‍🍳","👨🏾‍🍳","👨🏿‍🍳",
+"👩‍🎓","👩🏻‍🎓","👩🏼‍🎓","👩🏽‍🎓","👩🏾‍🎓","👩🏿‍🎓",
+"🧑‍🎓","🧑🏻‍🎓","🧑🏼‍🎓","🧑🏽‍🎓","🧑🏾‍🎓","🧑🏿‍🎓",
+"👨‍🎓","👨🏻‍🎓","👨🏼‍🎓","👨🏽‍🎓","👨🏾‍🎓","👨🏿‍🎓",
+"👩‍🎤","👩🏻‍🎤","👩🏼‍🎤","👩🏽‍🎤","👩🏾‍🎤","👩🏿‍🎤",
+"🧑‍🎤","🧑🏻‍🎤","🧑🏼‍🎤","🧑🏽‍🎤","🧑🏾‍🎤","🧑🏿‍🎤",
+"👨‍🎤","👨🏻‍🎤","👨🏼‍🎤","👨🏽‍🎤","👨🏾‍🎤","👨🏿‍🎤",
+"👩‍🏫","👩🏻‍🏫","👩🏼‍🏫","👩🏽‍🏫","👩🏾‍🏫","👩🏿‍🏫",
+"🧑‍🏫","🧑🏻‍🏫","🧑🏼‍🏫","🧑🏽‍🏫","🧑🏾‍🏫","🧑🏿‍🏫",
+"👨‍🏫","👨🏻‍🏫","👨🏼‍🏫","👨🏽‍🏫","👨🏾‍🏫","👨🏿‍🏫",
+"👩‍🏭","👩🏻‍🏭","👩🏼‍🏭","👩🏽‍🏭","👩🏾‍🏭","👩🏿‍🏭",
+"🧑‍🏭","🧑🏻‍🏭","🧑🏼‍🏭","🧑🏽‍🏭","🧑🏾‍🏭","🧑🏿‍🏭",
+"👨‍🏭","👨🏻‍🏭","👨🏼‍🏭","👨🏽‍🏭","👨🏾‍🏭","👨🏿‍🏭",
+"👩‍💻","👩🏻‍💻","👩🏼‍💻","👩🏽‍💻","👩🏾‍💻","👩🏿‍💻",
+"🧑‍💻","🧑🏻‍💻","🧑🏼‍💻","🧑🏽‍💻","🧑🏾‍💻","🧑🏿‍💻",
+"👨‍💻","👨🏻‍💻","👨🏼‍💻","👨🏽‍💻","👨🏾‍💻","👨🏿‍💻",
+"👩‍💼","👩🏻‍💼","👩🏼‍💼","👩🏽‍💼","👩🏾‍💼","👩🏿‍💼",
+"🧑‍💼","🧑🏻‍💼","🧑🏼‍💼","🧑🏽‍💼","🧑🏾‍💼","🧑🏿‍💼",
+"👨‍💼","👨🏻‍💼","👨🏼‍💼","👨🏽‍💼","👨🏾‍💼","👨🏿‍💼",
+"👩‍🔧","👩🏻‍🔧","👩🏼‍🔧","👩🏽‍🔧","👩🏾‍🔧","👩🏿‍🔧",
+"🧑‍🔧","🧑🏻‍🔧","🧑🏼‍🔧","🧑🏽‍🔧","🧑🏾‍🔧","🧑🏿‍🔧",
+"👨‍🔧","👨🏻‍🔧","👨🏼‍🔧","👨🏽‍🔧","👨🏾‍🔧","👨🏿‍🔧",
+"👩‍🔬","👩🏻‍🔬","👩🏼‍🔬","👩🏽‍🔬","👩🏾‍🔬","👩🏿‍🔬",
+"🧑‍🔬","🧑🏻‍🔬","🧑🏼‍🔬","🧑🏽‍🔬","🧑🏾‍🔬","🧑🏿‍🔬",
+"👨‍🔬","👨🏻‍🔬","👨🏼‍🔬","👨🏽‍🔬","👨🏾‍🔬","👨🏿‍🔬",
+"👩‍🎨","👩🏻‍🎨","👩🏼‍🎨","👩🏽‍🎨","👩🏾‍🎨","👩🏿‍🎨",
+"🧑‍🎨","🧑🏻‍🎨","🧑🏼‍🎨","🧑🏽‍🎨","🧑🏾‍🎨","🧑🏿‍🎨",
+"👨‍🎨","👨🏻‍🎨","👨🏼‍🎨","👨🏽‍🎨","👨🏾‍🎨","👨🏿‍🎨",
+"👩‍🚒","👩🏻‍🚒","👩🏼‍🚒","👩🏽‍🚒","👩🏾‍🚒","👩🏿‍🚒",
+"🧑‍🚒","🧑🏻‍🚒","🧑🏼‍🚒","🧑🏽‍🚒","🧑🏾‍🚒","🧑🏿‍🚒",
+"👨‍🚒","👨🏻‍🚒","👨🏼‍🚒","👨🏽‍🚒","👨🏾‍🚒","👨🏿‍🚒",
+"👩‍✈️","👩🏻‍✈️","👩🏼‍✈️","👩🏽‍✈️","👩🏾‍✈️","👩🏿‍✈️",
+"🧑‍✈️","🧑🏻‍✈️","🧑🏼‍✈️","🧑🏽‍✈️","🧑🏾‍✈️","🧑🏿‍✈️",
+"👨‍✈️","👨🏻‍✈️","👨🏼‍✈️","👨🏽‍✈️","👨🏾‍✈️","👨🏿‍✈️",
+"👩‍🚀","👩🏻‍🚀","👩🏼‍🚀","👩🏽‍🚀","👩🏾‍🚀","👩🏿‍🚀",
+"🧑‍🚀","🧑🏻‍🚀","🧑🏼‍🚀","🧑🏽‍🚀","🧑🏾‍🚀","🧑🏿‍🚀",
+"👨‍🚀","👨🏻‍🚀","👨🏼‍🚀","👨🏽‍🚀","👨🏾‍🚀","👨🏿‍🚀",
+"👩‍⚖️","👩🏻‍⚖️","👩🏼‍⚖️","👩🏽‍⚖️","👩🏾‍⚖️","👩🏿‍⚖️",
+"🧑‍⚖️","🧑🏻‍⚖️","🧑🏼‍⚖️","🧑🏽‍⚖️","🧑🏾‍⚖️","🧑🏿‍⚖️",
+"👨‍⚖️","👨🏻‍⚖️","👨🏼‍⚖️","👨🏽‍⚖️","👨🏾‍⚖️","👨🏿‍⚖️",
+"👰‍♀️","👰🏻‍♀️","👰🏼‍♀️","👰🏽‍♀️","👰🏾‍♀️","👰🏿‍♀️",
+"👰","👰🏻","👰🏼","👰🏽","👰🏾","👰🏿",
+"👰‍♂️","👰🏻‍♂️","👰🏼‍♂️","👰🏽‍♂️","👰🏾‍♂️","👰🏿‍♂️",
+"🤵‍♀️","🤵🏻‍♀️","🤵🏼‍♀️","🤵🏽‍♀️","🤵🏾‍♀️","🤵🏿‍♀️",
+"🤵","🤵🏻","🤵🏼","🤵🏽","🤵🏾","🤵🏿",
+"🤵‍♂️","🤵🏻‍♂️","🤵🏼‍♂️","🤵🏽‍♂️","🤵🏾‍♂️","🤵🏿‍♂️",
+"👸","👸🏻","👸🏼","👸🏽","👸🏾","👸🏿",
+"🫅","🫅🏻","🫅🏼","🫅🏽","🫅🏾","🫅🏿",
+"🤴","🤴🏻","🤴🏼","🤴🏽","🤴🏾","🤴🏿",
+"🥷","🥷🏻","🥷🏼","🥷🏽","🥷🏾","🥷🏿",
+"🦸‍♀️","🦸🏻‍♀️","🦸🏼‍♀️","🦸🏽‍♀️","🦸🏾‍♀️","🦸🏿‍♀️",
+"🦸","🦸🏻","🦸🏼","🦸🏽","🦸🏾","🦸🏿",
+"🦸‍♂️","🦸🏻‍♂️","🦸🏼‍♂️","🦸🏽‍♂️","🦸🏾‍♂️","🦸🏿‍♂️",
+"🦹‍♀️","🦹🏻‍♀️","🦹🏼‍♀️","🦹🏽‍♀️","🦹🏾‍♀️","🦹🏿‍♀️",
+"🦹","🦹🏻","🦹🏼","🦹🏽","🦹🏾","🦹🏿",
+"🦹‍♂️","🦹🏻‍♂️","🦹🏼‍♂️","🦹🏽‍♂️","🦹🏾‍♂️","🦹🏿‍♂️",
+"🤶","🤶🏻","🤶🏼","🤶🏽","🤶🏾","🤶🏿",
+"🧑‍🎄","🧑🏻‍🎄","🧑🏼‍🎄","🧑🏽‍🎄","🧑🏾‍🎄","🧑🏿‍🎄",
+"🎅","🎅🏻","🎅🏼","🎅🏽","🎅🏾","🎅🏿",
+"🧙‍♀️","🧙🏻‍♀️","🧙🏼‍♀️","🧙🏽‍♀️","🧙🏾‍♀️","🧙🏿‍♀️",
+"🧙","🧙🏻","🧙🏼","🧙🏽","🧙🏾","🧙🏿",
+"🧙‍♂️","🧙🏻‍♂️","🧙🏼‍♂️","🧙🏽‍♂️","🧙🏾‍♂️","🧙🏿‍♂️",
+"🧝‍♀️","🧝🏻‍♀️","🧝🏼‍♀️","🧝🏽‍♀️","🧝🏾‍♀️","🧝🏿‍♀️",
+"🧝","🧝🏻","🧝🏼","🧝🏽","🧝🏾","🧝🏿",
+"🧝‍♂️","🧝🏻‍♂️","🧝🏼‍♂️","🧝🏽‍♂️","🧝🏾‍♂️","🧝🏿‍♂️",
+"🧌",
+"🧛‍♀️","🧛🏻‍♀️","🧛🏼‍♀️","🧛🏽‍♀️","🧛🏾‍♀️","🧛🏿‍♀️",
+"🧛","🧛🏻","🧛🏼","🧛🏽","🧛🏾","🧛🏿",
+"🧛‍♂️","🧛🏻‍♂️","🧛🏼‍♂️","🧛🏽‍♂️","🧛🏾‍♂️","🧛🏿‍♂️",
+"🧟‍♀️","🧟","🧟‍♂️","🧞‍♀️","🧞","🧞‍♂️",
+"🧜‍♀️","🧜🏻‍♀️","🧜🏼‍♀️","🧜🏽‍♀️","🧜🏾‍♀️","🧜🏿‍♀️",
+"🧜","🧜🏻","🧜🏼","🧜🏽","🧜🏾","🧜🏿",
+"🧜‍♂️","🧜🏻‍♂️","🧜🏼‍♂️","🧜🏽‍♂️","🧜🏾‍♂️","🧜🏿‍♂️",
+"🧚‍♀️","🧚🏻‍♀️","🧚🏼‍♀️","🧚🏽‍♀️","🧚🏾‍♀️","🧚🏿‍♀️",
+"🧚","🧚🏻","🧚🏼","🧚🏽","🧚🏾","🧚🏿",
+"🧚‍♂️","🧚🏻‍♂️","🧚🏼‍♂️","🧚🏽‍♂️","🧚🏾‍♂️","🧚🏿‍♂️",
+"👼","👼🏻","👼🏼","👼🏽","👼🏾","👼🏿",
+"🤰","🤰🏻","🤰🏼","🤰🏽","🤰🏾","🤰🏿",
+"🫄","🫄🏻","🫄🏼","🫄🏽","🫄🏾","🫄🏿",
+"🫃","🫃🏻","🫃🏼","🫃🏽","🫃🏾","🫃🏿",
+"🤱","🤱🏻","🤱🏼","🤱🏽","🤱🏾","🤱🏿",
+"👩‍🍼","👩🏻‍🍼","👩🏼‍🍼","👩🏽‍🍼","👩🏾‍🍼","👩🏿‍🍼",
+"🧑‍🍼","🧑🏻‍🍼","🧑🏼‍🍼","🧑🏽‍🍼","🧑🏾‍🍼","🧑🏿‍🍼",
+"👨‍🍼","👨🏻‍🍼","👨🏼‍🍼","👨🏽‍🍼","👨🏾‍🍼","👨🏿‍🍼",
+"🙇‍♀️","🙇🏻‍♀️","🙇🏼‍♀️","🙇🏽‍♀️","🙇🏾‍♀️","🙇🏿‍♀️",
+"🙇","🙇🏻","🙇🏼","🙇🏽","🙇🏾","🙇🏿",
+"🙇‍♂️","🙇🏻‍♂️","🙇🏼‍♂️","🙇🏽‍♂️","🙇🏾‍♂️","🙇🏿‍♂️",
+"💁‍♀️","💁🏻‍♀️","💁🏼‍♀️","💁🏽‍♀️","💁🏾‍♀️","💁🏿‍♀️",
+"💁","💁🏻","💁🏼","💁🏽","💁🏾","💁🏿",
+"💁‍♂️","💁🏻‍♂️","💁🏼‍♂️","💁🏽‍♂️","💁🏾‍♂️","💁🏿‍♂️",
+"🙅‍♀️","🙅🏻‍♀️","🙅🏼‍♀️","🙅🏽‍♀️","🙅🏾‍♀️","🙅🏿‍♀️",
+"🙅","🙅🏻","🙅🏼","🙅🏽","🙅🏾","🙅🏿",
+"🙅‍♂️","🙅🏻‍♂️","🙅🏼‍♂️","🙅🏽‍♂️","🙅🏾‍♂️","🙅🏿‍♂️",
+"🙆‍♀️","🙆🏻‍♀️","🙆🏼‍♀️","🙆🏽‍♀️","🙆🏾‍♀️","🙆🏿‍♀️",
+"🙆","🙆🏻","🙆🏼","🙆🏽","🙆🏾","🙆🏿",
+"🙆‍♂️","🙆🏻‍♂️","🙆🏼‍♂️","🙆🏽‍♂️","🙆🏾‍♂️","🙆🏿‍♂️",
+"🙋‍♀️","🙋🏻‍♀️","🙋🏼‍♀️","🙋🏽‍♀️","🙋🏾‍♀️","🙋🏿‍♀️",
+"🙋","🙋🏻","🙋🏼","🙋🏽","🙋🏾","🙋🏿",
+"🙋‍♂️","🙋🏻‍♂️","🙋🏼‍♂️","🙋🏽‍♂️","🙋🏾‍♂️","🙋🏿‍♂️",
+"🧏‍♀️","🧏🏻‍♀️","🧏🏼‍♀️","🧏🏽‍♀️","🧏🏾‍♀️","🧏🏿‍♀️",
+"🧏","🧏🏻","🧏🏼","🧏🏽","🧏🏾","🧏🏿",
+"🧏‍♂️","🧏🏻‍♂️","🧏🏼‍♂️","🧏🏽‍♂️","🧏🏾‍♂️","🧏🏿‍♂️",
+"🤦‍♀️","🤦🏻‍♀️","🤦🏼‍♀️","🤦🏽‍♀️","🤦🏾‍♀️","🤦🏿‍♀️",
+"🤦","🤦🏻","🤦🏼","🤦🏽","🤦🏾","🤦🏿",
+"🤦‍♂️","🤦🏻‍♂️","🤦🏼‍♂️","🤦🏽‍♂️","🤦🏾‍♂️","🤦🏿‍♂️",
+"🤷‍♀️","🤷🏻‍♀️","🤷🏼‍♀️","🤷🏽‍♀️","🤷🏾‍♀️","🤷🏿‍♀️",
+"🤷","🤷🏻","🤷🏼","🤷🏽","🤷🏾","🤷🏿",
+"🤷‍♂️","🤷🏻‍♂️","🤷🏼‍♂️","🤷🏽‍♂️","🤷🏾‍♂️","🤷🏿‍♂️",
+"🙎‍♀️","🙎🏻‍♀️","🙎🏼‍♀️","🙎🏽‍♀️","🙎🏾‍♀️","🙎🏿‍♀️",
+"🙎","🙎🏻","🙎🏼","🙎🏽","🙎🏾","🙎🏿",
+"🙎‍♂️","🙎🏻‍♂️","🙎🏼‍♂️","🙎🏽‍♂️","🙎🏾‍♂️","🙎🏿‍♂️",
+"🙍‍♀️","🙍🏻‍♀️","🙍🏼‍♀️","🙍🏽‍♀️","🙍🏾‍♀️","🙍🏿‍♀️",
+"🙍","🙍🏻","🙍🏼","🙍🏽","🙍🏾","🙍🏿",
+"🙍‍♂️","🙍🏻‍♂️","🙍🏼‍♂️","🙍🏽‍♂️","🙍🏾‍♂️","🙍🏿‍♂️",
+"💇‍♀️","💇🏻‍♀️","💇🏼‍♀️","💇🏽‍♀️","💇🏾‍♀️","💇🏿‍♀️",
+"💇","💇🏻","💇🏼","💇🏽","💇🏾","💇🏿",
+"💇‍♂️","💇🏻‍♂️","💇🏼‍♂️","💇🏽‍♂️","💇🏾‍♂️","💇🏿‍♂️",
+"💆‍♀️","💆🏻‍♀️","💆🏼‍♀️","💆🏽‍♀️","💆🏾‍♀️","💆🏿‍♀️",
+"💆","💆🏻","💆🏼","💆🏽","💆🏾","💆🏿",
+"💆‍♂️","💆🏻‍♂️","💆🏼‍♂️","💆🏽‍♂️","💆🏾‍♂️","💆🏿‍♂️",
+"🧖‍♀️","🧖🏻‍♀️","🧖🏼‍♀️","🧖🏽‍♀️","🧖🏾‍♀️","🧖🏿‍♀️",
+"🧖","🧖🏻","🧖🏼","🧖🏽","🧖🏾","🧖🏿",
+"🧖‍♂️","🧖🏻‍♂️","🧖🏼‍♂️","🧖🏽‍♂️","🧖🏾‍♂️","🧖🏿‍♂️",
+"💅","💅🏻","💅🏼","💅🏽","💅🏾","💅🏿",
+"🤳","🤳🏻","🤳🏼","🤳🏽","🤳🏾","🤳🏿",
+"💃","💃🏻","💃🏼","💃🏽","💃🏾","💃🏿",
+"🕺","🕺🏻","🕺🏼","🕺🏽","🕺🏾","🕺🏿",
+"👯‍♀️","👯","👯‍♂️",
+"🕴","🕴🏻","🕴🏼","🕴🏽","🕴🏾","🕴🏿",
+"👩‍🦽","👩🏻‍🦽","👩🏼‍🦽","👩🏽‍🦽","👩🏾‍🦽","👩🏿‍🦽",
+"🧑‍🦽","🧑🏻‍🦽","🧑🏼‍🦽","🧑🏽‍🦽","🧑🏾‍🦽","🧑🏿‍🦽",
+"👨‍🦽","👨🏻‍🦽","👨🏼‍🦽","👨🏽‍🦽","👨🏾‍🦽","👨🏿‍🦽",
+"👩‍🦼","👩🏻‍🦼","👩🏼‍🦼","👩🏽‍🦼","👩🏾‍🦼","👩🏿‍🦼",
+"🧑‍🦼","🧑🏻‍🦼","🧑🏼‍🦼","🧑🏽‍🦼","🧑🏾‍🦼","🧑🏿‍🦼",
+"👨‍🦼","👨🏻‍🦼","👨🏼‍🦼","👨🏽‍🦼","👨🏾‍🦼","👨🏿‍🦼",
+"🚶‍♀️","🚶🏻‍♀️","🚶🏼‍♀️","🚶🏽‍♀️","🚶🏾‍♀️","🚶🏿‍♀️",
+"🚶","🚶🏻","🚶🏼","🚶🏽","🚶🏾","🚶🏿",
+"🚶‍♂️","🚶🏻‍♂️","🚶🏼‍♂️","🚶🏽‍♂️","🚶🏾‍♂️","🚶🏿‍♂️",
+"👩‍🦯","👩🏻‍🦯","👩🏼‍🦯","👩🏽‍🦯","👩🏾‍🦯","👩🏿‍🦯",
+"🧑‍🦯","🧑🏻‍🦯","🧑🏼‍🦯","🧑🏽‍🦯","🧑🏾‍🦯","🧑🏿‍🦯",
+"👨‍🦯","👨🏻‍🦯","👨🏼‍🦯","👨🏽‍🦯","👨🏾‍🦯","👨🏿‍🦯",
+"🧎‍♀️","🧎🏻‍♀️","🧎🏼‍♀️","🧎🏽‍♀️","🧎🏾‍♀️","🧎🏿‍♀️",
+"🧎","🧎🏻","🧎🏼","🧎🏽","🧎🏾","🧎🏿",
+"🧎‍♂️","🧎🏻‍♂️","🧎🏼‍♂️","🧎🏽‍♂️","🧎🏾‍♂️","🧎🏿‍♂️",
+"🏃‍♀️","🏃🏻‍♀️","🏃🏼‍♀️","🏃🏽‍♀️","🏃🏾‍♀️","🏃🏿‍♀️",
+"🏃","🏃🏻","🏃🏼","🏃🏽","🏃🏾","🏃🏿",
+"🏃‍♂️","🏃🏻‍♂️","🏃🏼‍♂️","🏃🏽‍♂️","🏃🏾‍♂️","🏃🏿‍♂️",
+"🧍‍♀️","🧍🏻‍♀️","🧍🏼‍♀️","🧍🏽‍♀️","🧍🏾‍♀️","🧍🏿‍♀️",
+"🧍","🧍🏻","🧍🏼","🧍🏽","🧍🏾","🧍🏿",
+"🧍‍♂️","🧍🏻‍♂️","🧍🏼‍♂️","🧍🏽‍♂️","🧍🏾‍♂️","🧍🏿‍♂️",
+"👫","👫🏻","👩🏻‍🤝‍👨🏼","👩🏻‍🤝‍👨🏽","👩🏻‍🤝‍👨🏾","👩🏻‍🤝‍👨🏿","👩🏼‍🤝‍👨🏻","👫🏼","👩🏼‍🤝‍👨🏽","👩🏼‍🤝‍👨🏾","👩🏼‍🤝‍👨🏿","👩🏽‍🤝‍👨🏻","👩🏽‍🤝‍👨🏼","👫🏽","👩🏽‍🤝‍👨🏾","👩🏽‍🤝‍👨🏿","👩🏾‍🤝‍👨🏻","👩🏾‍🤝‍👨🏼","👩🏾‍🤝‍👨🏽","👫🏾","👩🏾‍🤝‍👨🏿","👩🏿‍🤝‍👨🏻","👩🏿‍🤝‍👨🏼","👩🏿‍🤝‍👨🏽","👩🏿‍🤝‍👨🏾","👫🏿",
+"👭","👭🏻","👩🏻‍🤝‍👩🏼","👩🏻‍🤝‍👩🏽","👩🏻‍🤝‍👩🏾","👩🏻‍🤝‍👩🏿","👩🏼‍🤝‍👩🏻","👭🏼","👩🏼‍🤝‍👩🏽","👩🏼‍🤝‍👩🏾","👩🏼‍🤝‍👩🏿","👩🏽‍🤝‍👩🏻","👩🏽‍🤝‍👩🏼","👭🏽","👩🏽‍🤝‍👩🏾","👩🏽‍🤝‍👩🏿","👩🏾‍🤝‍👩🏻","👩🏾‍🤝‍👩🏼","👩🏾‍🤝‍👩🏽","👭🏾","👩🏾‍🤝‍👩🏿","👩🏿‍🤝‍👩🏻","👩🏿‍🤝‍👩🏼","👩🏿‍🤝‍👩🏽","👩🏿‍🤝‍👩🏾","👭🏿",
+"👬","👬🏻","👨🏻‍🤝‍👨🏼","👨🏻‍🤝‍👨🏽","👨🏻‍🤝‍👨🏾","👨🏻‍🤝‍👨🏿","👨🏼‍🤝‍👨🏻","👬🏼","👨🏼‍🤝‍👨🏽","👨🏼‍🤝‍👨🏾","👨🏼‍🤝‍👨🏿","👨🏽‍🤝‍👨🏻","👨🏽‍🤝‍👨🏼","👬🏽","👨🏽‍🤝‍👨🏾","👨🏽‍🤝‍👨🏿","👨🏾‍🤝‍👨🏻","👨🏾‍🤝‍👨🏼","👨🏾‍🤝‍👨🏽","👬🏾","👨🏾‍🤝‍👨🏿","👨🏿‍🤝‍👨🏻","👨🏿‍🤝‍👨🏼","👨🏿‍🤝‍👨🏽","👨🏿‍🤝‍👨🏾","👬🏿",
+"👩‍❤️‍👨","👩🏻‍❤️‍👨🏻","👩🏻‍❤️‍👨🏼","👩🏻‍❤️‍👨🏽","👩🏻‍❤️‍👨🏾","👩🏻‍❤️‍👨🏿","👩🏼‍❤️‍👨🏻","👩🏼‍❤️‍👨🏼","👩🏼‍❤️‍👨🏽","👩🏼‍❤️‍👨🏾","👩🏼‍❤️‍👨🏿","👩🏽‍❤️‍👨🏻","👩🏽‍❤️‍👨🏼","👩🏽‍❤️‍👨🏽","👩🏽‍❤️‍👨🏾","👩🏽‍❤️‍👨🏿","👩🏾‍❤️‍👨🏻","👩🏾‍❤️‍👨🏼","👩🏾‍❤️‍👨🏽","👩🏾‍❤️‍👨🏾","👩🏾‍❤️‍👨🏿","👩🏿‍❤️‍👨🏻","👩🏿‍❤️‍👨🏼","👩🏿‍❤️‍👨🏽","👩🏿‍❤️‍👨🏾","👩🏿‍❤️‍👨🏿",
+"👩‍❤️‍👩","👩🏻‍❤️‍👩🏻","👩🏻‍❤️‍👩🏼","👩🏻‍❤️‍👩🏽","👩🏻‍❤️‍👩🏾","👩🏻‍❤️‍👩🏿","👩🏼‍❤️‍👩🏻","👩🏼‍❤️‍👩🏼","👩🏼‍❤️‍👩🏽","👩🏼‍❤️‍👩🏾","👩🏼‍❤️‍👩🏿","👩🏽‍❤️‍👩🏻","👩🏽‍❤️‍👩🏼","👩🏽‍❤️‍👩🏽","👩🏽‍❤️‍👩🏾","👩🏽‍❤️‍👩🏿","👩🏾‍❤️‍👩🏻","👩🏾‍❤️‍👩🏼","👩🏾‍❤️‍👩🏽","👩🏾‍❤️‍👩🏾","👩🏾‍❤️‍👩🏿","👩🏿‍❤️‍👩🏻","👩🏿‍❤️‍👩🏼","👩🏿‍❤️‍👩🏽","👩🏿‍❤️‍👩🏾","👩🏿‍❤️‍👩🏿",
+"💑","🧑🏻‍❤️‍🧑🏻","🧑🏻‍❤️‍🧑🏼","🧑🏻‍❤️‍🧑🏽","🧑🏻‍❤️‍🧑🏾","🧑🏻‍❤️‍🧑🏿","🧑🏼‍❤️‍🧑🏻","🧑🏼‍❤️‍🧑🏼","🧑🏼‍❤️‍🧑🏽","🧑🏼‍❤️‍🧑🏾","🧑🏼‍❤️‍🧑🏿","🧑🏽‍❤️‍🧑🏻","🧑🏽‍❤️‍🧑🏼","🧑🏽‍❤️‍🧑🏽","🧑🏽‍❤️‍🧑🏾","🧑🏽‍❤️‍🧑🏿","🧑🏾‍❤️‍🧑🏻","🧑🏾‍❤️‍🧑🏼","🧑🏾‍❤️‍🧑🏽","🧑🏾‍❤️‍🧑🏾","🧑🏾‍❤️‍🧑🏿","🧑🏿‍❤️‍🧑🏻","🧑🏿‍❤️‍🧑🏼","🧑🏿‍❤️‍🧑🏽","🧑🏿‍❤️‍🧑🏾","🧑🏿‍❤️‍🧑🏿",
+"👨‍❤️‍👨","👨🏻‍❤️‍👨🏻","👨🏻‍❤️‍👨🏼","👨🏻‍❤️‍👨🏽","👨🏻‍❤️‍👨🏾","👨🏻‍❤️‍👨🏿","👨🏼‍❤️‍👨🏻","👨🏼‍❤️‍👨🏼","👨🏼‍❤️‍👨🏽","👨🏼‍❤️‍👨🏾","👨🏼‍❤️‍👨🏿","👨🏽‍❤️‍👨🏻","👨🏽‍❤️‍👨🏼","👨🏽‍❤️‍👨🏽","👨🏽‍❤️‍👨🏾","👨🏽‍❤️‍👨🏿","👨🏾‍❤️‍👨🏻","👨🏾‍❤️‍👨🏼","👨🏾‍❤️‍👨🏽","👨🏾‍❤️‍👨🏾","👨🏾‍❤️‍👨🏿","👨🏿‍❤️‍👨🏻","👨🏿‍❤️‍👨🏼","👨🏿‍❤️‍👨🏽","👨🏿‍❤️‍👨🏾","👨🏿‍❤️‍👨🏿",
+"👩‍❤️‍💋‍👨","👩🏻‍❤️‍💋‍👨🏻","👩🏻‍❤️‍💋‍👨🏼","👩🏻‍❤️‍💋‍👨🏽","👩🏻‍❤️‍💋‍👨🏾","👩🏻‍❤️‍💋‍👨🏿","👩🏼‍❤️‍💋‍👨🏻","👩🏼‍❤️‍💋‍👨🏼","👩🏼‍❤️‍💋‍👨🏽","👩🏼‍❤️‍💋‍👨🏾","👩🏼‍❤️‍💋‍👨🏿","👩🏽‍❤️‍💋‍👨🏻","👩🏽‍❤️‍💋‍👨🏼","👩🏽‍❤️‍💋‍👨🏽","👩🏽‍❤️‍💋‍👨🏾","👩🏽‍❤️‍💋‍👨🏿","👩🏾‍❤️‍💋‍👨🏻","👩🏾‍❤️‍💋‍👨🏼","👩🏾‍❤️‍💋‍👨🏽","👩🏾‍❤️‍💋‍👨🏾","👩🏾‍❤️‍💋‍👨🏿","👩🏿‍❤️‍💋‍👨🏻","👩🏿‍❤️‍💋‍👨🏼","👩🏿‍❤️‍💋‍👨🏽","👩🏿‍❤️‍💋‍👨🏾","👩🏿‍❤️‍💋‍👨🏿",
+"👩‍❤️‍💋‍👩","👩🏻‍❤️‍💋‍👩🏻","👩🏻‍❤️‍💋‍👩🏼","👩🏻‍❤️‍💋‍👩🏽","👩🏻‍❤️‍💋‍👩🏾","👩🏻‍❤️‍💋‍👩🏿","👩🏼‍❤️‍💋‍👩🏻","👩🏼‍❤️‍💋‍👩🏼","👩🏼‍❤️‍💋‍👩🏽","👩🏼‍❤️‍💋‍👩🏾","👩🏼‍❤️‍💋‍👩🏿","👩🏽‍❤️‍💋‍👩🏻","👩🏽‍❤️‍💋‍👩🏼","👩🏽‍❤️‍💋‍👩🏽","👩🏽‍❤️‍💋‍👩🏾","👩🏽‍❤️‍💋‍👩🏿","👩🏾‍❤️‍💋‍👩🏻","👩🏾‍❤️‍💋‍👩🏼","👩🏾‍❤️‍💋‍👩🏽","👩🏾‍❤️‍💋‍👩🏾","👩🏾‍❤️‍💋‍👩🏿","👩🏿‍❤️‍💋‍👩🏻","👩🏿‍❤️‍💋‍👩🏼","👩🏿‍❤️‍💋‍👩🏽","👩🏿‍❤️‍💋‍👩🏾","👩🏿‍❤️‍💋‍👩🏿",
+"💏","🧑🏻‍❤️‍💋‍🧑🏻","🧑🏻‍❤️‍💋‍🧑🏼","🧑🏻‍❤️‍💋‍🧑🏽","🧑🏻‍❤️‍💋‍🧑🏾","🧑🏻‍❤️‍💋‍🧑🏿","🧑🏼‍❤️‍💋‍🧑🏻","🧑🏼‍❤️‍💋‍🧑🏼","🧑🏼‍❤️‍💋‍🧑🏽","🧑🏼‍❤️‍💋‍🧑🏾","🧑🏼‍❤️‍💋‍🧑🏿","🧑🏽‍❤️‍💋‍🧑🏻","🧑🏽‍❤️‍💋‍🧑🏼","🧑🏽‍❤️‍💋‍🧑🏽","🧑🏽‍❤️‍💋‍🧑🏾","🧑🏽‍❤️‍💋‍🧑🏿","🧑🏾‍❤️‍💋‍🧑🏻","🧑🏾‍❤️‍💋‍🧑🏼","🧑🏾‍❤️‍💋‍🧑🏽","🧑🏾‍❤️‍💋‍🧑🏾","🧑🏾‍❤️‍💋‍🧑🏿","🧑🏿‍❤️‍💋‍🧑🏻","🧑🏿‍❤️‍💋‍🧑🏼","🧑🏿‍❤️‍💋‍🧑🏽","🧑🏿‍❤️‍💋‍🧑🏾","🧑🏿‍❤️‍💋‍🧑🏿",
+"👨‍❤️‍💋‍👨","👨🏻‍❤️‍💋‍👨🏻","👨🏻‍❤️‍💋‍👨🏼","👨🏻‍❤️‍💋‍👨🏽","👨🏻‍❤️‍💋‍👨🏾","👨🏻‍❤️‍💋‍👨🏿","👨🏼‍❤️‍💋‍👨🏻","👨🏼‍❤️‍💋‍👨🏼","👨🏼‍❤️‍💋‍👨🏽","👨🏼‍❤️‍💋‍👨🏾","👨🏼‍❤️‍💋‍👨🏿","👨🏽‍❤️‍💋‍👨🏻","👨🏽‍❤️‍💋‍👨🏼","👨🏽‍❤️‍💋‍👨🏽","👨🏽‍❤️‍💋‍👨🏾","👨🏽‍❤️‍💋‍👨🏿","👨🏾‍❤️‍💋‍👨🏻","👨🏾‍❤️‍💋‍👨🏼","👨🏾‍❤️‍💋‍👨🏽","👨🏾‍❤️‍💋‍👨🏾","👨🏾‍❤️‍💋‍👨🏿","👨🏿‍❤️‍💋‍👨🏻","👨🏿‍❤️‍💋‍👨🏼","👨🏿‍❤️‍💋‍👨🏽","👨🏿‍❤️‍💋‍👨🏾","👨🏿‍❤️‍💋‍👨🏿",
+"👨‍👩‍👦","👨‍👩‍👧","👨‍👩‍👧‍👦","👨‍👩‍👦‍👦","👨‍👩‍👧‍👧","👩‍👩‍👦","👩‍👩‍👧","👩‍👩‍👧‍👦","👩‍👩‍👦‍👦","👩‍👩‍👧‍👧","👨‍👨‍👦","👨‍👨‍👧","👨‍👨‍👧‍👦","👨‍👨‍👦‍👦","👨‍👨‍👧‍👧","👩‍👦","👩‍👧","👩‍👧‍👦","👩‍👦‍👦","👩‍👧‍👧","👨‍👦","👨‍👧","👨‍👧‍👦","👨‍👦‍👦","👨‍👧‍👧","🪢","🧶","🧵","🪡","🧥","🥼","🦺","👚","👕","👖","🩲","🩳","👔","👗","👙","🩱","👘","🥻","🩴","🥿","👠","👡","👢","👞","👟","🥾","🧦","🧤","🧣","🎩","🧢","👒","🎓","⛑","🪖","👑","💍","👝","👛","👜","💼","🎒","🧳","👓","🕶","🥽","🌂"
+
+
+"🐶","🐱","🐭","🐹","🐰","🦊","🐻","🐼","🐻‍❄️","🐨","🐯","🦁","🐮","🐷","🐽","🐸","🐵","🙈","🙉","🙊","🐒","🐔","🐧","🐦","🐤","🐣","🐥","🦆","🦅","🦉","🦇","🐺","🐗","🐴","🦄","🐝","🪱","🐛","🦋","🐌","🐞","🐜","🪰","🪲","🪳","🦟","🦗","🕷","🕸","🦂","🐢","🐍","🦎","🦖","🦕","🐙","🦑","🦐","🦞","🦀","🐡","🐠","🐟","🐬","🐳","🐋","🦈","🦭","🐊","🐅","🐆","🦓","🦍","🦧","🦣","🐘","🦛","🦏","🐪","🐫","🦒","🦘","🦬","🐃","🐂","🐄","🐎","🐖","🐏","🐑","🦙","🐐","🦌","🐕","🐩","🦮","🐕‍🦺","🐈","🐈‍⬛","🪶","🐓","🦃","🦤","🦚","🦜","🦢","🦩","🕊","🐇","🦝","🦨","🦡","🦫","🦦","🦥","🐁","🐀","🐿","🦔","🐾","🐉","🐲","🌵","🎄","🌲","🌳","🌴","🪵","🌱","🌿","☘️","🍀","🎍","🪴","🎋","🍃","🍂","🍁","🪺","🪹","🍄","🐚","🪸","🪨","🌾","💐","🌷","🌹","🥀","🪷","🌺","🌸","🌼","🌻","🌞","🌝","🌛","🌜","🌚","🌕","🌖","🌗","🌘","🌑","🌒","🌓","🌔","🌙","🌎","🌍","🌏","🪐","💫","⭐️","🌟","✨","⚡️","☄️","💥","🔥","🌪","🌈","☀️","🌤","⛅️","🌥","☁️","🌦","🌧","⛈","🌩","🌨","❄️","☃️","⛄️","🌬","💨","💧","💦","🫧","☔️","☂️","🌊","🌫"
+
+
+"🍏","🍎","🍐","🍊","🍋","🍌","🍉","🍇","🍓","🫐","🍈","🍒","🍑","🥭","🍍","🥥","🥝","🍅","🍆","🥑","🥦","🥬","🥒","🌶","🫑","🌽","🥕","🫒","🧄","🧅","🥔","🍠","🥐","🥯","🍞","🥖","🥨","🧀","🥚","🍳","🧈","🥞","🧇","🥓","🥩","🍗","🍖","🦴","🌭","🍔","🍟","🍕","🫓","🥪","🥙","🧆","🌮","🌯","🫔","🥗","🥘","🫕","🥫","🍝","🍜","🍲","🫙","🍛","🍣","🍱","🥟","🦪","🍤","🍙","🍚","🍘","🍥","🥠","🥮","🍢","🍡","🍧","🍨","🍦","🥧","🧁","🍰","🎂","🍮","🍭","🍬","🍫","🍿","🍩","🍪","🌰","🥜","🫘","🍯","🥛","🫗","🍼","🫖","☕️","🍵","🧃","🥤","🧋","🍶","🍺","🍻","🥂","🍷","🥃","🍸","🍹","🧉","🍾","🧊","🥄","🍴","🍽","🥣","🥡","🥢","🧂"
+
+
+"⚽️","🏀","🏈","⚾️","🥎","🎾","🏐","🏉","🥏","🎱","🪀","🏓","🏸","🏒","🏑","🥍","🏏","🪃","🥅","⛳️","🪁","🛝","🏹","🎣","🤿","🥊","🥋","🎽","🛹","🛼","🛷","⛸","🥌","🎿","⛷","🏂","🪂",
+"🏋️‍♀️","🏋🏻‍♀️","🏋🏼‍♀️","🏋🏽‍♀️","🏋🏾‍♀️","🏋🏿‍♀️",
+"🏋️","🏋🏻","🏋🏼","🏋🏽","🏋🏾","🏋🏿",
+"🏋️‍♂️","🏋🏻‍♂️","🏋🏼‍♂️","🏋🏽‍♂️","🏋🏾‍♂️","🏋🏿‍♂️",
+"🤼‍♀️","🤼","🤼‍♂️",
+"🤸‍♀️","🤸🏻‍♀️","🤸🏼‍♀️","🤸🏽‍♀️","🤸🏾‍♀️","🤸🏿‍♀️",
+"🤸","🤸🏻","🤸🏼","🤸🏽","🤸🏾","🤸🏿",
+"🤸‍♂️","🤸🏻‍♂️","🤸🏼‍♂️","🤸🏽‍♂️","🤸🏾‍♂️","🤸🏿‍♂️",
+"⛹️‍♀️","⛹🏻‍♀️","⛹🏼‍♀️","⛹🏽‍♀️","⛹🏾‍♀️","⛹🏿‍♀️",
+"⛹️","⛹🏻","⛹🏼","⛹🏽","⛹🏾","⛹🏿",
+"⛹️‍♂️","⛹🏻‍♂️","⛹🏼‍♂️","⛹🏽‍♂️","⛹🏾‍♂️","⛹🏿‍♂️",
+"🤺",
+"🤾‍♀️","🤾🏻‍♀️","🤾🏼‍♀️","🤾🏽‍♀️","🤾🏾‍♀️","🤾🏿‍♀️",
+"🤾","🤾🏻","🤾🏼","🤾🏽","🤾🏾","🤾🏿",
+"🤾‍♂️","🤾🏻‍♂️","🤾🏼‍♂️","🤾🏽‍♂️","🤾🏾‍♂️","🤾🏿‍♂️",
+"🏌️‍♀️","🏌🏻‍♀️","🏌🏼‍♀️","🏌🏽‍♀️","🏌🏾‍♀️","🏌🏿‍♀️",
+"🏌️","🏌🏻","🏌🏼","🏌🏽","🏌🏾","🏌🏿",
+"🏌️‍♂️","🏌🏻‍♂️","🏌🏼‍♂️","🏌🏽‍♂️","🏌🏾‍♂️","🏌🏿‍♂️",
+"🏇","🏇🏻","🏇🏼","🏇🏽","🏇🏾","🏇🏿",
+"🧘‍♀️","🧘🏻‍♀️","🧘🏼‍♀️","🧘🏽‍♀️","🧘🏾‍♀️","🧘🏿‍♀️",
+"🧘","🧘🏻","🧘🏼","🧘🏽","🧘🏾","🧘🏿",
+"🧘‍♂️","🧘🏻‍♂️","🧘🏼‍♂️","🧘🏽‍♂️","🧘🏾‍♂️","🧘🏿‍♂️",
+"🏄‍♀️","🏄🏻‍♀️","🏄🏼‍♀️","🏄🏽‍♀️","🏄🏾‍♀️","🏄🏿‍♀️",
+"🏄","🏄🏻","🏄🏼","🏄🏽","🏄🏾","🏄🏿",
+"🏄‍♂️","🏄🏻‍♂️","🏄🏼‍♂️","🏄🏽‍♂️","🏄🏾‍♂️","🏄🏿‍♂️",
+"🏊‍♀️","🏊🏻‍♀️","🏊🏼‍♀️","🏊🏽‍♀️","🏊🏾‍♀️","🏊🏿‍♀️",
+"🏊","🏊🏻","🏊🏼","🏊🏽","🏊🏾","🏊🏿",
+"🏊‍♂️","🏊🏻‍♂️","🏊🏼‍♂️","🏊🏽‍♂️","🏊🏾‍♂️","🏊🏿‍♂️",
+"🤽‍♀️","🤽🏻‍♀️","🤽🏼‍♀️","🤽🏽‍♀️","🤽🏾‍♀️","🤽🏿‍♀️",
+"🤽","🤽🏻","🤽🏼","🤽🏽","🤽🏾","🤽🏿",
+"🤽‍♂️","🤽🏻‍♂️","🤽🏼‍♂️","🤽🏽‍♂️","🤽🏾‍♂️","🤽🏿‍♂️",
+"🚣‍♀️","🚣🏻‍♀️","🚣🏼‍♀️","🚣🏽‍♀️","🚣🏾‍♀️","🚣🏿‍♀️",
+"🚣","🚣🏻","🚣🏼","🚣🏽","🚣🏾","🚣🏿",
+"🚣‍♂️","🚣🏻‍♂️","🚣🏼‍♂️","🚣🏽‍♂️","🚣🏾‍♂️","🚣🏿‍♂️",
+"🧗‍♀️","🧗🏻‍♀️","🧗🏼‍♀️","🧗🏽‍♀️","🧗🏾‍♀️","🧗🏿‍♀️",
+"🧗","🧗🏻","🧗🏼","🧗🏽","🧗🏾","🧗🏿",
+"🧗‍♂️","🧗🏻‍♂️","🧗🏼‍♂️","🧗🏽‍♂️","🧗🏾‍♂️","🧗🏿‍♂️",
+"🚵‍♀️","🚵🏻‍♀️","🚵🏼‍♀️","🚵🏽‍♀️","🚵🏾‍♀️","🚵🏿‍♀️",
+"🚵","🚵🏻","🚵🏼","🚵🏽","🚵🏾","🚵🏿",
+"🚵‍♂️","🚵🏻‍♂️","🚵🏼‍♂️","🚵🏽‍♂️","🚵🏾‍♂️","🚵🏿‍♂️",
+"🚴‍♀️","🚴🏻‍♀️","🚴🏼‍♀️","🚴🏽‍♀️","🚴🏾‍♀️","🚴🏿‍♀️",
+"🚴","🚴🏻","🚴🏼","🚴🏽","🚴🏾","🚴🏿",
+"🚴‍♂️","🚴🏻‍♂️","🚴🏼‍♂️","🚴🏽‍♂️","🚴🏾‍♂️","🚴🏿‍♂️",
+"🏆","🥇","🥈","🥉","🏅","🎖","🏵","🎗","🎫","🎟","🎪",
+"🤹‍♀️","🤹🏻‍♀️","🤹🏼‍♀️","🤹🏽‍♀️","🤹🏾‍♀️","🤹🏿‍♀️",
+"🤹","🤹🏻","🤹🏼","🤹🏽","🤹🏾","🤹🏿",
+"🤹‍♂️","🤹🏻‍♂️","🤹🏼‍♂️","🤹🏽‍♂️","🤹🏾‍♂️","🤹🏿‍♂️",
+"🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🎲","♟","🎯","🎳","🎮","🎰","🧩"
+
+
+"🚗","🚕","🚙","🚌","🚎","🏎","🚓","🚑","🚒","🚐","🛻","🚚","🚛","🚜","🦯","🦽","🦼","🩼","🛴","🚲","🛵","🏍","🛺","🛞","🚨","🚔","🚍","🚘","🚖","🚡","🚠","🚟","🚃","🚋","🚞","🚝","🚄","🚅","🚈","🚂","🚆","🚇","🚊","🚉","✈️","🛫","🛬","🛩","💺","🛰","🚀","🛸","🚁","🛶","⛵️","🚤","🛥","🛳","⛴","🚢","🛟","⚓️","🪝","⛽️","🚧","🚦","🚥","🚏","🗺","🗿","🗽","🗼","🏰","🏯","🏟","🎡","🎢","🎠","⛲️","⛱","🏖","🏝","🏜","🌋","⛰","🏔","🗻","🏕","⛺️","🛖","🏠","🏡","🏘","🏚","🏗","🏭","🏢","🏬","🏣","🏤","🏥","🏦","🏨","🏪","🏫","🏩","💒","🏛","⛪️","🕌","🕍","🛕","🕋","⛩","🛤","🛣","🗾","🎑","🏞","🌅","🌄","🌠","🎇","🎆","🌇","🌆","🏙","🌃","🌌","🌉","🌁"
+
+
+
+"⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🪫","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","🪪","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","🪬","💈","⚗️","🔭","🔬","🕳","🩻","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
+"🛀","🛀🏻","🛀🏼","🛀🏽","🛀🏾","🛀🏿",
+"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🪩","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
+
+
+
+"❤️","🧡","💛","💚","💙","💜","🖤","🤍","🤎","💔","❤️‍🔥","❤️‍🩹","❣️","💕","💞","💓","💗","💖","💘","💝","💟","☮️","✝️","☪️","🕉","☸️","✡️","🔯","🕎","☯️","☦️","🛐","⛎","♈️","♉️","♊️","♋️","♌️","♍️","♎️","♏️","♐️","♑️","♒️","♓️","🆔","⚛️","🉑","☢️","☣️","📴","📳","🈶","🈚️","🈸","🈺","🈷️","✴️","🆚","💮","🉐","㊙️","㊗️","🈴","🈵","🈹","🈲","🅰️","🅱️","🆎","🆑","🅾️","🆘","❌","⭕️","🛑","⛔️","📛","🚫","💯","💢","♨️","🚷","🚯","🚳","🚱","🔞","📵","🚭","❗️","❕","❓","❔","‼️","⁉️","🔅","🔆","〽️","⚠️","🚸","🔱","⚜️","🔰","♻️","✅","🈯️","💹","❇️","✳️","❎","🌐","💠","Ⓜ️","🌀","💤","🏧","🚾","♿️","🅿️","🛗","🈳","🈂️","🛂","🛃","🛄","🛅","🚹","🚺","🚼","⚧","🚻","🚮","🎦","📶","🈁","🔣","ℹ️","🔤","🔡","🔠","🆖","🆗","🆙","🆒","🆕","🆓","0️⃣","1️⃣","2️⃣","3️⃣","4️⃣","5️⃣","6️⃣","7️⃣","8️⃣","9️⃣","🔟","🔢","#️⃣","*️⃣","⏏️","▶️","⏸","⏯","⏹","⏺","⏭","⏮","⏩","⏪","⏫","⏬","◀️","🔼","🔽","➡️","⬅️","⬆️","⬇️","↗️","↘️","↙️","↖️","↕️","↔️","↪️","↩️","⤴️","⤵️","🔀","🔁","🔂","🔄","🔃","🎵","🎶","➕","➖","➗", "✖️", "🟰", "♾", "💲","💱","™️","©️","®️","👁‍🗨","🔚","🔙","🔛","🔝","🔜","〰️","➰","➿","✔️","☑️","🔘","🔴","🟠","🟡","🟢","🔵","🟣","⚫️","⚪️","🟤","🔺","🔻","🔸","🔹","🔶","🔷","🔳","🔲","▪️","▫️","◾️","◽️","◼️","◻️","🟥","🟧","🟨","🟩","🟦","🟪","⬛️","⬜️","🟫","🔈","🔇","🔉","🔊","🔔","🔕","📣","📢","💬","💭","🗯","♠️","♣️","♥️","♦️","🃏","🎴","🀄️","🕐","🕑","🕒","🕓","🕔","🕕","🕖","🕗","🕘","🕙","🕚","🕛","🕜","🕝","🕞","🕟","🕠","🕡","🕢","🕣","🕤","🕥","🕦","🕧"
+
+
+"🏳️","🏴","🏴‍☠️","🏁","🚩","🏳️‍🌈","🏳️‍⚧️","🇺🇳","🇦🇫","🇦🇽","🇦🇱","🇩🇿","🇦🇸","🇦🇩","🇦🇴","🇦🇮","🇦🇶","🇦🇬","🇦🇷","🇦🇲","🇦🇼","🇦🇺","🇦🇹","🇦🇿","🇧🇸","🇧🇭","🇧🇩","🇧🇧","🇧🇾","🇧🇪","🇧🇿","🇧🇯","🇧🇲","🇧🇹","🇧🇴","🇧🇦","🇧🇼","🇧🇷","🇻🇬","🇧🇳","🇧🇬","🇧🇫","🇧🇮","🇰🇭","🇨🇲","🇨🇦","🇮🇨","🇨🇻","🇧🇶","🇰🇾","🇨🇫","🇹🇩","🇮🇴","🇨🇱","🇨🇳","🇨🇽","🇨🇨","🇨🇴","🇰🇲","🇨🇬","🇨🇩","🇨🇰","🇨🇷","🇨🇮","🇭🇷","🇨🇺","🇨🇼","🇨🇾","🇨🇿","🇩🇰","🇩🇯","🇩🇲","🇩🇴","🇪🇨","🇪🇬","🇸🇻","🇬🇶","🇪🇷","🇪🇪","🇸🇿","🇪🇹","🇪🇺","🇫🇰","🇫🇴","🇫🇯","🇫🇮","🇫🇷","🇬🇫","🇵🇫","🇹🇫","🇬🇦","🇬🇲","🇬🇪","🇩🇪","🇬🇭","🇬🇮","🇬🇷","🇬🇱","🇬🇩","🇬🇵","🇬🇺","🇬🇹","🇬🇬","🇬🇳","🇬🇼","🇬🇾","🇭🇹","🇭🇳","🇭🇰","🇭🇺","🇮🇸","🇮🇳","🇮🇩","🇮🇷","🇮🇶","🇮🇪","🇮🇲","🇮🇱","🇮🇹","🇯🇲","🇯🇵","🎌","🇯🇪","🇯🇴","🇰🇿","🇰🇪","🇰🇮","🇽🇰","🇰🇼","🇰🇬","🇱🇦","🇱🇻","🇱🇧","🇱🇸","🇱🇷","🇱🇾","🇱🇮","🇱🇹","🇱🇺","🇲🇴","🇲🇬","🇲🇼","🇲🇾","🇲🇻","🇲🇱","🇲🇹","🇲🇭","🇲🇶","🇲🇷","🇲🇺","🇾🇹","🇲🇽","🇫🇲","🇲🇩","🇲🇨","🇲🇳","🇲🇪","🇲🇸","🇲🇦","🇲🇿","🇲🇲","🇳🇦","🇳🇷","🇳🇵","🇳🇱","🇳🇨","🇳🇿","🇳🇮","🇳🇪","🇳🇬","🇳🇺","🇳🇫","🇰🇵","🇲🇰","🇲🇵","🇳🇴","🇴🇲","🇵🇰","🇵🇼","🇵🇸","🇵🇦","🇵🇬","🇵🇾","🇵🇪","🇵🇭","🇵🇳","🇵🇱","🇵🇹","🇵🇷","🇶🇦","🇷🇪","🇷🇴","🇷🇺","🇷🇼","🇼🇸","🇸🇲","🇸🇹","🇸🇦","🇸🇳","🇷🇸","🇸🇨","🇸🇱","🇸🇬","🇸🇽","🇸🇰","🇸🇮","🇬🇸","🇸🇧","🇸🇴","🇿🇦","🇰🇷","🇸🇸","🇪🇸","🇱🇰","🇧🇱","🇸🇭","🇰🇳","🇱🇨","🇵🇲","🇻🇨","🇸🇩","🇸🇷","🇸🇪","🇨🇭","🇸🇾","🇹🇼","🇹🇯","🇹🇿","🇹🇭","🇹🇱","🇹🇬","🇹🇰","🇹🇴","🇹🇹","🇹🇳","🇹🇷","🇹🇲","🇹🇨","🇹🇻","🇺🇬","🇺🇦","🇦🇪","🇬🇧","🏴󠁧󠁢󠁥󠁮󠁧󠁿","🏴󠁧󠁢󠁳󠁣󠁴󠁿","🏴󠁧󠁢󠁷󠁬󠁳󠁿","🇺🇸","🇺🇾","🇻🇮","🇺🇿","🇻🇺","🇻🇦","🇻🇪","🇻🇳","🇼🇫","🇪🇭","🇾🇪","🇿🇲","🇿🇼"
+
+
+
+
+=========================================
+
+"😀","😃","😄","😁","😆","🥹","😅","😂","🤣","🥲","☺️","😊","😇","🙂","🙃","😉","😌","😍","🥰","😘","😗","😙","😚","😋","😛","😝","😜","🤪","🤨","🧐","🤓","😎","🥸","🤩","🥳","😏","😒","😞","😔","😟","😕","🙁","☹️","😣","😖","😫","😩","🥺","😢","😭","😤","😠","😡","🤬","🤯","😳","🥵","🥶","😶‍🌫️","😱","😨","😰","😥","😓","🤗","🤔","🫣","🤭","🫢","🫡","🤫","🫠","🤥","😶","🫥","😐","🫤","😑","😬","🙄","😯","😦","😧","😮","😲","🥱","😴","🤤","😪","😮‍💨","😵","😵‍💫","🤐","🥴","🤢","🤮","🤧","😷","🤒","🤕","🤑","🤠","😈","👿","👹","👺","🤡","💩","👻","💀","☠️","👽","👾","🤖","🎃","😺","😸","😹","😻","😼","😽","🙀","😿","😾",
+"🫶",
+"🤲",
+"👐",
+"🙌",
+"👏",
+"🤝",
+"👍",
+"👎",
+"👊",
+"✊",
+"🤛",
+"🤜",
+"🤞",
+"✌️",
+"🫰",
+"🤟",
+"🤘",
+"👌",
+"🤌",
+"🤏",
+"🫳",
+"🫴",
+"👈",
+"👉",
+"👆",
+"👇",
+"☝️",
+"✋",
+"🤚",
+"🖐",
+"🖖",
+"👋",
+"🤙",
+"🫲",
+"🫱",
+"💪",
+"🦾",
+"🖕",
+"✍️",
+"🙏",
+"🫵",
+"🦶",
+"🦵",
+"🦿","💄","💋","👄","🫦","🦷","👅",
+"👂",
+"🦻",
+"👃",
+"👣","👁","👀","🫀","🫁","🧠","🗣","👤","👥","🫂",
+"👶",
+"👧",
+"🧒",
+"👦",
+"👩",
+"🧑",
+"👨",
+"👩‍🦱",
+"🧑‍🦱",
+"👨‍🦱",
+"👩‍🦰",
+"🧑‍🦰",
+"👨‍🦰",
+"👱‍♀️",
+"👱",
+"👱‍♂️",
+"👩‍🦳",
+"🧑‍🦳",
+"👨‍🦳",
+"👩‍🦲",
+"🧑‍🦲",
+"👨‍🦲",
+"🧔‍♀️",
+"🧔",
+"🧔‍♂️",
+"👵",
+"🧓",
+"👴",
+"👲",
+"👳‍♀️",
+"👳",
+"👳‍♂️",
+"🧕",
+"👮‍♀️",
+"👮",
+"👮‍♂️",
+"👷‍♀️",
+"👷",
+"👷‍♂️",
+"💂‍♀️",
+"💂",
+"💂‍♂️",
+"🕵️‍♀️",
+"🕵️",
+"🕵️‍♂️",
+"👩‍⚕️",
+"🧑‍⚕️",
+"👨‍⚕️",
+"👩‍🌾",
+"🧑‍🌾",
+"👨‍🌾",
+"👩‍🍳",
+"🧑‍🍳",
+"👨‍🍳",
+"👩‍🎓",
+"🧑‍🎓",
+"👨‍🎓",
+"👩‍🎤",
+"🧑‍🎤",
+"👨‍🎤",
+"👩‍🏫",
+"🧑‍🏫",
+"👨‍🏫",
+"👩‍🏭",
+"🧑‍🏭",
+"👨‍🏭",
+"👩‍💻",
+"🧑‍💻",
+"👨‍💻",
+"👩‍💼",
+"🧑‍💼",
+"👨‍💼",
+"👩‍🔧",
+"🧑‍🔧",
+"👨‍🔧",
+"👩‍🔬",
+"🧑‍🔬",
+"👨‍🔬",
+"👩‍🎨",
+"🧑‍🎨",
+"👨‍🎨",
+"👩‍🚒",
+"🧑‍🚒",
+"👨‍🚒",
+"👩‍✈️",
+"🧑‍✈️",
+"👨‍✈️",
+"👩‍🚀",
+"🧑‍🚀",
+"👨‍🚀",
+"👩‍⚖️",
+"🧑‍⚖️",
+"👨‍⚖️",
+"👰‍♀️",
+"👰",
+"👰‍♂️",
+"🤵‍♀️",
+"🤵",
+"🤵‍♂️",
+"👸",
+"🫅",
+"🤴",
+"🥷",
+"🦸‍♀️",
+"🦸",
+"🦸‍♂️",
+"🦹‍♀️",
+"🦹",
+"🦹‍♂️",
+"🤶",
+"🧑‍🎄",
+"🎅",
+"🧙‍♀️",
+"🧙",
+"🧙‍♂️",
+"🧝‍♀️",
+"🧝",
+"🧝‍♂️",
+"🧌",
+"🧛‍♀️",
+"🧛",
+"🧛‍♂️",
+"🧟‍♀️","🧟","🧟‍♂️","🧞‍♀️","🧞","🧞‍♂️",
+"🧜‍♀️",
+"🧜",
+"🧜‍♂️",
+"🧚‍♀️",
+"🧚",
+"🧚‍♂️",
+"👼",
+"🤰",
+"🫄",
+"🫃",
+"🤱",
+"👩‍🍼",
+"🧑‍🍼",
+"👨‍🍼",
+"🙇‍♀️",
+"🙇",
+"🙇‍♂️",
+"💁‍♀️",
+"💁",
+"💁‍♂️",
+"🙅‍♀️",
+"🙅",
+"🙅‍♂️",
+"🙆‍♀️",
+"🙆",
+"🙆‍♂️",
+"🙋‍♀️",
+"🙋",
+"🙋‍♂️",
+"🧏‍♀️",
+"🧏",
+"🧏‍♂️",
+"🤦‍♀️",
+"🤦",
+"🤦‍♂️",
+"🤷‍♀️",
+"🤷",
+"🤷‍♂️",
+"🙎‍♀️",
+"🙎",
+"🙎‍♂️",
+"🙍‍♀️",
+"🙍",
+"🙍‍♂️",
+"💇‍♀️",
+"💇",
+"💇‍♂️",
+"💆‍♀️",
+"💆",
+"💆‍♂️",
+"🧖‍♀️",
+"🧖",
+"🧖‍♂️",
+"💅",
+"🤳",
+"💃",
+"🕺",
+"👯‍♀️","👯","👯‍♂️",
+"🕴",
+"👩‍🦽",
+"🧑‍🦽",
+"👨‍🦽",
+"👩‍🦼",
+"🧑‍🦼",
+"👨‍🦼",
+"🚶‍♀️",
+"🚶",
+"🚶‍♂️",
+"👩‍🦯",
+"🧑‍🦯",
+"👨‍🦯",
+"🧎‍♀️",
+"🧎",
+"🧎‍♂️",
+"🏃‍♀️",
+"🏃",
+"🏃‍♂️",
+"🧍‍♀️",
+"🧍",
+"🧍‍♂️",
+"👫",
+"👭",
+"👬",
+"👩‍❤️‍👨",
+"👩‍❤️‍👩",
+"💑",
+"👨‍❤️‍👨",
+"👩‍❤️‍💋‍👨",
+"👩‍❤️‍💋‍👩",
+"💏",
+"👨‍❤️‍💋‍👨",
+"👨‍👩‍👦","👨‍👩‍👧","👨‍👩‍👧‍👦","👨‍👩‍👦‍👦","👨‍👩‍👧‍👧","👩‍👩‍👦","👩‍👩‍👧","👩‍👩‍👧‍👦","👩‍👩‍👦‍👦","👩‍👩‍👧‍👧","👨‍👨‍👦","👨‍👨‍👧","👨‍👨‍👧‍👦","👨‍👨‍👦‍👦","👨‍👨‍👧‍👧","👩‍👦","👩‍👧","👩‍👧‍👦","👩‍👦‍👦","👩‍👧‍👧","👨‍👦","👨‍👧","👨‍👧‍👦","👨‍👦‍👦","👨‍👧‍👧","🪢","🧶","🧵","🪡","🧥","🥼","🦺","👚","👕","👖","🩲","🩳","👔","👗","👙","🩱","👘","🥻","🩴","🥿","👠","👡","👢","👞","👟","🥾","🧦","🧤","🧣","🎩","🧢","👒","🎓","⛑","🪖","👑","💍","👝","👛","👜","💼","🎒","🧳","👓","🕶","🥽","🌂"
+
+
+"⚽️","🏀","🏈","⚾️","🥎","🎾","🏐","🏉","🥏","🎱","🪀","🏓","🏸","🏒","🏑","🥍","🏏","🪃","🥅","⛳️","🪁","🏹","🎣","🤿","🥊","🥋","🎽","🛹","🛼","🛷","⛸","🥌","🎿","⛷","🏂","🪂",
+"🏋️‍♀️",
+"🏋️",
+"🏋️‍♂️",
+"🤼‍♀️","🤼","🤼‍♂️",
+"🤸‍♀️",
+"🤸",
+"🤸‍♂️",
+"⛹️‍♀️",
+"⛹️",
+"⛹️‍♂️",
+"🤺",
+"🤾‍♀️",
+"🤾",
+"🤾‍♂️",
+"🏌️‍♀️",
+"🏌️",
+"🏌️‍♂️",
+"🏇",
+"🧘‍♀️",
+"🧘",
+"🧘‍♂️",
+"🏄‍♀️",
+"🏄",
+"🏄‍♂️",
+"🏊‍♀️",
+"🏊",
+"🏊‍♂️",
+"🤽‍♀️",
+"🤽",
+"🤽‍♂️",
+"🚣‍♀️",
+"🚣",
+"🚣‍♂️",
+"🧗‍♀️",
+"🧗",
+"🧗‍♂️",
+"🚵‍♀️",
+"🚵",
+"🚵‍♂️",
+"🚴‍♀️",
+"🚴",
+"🚴‍♂️",
+"🏆","🥇","🥈","🥉","🏅","🎖","🏵","🎗","🎫","🎟","🎪",
+"🤹‍♀️",
+"🤹",
+"🤹‍♂️",
+"🎭","🩰","🎨","🎬","🎤","🎧","🎼","🎹","🥁","🪘","🎷","🎺","🪗","🎸","🪕","🎻","🎲","♟","🎯","🎳","🎮","🎰","🧩"
+
+
+
+
+"⌚️","📱","📲","💻","⌨️","🖥","🖨","🖱","🖲","🕹","🗜","💽","💾","💿","📀","📼","📷","📸","📹","🎥","📽","🎞","📞","☎️","📟","📠","📺","📻","🎙","🎚","🎛","🧭","⏱","⏲","⏰","🕰","⌛️","⏳","📡","🔋","🪫","🔌","💡","🔦","🕯","🪔","🧯","🛢","💸","💵","💴","💶","💷","🪙","💰","💳","🪪","💎","⚖️","🪜","🧰","🪛","🔧","🔨","⚒","🛠","⛏","🪚","🔩","⚙️","🪤","🧱","⛓","🧲","🔫","💣","🧨","🪓","🔪","🗡","⚔️","🛡","🚬","⚰️","🪦","⚱️","🏺","🔮","📿","🧿","🪬","💈","⚗️","🔭","🔬","🕳","🩻","🩹","🩺","💊","💉","🩸","🧬","🦠","🧫","🧪","🌡","🧹","🪠","🧺","🧻","🚽","🚰","🚿","🛁",
+"🛀",
+"🧼","🪥","🪒","🧽","🪣","🧴","🛎","🔑","🗝","🚪","🪑","🛋","🛏","🛌","🧸","🪆","🖼","🪞","🪟","🛍","🛒","🎁","🎈","🎏","🎀","🪄","🪅","🎊","🎉","🎎","🏮","🎐","🪩","🧧","✉️","📩","📨","📧","💌","📥","📤","📦","🏷","🪧","📪","📫","📬","📭","📮","📯","📜","📃","📄","📑","🧾","📊","📈","📉","🗒","🗓","📆","📅","🗑","📇","🗃","🗳","🗄","📋","📁","📂","🗂","🗞","📰","📓","📔","📒","📕","📗","📘","📙","📚","📖","🔖","🧷","🔗","📎","🖇","📐","📏","🧮","📌","📍","✂️","🖊","🖋","✒️","🖌","🖍","📝","✏️","🔍","🔎","🔏","🔐","🔒","🔓"
+
+
+
+=========================================
+"🫶","🤲","👐","🙌","👏","👍","👎","👊","✊","🤛","🤜","🤞","✌️","🫰","🤟","🤘","👌","🤌","🤏","🫳","🫴","👈","👉","👆","👇","☝️","✋","🤚","🖐","🖖","👋","🤙","🫲","🫱","💪","🖕","✍️","🙏","🫵","🦶","🦵","👂","🦻","👃","👶","👧","🧒","👦","👩","🧑","👨","👩‍🦱","🧑‍🦱","👨‍🦱","👩‍🦰","🧑‍🦰","👨‍🦰","👱‍♀️","👱","👱‍♂️","👩‍🦳","🧑‍🦳","👨‍🦳","👩‍🦲","🧑‍🦲","👨‍🦲","🧔‍♀️","🧔","🧔‍♂️","👵","🧓","👴","👲","👳‍♀️","👳","👳‍♂️","🧕","👮‍♀️","👮","👮‍♂️","👷‍♀️","👷","👷‍♂️","💂‍♀️","💂","💂‍♂️","🕵️‍♀️","🕵️","🕵️‍♂️","👩‍⚕️","🧑‍⚕️","👨‍⚕️","👩‍🌾","🧑‍🌾","👨‍🌾","👩‍🍳","🧑‍🍳","👨‍🍳","👩‍🎓","🧑‍🎓","👨‍🎓","👩‍🎤","🧑‍🎤","👨‍🎤","👩‍🏫","🧑‍🏫","👨‍🏫","👩‍🏭","🧑‍🏭","👨‍🏭","👩‍💻","🧑‍💻","👨‍💻","👩‍💼","🧑‍💼","👨‍💼","👩‍🔧","🧑‍🔧","👨‍🔧","👩‍🔬","🧑‍🔬","👨‍🔬","👩‍🎨","🧑‍🎨","👨‍🎨","👩‍🚒","🧑‍🚒","👨‍🚒","👩‍✈️","🧑‍✈️","👨‍✈️","👩‍🚀","🧑‍🚀","👨‍🚀","👩‍⚖️","🧑‍⚖️","👨‍⚖️","👰‍♀️","👰","👰‍♂️","🤵‍♀️","🤵","🤵‍♂️","👸","🫅","🤴","🥷","🦸‍♀️","🦸","🦸‍♂️","🦹‍♀️","🦹","🦹‍♂️","🤶","🧑‍🎄","🎅","🧙‍♀️","🧙","🧙‍♂️","🧝‍♀️","🧝","🧝‍♂️","🧛‍♀️","🧛","🧛‍♂️","🧜‍♀️","🧜","🧜‍♂️","🧚‍♀️","🧚","🧚‍♂️","👼","🤰","🫄","🫃","🤱","👩‍🍼","🧑‍🍼","👨‍🍼","🙇‍♀️","🙇","🙇‍♂️","💁‍♀️","💁","💁‍♂️","🙅‍♀️","🙅","🙅‍♂️","🙆‍♀️","🙆","🙆‍♂️","🙋‍♀️","🙋","🙋‍♂️","🧏‍♀️","🧏","🧏‍♂️","🤦‍♀️","🤦","🤦‍♂️","🤷‍♀️","🤷","🤷‍♂️","🙎‍♀️","🙎","🙎‍♂️","🙍‍♀️","🙍","🙍‍♂️","💇‍♀️","💇","💇‍♂️","💆‍♀️","💆","💆‍♂️","🧖‍♀️","🧖","🧖‍♂️","💅","🤳","💃","🕺","🕴","👩‍🦽","🧑‍🦽","👨‍🦽","👩‍🦼","🧑‍🦼","👨‍🦼","🚶‍♀️","🚶","🚶‍♂️","👩‍🦯","🧑‍🦯","👨‍🦯","🧎‍♀️","🧎","🧎‍♂️","🏃‍♀️","🏃","🏃‍♂️","🧍‍♀️","🧍","🧍‍♂️","🏋️‍♀️","🏋️","🏋️‍♂️","🤸‍♀️","🤸","🤸‍♂️","⛹️‍♀️","⛹️","⛹️‍♂️","🤾‍♀️","🤾","🤾‍♂️","🏌️‍♀️","🏌️","🏌️‍♂️","🏇","🧘‍♀️","🧘","🧘‍♂️","🏄‍♀️","🏄","🏄‍♂️","🏊‍♀️","🏊","🏊‍♂️","🤽‍♀️","🤽","🤽‍♂️","🚣‍♀️","🚣","🚣‍♂️","🧗‍♀️","🧗","🧗‍♂️","🚵‍♀️","🚵","🚵‍♂️","🚴‍♀️","🚴","🚴‍♂️","🤹‍♀️","🤹","🤹‍♂️","🛀"
+
+
+"🤝","👫","👭","👬","👩‍❤️‍👨","👩‍❤️‍👩","💑","👨‍❤️‍👨","👩‍❤️‍💋‍👨","👩‍❤️‍💋‍👩","💏","👨‍❤️‍💋‍👨"
+
+=========================================
+
+
+"🗨", "👪"
\ No newline at end of file
diff --git a/ui/emoji_config.cpp b/ui/emoji_config.cpp
index 1106e0d..49f29e9 100644
--- a/ui/emoji_config.cpp
+++ b/ui/emoji_config.cpp
@@ -31,7 +31,7 @@ constexpr auto kUniversalSize = 72;
 constexpr auto kImagesPerRow = 32;
 constexpr auto kImageRowsPerSprite = 16;
 
-constexpr auto kSetVersion = uint32(4);
+constexpr auto kSetVersion = uint32(5);
 constexpr auto kCacheVersion = uint32(7);
 constexpr auto kMaxId = uint32(1 << 8);
 

From 88423818f8b8cbb5b0914f72caccba6019bd6935 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Sep 2023 22:50:27 +0400
Subject: [PATCH 502/635] Fix build with Xcode.

---
 ui/layers/box_layer_widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index 4798162..ad8b6f9 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -42,9 +42,10 @@ BoxLayerWidget::BoxLayerWidget(
 	_content->setParent(this);
 	_content->setDelegate(this);
 
+	const auto &object = *_content;
 	base::Integration::Instance().setCrashAnnotation(
 		"BoxName",
-		QString::fromUtf8(typeid(*_content).name()));
+		QString::fromUtf8(typeid(object).name()));
 
 	_additionalTitle.changes(
 	) | rpl::start_with_next([=] {

From caff63f28434e295ba274008f1f0fea1ffb25728 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 21 Sep 2023 08:11:32 +0400
Subject: [PATCH 503/635] Get Wayland window menu out of
 DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION

---
 .../linux/ui_linux_wayland_integration.cpp    | 26 ------
 .../linux/ui_linux_wayland_integration.h      |  3 -
 .../ui_linux_wayland_integration_dummy.cpp    |  5 --
 ui/platform/linux/ui_utility_linux.cpp        | 89 +++++++++++++++++--
 4 files changed, 82 insertions(+), 41 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index b44df9e..b9436be 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -20,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 using namespace QNativeInterface;
 using namespace QNativeInterface::Private;
 using namespace base::Platform::Wayland;
-struct xdg_toplevel;
 
 namespace Ui {
 namespace Platform {
@@ -83,30 +82,5 @@ bool WaylandIntegration::xdgDecorationSupported() {
 	return _private->xdgDecoration.has_value();
 }
 
-void WaylandIntegration::showWindowMenu(
-		not_null<QWidget*> widget,
-		const QPoint &point) {
-	const auto window = not_null(widget->windowHandle());
-	const auto native = qApp->nativeInterface<QWaylandApplication>();
-	const auto nativeWindow = window->nativeInterface<QWaylandWindow>();
-	if (!native || !nativeWindow) {
-		return;
-	}
-
-	const auto toplevel = nativeWindow->surfaceRole<xdg_toplevel>();
-	const auto seat = native->lastInputSeat();
-	if (!toplevel || !seat) {
-		return;
-	}
-
-	wl_proxy_marshal(
-		reinterpret_cast<wl_proxy*>(toplevel),
-		4, // XDG_TOPLEVEL_SHOW_WINDOW_MENU
-		seat,
-		native->lastInputSerial(),
-		point.x(),
-		point.y());
-}
-
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/linux/ui_linux_wayland_integration.h b/ui/platform/linux/ui_linux_wayland_integration.h
index 7d13631..62f1610 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.h
+++ b/ui/platform/linux/ui_linux_wayland_integration.h
@@ -7,8 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-class QWindow;
-
 namespace Ui {
 namespace Platform {
 
@@ -20,7 +18,6 @@ public:
 	[[nodiscard]] static WaylandIntegration *Instance();
 
 	[[nodiscard]] bool xdgDecorationSupported();
-	void showWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 private:
 	struct Private;
diff --git a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
index 171fc48..04f2a16 100644
--- a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
@@ -30,10 +30,5 @@ bool WaylandIntegration::xdgDecorationSupported() {
 	return false;
 }
 
-void WaylandIntegration::showWindowMenu(
-		not_null<QWidget*> widget,
-		const QPoint &point) {
-}
-
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index da9fb4b..8a3cf9c 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -7,8 +7,8 @@
 #include "ui/platform/linux/ui_utility_linux.h"
 
 #include "base/platform/base_platform_info.h"
+#include "base/platform/linux/base_linux_library.h"
 #include "base/call_delayed.h"
-#include "ui/platform/linux/ui_linux_wayland_integration.h"
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xcb_utilities.h"
@@ -19,6 +19,27 @@
 #include <QtWidgets/QApplication>
 #include <qpa/qplatformwindow_p.h>
 
+extern "C" {
+
+typedef int32_t wl_fixed_t;
+struct wl_object;
+struct wl_array;
+struct wl_proxy;
+struct xdg_toplevel;
+
+union wl_argument {
+	int32_t i;           /**< `int`    */
+	uint32_t u;          /**< `uint`   */
+	wl_fixed_t f;        /**< `fixed`  */
+	const char *s;       /**< `string` */
+	struct wl_object *o; /**< `object` */
+	uint32_t n;          /**< `new_id` */
+	struct wl_array *a;  /**< `array`  */
+	int32_t h;           /**< `fd`     */
+};
+
+}
+
 namespace Ui {
 namespace Platform {
 namespace {
@@ -396,6 +417,54 @@ void ShowXCBWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 }
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+void ShowWaylandWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
+	static const auto wl_proxy_marshal_array = [] {
+		void (*result)(
+			struct wl_proxy *p,
+			uint32_t opcode,
+			union wl_argument *args) = nullptr;
+
+		if (const auto lib = base::Platform::LoadLibrary(
+				"libwayland-client.so.0",
+				RTLD_NODELETE)) {
+			base::Platform::LoadSymbol(lib, "wl_proxy_marshal_array", result);
+		}
+
+		return result;
+	}();
+
+	if (!wl_proxy_marshal_array) {
+		return;
+	}
+
+	using namespace QNativeInterface;
+	using namespace QNativeInterface::Private;
+	const auto window = not_null(widget->windowHandle());
+	const auto native = qApp->nativeInterface<QWaylandApplication>();
+	const auto nativeWindow = window->nativeInterface<QWaylandWindow>();
+	if (!native || !nativeWindow) {
+		return;
+	}
+
+	const auto toplevel = nativeWindow->surfaceRole<xdg_toplevel>();
+	const auto seat = native->lastInputSeat();
+	if (!toplevel || !seat) {
+		return;
+	}
+
+	wl_proxy_marshal_array(
+		reinterpret_cast<wl_proxy*>(toplevel),
+		4, // XDG_TOPLEVEL_SHOW_WINDOW_MENU
+		std::array{
+			wl_argument{ .o = reinterpret_cast<wl_object*>(seat) },
+			wl_argument{ .u = native->lastInputSerial() },
+			wl_argument{ .i = point.x() },
+			wl_argument{ .i = point.y() },
+		}.data());
+}
+#endif // Qt >= 6.5.0
+
 } // namespace
 
 bool IsApplicationActive() {
@@ -527,13 +596,19 @@ void UnsetWindowMargins(not_null<QWidget*> widget) {
 }
 
 void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
-	if (const auto integration = WaylandIntegration::Instance()) {
-		integration->showWindowMenu(widget, point);
-	} else if (::Platform::IsX11()) {
-#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
-		ShowXCBWindowMenu(widget, point);
-#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+	if (::Platform::IsWayland()) {
+		ShowWaylandWindowMenu(widget, point);
+		return;
 	}
+#endif // Qt >= 6.5.0
+
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+	if (::Platform::IsX11()) {
+		ShowXCBWindowMenu(widget, point);
+		return;
+	}
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 }
 
 void RegisterChildPopupHiding() {

From f317f20ac831c9564575f9ce6f0d3f8b40aa4c90 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 21 Sep 2023 12:36:32 +0400
Subject: [PATCH 504/635] Try to allow native window frame on Wayland for
 everyone

---
 CMakeLists.txt                                | 19 ----
 .../linux/ui_linux_wayland_integration.cpp    | 86 -------------------
 .../linux/ui_linux_wayland_integration.h      | 28 ------
 .../ui_linux_wayland_integration_dummy.cpp    | 34 --------
 ui/platform/linux/ui_window_linux.cpp         |  5 --
 5 files changed, 172 deletions(-)
 delete mode 100644 ui/platform/linux/ui_linux_wayland_integration.cpp
 delete mode 100644 ui/platform/linux/ui_linux_wayland_integration.h
 delete mode 100644 ui/platform/linux/ui_linux_wayland_integration_dummy.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e335b76..3323a52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,9 +107,6 @@ PRIVATE
     ui/paint/blobs.h
     ui/paint/blobs_linear.cpp
     ui/paint/blobs_linear.h
-    ui/platform/linux/ui_linux_wayland_integration.cpp
-    ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
-    ui/platform/linux/ui_linux_wayland_integration.h
     ui/platform/linux/ui_window_linux.cpp
     ui/platform/linux/ui_window_linux.h
     ui/platform/linux/ui_window_title_linux.cpp
@@ -309,22 +306,6 @@ if (WIN32)
     nuget_add_winrt(lib_ui)
 endif()
 
-if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-    remove_target_sources(lib_ui ${src_loc} ui/platform/linux/ui_linux_wayland_integration.cpp)
-elseif(LINUX)
-    remove_target_sources(lib_ui ${src_loc} ui/platform/linux/ui_linux_wayland_integration_dummy.cpp)
-
-    qt_generate_wayland_protocol_client_sources(lib_ui
-    FILES
-        ${third_party_loc}/wayland/protocol/wayland.xml
-    )
-
-    target_link_libraries(lib_ui
-    PUBLIC
-        desktop-app::external_wayland_client
-    )
-endif()
-
 target_include_directories(lib_ui
 PUBLIC
     ${src_loc}
diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
deleted file mode 100644
index b9436be..0000000
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "ui/platform/linux/ui_linux_wayland_integration.h"
-
-#include "base/platform/linux/base_linux_wayland_utilities.h"
-#include "base/platform/base_platform_info.h"
-#include "base/qt_signal_producer.h"
-
-#include <QtGui/QGuiApplication>
-#include <QtGui/QWindow>
-#include <qpa/qplatformnativeinterface.h>
-#include <qpa/qplatformwindow_p.h>
-#include <qwayland-wayland.h>
-
-using namespace QNativeInterface;
-using namespace QNativeInterface::Private;
-using namespace base::Platform::Wayland;
-
-namespace Ui {
-namespace Platform {
-
-struct WaylandIntegration::Private : public AutoDestroyer<QtWayland::wl_registry> {
-	std::optional<uint32_t> xdgDecoration;
-
-protected:
-	void registry_global(
-			uint32_t name,
-			const QString &interface,
-			uint32_t version) override {
-		if (interface == qstr("zxdg_decoration_manager_v1")) {
-			xdgDecoration = name;
-		}
-	}
-
-	void registry_global_remove(uint32_t name) override {
-		if (xdgDecoration && name == *xdgDecoration) {
-			xdgDecoration = std::nullopt;
-		}
-	}
-};
-
-WaylandIntegration::WaylandIntegration()
-: _private(std::make_unique<Private>()) {
-	const auto native = qApp->nativeInterface<QWaylandApplication>();
-	if (!native) {
-		return;
-	}
-
-	const auto display = native->display();
-	if (!display) {
-		return;
-	}
-
-	_private->init(wl_display_get_registry(display));
-	wl_display_roundtrip(display);
-}
-
-WaylandIntegration::~WaylandIntegration() = default;
-
-WaylandIntegration *WaylandIntegration::Instance() {
-	if (!::Platform::IsWayland()) return nullptr;
-	static std::optional<WaylandIntegration> instance(std::in_place);
-	[[maybe_unused]] static const auto Inited = [] {
-		base::qt_signal_producer(
-			QGuiApplication::platformNativeInterface(),
-			&QObject::destroyed
-		) | rpl::start_with_next([] {
-			instance = std::nullopt;
-		}, instance->_private->lifetime());
-		return true;
-	}();
-	if (!instance) return nullptr;
-	return &*instance;
-}
-
-bool WaylandIntegration::xdgDecorationSupported() {
-	return _private->xdgDecoration.has_value();
-}
-
-} // namespace Platform
-} // namespace Ui
diff --git a/ui/platform/linux/ui_linux_wayland_integration.h b/ui/platform/linux/ui_linux_wayland_integration.h
deleted file mode 100644
index 62f1610..0000000
--- a/ui/platform/linux/ui_linux_wayland_integration.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-namespace Ui {
-namespace Platform {
-
-class WaylandIntegration {
-public:
-	WaylandIntegration();
-	~WaylandIntegration();
-
-	[[nodiscard]] static WaylandIntegration *Instance();
-
-	[[nodiscard]] bool xdgDecorationSupported();
-
-private:
-	struct Private;
-	const std::unique_ptr<Private> _private;
-};
-
-} // namespace Platform
-} // namespace Ui
diff --git a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
deleted file mode 100644
index 04f2a16..0000000
--- a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "ui/platform/linux/ui_linux_wayland_integration.h"
-
-#include "base/platform/base_platform_info.h"
-
-namespace Ui {
-namespace Platform {
-
-struct WaylandIntegration::Private {
-};
-
-WaylandIntegration::WaylandIntegration() {
-}
-
-WaylandIntegration::~WaylandIntegration() = default;
-
-WaylandIntegration *WaylandIntegration::Instance() {
-	if (!::Platform::IsWayland()) return nullptr;
-	static WaylandIntegration instance;
-	return &instance;
-}
-
-bool WaylandIntegration::xdgDecorationSupported() {
-	return false;
-}
-
-} // namespace Platform
-} // namespace Ui
diff --git a/ui/platform/linux/ui_window_linux.cpp b/ui/platform/linux/ui_window_linux.cpp
index a0b9cad..7a3aa25 100644
--- a/ui/platform/linux/ui_window_linux.cpp
+++ b/ui/platform/linux/ui_window_linux.cpp
@@ -6,8 +6,6 @@
 //
 #include "ui/platform/linux/ui_window_linux.h"
 
-#include "ui/platform/linux/ui_linux_wayland_integration.h"
-
 namespace Ui {
 namespace Platform {
 
@@ -17,9 +15,6 @@ std::unique_ptr<BasicWindowHelper> CreateSpecialWindowHelper(
 }
 
 bool NativeWindowFrameSupported() {
-	if (const auto integration = WaylandIntegration::Instance()) {
-		return integration->xdgDecorationSupported();
-	}
 	return true;
 }
 

From a33bd4e0a590fb08f0055b6e859ce84db11eb843 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 21 Sep 2023 23:27:56 +0400
Subject: [PATCH 505/635] Fix QApplicationPrivate::translateRawTouchEvent Qt
 version check

---
 ui/widgets/popup_menu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 5a6884e..5ce70cf 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -655,14 +655,14 @@ bool PopupMenu::eventFilter(QObject *o, QEvent *e) {
 					event->device(),
 					event->touchPoints(),
 					event->timestamp()));
-#elif QT_VERSION < QT_VERSION_CHECK(6, 3, 0) // Qt < 6.0.0
+#elif QT_VERSION < QT_VERSION_CHECK(6, 2, 0) // Qt < 6.0.0
 			e->setAccepted(
 				QApplicationPrivate::translateRawTouchEvent(
 					this,
 					event->pointingDevice(),
 					const_cast<QList<QEventPoint> &>(event->points()),
 					event->timestamp()));
-#else // Qt < 6.3.0
+#else // Qt < 6.2.0
 			e->setAccepted(
 				QApplicationPrivate::translateRawTouchEvent(this, event));
 #endif

From 68b43db05de732df563caf297b882df4ffa387dc Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 22 Sep 2023 04:22:15 +0400
Subject: [PATCH 506/635] Minimize amount of code to rebuild when switching
 options

---
 CMakeLists.txt                      |  6 ++++--
 ui/style/style_core_custom_font.cpp |  6 +++---
 ui/style/style_core_font.cpp        | 14 +++++++-------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3323a52..9038739 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,7 @@ PRIVATE
     ui/colors.palette
     emoji_suggestions/emoji_autocomplete.json
 
+    fonts/fonts.qrc
     qt_conf/win.qrc
 
     ui/dpr/dpr_icon.cpp
@@ -298,8 +299,9 @@ PRIVATE
     emoji_suggestions/emoji_suggestions_helper.h
 )
 
-if (NOT DESKTOP_APP_USE_PACKAGED_FONTS)
-    nice_target_sources(lib_ui ${src_loc} PRIVATE fonts/fonts.qrc)
+if (DESKTOP_APP_USE_PACKAGED_FONTS)
+    target_compile_definitions(lib_ui PRIVATE LIB_UI_USE_PACKAGED_FONTS)
+    remove_target_sources(lib_ui ${src_loc} fonts/fonts.qrc)
 endif()
 
 if (WIN32)
diff --git a/ui/style/style_core_custom_font.cpp b/ui/style/style_core_custom_font.cpp
index 8f42baf..0ad0fdf 100644
--- a/ui/style/style_core_custom_font.cpp
+++ b/ui/style/style_core_custom_font.cpp
@@ -52,11 +52,11 @@ QFont ResolveFont(const QString &familyOverride, uint32 flags, int size) {
 	} else {
 		result.setFamily(GetFontOverride(flags));
 		if (bold) {
-#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
+#ifdef LIB_UI_USE_PACKAGED_FONTS
 			result.setWeight(QFont::DemiBold);
-#else // DESKTOP_APP_USE_PACKAGED_FONTS
+#else // LIB_UI_USE_PACKAGED_FONTS
 			result.setBold(true);
-#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
+#endif // !LIB_UI_USE_PACKAGED_FONTS
 
 			if (flags & FontItalic) {
 				result.setStyleName("Semibold Italic");
diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index 4ed7089..8e067ca 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -29,9 +29,9 @@ void style_InitFontsResource() {
 
 #else // Q_OS_MAC
 
-#ifndef DESKTOP_APP_USE_PACKAGED_FONTS
+#ifndef LIB_UI_USE_PACKAGED_FONTS
 	Q_INIT_RESOURCE(fonts);
-#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
+#endif // !LIB_UI_USE_PACKAGED_FONTS
 #ifdef Q_OS_WIN
 	Q_INIT_RESOURCE(win);
 #endif // Q_OS_WIN
@@ -127,7 +127,7 @@ enum {
 
 	FontTypesCount,
 };
-#ifndef DESKTOP_APP_USE_PACKAGED_FONTS
+#ifndef LIB_UI_USE_PACKAGED_FONTS
 QString FontTypeFiles[FontTypesCount] = {
 	"DAOpenSansRegular",
 	"DAOpenSansRegularItalic",
@@ -160,7 +160,7 @@ QString FontTypePersianFallback[FontTypesCount] = {
 	"DAVazirMedium",
 	"DAVazirMedium",
 };
-#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
+#endif // !LIB_UI_USE_PACKAGED_FONTS
 int32 FontTypeFlags[FontTypesCount] = {
 	0,
 	FontItalic,
@@ -183,7 +183,7 @@ void StartFonts() {
 
 	style_InitFontsResource();
 
-#ifndef DESKTOP_APP_USE_PACKAGED_FONTS
+#ifndef LIB_UI_USE_PACKAGED_FONTS
 	[[maybe_unused]] bool areGood[FontTypesCount] = { false };
 	for (auto i = 0; i != FontTypesCount; ++i) {
 		const auto file = FontTypeFiles[i];
@@ -227,11 +227,11 @@ void StartFonts() {
 		QFont::insertSubstitutions(name, list);
 	}
 #endif // Q_OS_MAC
-#elif __has_include(<glib.h>) // !DESKTOP_APP_USE_PACKAGED_FONTS
+#elif __has_include(<glib.h>) // !LIB_UI_USE_PACKAGED_FONTS
 	g_warning(
 		"Unable to load patched fonts with Qt workarounds, "
 		"expect font issues.");
-#endif // DESKTOP_APP_USE_PACKAGED_FONTS
+#endif // LIB_UI_USE_PACKAGED_FONTS
 
 	auto appFont = QApplication::font();
 	appFont.setStyleStrategy(QFont::PreferQuality);

From b361d6151c31bd67be757706dc10bcefafb49cf2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 22 Sep 2023 04:48:27 +0400
Subject: [PATCH 507/635] Fix unused warnings with
 DESKTOP_APP_USE_PACKAGED_FONTS

---
 ui/style/style_core_font.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index 8e067ca..a10d43a 100644
--- a/ui/style/style_core_font.cpp
+++ b/ui/style/style_core_font.cpp
@@ -71,6 +71,7 @@ bool ValidateFont(const QString &familyName, int flags = 0) {
 	return true;
 }
 
+#ifndef LIB_UI_USE_PACKAGED_FONTS
 bool LoadCustomFont(const QString &filePath, const QString &familyName, int flags = 0) {
 	auto regularId = QFontDatabase::addApplicationFont(filePath);
 	if (regularId < 0) {
@@ -94,6 +95,7 @@ bool LoadCustomFont(const QString &filePath, const QString &familyName, int flag
 
 	return ValidateFont(familyName, flags);
 }
+#endif // !LIB_UI_USE_PACKAGED_FONTS
 
 [[nodiscard]] QString SystemMonospaceFont() {
 	const auto type = QFontDatabase::FixedFont;
@@ -160,7 +162,6 @@ QString FontTypePersianFallback[FontTypesCount] = {
 	"DAVazirMedium",
 	"DAVazirMedium",
 };
-#endif // !LIB_UI_USE_PACKAGED_FONTS
 int32 FontTypeFlags[FontTypesCount] = {
 	0,
 	FontItalic,
@@ -169,6 +170,7 @@ int32 FontTypeFlags[FontTypesCount] = {
 	FontSemibold,
 	FontSemibold | FontItalic,
 };
+#endif // !LIB_UI_USE_PACKAGED_FONTS
 
 bool Started = false;
 QString Overrides[FontTypesCount];

From d3ac9dcf97494aa1acfbfd8b6c0a3f57950e4962 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 22 Sep 2023 01:09:01 +0400
Subject: [PATCH 508/635] Add a warning for patching lovers

---
 ui/rp_widget.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index 3301c9f..a911a66 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -15,6 +15,9 @@
 #include <QtGui/QColorSpace>
 #include <private/qwidget_p.h>
 
+// Patching out this code without patching out all other private API usage
+// and the Qt::{Core,Gui,Widgets}Private cmake dependency is asking
+// for memory corruption
 class TWidgetPrivate : public QWidgetPrivate {
 public:
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)

From a22254860f01256de3acdcd799c8fe6e1f8e0f0e Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 3 Sep 2023 14:31:35 +0400
Subject: [PATCH 509/635] Revert "Use glib to open URLs on Linux"

This reverts commit a7117df837db39e8d2e4590dd6b0434415f79264.
---
 ui/basic_click_handlers.cpp | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/ui/basic_click_handlers.cpp b/ui/basic_click_handlers.cpp
index c68fbd5..91e52e7 100644
--- a/ui/basic_click_handlers.cpp
+++ b/ui/basic_click_handlers.cpp
@@ -11,17 +11,12 @@
 #include "ui/integration.h"
 #include "base/qthelp_url.h"
 #include "base/qt/qt_string_view.h"
-#include "base/platform/linux/base_linux_app_launch_context.h"
 
 #include <QtCore/QUrl>
 #include <QtCore/QRegularExpression>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QGuiApplication>
 
-#if __has_include(<gio/gio.hpp>)
-#include <gio/gio.hpp>
-#endif // __has_include(<gio/gio.hpp>)
-
 QString TextClickHandler::readable() const {
 	const auto result = url();
 	return !result.startsWith(qstr("internal:"))
@@ -85,26 +80,6 @@ void UrlClickHandler::Open(QString url, QVariant context) {
 		if (IsEmail(url)) {
 			url = "mailto: " + url;
 		}
-#if __has_include(<gio/gio.hpp>)
-		// Desktop entry spec implementation,
-		// prefer it over QDesktopServices::openUrl since it just calls
-		// the xdg-open shell script that is known to be bugged:
-		// various shell-specific bugs with spaces in paths,
-		// logic bugs violating the spec and etc, etc.
-		// Not to mention xdg-open can and will use DE-specific executables
-		// that allows various ill people to develop extensions
-		// to the standard and differ the behavior across apps.
-		// https://specifications.freedesktop.org/desktop-entry-spec/latest/
-		{
-			using namespace gi::repository;
-			if (Gio::AppInfo::launch_default_for_uri(
-				url.toStdString(),
-				base::Platform::AppLaunchContext(),
-				nullptr)) {
-				return;
-			}
-		}
-#endif // __has_include(<gio/gio.hpp>)
 		QDesktopServices::openUrl(url);
 	}
 }

From ea4c67408e1997cfce5d4bb0d9a0d55bb2d8b0f2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 21 Sep 2023 23:37:07 +0400
Subject: [PATCH 510/635] Revert "Workaround Wayland popup menu bug."

This reverts commit 8db6dcf125da5c767d36a696794d4a51d82c7955.
---
 ui/platform/linux/ui_utility_linux.cpp | 33 --------------------------
 ui/platform/mac/ui_utility_mac.mm      | 10 --------
 ui/platform/ui_platform_utility.h      |  6 -----
 ui/platform/win/ui_utility_win.cpp     | 10 --------
 ui/widgets/popup_menu.cpp              |  3 ---
 5 files changed, 62 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 8a3cf9c..933902f 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -8,7 +8,6 @@
 
 #include "base/platform/base_platform_info.h"
 #include "base/platform/linux/base_linux_library.h"
-#include "base/call_delayed.h"
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xcb_utilities.h"
@@ -45,10 +44,6 @@ namespace Platform {
 namespace {
 
 static const auto kXCBFrameExtentsAtomName = u"_GTK_FRAME_EXTENTS"_q;
-constexpr auto kDelayDeactivateEventTimeout = crl::time(400);
-
-bool PendingDeactivateEvent/* = false*/;
-int ChildPopupsHiddenOnWayland/* = 0*/;
 
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 std::optional<bool> XCBWindowMapped(xcb_window_t window) {
@@ -611,33 +606,5 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 }
 
-void RegisterChildPopupHiding() {
-	if (!::Platform::IsWayland()) {
-		return;
-	}
-	++ChildPopupsHiddenOnWayland;
-	base::call_delayed(kDelayDeactivateEventTimeout, [] {
-		if (!--ChildPopupsHiddenOnWayland) {
-			if (base::take(PendingDeactivateEvent)) {
-				// We didn't receive ApplicationActivate event in time.
-				QEvent appDeactivate(QEvent::ApplicationDeactivate);
-				QCoreApplication::sendEvent(qApp, &appDeactivate);
-			}
-		}
-	});
-}
-
-bool SkipApplicationDeactivateEvent() {
-	if (!ChildPopupsHiddenOnWayland) {
-		return false;
-	}
-	PendingDeactivateEvent = true;
-	return true;
-}
-
-void GotApplicationActivateEvent() {
-	PendingDeactivateEvent = false;
-}
-
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 8aa7475..366b42f 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -147,15 +147,5 @@ std::optional<bool> IsOverlapped(
 	return false;
 }
 
-void RegisterChildPopupHiding() {
-}
-
-bool SkipApplicationDeactivateEvent() {
-	return false;
-}
-
-void GotApplicationActivateEvent() {
-}
-
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index eb1aa48..73d6c27 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -45,12 +45,6 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
 
-// Workaround for a Qt/Wayland bug that hides the parent popup when
-// the child popup gets hidden, by sending Deactivate / Activate events.
-void RegisterChildPopupHiding();
-[[nodiscard]] bool SkipApplicationDeactivateEvent();
-void GotApplicationActivateEvent();
-
 } // namespace Ui::Platform
 
 // Platform dependent implementations.
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index c9678c0..23592ce 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -189,14 +189,4 @@ void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
 		menu->lifetime().make_state<Filter>(menu));
 }
 
-void RegisterChildPopupHiding() {
-}
-
-bool SkipApplicationDeactivateEvent() {
-	return false;
-}
-
-void GotApplicationActivateEvent() {
-}
-
 } // namespace Ui::Platform
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 5ce70cf..fba91a9 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -673,9 +673,6 @@ bool PopupMenu::eventFilter(QObject *o, QEvent *e) {
 }
 
 void PopupMenu::hideMenu(bool fast) {
-	if (fast && _parent) {
-		Platform::RegisterChildPopupHiding();
-	}
 	if (isHidden() || (_hiding && !fast)) {
 		return;
 	}

From eac439713b35f11e13d941d5f047712c0c4e70d3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 28 Sep 2023 23:28:18 +0400
Subject: [PATCH 511/635] Improve confirm box text padding.

---
 ui/layers/layers.style | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 1a3caa7..814092a 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -119,7 +119,7 @@ boxOptionListSkip: 20px;
 
 boxWidth: 320px;
 boxWideWidth: 364px;
-boxPadding: margins(24px, 30px, 24px, 8px);
+boxPadding: margins(24px, 14px, 24px, 8px);
 boxMaxListHeight: 492px;
 boxLittleSkip: 10px;
 boxMediumSkip: 20px;

From 18ea4136b75a5c25f0e1c392a27d28824cfd914c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 7 Jul 2023 14:45:58 +0300
Subject: [PATCH 512/635] Added helper class for tempered opacity in QPainter.

---
 ui/painter.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ui/painter.h b/ui/painter.h
index 4d15b82..5bbbfd0 100644
--- a/ui/painter.h
+++ b/ui/painter.h
@@ -135,3 +135,30 @@ private:
 	QPainter::RenderHints _hints;
 
 };
+
+class ScopedPainterOpacity {
+public:
+	ScopedPainterOpacity(QPainter &p, float64 nowOpacity)
+	: _painter(p)
+	, _wasOpacity(p.opacity()) {
+		if (_wasOpacity != nowOpacity) {
+			_painter.setOpacity(nowOpacity);
+		}
+	}
+
+	ScopedPainterOpacity(
+		const ScopedPainterOpacity &other) = delete;
+	ScopedPainterOpacity &operator=(
+		const ScopedPainterOpacity &other) = delete;
+
+	~ScopedPainterOpacity() {
+		if (_painter.isActive()) {
+			_painter.setOpacity(_wasOpacity);
+		}
+	}
+
+private:
+	QPainter &_painter;
+	const float64 _wasOpacity;
+
+};

From 5963a62ff5f165373b72b1e8261a4e2c026ce2af Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 11 Jul 2023 18:30:45 +0300
Subject: [PATCH 513/635] Added colors for statistic charts.

---
 ui/colors.palette | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ui/colors.palette b/ui/colors.palette
index f62334b..79328f4 100644
--- a/ui/colors.palette
+++ b/ui/colors.palette
@@ -655,3 +655,17 @@ premiumButtonFg: #ffffff; // upgrade to premium button text
 premiumIconBg1: #f38926; // icon in premium settings gradient 1
 premiumIconBg2: #e44456; // icon in premium settings gradient 2
 premiumIconBg3: #4acd43; // icon in premium settings gradient 3
+
+statisticsChartInactive: #e2eef999; // inactive area in footer of statistic charts
+statisticsChartActive: #baccd9d8; // sides in footer of statistic charts
+
+statisticsChartLineBlue: #327fe5; // represents blue color on statistical charts
+statisticsChartLineGreen: #61c752; // represents green color on statistical charts
+statisticsChartLineRed: #e05356; // represents red color on statistical charts
+statisticsChartLineGolden: #eba52d; // represents golden color on statistical charts
+statisticsChartLineLightblue: #58a8ed; // represents lightblue color on statistical charts
+statisticsChartLineLightgreen: #8fcf39; // represents lightgreen color on statistical charts
+statisticsChartLineOrange: #f28c39; // represents orange color on statistical charts
+statisticsChartLineIndigo: #7f79f3; // represents indigo color on statistical charts
+statisticsChartLinePurple: #9f79e8; // represents purple color on statistical charts
+statisticsChartLineCyan: #40d0ca; // represents cyan color on statistical charts

From dc6a4e976cccc51e1978ce3c5b829338293d4a4c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Sep 2023 16:15:39 +0400
Subject: [PATCH 514/635] Add simple label->value table layout.

---
 CMakeLists.txt           |   2 +
 ui/widgets/widgets.style |  19 ++++
 ui/wrap/table_layout.cpp | 235 +++++++++++++++++++++++++++++++++++++++
 ui/wrap/table_layout.h   |  95 ++++++++++++++++
 4 files changed, 351 insertions(+)
 create mode 100644 ui/wrap/table_layout.cpp
 create mode 100644 ui/wrap/table_layout.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9038739..6d03d8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,6 +252,8 @@ PRIVATE
     ui/wrap/padding_wrap.h
     ui/wrap/slide_wrap.cpp
     ui/wrap/slide_wrap.h
+    ui/wrap/table_layout.cpp
+    ui/wrap/table_layout.h
     ui/wrap/vertical_layout.cpp
     ui/wrap/vertical_layout.h
     ui/wrap/vertical_layout_reorder.cpp
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index f9a93a2..8b90876 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -612,6 +612,16 @@ Toast {
 	durationSlide: int;
 }
 
+Table {
+	bg: color;
+	headerBg: color;
+	borderFg: color;
+	border: pixels;
+	radius: pixels;
+	labelMinWidth: pixels;
+	labelMaxWidth: double;
+}
+
 defaultLabelSimple: LabelSimple {
 	font: normalFont;
 	maxWidth: 0px;
@@ -640,6 +650,15 @@ defaultRippleAnimation: RippleAnimation {
 	hideDuration: 200;
 }
 
+defaultTable: Table {
+	bg: windowBg;
+	headerBg: windowBgOver;
+	borderFg: inputBorderFg;
+	border: 1px;
+	radius: 6px;
+	labelMaxWidth: 0.5;
+}
+
 emptyRippleAnimation: RippleAnimation {
 }
 
diff --git a/ui/wrap/table_layout.cpp b/ui/wrap/table_layout.cpp
new file mode 100644
index 0000000..feecc1a
--- /dev/null
+++ b/ui/wrap/table_layout.cpp
@@ -0,0 +1,235 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#include "ui/wrap/table_layout.h"
+
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "styles/style_widgets.h"
+
+#include <QtGui/QPainterPath>
+
+namespace Ui {
+
+TableLayout::TableLayout(QWidget *parent, const style::Table &st)
+: RpWidget(parent)
+, _st(st) {
+}
+
+void TableLayout::paintEvent(QPaintEvent *e) {
+	if (_rows.empty()) {
+		return;
+	}
+
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+
+	const auto half = _st.border / 2.;
+	const auto inner = QRectF(rect()).marginsRemoved(
+		{ half, half, half, half });
+
+	p.setClipRect(0, 0, _valueLeft, height());
+	p.setBrush(_st.headerBg);
+	p.setPen(Qt::NoPen);
+	p.drawRoundedRect(inner, _st.radius, _st.radius);
+	p.setClipping(false);
+
+	auto path = QPainterPath();
+	path.addRoundedRect(inner, _st.radius, _st.radius);
+	auto top = half;
+	for (auto i = 1, count = int(_rows.size()); i != count; ++i) {
+		const auto y = _rows[i].top - half;
+		path.moveTo(half, y);
+		path.lineTo(width() - half, y);
+	}
+	path.moveTo(_valueLeft - half, half);
+	path.lineTo(_valueLeft - half, height() - half);
+
+	auto pen = _st.borderFg->p;
+	pen.setWidth(_st.border);
+	p.setPen(pen);
+	p.setBrush(Qt::NoBrush);
+	p.drawPath(path);
+}
+
+int TableLayout::resizeGetHeight(int newWidth) {
+	_inResize = true;
+	auto guard = gsl::finally([&] { _inResize = false; });
+
+	auto available = newWidth - 3 * _st.border;
+	const auto labelMax = int(base::SafeRound(
+		_st.labelMaxWidth * available));
+	const auto valueMin = available - labelMax;
+	if (labelMax <= 0 || valueMin <= 0 || _rows.empty()) {
+		return 0;
+	}
+	auto label = _st.labelMinWidth;
+	for (auto &row : _rows) {
+		const auto natural = row.label->naturalWidth()
+			+ row.labelMargin.left()
+			+ row.labelMargin.right();
+		if (natural < 0 || natural >= labelMax) {
+			label = labelMax;
+			break;
+		} else if (natural > label) {
+			label = natural;
+		}
+	}
+	_valueLeft = _st.border * 2 + label;
+
+	auto result = _st.border;
+	for (auto &row : _rows) {
+		updateRowGeometry(row, newWidth, result);
+		result += rowVerticalSkip(row);
+	}
+	return result;
+}
+
+void TableLayout::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	for (auto &row : _rows) {
+		setChildVisibleTopBottom(
+			row.label,
+			visibleTop,
+			visibleBottom);
+		setChildVisibleTopBottom(
+			row.value,
+			visibleTop,
+			visibleBottom);
+	}
+}
+
+void TableLayout::updateRowGeometry(
+		const Row &row,
+		int width,
+		int top) const {
+	row.top = top;
+	row.label->resizeToNaturalWidth(_valueLeft
+		- 2 * _st.border
+		- row.labelMargin.left()
+		- row.labelMargin.right());
+	row.label->moveToLeft(
+		_st.border + row.labelMargin.left(),
+		top + row.labelMargin.top(),
+		width);
+	row.value->resizeToNaturalWidth(width
+		- _valueLeft
+		- _st.border
+		- row.valueMargin.left()
+		- row.valueMargin.right());
+	row.value->moveToLeft(
+		_valueLeft + row.valueMargin.left(),
+		top + row.valueMargin.top(),
+		width);
+}
+
+void TableLayout::insertRow(
+		int atPosition,
+		object_ptr<RpWidget> &&label,
+		object_ptr<RpWidget> &&value,
+		const style::margins &labelMargin,
+		const style::margins &valueMargin) {
+	Expects(atPosition >= 0 && atPosition <= _rows.size());
+	Expects(!_inResize);
+
+	const auto wlabel = AttachParentChild(this, label);
+	const auto wvalue = AttachParentChild(this, value);
+	if (wlabel && wvalue) {
+		_rows.insert(begin(_rows) + atPosition, {
+			std::move(label),
+			std::move(value),
+			labelMargin,
+			valueMargin,
+		});
+		wlabel->heightValue(
+		) | rpl::start_with_next_done([=] {
+			if (!_inResize) {
+				childHeightUpdated(wlabel);
+			}
+		}, [=] {
+			removeChild(wlabel);
+		}, _rowsLifetime);
+		wvalue->heightValue(
+		) | rpl::start_with_next_done([=] {
+			if (!_inResize) {
+				childHeightUpdated(wvalue);
+			}
+		}, [=] {
+			removeChild(wvalue);
+		}, _rowsLifetime);
+	}
+}
+
+void TableLayout::childHeightUpdated(RpWidget *child) {
+	auto it = ranges::find_if(_rows, [child](const Row &row) {
+		return (row.label == child) || (row.value == child);
+	});
+
+	auto top = (it == _rows.begin()) ? _st.border : (it - 1)->top;
+	const auto outer = width();
+	for (auto end = _rows.end(); it != end; ++it) {
+		const auto &row = *it;
+		row.top = top;
+		row.label->moveToLeft(
+			_st.border + row.labelMargin.left(),
+			top + row.labelMargin.top(),
+			outer);
+		row.value->moveToLeft(
+			_valueLeft + row.valueMargin.left(),
+			top + row.valueMargin.top(),
+			outer);
+		top += rowVerticalSkip(row);
+	}
+	resize(width(), _rows.empty() ? 0 : top);
+}
+
+void TableLayout::removeChild(RpWidget *child) {
+	auto it = ranges::find_if(_rows, [child](const Row &row) {
+		return (row.label == child) || (row.value == child);
+	});
+	auto end = _rows.end();
+	Assert(it != end);
+
+	auto top = (it == _rows.begin()) ? _st.border : (it - 1)->top;
+	const auto outer = width();
+	for (auto next = it + 1; next != end; ++next) {
+		auto &row = *next;
+		row.top = top;
+		row.label->moveToLeft(
+			_st.border + row.labelMargin.left(),
+			top + row.labelMargin.top(),
+			outer);
+		row.value->moveToLeft(
+			_valueLeft + row.valueMargin.left(),
+			top + row.valueMargin.top(),
+			outer);
+		top += rowVerticalSkip(row);
+	}
+	it->label = nullptr;
+	it->value = nullptr;
+	_rows.erase(it);
+
+	resize(width(), _rows.empty() ? 0 : top);
+}
+
+int TableLayout::rowVerticalSkip(const Row &row) const {
+	const auto labelHeight = row.labelMargin.top()
+		+ row.label->heightNoMargins()
+		+ row.labelMargin.bottom();
+	const auto valueHeight = row.valueMargin.top()
+		+ row.value->heightNoMargins()
+		+ row.valueMargin.bottom();
+	return std::max(labelHeight, valueHeight) + _st.border;
+}
+
+void TableLayout::clear() {
+	while (!_rows.empty()) {
+		removeChild(_rows.front().label.data());
+	}
+}
+
+} // namespace Ui
diff --git a/ui/wrap/table_layout.h b/ui/wrap/table_layout.h
new file mode 100644
index 0000000..eb1e3b4
--- /dev/null
+++ b/ui/wrap/table_layout.h
@@ -0,0 +1,95 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+#include "base/object_ptr.h"
+#include "ui/rp_widget.h"
+
+namespace style {
+struct Table;
+} // namespace style
+
+namespace st {
+extern const style::Table &defaultTable;
+} // namespace st
+
+namespace Ui {
+
+class TableLayout : public RpWidget {
+public:
+	TableLayout(QWidget *parent, const style::Table &st = st::defaultTable);
+
+	[[nodiscard]] int rowsCount() const {
+		return _rows.size();
+	}
+
+	[[nodiscard]] not_null<RpWidget*> labelAt(int index) const {
+		Expects(index >= 0 && index < rowsCount());
+
+		return _rows[index].label.data();
+	}
+	[[nodiscard]] not_null<RpWidget*> valueAt(int index) const {
+		Expects(index >= 0 && index < rowsCount());
+
+		return _rows[index].value.data();
+	}
+
+	void insertRow(
+		int atPosition,
+		object_ptr<RpWidget> &&label,
+		object_ptr<RpWidget> &&value,
+		const style::margins &labelMargin = style::margins(),
+		const style::margins &valueMargin = style::margins());
+
+	void addRow(
+			object_ptr<RpWidget> &&label,
+			object_ptr<RpWidget> &&value,
+			const style::margins &labelMargin = style::margins(),
+			const style::margins &valueMargin = style::margins()) {
+		insertRow(
+			rowsCount(),
+			std::move(label),
+			std::move(value),
+			labelMargin,
+			valueMargin);
+	}
+
+	void clear();
+
+protected:
+	void paintEvent(QPaintEvent *e) override;
+
+	int resizeGetHeight(int newWidth) override;
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	struct Row {
+		object_ptr<RpWidget> label;
+		object_ptr<RpWidget> value;
+		style::margins labelMargin;
+		style::margins valueMargin;
+		mutable int top = 0;
+	};
+
+	[[nodiscard]] int rowVerticalSkip(const Row &row) const;
+	void childHeightUpdated(RpWidget *child);
+	void removeChild(RpWidget *child);
+	void updateRowGeometry(const Row &row, int width, int top) const;
+
+	const style::Table &_st;
+
+	std::vector<Row> _rows;
+	int _valueLeft = 0;
+	bool _inResize = false;
+
+	rpl::lifetime _rowsLifetime;
+
+};
+
+} // namespace Ui

From ae7409b06267c13e986fe0c22575b5fa29c62dd4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Sep 2023 21:51:08 +0400
Subject: [PATCH 515/635] Allow pinned top box part without a shadow.

---
 ui/layers/box_content.cpp | 19 +++++++------------
 ui/layers/box_content.h   |  2 +-
 ui/layers/layers.style    |  1 +
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ui/layers/box_content.cpp b/ui/layers/box_content.cpp
index 00ec1b6..fdaa06c 100644
--- a/ui/layers/box_content.cpp
+++ b/ui/layers/box_content.cpp
@@ -321,18 +321,20 @@ void BoxContent::updateInnerVisibleTopBottom() {
 	}
 }
 
-void BoxContent::updateShadowsVisibility() {
+void BoxContent::updateShadowsVisibility(anim::type animated) {
 	if (!_scroll) {
 		return;
 	}
 
 	const auto top = _scroll->scrollTop();
 	_topShadow->toggle(
-		(top > 0 || _innerTopSkip > 0),
-		anim::type::normal);
+		((top > 0)
+			|| (_innerTopSkip > 0
+				&& !getDelegate()->style().shadowIgnoreTopSkip)),
+		animated);
 	_bottomShadow->toggle(
 		(top < _scroll->scrollTopMax() || _innerBottomSkip > 0),
-		anim::type::normal);
+		animated);
 }
 
 void BoxContent::setDimensionsToContent(
@@ -419,14 +421,7 @@ void BoxContent::updateScrollAreaGeometry() {
 		height() - _innerBottomSkip - st::lineWidth);
 	if (changed) {
 		updateInnerVisibleTopBottom();
-
-		const auto top = _scroll->scrollTop();
-		_topShadow->toggle(
-			(top > 0 || _innerTopSkip > 0),
-			anim::type::instant);
-		_bottomShadow->toggle(
-			(top < _scroll->scrollTopMax() || _innerBottomSkip > 0),
-			anim::type::instant);
+		updateShadowsVisibility(anim::type::instant);
 	}
 }
 
diff --git a/ui/layers/box_content.h b/ui/layers/box_content.h
index c5f31cd..d528bf1 100644
--- a/ui/layers/box_content.h
+++ b/ui/layers/box_content.h
@@ -294,7 +294,7 @@ private:
 	void setInner(object_ptr<TWidget> inner, const style::ScrollArea &st);
 	void updateScrollAreaGeometry();
 	void updateInnerVisibleTopBottom();
-	void updateShadowsVisibility();
+	void updateShadowsVisibility(anim::type animated = anim::type::normal);
 	object_ptr<TWidget> doTakeInnerWidget();
 
 	BoxContentDelegate *_delegate = nullptr;
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 814092a..1f7f897 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -29,6 +29,7 @@ Box {
 	title: FlatLabel;
 	bg: color;
 	titleAdditionalFg: color;
+	shadowIgnoreTopSkip: bool;
 }
 
 boxDuration: 200;

From 93458e4cb3845c9743bb0c0a78f1e6ce7ee99363 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 4 Oct 2023 02:28:36 +0400
Subject: [PATCH 516/635] Ensure jpeg exception object doesn't leak

---
 ui/image/image_prepare.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/image/image_prepare.cpp b/ui/image/image_prepare.cpp
index 5559aef..12a80ef 100644
--- a/ui/image/image_prepare.cpp
+++ b/ui/image/image_prepare.cpp
@@ -1258,7 +1258,7 @@ bool IsProgressiveJpeg(const QByteArray &bytes) {
 		info.err = jpeg_std_error(&jerr);
 		jerr.error_exit = [](j_common_ptr cinfo) {
 			(*cinfo->err->output_message)(cinfo);
-			throw new std::exception;
+			throw std::exception();
 		};
 
 		jpeg_create_decompress(&info);
@@ -1290,7 +1290,7 @@ QByteArray MakeProgressiveJpeg(const QByteArray &bytes) {
 		dstinfo.err = jpeg_std_error(&jerr);
 		jerr.error_exit = [](j_common_ptr cinfo) {
 			(*cinfo->err->output_message)(cinfo);
-			throw new std::exception;
+			throw std::exception();
 		};
 
 		jpeg_create_decompress(&srcinfo);

From 02440524eaa2b1bd6d1909ff4aa2ca207a282b2c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 3 Oct 2023 13:06:56 +0400
Subject: [PATCH 517/635] Add per-line geometry / colors customization for
 Text.

---
 ui/basic.style                 |   2 +-
 ui/text/text.cpp               | 301 ++++++++++--------
 ui/text/text.h                 |  77 ++++-
 ui/text/text_block.cpp         | 538 +++++++++++++++++++--------------
 ui/text/text_block.h           | 237 ++++++++-------
 ui/text/text_entity.cpp        |   6 +-
 ui/text/text_entity.h          |  14 +-
 ui/text/text_parser.cpp        | 225 +++++++-------
 ui/text/text_parser.h          |  19 +-
 ui/text/text_renderer.cpp      | 462 ++++++++++++++--------------
 ui/text/text_renderer.h        |  26 +-
 ui/text/text_utilities.cpp     |  10 +-
 ui/text/text_utilities.h       |   8 +-
 ui/toast/toast_widget.cpp      |   3 +-
 ui/widgets/checkbox.cpp        |   4 +-
 ui/widgets/checkbox.h          |   2 +-
 ui/widgets/labels.cpp          |  16 +-
 ui/widgets/labels.h            |   4 +-
 ui/widgets/side_bar_button.cpp |   8 +-
 19 files changed, 1087 insertions(+), 875 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index 9bcbd90..6073a2f 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -16,7 +16,7 @@ TextPalette {
 	selectMonoFg: color;
 	selectSpoilerFg: color;
 	selectOverlay: color;
-	linkAlwaysActive: int;
+	linkAlwaysActive: bool;
 }
 
 TextStyle {
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index cb0ffab..41addf1 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -15,6 +15,12 @@
 #include "base/platform/base_platform_info.h"
 #include "styles/style_basic.h"
 
+namespace Ui {
+
+const QString kQEllipsis = u"..."_q;
+
+} // namespace Ui
+
 namespace Ui::Text {
 namespace {
 
@@ -125,6 +131,52 @@ not_null<SpoilerMessCache*> DefaultSpoilerCache() {
 	return &data.cache;
 }
 
+GeometryDescriptor SimpleGeometry(
+		int availableWidth,
+		int fontHeight,
+		int elisionHeight,
+		int elisionRemoveFromEnd,
+		bool elisionOneLine,
+		bool elisionBreakEverywhere) {
+	constexpr auto wrap = [](
+			Fn<LineGeometry(LineGeometry, uint16)> layout,
+			bool breakEverywhere = false) {
+		return GeometryDescriptor{ std::move(layout), breakEverywhere };
+	};
+
+	// Try to minimize captured values (to minimize Fn allocations).
+	if (!elisionOneLine && !elisionHeight) {
+		return wrap([=](LineGeometry line, uint16 positino) {
+			line.width = availableWidth;
+			return line;
+		});
+	} else if (elisionOneLine) {
+		return wrap([=](LineGeometry line, uint16 position) {
+			line.elided = true;
+			line.width = availableWidth - elisionRemoveFromEnd;
+			return line;
+		}, elisionBreakEverywhere);
+	} else if (!elisionRemoveFromEnd) {
+		return wrap([=](LineGeometry line, uint16 position) {
+			if (line.top + fontHeight * 2 > elisionHeight) {
+				line.elided = true;
+			}
+			line.width = availableWidth;
+			return line;
+		});
+	} else {
+		return wrap([=](LineGeometry line, uint16 position) {
+			if (line.top + fontHeight * 2 > elisionHeight) {
+				line.elided = true;
+				line.width = availableWidth - elisionRemoveFromEnd;
+			} else {
+				line.width = availableWidth;
+			}
+			return line;
+		});
+	}
+};
+
 String::SpoilerDataWrap::SpoilerDataWrap() noexcept = default;
 
 String::SpoilerDataWrap::SpoilerDataWrap(SpoilerDataWrap &&other) noexcept
@@ -188,7 +240,9 @@ void String::setText(const style::TextStyle &st, const QString &text, const Text
 	recountNaturalSize(true, options.dir);
 }
 
-void String::recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir) {
+void String::recountNaturalSize(
+		bool initial,
+		Qt::LayoutDirection optionsDirection) {
 	NewlineBlock *lastNewline = 0;
 
 	_maxWidth = _minHeight = 0;
@@ -199,20 +253,23 @@ void String::recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir) {
 		auto b = block.get();
 		auto _btype = b->type();
 		auto blockHeight = CountBlockHeight(b, _st);
-		if (_btype == TextBlockTNewline) {
+		if (_btype == TextBlockType::Newline) {
 			if (!lineHeight) lineHeight = blockHeight;
 			if (initial) {
-				Qt::LayoutDirection dir = optionsDir;
-				if (dir == Qt::LayoutDirectionAuto) {
-					dir = StringDirection(_text, lastNewlineStart, b->from());
+				Qt::LayoutDirection direction = optionsDirection;
+				if (direction == Qt::LayoutDirectionAuto) {
+					direction = StringDirection(
+						_text,
+						lastNewlineStart,
+						b->position());
 				}
 				if (lastNewline) {
-					lastNewline->_nextDir = dir;
+					lastNewline->_nextDirection = direction;
 				} else {
-					_startDir = dir;
+					_startDirection = direction;
 				}
 			}
-			lastNewlineStart = b->from();
+			lastNewlineStart = b->position();
 			lastNewline = &block.unsafe<NewlineBlock>();
 
 			_minHeight += lineHeight;
@@ -244,14 +301,14 @@ void String::recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir) {
 		continue;
 	}
 	if (initial) {
-		Qt::LayoutDirection dir = optionsDir;
-		if (dir == Qt::LayoutDirectionAuto) {
-			dir = StringDirection(_text, lastNewlineStart, _text.size());
+		Qt::LayoutDirection direction = optionsDirection;
+		if (direction == Qt::LayoutDirectionAuto) {
+			direction = StringDirection(_text, lastNewlineStart, _text.size());
 		}
 		if (lastNewline) {
-			lastNewline->_nextDir = dir;
+			lastNewline->_nextDirection = direction;
 		} else {
-			_startDir = dir;
+			_startDirection = direction;
 		}
 	}
 	if (_width > 0) {
@@ -269,7 +326,7 @@ int String::countMaxMonospaceWidth() const {
 	for (auto &block : _blocks) {
 		auto b = block.get();
 		auto _btype = b->type();
-		if (_btype == TextBlockTNewline) {
+		if (_btype == TextBlockType::Newline) {
 			last_rBearing = b->f_rbearing();
 			last_rPadding = b->f_rpadding();
 
@@ -283,8 +340,8 @@ int String::countMaxMonospaceWidth() const {
 			_width = (b->f_width() - last_rBearing);
 			continue;
 		}
-		if (!(b->flags() & (TextBlockFPre | TextBlockFCode))
-			&& (b->type() != TextBlockTSkip)) {
+		if (!(b->flags() & (TextBlockFlag::Pre | TextBlockFlag::Code))
+			&& (b->type() != TextBlockType::Skip)) {
 			fullMonospace = false;
 		}
 		auto b__f_rbearing = b->f_rbearing(); // cache
@@ -347,9 +404,10 @@ void String::setMarkedText(const style::TextStyle &st, const TextWithEntities &t
 	recountNaturalSize(true, options.dir);
 }
 
-void String::setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk) {
-	if (!lnkIndex || lnkIndex > _links.size()) return;
-	_links[lnkIndex - 1] = lnk;
+void String::setLink(uint16 index, const ClickHandlerPtr &link) {
+	if (index > 0 && index <= _links.size()) {
+		_links[index - 1] = link;
+	}
 }
 
 void String::setSpoilerRevealed(bool revealed, anim::type animated) {
@@ -394,16 +452,17 @@ bool String::hasSpoilers() const {
 }
 
 bool String::hasSkipBlock() const {
-	return _blocks.empty() ? false : _blocks.back()->type() == TextBlockTSkip;
+	return !_blocks.empty()
+		&& (_blocks.back()->type() == TextBlockType::Skip);
 }
 
 bool String::updateSkipBlock(int width, int height) {
-	if (!_blocks.empty() && _blocks.back()->type() == TextBlockTSkip) {
+	if (!_blocks.empty() && _blocks.back()->type() == TextBlockType::Skip) {
 		const auto block = static_cast<SkipBlock*>(_blocks.back().get());
-		if (block->width() == width && block->height() == height) {
+		if (block->f_width().toInt() == width && block->height() == height) {
 			return false;
 		}
-		_text.resize(block->from());
+		_text.resize(block->position());
 		_blocks.pop_back();
 	}
 	_text.push_back('_');
@@ -420,10 +479,10 @@ bool String::updateSkipBlock(int width, int height) {
 }
 
 bool String::removeSkipBlock() {
-	if (_blocks.empty() || _blocks.back()->type() != TextBlockTSkip) {
+	if (_blocks.empty() || _blocks.back()->type() != TextBlockType::Skip) {
 		return false;
 	}
-	_text.resize(_blocks.back()->from());
+	_text.resize(_blocks.back()->position());
 	_blocks.pop_back();
 	recountNaturalSize(false);
 	return true;
@@ -454,10 +513,21 @@ int String::countHeight(int width, bool breakEverywhere) const {
 	return result;
 }
 
-void String::countLineWidths(int width, QVector<int> *lineWidths, bool breakEverywhere) const {
-	enumerateLines(width, breakEverywhere, [&](QFixed lineWidth, int lineHeight) {
-		lineWidths->push_back(lineWidth.ceil().toInt());
+std::vector<int> String::countLineWidths(int width) const {
+	return countLineWidths(width, {});
+}
+
+std::vector<int> String::countLineWidths(
+		int width,
+		LineWidthsOptions options) const {
+	auto result = std::vector<int>();
+	if (options.reserve) {
+		result.reserve(options.reserve);
+	}
+	enumerateLines(width, options.breakEverywhere, [&](QFixed lineWidth, int lineHeight) {
+		result.push_back(lineWidth.ceil().toInt());
 	});
+	return result;
 }
 
 template <typename Callback>
@@ -475,7 +545,7 @@ void String::enumerateLines(
 		auto _btype = b->type();
 		int blockHeight = CountBlockHeight(b.get(), _st);
 
-		if (_btype == TextBlockTNewline) {
+		if (_btype == TextBlockType::Newline) {
 			if (!lineHeight) lineHeight = blockHeight;
 			callback(width - widthLeft, lineHeight);
 
@@ -500,7 +570,7 @@ void String::enumerateLines(
 			continue;
 		}
 
-		if (_btype == TextBlockTText) {
+		if (_btype == TextBlockType::Text) {
 			const auto t = &b.unsafe<TextBlock>();
 			if (t->_words.isEmpty()) { // no words in this block, spaces only => layout this block in the same line
 				last_rPadding += b->f_rpadding();
@@ -577,6 +647,13 @@ void String::draw(QPainter &p, const PaintContext &context) const {
 	Renderer(*this).draw(p, context);
 }
 
+StateResult String::getState(
+		QPoint point,
+		GeometryDescriptor geometry,
+		StateRequest request) const {
+	return Renderer(*this).getState(point, std::move(geometry), request);
+}
+
 void String::draw(Painter &p, int32 left, int32 top, int32 w, style::align align, int32 yFrom, int32 yTo, TextSelection selection, bool fullWidthSelection) const {
 //	p.fillRect(QRect(left, top, w, countHeight(w)), QColor(0, 0, 0, 32)); // debug
 	Renderer(*this).draw(p, {
@@ -605,14 +682,16 @@ void String::drawElided(Painter &p, int32 left, int32 top, int32 w, int32 lines,
 		.palette = &p.textPalette(),
 		.paused = p.inactive(),
 		.selection = selection,
-		.elisionLines = lines,
+		.elisionHeight = (lines > 1) ? (lines * _st->font->height) : 0,
 		.elisionRemoveFromEnd = removeFromEnd,
+		.elisionOneLine = (lines == 1),
 	});
 }
 
 void String::drawLeft(Painter &p, int32 left, int32 top, int32 width, int32 outerw, style::align align, int32 yFrom, int32 yTo, TextSelection selection) const {
 	Renderer(*this).draw(p, {
 		.position = { left, top },
+		//.outerWidth = outerw,
 		.availableWidth = width,
 		.align = align,
 		.clip = (yTo >= 0
@@ -622,7 +701,6 @@ void String::drawLeft(Painter &p, int32 left, int32 top, int32 width, int32 oute
 		.paused = p.inactive(),
 		.selection = selection,
 	});
-	draw(p, style::RightToLeft() ? (outerw - left - width) : left, top, width, align, yFrom, yTo, selection);
 }
 
 void String::drawLeftElided(Painter &p, int32 left, int32 top, int32 width, int32 outerw, int32 lines, style::align align, int32 yFrom, int32 yTo, int32 removeFromEnd, bool breakEverywhere, TextSelection selection) const {
@@ -638,7 +716,10 @@ void String::drawRightElided(Painter &p, int32 right, int32 top, int32 width, in
 }
 
 StateResult String::getState(QPoint point, int width, StateRequest request) const {
-	return Renderer(*this).getState(point, width, request);
+	return Renderer(*this).getState(
+		point,
+		SimpleGeometry(width, _st->font->height, 0, 0, false, false),
+		request);
 }
 
 StateResult String::getStateLeft(QPoint point, int width, int outerw, StateRequest request) const {
@@ -646,7 +727,14 @@ StateResult String::getStateLeft(QPoint point, int width, int outerw, StateReque
 }
 
 StateResult String::getStateElided(QPoint point, int width, StateRequestElided request) const {
-	return Renderer(*this).getStateElided(point, width, request);
+	return Renderer(*this).getState(point, SimpleGeometry(
+		width,
+		_st->font->height,
+		(request.lines > 1) ? (request.lines * _st->font->height) : 0,
+		request.removeFromEnd,
+		(request.lines == 1),
+		request.flags & StateRequest::Flag::BreakEverywhere
+	), static_cast<StateRequest>(request));
 }
 
 StateResult String::getStateElidedLeft(QPoint point, int width, int outerw, StateRequestElided request) const {
@@ -661,7 +749,7 @@ TextSelection String::adjustSelection(TextSelection selection, TextSelectType se
 
 			// Full selection of monospace entity.
 			for (const auto &b : _blocks) {
-				if (b->from() < from) {
+				if (b->position() < from) {
 					continue;
 				}
 				if (!IsMono(b->flags())) {
@@ -723,15 +811,15 @@ TextSelection String::adjustSelection(TextSelection selection, TextSelectType se
 }
 
 bool String::isEmpty() const {
-	return _blocks.empty() || _blocks[0]->type() == TextBlockTSkip;
+	return _blocks.empty() || _blocks[0]->type() == TextBlockType::Skip;
 }
 
 uint16 String::countBlockEnd(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const {
-	return (i + 1 == e) ? _text.size() : (*(i + 1))->from();
+	return (i + 1 == e) ? _text.size() : (*(i + 1))->position();
 }
 
 uint16 String::countBlockLength(const String::TextBlocks::const_iterator &i, const String::TextBlocks::const_iterator &e) const {
-	return countBlockEnd(i, e) - (*i)->from();
+	return countBlockEnd(i, e) - (*i)->position();
 }
 
 template <
@@ -749,92 +837,67 @@ void String::enumerateText(
 		return;
 	}
 
-	int lnkIndex = 0;
-	uint16 lnkFrom = 0;
-
-	int spoilerIndex = 0;
-	uint16 spoilerFrom = 0;
+	int linkIndex = 0;
+	uint16 linkPosition = 0;
 
 	int32 flags = 0;
 	for (auto i = _blocks.cbegin(), e = _blocks.cend(); true; ++i) {
-		int blockLnkIndex = (i == e) ? 0 : (*i)->lnkIndex();
-		int blockSpoilerIndex = (i == e) ? 0 : (*i)->spoilerIndex();
-		uint16 blockFrom = (i == e) ? _text.size() : (*i)->from();
-		int32 blockFlags = (i == e) ? 0 : (*i)->flags();
-
-		if (IsMono(blockFlags)) {
-			blockLnkIndex = 0;
-		}
-		if (blockLnkIndex && !_links.at(blockLnkIndex - 1)) { // ignore empty links
-			blockLnkIndex = 0;
-		}
-		if (blockLnkIndex != lnkIndex) {
-			if (lnkIndex) {
-				auto rangeFrom = qMax(selection.from, lnkFrom);
-				auto rangeTo = qMin(selection.to, blockFrom);
+		const auto blockPosition = (i == e) ? uint16(_text.size()) : (*i)->position();
+		const auto blockFlags = (i == e) ? TextBlockFlags() : (*i)->flags();
+		const auto blockLinkIndex = [&] {
+			if (IsMono(blockFlags) || (i == e)) {
+				return 0;
+			}
+			const auto result = (*i)->linkIndex();
+			return (result && _links.at(result - 1)) ? result : 0;
+		}();
+		if (blockLinkIndex != linkIndex) {
+			if (linkIndex) {
+				auto rangeFrom = qMax(selection.from, linkPosition);
+				auto rangeTo = qMin(selection.to, blockPosition);
 				if (rangeTo > rangeFrom) { // handle click handler
 					const auto r = base::StringViewMid(_text, rangeFrom, rangeTo - rangeFrom);
 					// Ignore links that are partially copied.
-					const auto handler = (lnkFrom != rangeFrom || blockFrom != rangeTo)
+					const auto handler = (linkPosition != rangeFrom || blockPosition != rangeTo)
 						? nullptr
-						: _links.at(lnkIndex - 1);
+						: _links.at(linkIndex - 1);
 					const auto type = handler
 						? handler->getTextEntity().type
 						: EntityType::Invalid;
 					clickHandlerFinishCallback(r, handler, type);
 				}
 			}
-			lnkIndex = blockLnkIndex;
-			if (lnkIndex) {
-				lnkFrom = blockFrom;
-				const auto handler = _links.at(lnkIndex - 1);
+			linkIndex = blockLinkIndex;
+			if (linkIndex) {
+				linkPosition = blockPosition;
+				const auto handler = _links.at(linkIndex - 1);
 				clickHandlerStartCallback(handler
 					? handler->getTextEntity().type
 					: EntityType::Invalid);
 			}
 		}
-		if (blockSpoilerIndex != spoilerIndex) {
-			if (spoilerIndex) {
-				auto rangeFrom = qMax(selection.from, spoilerFrom);
-				auto rangeTo = qMin(selection.to, blockFrom);
-				if (rangeTo > rangeFrom) { // handle click handler
-					const auto r = base::StringViewMid(_text, rangeFrom, rangeTo - rangeFrom);
-					// Ignore links that are partially copied.
-					const auto handler = (spoilerFrom != rangeFrom
-						|| blockFrom != rangeTo
-						|| !_spoiler.data)
-						? nullptr
-						: _spoiler.data->link;
-					const auto type = EntityType::Spoiler;
-					clickHandlerFinishCallback(r, handler, type);
-				}
-			}
-			spoilerIndex = blockSpoilerIndex;
-			if (spoilerIndex) {
-				spoilerFrom = blockFrom;
-				clickHandlerStartCallback(EntityType::Spoiler);
-			}
-		}
 
-		const auto checkBlockFlags = (blockFrom >= selection.from)
-			&& (blockFrom <= selection.to);
+		const auto checkBlockFlags = (blockPosition >= selection.from)
+			&& (blockPosition <= selection.to);
 		if (checkBlockFlags && blockFlags != flags) {
 			flagsChangeCallback(flags, blockFlags);
 			flags = blockFlags;
 		}
-		if (i == e || (lnkIndex ? lnkFrom : blockFrom) >= selection.to) {
+		if (i == e || (linkIndex ? linkPosition : blockPosition) >= selection.to) {
 			break;
 		}
 
 		const auto blockType = (*i)->type();
-		if (blockType == TextBlockTSkip) continue;
+		if (blockType == TextBlockType::Skip) {
+			continue;
+		}
 
-		auto rangeFrom = qMax(selection.from, blockFrom);
+		auto rangeFrom = qMax(selection.from, blockPosition);
 		auto rangeTo = qMin(
 			selection.to,
-			uint16(blockFrom + countBlockLength(i, e)));
+			uint16(blockPosition + countBlockLength(i, e)));
 		if (rangeTo > rangeFrom) {
-			const auto customEmojiData = (blockType == TextBlockTCustomEmoji)
+			const auto customEmojiData = (blockType == TextBlockType::CustomEmoji)
 				? static_cast<const CustomEmojiBlock*>(i->get())->_custom->entityData()
 				: QString();
 			appendPartCallback(
@@ -852,7 +915,7 @@ void String::unloadPersistentAnimation() {
 	if (_hasCustomEmoji) {
 		for (const auto &block : _blocks) {
 			const auto raw = block.get();
-			if (raw->type() == TextBlockTCustomEmoji) {
+			if (raw->type() == TextBlockType::CustomEmoji) {
 				static_cast<const CustomEmojiBlock*>(raw)->_custom->unload();
 			}
 		}
@@ -871,12 +934,12 @@ OnlyCustomEmoji String::toOnlyCustomEmoji() const {
 	result.lines.emplace_back();
 	for (const auto &block : _blocks) {
 		const auto raw = block.get();
-		if (raw->type() == TextBlockTCustomEmoji) {
+		if (raw->type() == TextBlockType::CustomEmoji) {
 			const auto custom = static_cast<const CustomEmojiBlock*>(raw);
 			result.lines.back().push_back({
 				.entityData = custom->_custom->entityData(),
 			});
-		} else if (raw->type() == TextBlockTNewline) {
+		} else if (raw->type() == TextBlockType::Newline) {
 			result.lines.emplace_back();
 		}
 	}
@@ -925,17 +988,16 @@ TextForMimeData String::toText(
 		result.rich.entities.insert(i, std::move(entity));
 	};
 	auto linkStart = 0;
-	auto spoilerStart = 0;
 	auto markdownTrackers = composeEntities
 		? std::vector<MarkdownTagTracker>{
-			{ TextBlockFItalic, EntityType::Italic },
-			{ TextBlockFBold, EntityType::Bold },
-			{ TextBlockFSemibold, EntityType::Semibold },
-			{ TextBlockFUnderline, EntityType::Underline },
-			{ TextBlockFPlainLink, EntityType::PlainLink },
-			{ TextBlockFStrikeOut, EntityType::StrikeOut },
-			{ TextBlockFCode, EntityType::Code }, // #TODO entities
-			{ TextBlockFPre, EntityType::Pre },
+			{ TextBlockFlag::Italic, EntityType::Italic },
+			{ TextBlockFlag::Bold, EntityType::Bold },
+			{ TextBlockFlag::Semibold, EntityType::Semibold },
+			{ TextBlockFlag::Underline, EntityType::Underline },
+			{ TextBlockFlag::Spoiler, EntityType::Spoiler },
+			{ TextBlockFlag::StrikeOut, EntityType::StrikeOut },
+			{ TextBlockFlag::Code, EntityType::Code }, // #TODO entities
+			{ TextBlockFlag::Pre, EntityType::Pre },
 		} : std::vector<MarkdownTagTracker>();
 	const auto flagsChangeCallback = [&](int32 oldFlags, int32 newFlags) {
 		if (!composeEntities) {
@@ -954,25 +1016,12 @@ TextForMimeData String::toText(
 		}
 	};
 	const auto clickHandlerStartCallback = [&](EntityType type) {
-		if (type == EntityType::Spoiler) {
-			spoilerStart = result.rich.text.size();
-		} else {
-			linkStart = result.rich.text.size();
-		}
+		linkStart = result.rich.text.size();
 	};
 	const auto clickHandlerFinishCallback = [&](
 			QStringView inText,
 			const ClickHandlerPtr &handler,
 			EntityType type) {
-		if (type == EntityType::Spoiler) {
-			insertEntity({
-				type,
-				spoilerStart,
-				int(result.rich.text.size() - spoilerStart),
-				QString(),
-			});
-			return;
-		}
 		if (!handler || (!composeExpanded && !composeEntities)) {
 			return;
 		}
@@ -1061,21 +1110,21 @@ IsolatedEmoji String::toIsolatedEmoji() const {
 	}
 	auto result = IsolatedEmoji();
 	const auto skip = (_blocks.empty()
-		|| _blocks.back()->type() != TextBlockTSkip) ? 0 : 1;
+		|| _blocks.back()->type() != TextBlockType::Skip) ? 0 : 1;
 	if ((_blocks.size() > kIsolatedEmojiLimit + skip) || hasSpoilers()) {
 		return {};
 	}
 	auto index = 0;
 	for (const auto &block : _blocks) {
 		const auto type = block->type();
-		if (block->lnkIndex()) {
+		if (block->linkIndex()) {
 			return {};
-		} else if (type == TextBlockTEmoji) {
+		} else if (type == TextBlockType::Emoji) {
 			result.items[index++] = block.unsafe<EmojiBlock>()._emoji;
-		} else if (type == TextBlockTCustomEmoji) {
+		} else if (type == TextBlockType::CustomEmoji) {
 			result.items[index++]
 				= block.unsafe<CustomEmojiBlock>()._custom->entityData();
-		} else if (type != TextBlockTSkip) {
+		} else if (type != TextBlockType::Skip) {
 			return {};
 		}
 	}
@@ -1092,7 +1141,7 @@ void String::clearFields() {
 	_links.clear();
 	_spoiler.data = nullptr;
 	_maxWidth = _minHeight = 0;
-	_startDir = Qt::LayoutDirectionAuto;
+	_startDirection = Qt::LayoutDirectionAuto;
 }
 
 bool IsBad(QChar ch) {
@@ -1186,7 +1235,7 @@ bool IsSpace(QChar ch) {
 		|| (ch == QChar(8203)/*Zero width space.*/);
 }
 
-bool IsDiac(QChar ch) { // diac and variation selectors
+bool IsDiacritic(QChar ch) { // diacritic and variation selectors
 	return (ch.category() == QChar::Mark_NonSpacing)
 		|| (ch == 1652)
 		|| (ch >= 64606 && ch <= 64611);
diff --git a/ui/text/text.h b/ui/text/text.h
index 809f926..2b32bb8 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -26,11 +26,9 @@ struct TextPalette;
 } // namespace style
 
 namespace Ui {
-static const auto kQEllipsis = QStringLiteral("...");
+extern const QString kQEllipsis;
 } // namespace Ui
 
-static const QChar TextCommand(0x0010);
-
 struct TextParseOptions {
 	int32 flags;
 	int32 maxw;
@@ -125,16 +123,42 @@ private:
 
 };
 
+struct SpecialColor {
+	const QPen *pen = nullptr;
+	const QPen *penSelected = nullptr;
+};
+
+struct LineGeometry {
+	int left = 0;
+	int top = 0;
+	int width = 0;
+	bool elided = false;
+};
+struct GeometryDescriptor {
+	Fn<LineGeometry(LineGeometry line, uint16 position)> layout;
+	bool breakEverywhere = false;
+};
+
 [[nodiscard]] not_null<SpoilerMessCache*> DefaultSpoilerCache();
 
+[[nodiscard]] GeometryDescriptor SimpleGeometry(
+	int availableWidth,
+	int fontHeight,
+	int elisionHeight,
+	int elisionRemoveFromEnd,
+	bool elisionOneLine,
+	bool elisionBreakEverywhere);
+
 struct PaintContext {
 	QPoint position;
 	int outerWidth = 0; // For automatic RTL Ui inversion.
 	int availableWidth = 0;
+	GeometryDescriptor geometry; // By default is SimpleGeometry.
 	style::align align = style::al_left;
 	QRect clip;
 
 	const style::TextPalette *palette = nullptr;
+	std::span<SpecialColor> colors;
 	SpoilerMessCache *spoiler = nullptr;
 	crl::time now = 0;
 	bool paused = false;
@@ -144,8 +168,9 @@ struct PaintContext {
 	TextSelection selection;
 	bool fullWidthSelection = true;
 
-	int elisionLines = 0;
+	int elisionHeight = 0;
 	int elisionRemoveFromEnd = 0;
+	bool elisionOneLine = false;
 	bool elisionBreakEverywhere = false;
 };
 
@@ -167,14 +192,42 @@ public:
 	String &operator=(String &&other);
 	~String();
 
-	[[nodiscard]] int countWidth(int width, bool breakEverywhere = false) const;
-	[[nodiscard]] int countHeight(int width, bool breakEverywhere = false) const;
-	void countLineWidths(int width, QVector<int> *lineWidths, bool breakEverywhere = false) const;
+	[[nodiscard]] int countWidth(
+		int width,
+		bool breakEverywhere = false) const;
+	[[nodiscard]] int countHeight(
+		int width,
+		bool breakEverywhere = false) const;
+
+	struct LineWidthsOptions {
+		bool breakEverywhere = false;
+		int reserve = 0;
+	};
+	[[nodiscard]] std::vector<int> countLineWidths(int width) const;
+	[[nodiscard]] std::vector<int> countLineWidths(
+		int width,
+		LineWidthsOptions options) const;
+
+	struct DimensionsResult {
+		int width = 0;
+		int height = 0;
+		std::vector<int> lineWidths;
+	};
+	struct DimensionsRequest {
+		bool lineWidths = false;
+		int reserve = 0;
+	};
+	[[nodiscard]] DimensionsResult countDimensions(
+		GeometryDescriptor geometry) const;
+	[[nodiscard]] DimensionsResult countDimensions(
+		GeometryDescriptor geometry,
+		DimensionsRequest request) const;
+
 	void setText(const style::TextStyle &st, const QString &text, const TextParseOptions &options = kDefaultTextOptions);
 	void setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options = kMarkupTextOptions, const std::any &context = {});
 
 	[[nodiscard]] bool hasLinks() const;
-	void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk);
+	void setLink(uint16 index, const ClickHandlerPtr &lnk);
 
 	[[nodiscard]] bool hasSpoilers() const;
 	void setSpoilerRevealed(bool revealed, anim::type animated);
@@ -193,6 +246,10 @@ public:
 	[[nodiscard]] int countMaxMonospaceWidth() const;
 
 	void draw(QPainter &p, const PaintContext &context) const;
+	[[nodiscard]] StateResult getState(
+		QPoint point,
+		GeometryDescriptor geometry,
+		StateRequest request = StateRequest()) const;
 
 	void draw(Painter &p, int32 left, int32 top, int32 width, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, TextSelection selection = { 0, 0 }, bool fullWidthSelection = true) const;
 	void drawElided(Painter &p, int32 left, int32 top, int32 width, int32 lines = 1, style::align align = style::al_left, int32 yFrom = 0, int32 yTo = -1, int32 removeFromEnd = 0, bool breakEverywhere = false, TextSelection selection = { 0, 0 }) const;
@@ -298,7 +355,7 @@ private:
 	TextBlocks _blocks;
 	TextLinks _links;
 
-	Qt::LayoutDirection _startDir = Qt::LayoutDirectionAuto;
+	Qt::LayoutDirection _startDirection = Qt::LayoutDirectionAuto;
 
 	SpoilerDataWrap _spoiler;
 
@@ -313,7 +370,7 @@ private:
 [[nodiscard]] bool IsLinkEnd(QChar ch);
 [[nodiscard]] bool IsNewline(QChar ch);
 [[nodiscard]] bool IsSpace(QChar ch);
-[[nodiscard]] bool IsDiac(QChar ch);
+[[nodiscard]] bool IsDiacritic(QChar ch);
 [[nodiscard]] bool IsReplacedBySpace(QChar ch);
 [[nodiscard]] bool IsTrimmed(QChar ch);
 
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index 54ccc74..f7ad545 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -47,7 +47,8 @@ struct LineBreakHelper {
 	void calculateRightBearingForPreviousGlyph();
 
 	// We always calculate the right bearing right before it is needed.
-	// So we don't need caching / optimizations referred to delayed right bearing calculations.
+	// So we don't need caching / optimizations referred to
+	// delayed right bearing calculations.
 
 	//static const QFixed RightBearingNotCalculated;
 
@@ -156,15 +157,6 @@ void addNextCluster(
 	} while (glyphPosition < current.num_glyphs
 		&& !glyphs.attributes[glyphPosition].clusterStart);
 
-	if (!((pos == end && glyphPosition == current.num_glyphs) || logClusters[pos] == glyphPosition)) {
-		auto str = QStringList();
-		for (auto i = 0; i < pos; ++i) {
-			str.append(QString::number(logClusters[i]));
-		}
-		LOG(("text: %1 (from: %2, length: %3) part: %4").arg(DebugCurrentParsingString).arg(DebugCurrentParsingFrom).arg(DebugCurrentParsingLength).arg(DebugCurrentParsingPart));
-		LOG(("pos: %1, end: %2, glyphPosition: %3, glyphCount: %4, lineLength: %5, num_glyphs: %6, logClusters[0..pos]: %7").arg(pos).arg(end).arg(glyphPosition).arg(glyphCount).arg(line.length).arg(current.num_glyphs).arg(str.join(",")));
-		Unexpected("Values in addNextCluster()");
-	}
 	Q_ASSERT((pos == end && glyphPosition == current.num_glyphs)
 		|| logClusters[pos] == glyphPosition);
 
@@ -176,32 +168,36 @@ void addNextCluster(
 class BlockParser {
 public:
 	BlockParser(
-		QTextEngine *e,
-		TextBlock *b,
+		TextBlock &block,
+		QTextEngine &engine,
 		QFixed minResizeWidth,
-		int blockFrom,
-		const QString &str);
+		int blockPosition,
+		const QString &text);
 
 private:
 	void parseWords(QFixed minResizeWidth, int blockFrom);
-	bool isLineBreak(const QCharAttributes *attributes, int index);
-	bool isSpaceBreak(const QCharAttributes *attributes, int index);
+	[[nodiscard]] bool isLineBreak(
+		const QCharAttributes *attributes,
+		int index) const;
+	[[nodiscard]] bool isSpaceBreak(
+		const QCharAttributes *attributes,
+		int index) const;
 
-	TextBlock *block;
-	QTextEngine *eng;
-	const QString &str;
+	TextBlock &block;
+	QTextEngine &engine;
+	const QString &text;
 
 };
 
 BlockParser::BlockParser(
-	QTextEngine *e,
-	TextBlock *b,
+	TextBlock &block,
+	QTextEngine &engine,
 	QFixed minResizeWidth,
 	int blockFrom,
-	const QString &str)
-: block(b)
-, eng(e)
-, str(str) {
+	const QString &text)
+: block(block)
+, engine(engine)
+, text(text) {
 	parseWords(minResizeWidth, blockFrom);
 }
 
@@ -221,15 +217,15 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 	//		LOG(("Text: %1, chars: %2").arg(str).arg(debugChars));
 
 	int item = -1;
-	int newItem = eng->findItem(0);
+	int newItem = engine.findItem(0);
 
-	const QCharAttributes *attributes = eng->attributes();
+	const QCharAttributes *attributes = engine.attributes();
 	if (!attributes)
 		return;
 	int end = 0;
-	lbh.logClusters = eng->layoutData->logClustersPtr;
+	lbh.logClusters = engine.layoutData->logClustersPtr;
 
-	block->_words.clear();
+	block._words.clear();
 
 	int wordStart = lbh.currentPosition;
 
@@ -237,26 +233,26 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 	int lastGraphemeBoundaryPosition = -1;
 	ScriptLine lastGraphemeBoundaryLine;
 
-	while (newItem < eng->layoutData->items.size()) {
+	while (newItem < engine.layoutData->items.size()) {
 		if (newItem != item) {
 			item = newItem;
-			const QScriptItem &current = eng->layoutData->items[item];
+			const QScriptItem &current = engine.layoutData->items[item];
 			if (!current.num_glyphs) {
-				eng->shape(item);
-				attributes = eng->attributes();
+				engine.shape(item);
+				attributes = engine.attributes();
 				if (!attributes)
 					return;
-				lbh.logClusters = eng->layoutData->logClustersPtr;
+				lbh.logClusters = engine.layoutData->logClustersPtr;
 			}
 			lbh.currentPosition = current.position;
-			end = current.position + eng->length(item);
-			lbh.glyphs = eng->shapedGlyphs(&current);
-			QFontEngine *fontEngine = eng->fontEngine(current);
+			end = current.position + engine.length(item);
+			lbh.glyphs = engine.shapedGlyphs(&current);
+			QFontEngine *fontEngine = engine.fontEngine(current);
 			if (lbh.fontEngine != fontEngine) {
 				lbh.fontEngine = fontEngine;
 			}
 		}
-		const QScriptItem &current = eng->layoutData->items[item];
+		const QScriptItem &current = engine.layoutData->items[item];
 
 		const auto atSpaceBreak = [&] {
 			for (auto index = lbh.currentPosition; index < end; ++index) {
@@ -269,15 +265,25 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 			return false;
 		}();
 		if (atSpaceBreak) {
-			while (lbh.currentPosition < end && attributes[lbh.currentPosition].whiteSpace)
-				addNextCluster(lbh.currentPosition, end, lbh.spaceData, lbh.glyphCount,
-					current, lbh.logClusters, lbh.glyphs);
+			while (lbh.currentPosition < end
+				&& attributes[lbh.currentPosition].whiteSpace)
+				addNextCluster(
+					lbh.currentPosition,
+					end,
+					lbh.spaceData,
+					lbh.glyphCount,
+					current,
+					lbh.logClusters,
+					lbh.glyphs);
 
-			if (block->_words.isEmpty()) {
-				block->_words.push_back(TextWord(wordStart + blockFrom, lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
+			if (block._words.isEmpty()) {
+				block._words.push_back(TextWord(
+					wordStart + blockFrom,
+					lbh.tmpData.textWidth,
+					-lbh.negativeRightBearing()));
 			}
-			block->_words.back().add_rpadding(lbh.spaceData.textWidth);
-			block->_width += lbh.spaceData.textWidth;
+			block._words.back().add_rpadding(lbh.spaceData.textWidth);
+			block._width += lbh.spaceData.textWidth;
 			lbh.spaceData.length = 0;
 			lbh.spaceData.textWidth = 0;
 
@@ -288,15 +294,24 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 			lastGraphemeBoundaryLine = ScriptLine();
 		} else {
 			do {
-				addNextCluster(lbh.currentPosition, end, lbh.tmpData, lbh.glyphCount,
-					current, lbh.logClusters, lbh.glyphs);
+				addNextCluster(
+					lbh.currentPosition,
+					end,
+					lbh.tmpData,
+					lbh.glyphCount,
+					current,
+					lbh.logClusters,
+					lbh.glyphs);
 
-				if (lbh.currentPosition >= eng->layoutData->string.length()
+				if (lbh.currentPosition >= engine.layoutData->string.length()
 					|| isSpaceBreak(attributes, lbh.currentPosition)
 					|| isLineBreak(attributes, lbh.currentPosition)) {
 					lbh.calculateRightBearing();
-					block->_words.push_back(TextWord(wordStart + blockFrom, lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
-					block->_width += lbh.tmpData.textWidth;
+					block._words.push_back(TextWord(
+						wordStart + blockFrom,
+						lbh.tmpData.textWidth,
+						-lbh.negativeRightBearing()));
+					block._width += lbh.tmpData.textWidth;
 					lbh.tmpData.textWidth = 0;
 					lbh.tmpData.length = 0;
 					wordStart = lbh.currentPosition;
@@ -305,8 +320,11 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 					if (!addingEachGrapheme && lbh.tmpData.textWidth > minResizeWidth) {
 						if (lastGraphemeBoundaryPosition >= 0) {
 							lbh.calculateRightBearingForPreviousGlyph();
-							block->_words.push_back(TextWord(wordStart + blockFrom, -lastGraphemeBoundaryLine.textWidth, -lbh.negativeRightBearing()));
-							block->_width += lastGraphemeBoundaryLine.textWidth;
+							block._words.push_back(TextWord(
+								wordStart + blockFrom,
+								-lastGraphemeBoundaryLine.textWidth,
+								-lbh.negativeRightBearing()));
+							block._width += lastGraphemeBoundaryLine.textWidth;
 							lbh.tmpData.textWidth -= lastGraphemeBoundaryLine.textWidth;
 							lbh.tmpData.length -= lastGraphemeBoundaryLine.length;
 							wordStart = lastGraphemeBoundaryPosition;
@@ -315,8 +333,11 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 					}
 					if (addingEachGrapheme) {
 						lbh.calculateRightBearing();
-						block->_words.push_back(TextWord(wordStart + blockFrom, -lbh.tmpData.textWidth, -lbh.negativeRightBearing()));
-						block->_width += lbh.tmpData.textWidth;
+						block._words.push_back(TextWord(
+							wordStart + blockFrom,
+							-lbh.tmpData.textWidth,
+							-lbh.negativeRightBearing()));
+						block._width += lbh.tmpData.textWidth;
 						lbh.tmpData.textWidth = 0;
 						lbh.tmpData.length = 0;
 						wordStart = lbh.currentPosition;
@@ -331,54 +352,87 @@ void BlockParser::parseWords(QFixed minResizeWidth, int blockFrom) {
 		if (lbh.currentPosition == end)
 			newItem = item + 1;
 	}
-	if (!block->_words.isEmpty()) {
-		block->_rpadding = block->_words.back().f_rpadding();
-		block->_width -= block->_rpadding;
-		block->_words.squeeze();
+	if (!block._words.isEmpty()) {
+		block._rpadding = block._words.back().f_rpadding();
+		block._width -= block._rpadding;
+		block._words.squeeze();
 	}
 }
 
 bool BlockParser::isLineBreak(
 		const QCharAttributes *attributes,
-		int index) {
+		int index) const {
 	// Don't break after / in links.
 	return attributes[index].lineBreak
-		&& (block->lnkIndex() <= 0
-			|| index <= 0
-			|| str[index - 1] != '/');
+		&& (block.linkIndex() <= 0 || index <= 0 || text[index - 1] != '/');
 }
 
 bool BlockParser::isSpaceBreak(
 		const QCharAttributes *attributes,
-		int index) {
+		int index) const {
 	// Don't break on &nbsp;
-	return attributes[index].whiteSpace
-		&& (str[index] != QChar::Nbsp);
+	return attributes[index].whiteSpace && (text[index] != QChar::Nbsp);
+}
+
+style::font WithFlags(
+		const style::font &font,
+		TextBlockFlags flags,
+		uint32 fontFlags) {
+	using namespace style::internal;
+
+	if (!flags && !fontFlags) {
+		return font;
+	} else if (IsMono(flags) || (fontFlags & FontMonospace)) {
+		return font->monospace();
+	}
+	auto result = font;
+	if ((flags & TextBlockFlag::Bold) || (fontFlags & FontBold)) {
+		result = result->bold();
+	} else if ((flags & TextBlockFlag::Semibold)
+		|| (fontFlags & FontSemibold)) {
+		result = result->semibold();
+	}
+	if ((flags & TextBlockFlag::Italic) || (fontFlags & FontItalic)) {
+		result = result->italic();
+	}
+	if ((flags & TextBlockFlag::Underline) || (fontFlags & FontUnderline)) {
+		result = result->underline();
+	}
+	if ((flags & TextBlockFlag::StrikeOut) || (fontFlags & FontStrikeOut)) {
+		result = result->strikeout();
+	}
+	if (flags & TextBlockFlag::Tilde) { // Tilde fix in OpenSans.
+		result = result->semibold();
+	}
+	return result;
 }
 
 AbstractBlock::AbstractBlock(
 	const style::font &font,
-	const QString &str,
-	uint16 from,
+	const QString &text,
+	uint16 position,
 	uint16 length,
+	TextBlockType type,
 	uint16 flags,
-	uint16 lnkIndex,
-	uint16 spoilerIndex)
-: _flags((flags & 0b1111111111) | ((lnkIndex & 0xFFFF) << 14))
-, _from(from)
-, _spoilerIndex(spoilerIndex) {
+	uint16 linkIndex,
+	uint16 colorIndex)
+: _position(position)
+, _type(static_cast<uint16>(type))
+, _flags(flags)
+, _linkIndex(linkIndex)
+, _colorIndex(colorIndex) {
 }
 
-uint16 AbstractBlock::from() const {
-	return _from;
+uint16 AbstractBlock::position() const {
+	return _position;
 }
 
-int AbstractBlock::width() const {
-	return _width.toInt();
+TextBlockType AbstractBlock::type() const {
+	return static_cast<TextBlockType>(_type);
 }
 
-int AbstractBlock::rpadding() const {
-	return _rpadding.toInt();
+TextBlockFlags AbstractBlock::flags() const {
+	return TextBlockFlags::from_raw(_flags);
 }
 
 QFixed AbstractBlock::f_width() const {
@@ -389,77 +443,54 @@ QFixed AbstractBlock::f_rpadding() const {
 	return _rpadding;
 }
 
-uint16 AbstractBlock::lnkIndex() const {
-	return (_flags >> 14) & 0xFFFF;
+uint16 AbstractBlock::linkIndex() const {
+	return _linkIndex;
 }
 
-void AbstractBlock::setLnkIndex(uint16 lnkIndex) {
-	_flags = (_flags & ~(0xFFFF << 14)) | (lnkIndex << 14);
+uint16 AbstractBlock::colorIndex() const {
+	return _colorIndex;
 }
 
-uint16 AbstractBlock::spoilerIndex() const {
-	return _spoilerIndex;
-}
-
-void AbstractBlock::setSpoilerIndex(uint16 spoilerIndex) {
-	_spoilerIndex = spoilerIndex;
-}
-
-TextBlockType AbstractBlock::type() const {
-	return TextBlockType((_flags >> 10) & 0x0F);
-}
-
-int32 AbstractBlock::flags() const {
-	return (_flags & 0b1111111111);
+void AbstractBlock::setLinkIndex(uint16 index) {
+	_linkIndex = index;
 }
 
 QFixed AbstractBlock::f_rbearing() const {
-	return (type() == TextBlockTText)
+	return (type() == TextBlockType::Text)
 		? static_cast<const TextBlock*>(this)->real_f_rbearing()
 		: 0;
 }
 
 TextBlock::TextBlock(
 	const style::font &font,
-	const QString &str,
-	QFixed minResizeWidth,
-	uint16 from,
+	const QString &text,
+	uint16 position,
 	uint16 length,
-	uint16 flags,
-	uint16 lnkIndex,
-	uint16 spoilerIndex)
-: AbstractBlock(font, str, from, length, flags, lnkIndex, spoilerIndex) {
-	_flags |= ((TextBlockTText & 0x0F) << 10);
-	if (length) {
-		style::font blockFont = font;
-		if (!flags && lnkIndex) {
-			// should use TextStyle lnkFlags somehow... not supported
-		}
-
-		if ((flags & TextBlockFPre) || (flags & TextBlockFCode)) {
-			blockFont = blockFont->monospace();
-		} else {
-			if (flags & TextBlockFBold) {
-				blockFont = blockFont->bold();
-			} else if (flags & TextBlockFSemibold) {
-				blockFont = blockFont->semibold();
-			}
-			if (flags & TextBlockFItalic) blockFont = blockFont->italic();
-			if (flags & TextBlockFUnderline) blockFont = blockFont->underline();
-			if (flags & TextBlockFStrikeOut) blockFont = blockFont->strikeout();
-			if (flags & TextBlockFTilde) { // tilde fix in OpenSans
-				blockFont = blockFont->semibold();
-			}
-		}
-
-		DebugCurrentParsingString = str;
-		DebugCurrentParsingFrom = _from;
-		DebugCurrentParsingLength = length;
-		const auto part = DebugCurrentParsingPart = str.mid(_from, length);
-
-		QStackTextEngine engine(part, blockFont->f);
-		BlockParser parser(&engine, this, minResizeWidth, _from, part);
+	TextBlockFlags flags,
+	uint16 linkIndex,
+	uint16 colorIndex,
+	QFixed minResizeWidth)
+: AbstractBlock(
+		font,
+		text,
+		position,
+		length,
+		TextBlockType::Text,
+		flags,
+		linkIndex,
+		colorIndex) {
+	if (!length) {
+		return;
 	}
+	const auto blockFont = WithFlags(font, flags);
+	if (!flags && linkIndex) {
+		// should use TextStyle lnkFlags somehow... not supported
+	}
+
+	const auto part = text.mid(_position, length);
+
+	QStackTextEngine engine(part, blockFont->f);
+	BlockParser parser(*this, engine, minResizeWidth, _position, part);
 }
 
 QFixed TextBlock::real_f_rbearing() const {
@@ -468,20 +499,27 @@ QFixed TextBlock::real_f_rbearing() const {
 
 EmojiBlock::EmojiBlock(
 	const style::font &font,
-	const QString &str,
-	uint16 from,
+	const QString &text,
+	uint16 position,
 	uint16 length,
-	uint16 flags,
-	uint16 lnkIndex,
-	uint16 spoilerIndex,
+	TextBlockFlags flags,
+	uint16 linkIndex,
+	uint16 colorIndex,
 	EmojiPtr emoji)
-: AbstractBlock(font, str, from, length, flags, lnkIndex, spoilerIndex)
+: AbstractBlock(
+	font,
+	text,
+	position,
+	length,
+	TextBlockType::Emoji,
+	flags,
+	linkIndex,
+	colorIndex)
 , _emoji(emoji) {
-	_flags |= ((TextBlockTEmoji & 0x0F) << 10);
 	_width = int(st::emojiSize + 2 * st::emojiPadding);
 	_rpadding = 0;
 	for (auto i = length; i != 0;) {
-		auto ch = str[_from + (--i)];
+		auto ch = text[_position + (--i)];
 		if (ch.unicode() == QChar::Space) {
 			_rpadding += font->spacew;
 		} else {
@@ -492,20 +530,27 @@ EmojiBlock::EmojiBlock(
 
 CustomEmojiBlock::CustomEmojiBlock(
 	const style::font &font,
-	const QString &str,
-	uint16 from,
+	const QString &text,
+	uint16 position,
 	uint16 length,
-	uint16 flags,
-	uint16 lnkIndex,
-	uint16 spoilerIndex,
+	TextBlockFlags flags,
+	uint16 linkIndex,
+	uint16 colorIndex,
 	std::unique_ptr<CustomEmoji> custom)
-: AbstractBlock(font, str, from, length, flags, lnkIndex, spoilerIndex)
+: AbstractBlock(
+	font,
+	text,
+	position,
+	length,
+	TextBlockType::CustomEmoji,
+	flags,
+	linkIndex,
+	colorIndex)
 , _custom(std::move(custom)) {
-	_flags |= ((TextBlockTCustomEmoji & 0x0F) << 10);
 	_width = int(st::emojiSize + 2 * st::emojiPadding);
 	_rpadding = 0;
 	for (auto i = length; i != 0;) {
-		auto ch = str[_from + (--i)];
+		auto ch = text[_position + (--i)];
 		if (ch.unicode() == QChar::Space) {
 			_rpadding += font->spacew;
 		} else {
@@ -516,32 +561,46 @@ CustomEmojiBlock::CustomEmojiBlock(
 
 NewlineBlock::NewlineBlock(
 	const style::font &font,
-	const QString &str,
-	uint16 from,
+	const QString &text,
+	uint16 position,
 	uint16 length,
-	uint16 flags,
-	uint16 lnkIndex,
-	uint16 spoilerIndex)
-: AbstractBlock(font, str, from, length, flags, lnkIndex, spoilerIndex) {
-	_flags |= ((TextBlockTNewline & 0x0F) << 10);
+	TextBlockFlags flags,
+	uint16 linkIndex,
+	uint16 colorIndex)
+: AbstractBlock(
+	font,
+	text,
+	position,
+	length,
+	TextBlockType::Newline,
+	flags,
+	linkIndex,
+	colorIndex) {
 }
 
 Qt::LayoutDirection NewlineBlock::nextDirection() const {
-	return _nextDir;
+	return _nextDirection;
 }
 
 SkipBlock::SkipBlock(
 	const style::font &font,
-	const QString &str,
-	uint16 from,
-	int32 w,
-	int32 h,
-	uint16 lnkIndex,
-	uint16 spoilerIndex)
-: AbstractBlock(font, str, from, 1, 0, lnkIndex, spoilerIndex)
-, _height(h) {
-	_flags |= ((TextBlockTSkip & 0x0F) << 10);
-	_width = w;
+	const QString &text,
+	uint16 position,
+	int32 width,
+	int32 height,
+	uint16 linkIndex,
+	uint16 colorIndex)
+: AbstractBlock(
+	font,
+	text,
+	position,
+	1,
+	TextBlockType::Skip,
+	0,
+	linkIndex,
+	colorIndex)
+, _height(height) {
+	_width = width;
 }
 
 int SkipBlock::height() const {
@@ -550,11 +609,11 @@ int SkipBlock::height() const {
 
 
 TextWord::TextWord(
-	uint16 from,
+	uint16 position,
 	QFixed width,
 	QFixed rbearing,
 	QFixed rpadding)
-: _from(from)
+: _position(position)
 , _rbearing((rbearing.value() > 0x7FFF)
 	? 0x7FFF
 	: (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value()))
@@ -562,8 +621,8 @@ TextWord::TextWord(
 , _rpadding(rpadding) {
 }
 
-uint16 TextWord::from() const {
-	return _from;
+uint16 TextWord::position() const {
+	return _position;
 }
 
 QFixed TextWord::f_rbearing() const {
@@ -588,19 +647,20 @@ Block::Block() {
 
 Block::Block(Block &&other) {
 	switch (other->type()) {
-	case TextBlockTNewline:
+	case TextBlockType::Newline:
 		emplace<NewlineBlock>(std::move(other.unsafe<NewlineBlock>()));
 		break;
-	case TextBlockTText:
+	case TextBlockType::Text:
 		emplace<TextBlock>(std::move(other.unsafe<TextBlock>()));
 		break;
-	case TextBlockTEmoji:
+	case TextBlockType::Emoji:
 		emplace<EmojiBlock>(std::move(other.unsafe<EmojiBlock>()));
 		break;
-	case TextBlockTCustomEmoji:
-		emplace<CustomEmojiBlock>(std::move(other.unsafe<CustomEmojiBlock>()));
+	case TextBlockType::CustomEmoji:
+		emplace<CustomEmojiBlock>(
+			std::move(other.unsafe<CustomEmojiBlock>()));
 		break;
-	case TextBlockTSkip:
+	case TextBlockType::Skip:
 		emplace<SkipBlock>(std::move(other.unsafe<SkipBlock>()));
 		break;
 	default:
@@ -614,19 +674,20 @@ Block &Block::operator=(Block &&other) {
 	}
 	destroy();
 	switch (other->type()) {
-	case TextBlockTNewline:
+	case TextBlockType::Newline:
 		emplace<NewlineBlock>(std::move(other.unsafe<NewlineBlock>()));
 		break;
-	case TextBlockTText:
+	case TextBlockType::Text:
 		emplace<TextBlock>(std::move(other.unsafe<TextBlock>()));
 		break;
-	case TextBlockTEmoji:
+	case TextBlockType::Emoji:
 		emplace<EmojiBlock>(std::move(other.unsafe<EmojiBlock>()));
 		break;
-	case TextBlockTCustomEmoji:
-		emplace<CustomEmojiBlock>(std::move(other.unsafe<CustomEmojiBlock>()));
+	case TextBlockType::CustomEmoji:
+		emplace<CustomEmojiBlock>(
+			std::move(other.unsafe<CustomEmojiBlock>()));
 		break;
-	case TextBlockTSkip:
+	case TextBlockType::Skip:
 		emplace<SkipBlock>(std::move(other.unsafe<SkipBlock>()));
 		break;
 	default:
@@ -641,91 +702,98 @@ Block::~Block() {
 
 Block Block::Newline(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex) {
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex) {
 	return New<NewlineBlock>(
 		font,
-		str,
-		from,
+		text,
+		position,
 		length,
 		flags,
-		lnkIndex,
-		spoilerIndex);
+		linkIndex,
+		colorIndex);
 }
 
 Block Block::Text(
 		const style::font &font,
-		const QString &str,
-		QFixed minResizeWidth,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex) {
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
+		QFixed minResizeWidth) {
 	return New<TextBlock>(
 		font,
-		str,
-		minResizeWidth,
-		from,
+		text,
+		position,
 		length,
 		flags,
-		lnkIndex,
-		spoilerIndex);
+		linkIndex,
+		colorIndex,
+		minResizeWidth);
 }
 
 Block Block::Emoji(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex,
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
 		EmojiPtr emoji) {
 	return New<EmojiBlock>(
 		font,
-		str,
-		from,
+		text,
+		position,
 		length,
 		flags,
-		lnkIndex,
-		spoilerIndex,
+		linkIndex,
+		colorIndex,
 		emoji);
 }
 
 Block Block::CustomEmoji(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex,
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
 		std::unique_ptr<Text::CustomEmoji> custom) {
 	return New<CustomEmojiBlock>(
 		font,
-		str,
-		from,
+		text,
+		position,
 		length,
 		flags,
-		lnkIndex,
-		spoilerIndex,
+		linkIndex,
+		colorIndex,
 		std::move(custom));
 }
 
 Block Block::Skip(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
-		int32 w,
-		int32 h,
-		uint16 lnkIndex,
-		uint16 spoilerIndex) {
-	return New<SkipBlock>(font, str, from, w, h, lnkIndex, spoilerIndex);
+		const QString &text,
+		uint16 position,
+		int32 width,
+		int32 height,
+		uint16 linkIndex,
+		uint16 colorIndex) {
+	return New<SkipBlock>(
+		font,
+		text,
+		position,
+		width,
+		height,
+		linkIndex,
+		colorIndex);
 }
 
 AbstractBlock *Block::get() {
@@ -754,19 +822,19 @@ const AbstractBlock &Block::operator*() const {
 
 void Block::destroy() {
 	switch (get()->type()) {
-	case TextBlockTNewline:
+	case TextBlockType::Newline:
 		unsafe<NewlineBlock>().~NewlineBlock();
 		break;
-	case TextBlockTText:
+	case TextBlockType::Text:
 		unsafe<TextBlock>().~TextBlock();
 		break;
-	case TextBlockTEmoji:
+	case TextBlockType::Emoji:
 		unsafe<EmojiBlock>().~EmojiBlock();
 		break;
-	case TextBlockTCustomEmoji:
+	case TextBlockType::CustomEmoji:
 		unsafe<CustomEmojiBlock>().~CustomEmojiBlock();
 		break;
-	case TextBlockTSkip:
+	case TextBlockType::Skip:
 		unsafe<SkipBlock>().~SkipBlock();
 		break;
 	default:
@@ -777,7 +845,7 @@ void Block::destroy() {
 int CountBlockHeight(
 		const AbstractBlock *block,
 		const style::TextStyle *st) {
-	return (block->type() == TextBlockTSkip)
+	return (block->type() == TextBlockType::Skip)
 		? static_cast<const SkipBlock*>(block)->height()
 		: (st->lineHeight > st->font->height)
 		? st->lineHeight
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index b5a140a..dfb7ba5 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "base/flags.h"
 #include "ui/text/text_custom_emoji.h"
 #include "ui/style/style_core.h"
 #include "ui/emoji_config.h"
@@ -20,59 +21,64 @@ struct TextStyle;
 
 namespace Ui::Text {
 
-enum TextBlockType {
-	TextBlockTNewline = 0x01,
-	TextBlockTText = 0x02,
-	TextBlockTEmoji = 0x03,
-	TextBlockTCustomEmoji = 0x04,
-	TextBlockTSkip = 0x05,
+enum class TextBlockType : uint16 {
+	Newline     = 0x01,
+	Text        = 0x02,
+	Emoji       = 0x03,
+	CustomEmoji = 0x04,
+	Skip        = 0x05,
 };
 
-enum TextBlockFlags {
-	TextBlockFBold = 0x01,
-	TextBlockFItalic = 0x02,
-	TextBlockFUnderline = 0x04,
-	TextBlockFStrikeOut = 0x08,
-	TextBlockFTilde = 0x10, // tilde fix in OpenSans
-	TextBlockFSemibold = 0x20,
-	TextBlockFCode = 0x40,
-	TextBlockFPre = 0x80,
-	TextBlockFPlainLink = 0x100,
+enum class TextBlockFlag : uint16 {
+	Bold      = 0x001,
+	Italic    = 0x002,
+	Underline = 0x004,
+	StrikeOut = 0x008,
+	Tilde     = 0x010, // Tilde fix in OpenSans.
+	Semibold  = 0x020,
+	Code      = 0x040,
+	Pre       = 0x080,
+	Spoiler   = 0x100,
 };
+inline constexpr bool is_flag_type(TextBlockFlag) { return true; }
+using TextBlockFlags = base::flags<TextBlockFlag>;
+
+[[nodiscard]] style::font WithFlags(
+	const style::font &font,
+	TextBlockFlags flags,
+	uint32 fontFlags = 0);
 
 class AbstractBlock {
 public:
-	uint16 from() const;
-	int width() const;
-	int rpadding() const;
-	QFixed f_width() const;
-	QFixed f_rpadding() const;
+	[[nodiscard]] uint16 position() const;
+	[[nodiscard]] TextBlockType type() const;
+	[[nodiscard]] TextBlockFlags flags() const;
+	[[nodiscard]] uint16 colorIndex() const;
+	[[nodiscard]] uint16 linkIndex() const;
+	void setLinkIndex(uint16 index);
+
+	[[nodiscard]] QFixed f_width() const;
+	[[nodiscard]] QFixed f_rpadding() const;
 
 	// Should be virtual, but optimized throught type() call.
-	QFixed f_rbearing() const;
-
-	uint16 lnkIndex() const;
-	void setLnkIndex(uint16 lnkIndex);
-
-	uint16 spoilerIndex() const;
-	void setSpoilerIndex(uint16 spoilerIndex);
-
-	TextBlockType type() const;
-	int32 flags() const;
+	[[nodiscard]] QFixed f_rbearing() const;
 
 protected:
 	AbstractBlock(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
+		TextBlockType type,
 		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex);
+		uint16 linkIndex,
+		uint16 colorIndex);
 
-	uint32 _flags = 0; // 2 bits empty, 16 bits lnkIndex, 4 bits type, 10 bits flags
-	uint16 _from = 0;
-	uint16 _spoilerIndex = 0;
+	uint16 _position = 0;
+	uint16 _type : 4 = 0;
+	uint16 _flags : 12 = 0;
+	uint16 _linkIndex = 0;
+	uint16 _colorIndex = 0;
 
 	QFixed _width = 0;
 
@@ -90,16 +96,16 @@ public:
 	NewlineBlock(
 		const style::font &font,
 		const QString &str,
-		uint16 from,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex);
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex);
 
-	Qt::LayoutDirection nextDirection() const;
+	[[nodiscard]] Qt::LayoutDirection nextDirection() const;
 
 private:
-	Qt::LayoutDirection _nextDir = Qt::LayoutDirectionAuto;
+	Qt::LayoutDirection _nextDirection = Qt::LayoutDirectionAuto;
 
 	friend class String;
 	friend class Parser;
@@ -110,17 +116,24 @@ private:
 class TextWord final {
 public:
 	TextWord() = default;
-	TextWord(uint16 from, QFixed width, QFixed rbearing, QFixed rpadding = 0);
-	uint16 from() const;
-	QFixed f_rbearing() const;
-	QFixed f_width() const;
-	QFixed f_rpadding() const;
+	TextWord(
+		uint16 position,
+		QFixed width,
+		QFixed rbearing,
+		QFixed rpadding = 0);
+
+	[[nodiscard]] uint16 position() const;
+	[[nodiscard]] QFixed f_rbearing() const;
+	[[nodiscard]] QFixed f_width() const;
+	[[nodiscard]] QFixed f_rpadding() const;
+
 	void add_rpadding(QFixed padding);
 
 private:
-	uint16 _from = 0;
+	uint16 _position = 0;
 	int16 _rbearing = 0;
-	QFixed _width, _rpadding;
+	QFixed _width;
+	QFixed _rpadding;
 
 };
 
@@ -128,16 +141,16 @@ class TextBlock final : public AbstractBlock {
 public:
 	TextBlock(
 		const style::font &font,
-		const QString &str,
-		QFixed minResizeWidth,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex);
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
+		QFixed minResizeWidth);
 
 private:
-	QFixed real_f_rbearing() const;
+	[[nodiscard]] QFixed real_f_rbearing() const;
 
 	QVector<TextWord> _words;
 
@@ -153,12 +166,12 @@ class EmojiBlock final : public AbstractBlock {
 public:
 	EmojiBlock(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex,
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
 		EmojiPtr emoji);
 
 private:
@@ -174,12 +187,12 @@ class CustomEmojiBlock final : public AbstractBlock {
 public:
 	CustomEmojiBlock(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex,
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
 		std::unique_ptr<CustomEmoji> custom);
 
 private:
@@ -195,14 +208,14 @@ class SkipBlock final : public AbstractBlock {
 public:
 	SkipBlock(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
-		int32 w,
-		int32 h,
-		uint16 lnkIndex,
-		uint16 spoilerIndex);
+		const QString &text,
+		uint16 position,
+		int32 width,
+		int32 height,
+		uint16 linkIndex,
+		uint16 colorIndex);
 
-	int height() const;
+	[[nodiscard]] int height() const;
 
 private:
 	int _height = 0;
@@ -221,52 +234,52 @@ public:
 	~Block();
 
 	[[nodiscard]] static Block Newline(
-			const style::font &font,
-			const QString &str,
-			uint16 from,
-			uint16 length,
-			uint16 flags,
-			uint16 lnkIndex,
-			uint16 spoilerIndex);
+		const style::font &font,
+		const QString &text,
+		uint16 position,
+		uint16 length,
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex);
 
 	[[nodiscard]] static Block Text(
-			const style::font &font,
-			const QString &str,
-			QFixed minResizeWidth,
-			uint16 from,
-			uint16 length,
-			uint16 flags,
-			uint16 lnkIndex,
-			uint16 spoilerIndex);
+		const style::font &font,
+		const QString &text,
+		uint16 position,
+		uint16 length,
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
+		QFixed minResizeWidth);
 
 	[[nodiscard]] static Block Emoji(
-			const style::font &font,
-			const QString &str,
-			uint16 from,
-			uint16 length,
-			uint16 flags,
-			uint16 lnkIndex,
-			uint16 spoilerIndex,
-			EmojiPtr emoji);
+		const style::font &font,
+		const QString &text,
+		uint16 position,
+		uint16 length,
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
+		EmojiPtr emoji);
 
 	[[nodiscard]] static Block CustomEmoji(
 		const style::font &font,
-		const QString &str,
-		uint16 from,
+		const QString &text,
+		uint16 position,
 		uint16 length,
-		uint16 flags,
-		uint16 lnkIndex,
-		uint16 spoilerIndex,
+		TextBlockFlags flags,
+		uint16 linkIndex,
+		uint16 colorIndex,
 		std::unique_ptr<CustomEmoji> custom);
 
 	[[nodiscard]] static Block Skip(
-			const style::font &font,
-			const QString &str,
-			uint16 from,
-			int32 w,
-			int32 h,
-			uint16 lnkIndex,
-			uint16 spoilerIndex);
+		const style::font &font,
+		const QString &text,
+		uint16 position,
+		int32 width,
+		int32 height,
+		uint16 linkIndex,
+		uint16 colorIndex);
 
 	template <typename FinalBlock>
 	[[nodiscard]] FinalBlock &unsafe() {
@@ -325,8 +338,8 @@ private:
 	const AbstractBlock *block,
 	const style::TextStyle *st);
 
-[[nodiscard]] inline bool IsMono(int32 flags) {
-	return (flags & TextBlockFPre) || (flags & TextBlockFCode);
+[[nodiscard]] inline bool IsMono(TextBlockFlags flags) {
+	return (flags & TextBlockFlag::Pre) || (flags & TextBlockFlag::Code);
 }
 
 } // namespace Ui::Text
diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 3945774..05633ec 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -1358,7 +1358,7 @@ QString RemoveAccents(const QString &text) {
 			if (copying) result[i] = *ch;
 			continue;
 		}
-		if (IsDiac(*ch)) {
+		if (IsDiacritic(*ch)) {
 			copying = true;
 			--i;
 			continue;
@@ -2047,9 +2047,9 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 
 	auto offset = 0;
 	auto state = State();
-	auto notClosedEntities = QVector<int>(); // Stack of indices.
+	auto notClosedEntities = std::vector<int>(); // Stack of indices.
 	const auto closeOne = [&] {
-		Expects(!notClosedEntities.isEmpty());
+		Expects(!notClosedEntities.empty());
 
 		auto &entity = result[notClosedEntities.back()];
 		entity = {
diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 07e281c..336d136 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -26,7 +26,7 @@ enum class EntityType : uchar {
 	CustomEmoji,
 	BotCommand,
 	MediaTimestamp,
-	PlainLink, // Senders in chat list, attachements in chat list, etc.
+	Colorized, // Senders in chat list, attachments in chat list, etc.
 
 	Bold,
 	Semibold,
@@ -61,16 +61,16 @@ public:
 		int length,
 		const QString &data = QString());
 
-	EntityType type() const {
+	[[nodiscard]] EntityType type() const {
 		return _type;
 	}
-	int offset() const {
+	[[nodiscard]] int offset() const {
 		return _offset;
 	}
-	int length() const {
+	[[nodiscard]] int length() const {
 		return _length;
 	}
-	QString data() const {
+	[[nodiscard]] QString data() const {
 		return _data;
 	}
 
@@ -103,7 +103,7 @@ public:
 		}
 	}
 
-	static int FirstMonospaceOffset(
+	[[nodiscard]] static int FirstMonospaceOffset(
 		const EntitiesInText &entities,
 		int textLength);
 
@@ -253,7 +253,7 @@ enum {
 	TextParseHashtags = 0x008,
 	TextParseBotCommands = 0x010,
 	TextParseMarkdown = 0x020,
-	TextParsePlainLinks = 0x040,
+	TextParseColorized = 0x040,
 };
 
 struct TextWithTags {
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 41c5da8..8eb925a 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -26,8 +26,8 @@ constexpr auto kMaxDiacAfterSymbol = 2;
 	auto result = text;
 	const auto &preparsed = text.entities;
 	const bool parseLinks = (options.flags & TextParseLinks);
-	const bool parsePlainLinks = (options.flags & TextParsePlainLinks);
-	if (!preparsed.isEmpty() && (parseLinks || parsePlainLinks)) {
+	const bool parseColorized = (options.flags & TextParseColorized);
+	if (!preparsed.isEmpty() && (parseLinks || parseColorized)) {
 		bool parseMentions = (options.flags & TextParseMentions);
 		bool parseHashtags = (options.flags & TextParseHashtags);
 		bool parseBotCommands = (options.flags & TextParseBotCommands);
@@ -41,9 +41,6 @@ constexpr auto kMaxDiacAfterSymbol = 2;
 				if (((type == EntityType::Mention || type == EntityType::MentionName) && !parseMentions) ||
 					(type == EntityType::Hashtag && !parseHashtags) ||
 					(type == EntityType::Cashtag && !parseHashtags) ||
-					(type == EntityType::PlainLink
-						&& !parsePlainLinks
-						&& !parseMarkdown) ||
 					(!parseLinks
 						&& (type == EntityType::Url
 							|| type == EntityType::CustomUrl)) ||
@@ -53,6 +50,8 @@ constexpr auto kMaxDiacAfterSymbol = 2;
 						|| type == EntityType::Italic
 						|| type == EntityType::Underline
 						|| type == EntityType::StrikeOut
+						|| type == EntityType::Colorized
+						|| type == EntityType::Spoiler
 						|| type == EntityType::Code
 						|| type == EntityType::Pre))) {
 					continue;
@@ -72,7 +71,7 @@ constexpr auto kMaxDiacAfterSymbol = 2;
 		: QFIXED_MAX;
 }
 
-// Open Sans tilde fix.
+// Tilde fix in OpenSans.
 [[nodiscard]] bool ComputeCheckTilde(const style::TextStyle &st) {
 	const auto &font = st.font;
 	return (font->size() * style::DevicePixelRatio() == 13)
@@ -83,7 +82,7 @@ constexpr auto kMaxDiacAfterSymbol = 2;
 } // namespace
 
 Parser::StartedEntity::StartedEntity(TextBlockFlags flags)
-: _value(flags)
+: _value(flags.value())
 , _type(Type::Flags) {
 	Expects(_value >= 0 && _value < int(kStringLinkIndexShift));
 }
@@ -102,12 +101,12 @@ Parser::StartedEntity::Type Parser::StartedEntity::type() const {
 
 std::optional<TextBlockFlags> Parser::StartedEntity::flags() const {
 	if (_value < int(kStringLinkIndexShift) && (_type == Type::Flags)) {
-		return TextBlockFlags(_value);
+		return TextBlockFlags::from_raw(uint16(_value));
 	}
 	return std::nullopt;
 }
 
-std::optional<uint16> Parser::StartedEntity::lnkIndex() const {
+std::optional<uint16> Parser::StartedEntity::linkIndex() const {
 	if ((_value < int(kStringLinkIndexShift) && (_type == Type::IndexedLink))
 		|| (_value >= int(kStringLinkIndexShift) && (_type == Type::Link))) {
 		return uint16(_value);
@@ -115,8 +114,8 @@ std::optional<uint16> Parser::StartedEntity::lnkIndex() const {
 	return std::nullopt;
 }
 
-std::optional<uint16> Parser::StartedEntity::spoilerIndex() const {
-	if (_value < int(kStringLinkIndexShift) && (_type == Type::Spoiler)) {
+std::optional<uint16> Parser::StartedEntity::colorIndex() const {
+	if (_type == Type::Colorized) {
 		return uint16(_value);
 	}
 	return std::nullopt;
@@ -163,47 +162,61 @@ void Parser::blockCreated() {
 }
 
 void Parser::createBlock(int32 skipBack) {
-	if (_lnkIndex < kStringLinkIndexShift && _lnkIndex > _maxLnkIndex) {
-		_maxLnkIndex = _lnkIndex;
+	if (_linkIndex < kStringLinkIndexShift && _linkIndex > _maxLinkIndex) {
+		_maxLinkIndex = _linkIndex;
 	}
-	if (_lnkIndex > kStringLinkIndexShift) {
-		_maxShiftedLnkIndex = std::max(
-			uint16(_lnkIndex - kStringLinkIndexShift),
-			_maxShiftedLnkIndex);
+	if (_linkIndex > kStringLinkIndexShift) {
+		_maxShiftedLinkIndex = std::max(
+			uint16(_linkIndex - kStringLinkIndexShift),
+			_maxShiftedLinkIndex);
 	}
 
-	int32 len = int32(_t->_text.size()) + skipBack - _blockStart;
-	if (len > 0) {
-		bool newline = !_emoji && (len == 1 && _t->_text.at(_blockStart) == QChar::LineFeed);
-		if (_newlineAwaited) {
-			_newlineAwaited = false;
-			if (!newline) {
-				_t->_text.insert(_blockStart, QChar::LineFeed);
-				createBlock(skipBack - len);
-			}
-		}
-		const auto lnkIndex = _monoIndex ? _monoIndex : _lnkIndex;
-		auto custom = _customEmojiData.isEmpty()
-			? nullptr
-			: Integration::Instance().createCustomEmoji(
-				_customEmojiData,
-				_context);
-		if (custom) {
-			_t->_blocks.push_back(Block::CustomEmoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, std::move(custom)));
-		} else if (_emoji) {
-			_t->_blocks.push_back(Block::Emoji(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex, _emoji));
-		} else if (newline) {
-			_t->_blocks.push_back(Block::Newline(_t->_st->font, _t->_text, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
-		} else {
-			_t->_blocks.push_back(Block::Text(_t->_st->font, _t->_text, _t->_minResizeWidth, _blockStart, len, _flags, lnkIndex, _spoilerIndex));
-		}
-		// Diacritic can't attach from the next block to this one.
-		_allowDiacritic = false;
-		_blockStart += len;
-		_customEmojiData = QByteArray();
-		_emoji = nullptr;
-		blockCreated();
+	const auto length = int32(_t->_text.size()) + skipBack - _blockStart;
+	if (length <= 0) {
+		return;
 	}
+	const auto newline = !_emoji
+		&& (length == 1)
+		&& (_t->_text.at(_blockStart) == QChar::LineFeed);
+	if (_newlineAwaited) {
+		_newlineAwaited = false;
+		if (!newline) {
+			_t->_text.insert(_blockStart, QChar::LineFeed);
+			createBlock(skipBack - length);
+		}
+	}
+	const auto linkIndex = _monoIndex ? _monoIndex : _linkIndex;
+	auto custom = _customEmojiData.isEmpty()
+		? nullptr
+		: Integration::Instance().createCustomEmoji(
+			_customEmojiData,
+			_context);
+	const auto push = [&](auto &&factory, auto &&...args) {
+		_t->_blocks.push_back(factory(
+			_t->_st->font,
+			_t->_text,
+			_blockStart,
+			length,
+			_flags,
+			linkIndex,
+			_colorIndex,
+			std::forward<decltype(args)>(args)...));
+	};
+	if (custom) {
+		push(&Block::CustomEmoji, std::move(custom));
+	} else if (_emoji) {
+		push(&Block::Emoji, _emoji);
+	} else if (newline) {
+		push(&Block::Newline);
+	} else {
+		push(&Block::Text, _t->_minResizeWidth);
+	}
+	// Diacritic can't attach from the next block to this one.
+	_allowDiacritic = false;
+	_blockStart += length;
+	_customEmojiData = QByteArray();
+	_emoji = nullptr;
+	blockCreated();
 }
 
 void Parser::createNewlineBlock() {
@@ -226,24 +239,24 @@ void Parser::finishEntities() {
 				if (_flags & (*flags)) {
 					createBlock();
 					_flags &= ~(*flags);
-					if (((*flags) & TextBlockFPre)
+					if (((*flags) & TextBlockFlag::Pre)
 						&& !_t->_blocks.empty()
-						&& _t->_blocks.back()->type() != TextBlockTNewline) {
+						&& _t->_blocks.back()->type() != TextBlockType::Newline) {
 						_newlineAwaited = true;
 					}
 					if (IsMono(*flags)) {
 						_monoIndex = 0;
 					}
 				}
-			} else if (const auto lnkIndex = list.back().lnkIndex()) {
-				if (_lnkIndex == *lnkIndex) {
+			} else if (const auto linkIndex = list.back().linkIndex()) {
+				if (_linkIndex == *linkIndex) {
 					createBlock();
-					_lnkIndex = 0;
+					_linkIndex = 0;
 				}
-			} else if (const auto spoilerIndex = list.back().spoilerIndex()) {
-				if (_spoilerIndex == *spoilerIndex && (_spoilerIndex != 0)) {
+			} else if (const auto colorIndex = list.back().colorIndex()) {
+				if (_colorIndex == *colorIndex) {
 					createBlock();
-					_spoilerIndex = 0;
+					_colorIndex = 0;
 				}
 			}
 			list.pop_back();
@@ -289,26 +302,26 @@ bool Parser::checkEntities() {
 		_customEmojiData = _waitingEntity->data();
 		_startedEntities[entityEnd].emplace_back(0, Type::CustomEmoji);
 	} else if (entityType == EntityType::Bold) {
-		flags = TextBlockFBold;
+		flags = TextBlockFlag::Bold;
 	} else if (entityType == EntityType::Semibold) {
-		flags = TextBlockFSemibold;
+		flags = TextBlockFlag::Semibold;
 	} else if (entityType == EntityType::Italic) {
-		flags = TextBlockFItalic;
+		flags = TextBlockFlag::Italic;
 	} else if (entityType == EntityType::Underline) {
-		flags = TextBlockFUnderline;
-	} else if (entityType == EntityType::PlainLink) {
-		flags = TextBlockFPlainLink;
+		flags = TextBlockFlag::Underline;
+	} else if (entityType == EntityType::Spoiler) {
+		flags = TextBlockFlag::Spoiler;
 	} else if (entityType == EntityType::StrikeOut) {
-		flags = TextBlockFStrikeOut;
+		flags = TextBlockFlag::StrikeOut;
 	} else if ((entityType == EntityType::Code) // #TODO entities
 		|| (entityType == EntityType::Pre)) {
 		if (entityType == EntityType::Code) {
-			flags = TextBlockFCode;
+			flags = TextBlockFlag::Code;
 		} else {
-			flags = TextBlockFPre;
+			flags = TextBlockFlag::Pre;
 			createBlock();
 			if (!_t->_blocks.empty()
-				&& _t->_blocks.back()->type() != TextBlockTNewline
+				&& _t->_blocks.back()->type() != TextBlockType::Newline
 				&& _customEmojiData.isEmpty()) {
 				createNewlineBlock();
 			}
@@ -342,6 +355,14 @@ bool Parser::checkEntities() {
 		}
 	} else if (entityType == EntityType::MentionName) {
 		pushComplexUrl();
+	} else if (entityType == EntityType::Colorized) {
+		createBlock();
+
+		const auto data = _waitingEntity->data();
+		_colorIndex = data.isEmpty() ? 1 : (data.front().unicode() + 1);
+		_startedEntities[entityEnd].emplace_back(
+			_colorIndex,
+			Type::Colorized);
 	}
 
 	if (link.type != EntityType::Invalid) {
@@ -350,9 +371,9 @@ bool Parser::checkEntities() {
 		_links.push_back(link);
 		const auto tempIndex = _links.size();
 		const auto useCustom = processCustomIndex(tempIndex);
-		_lnkIndex = tempIndex + (useCustom ? 0 : kStringLinkIndexShift);
+		_linkIndex = tempIndex + (useCustom ? 0 : kStringLinkIndexShift);
 		_startedEntities[entityEnd].emplace_back(
-			_lnkIndex,
+			_linkIndex,
 			useCustom ? Type::IndexedLink : Type::Link);
 	} else if (flags) {
 		if (!(_flags & flags)) {
@@ -361,18 +382,6 @@ bool Parser::checkEntities() {
 			_startedEntities[entityEnd].emplace_back(flags);
 			_monoIndex = monoIndex;
 		}
-	} else if (entityType == EntityType::Spoiler) {
-		createBlock();
-
-		_spoilers.push_back(EntityLinkData{
-			.data = QString::number(_spoilers.size() + 1),
-			.type = entityType,
-		});
-		_spoilerIndex = _spoilers.size();
-
-		_startedEntities[entityEnd].emplace_back(
-			_spoilerIndex,
-			Type::Spoiler);
 	}
 
 	++_waitingEntity;
@@ -423,7 +432,7 @@ void Parser::parseCurrentChar() {
 	const auto inCustomEmoji = !_customEmojiData.isEmpty();
 	const auto isNewLine = !inCustomEmoji && _multiline && IsNewline(_ch);
 	const auto replaceWithSpace = IsSpace(_ch) && (_ch != QChar::Nbsp);
-	const auto isDiac = IsDiac(_ch);
+	const auto isDiacritic = IsDiacritic(_ch);
 	const auto isTilde = !inCustomEmoji && _checkTilde && (_ch == '~');
 	const auto skip = [&] {
 		if (IsBad(_ch) || _ch.isLowSurrogate()) {
@@ -431,8 +440,10 @@ void Parser::parseCurrentChar() {
 		} else if (_ch == 0xFE0F && Platform::IsMac()) {
 			// Some sequences like 0x0E53 0xFE0F crash OS X harfbuzz text processing :(
 			return true;
-		} else if (isDiac) {
-			if (!_allowDiacritic || _emoji || ++_diacs > kMaxDiacAfterSymbol) {
+		} else if (isDiacritic) {
+			if (!_allowDiacritic
+				|| _emoji
+				|| ++_diacritics > kMaxDiacAfterSymbol) {
 				return true;
 			}
 		} else if (_ch.isHighSurrogate()) {
@@ -474,15 +485,15 @@ void Parser::parseCurrentChar() {
 		_ch = 0;
 		_allowDiacritic = false;
 	} else {
-		if (isTilde) { // tilde fix in OpenSans
-			if (!(_flags & TextBlockFTilde)) {
+		if (isTilde) { // Tilde fix in OpenSans.
+			if (!(_flags & TextBlockFlag::Tilde)) {
 				createBlock(-_emojiLookback);
-				_flags |= TextBlockFTilde;
+				_flags |= TextBlockFlag::Tilde;
 			}
 		} else {
-			if (_flags & TextBlockFTilde) {
+			if (_flags & TextBlockFlag::Tilde) {
 				createBlock(-_emojiLookback);
-				_flags &= ~TextBlockFTilde;
+				_flags &= ~TextBlockFlag::Tilde;
 			}
 		}
 		if (isNewLine) {
@@ -497,8 +508,8 @@ void Parser::parseCurrentChar() {
 			_t->_text.push_back(_ch);
 			_allowDiacritic = true;
 		}
-		if (!isDiac) {
-			_diacs = 0;
+		if (!isDiacritic) {
+			_diacritics = 0;
 		}
 	}
 }
@@ -594,7 +605,7 @@ void Parser::trimSourceRange() {
 // }
 
 void Parser::finalize(const TextParseOptions &options) {
-	_t->_links.resize(_maxLnkIndex + _maxShiftedLnkIndex);
+	_t->_links.resize(_maxLinkIndex + _maxShiftedLinkIndex);
 	auto counterCustomIndex = uint16(0);
 	auto currentIndex = uint16(0); // Current the latest index of _t->_links.
 	struct {
@@ -614,21 +625,21 @@ void Parser::finalize(const TextParseOptions &options) {
 	auto spacesCheckFrom = uint16(-1);
 	const auto length = int(_t->_text.size());
 	for (auto &block : _t->_blocks) {
-		if (block->type() == TextBlockTCustomEmoji) {
+		if (block->type() == TextBlockType::CustomEmoji) {
 			_t->_hasCustomEmoji = true;
-		} else if (block->type() != TextBlockTNewline
-			&& block->type() != TextBlockTSkip) {
+		} else if (block->type() != TextBlockType::Newline
+			&& block->type() != TextBlockType::Skip) {
 			_t->_isOnlyCustomEmoji = false;
-		} else if (block->lnkIndex()) {
+		} else if (block->linkIndex()) {
 			_t->_isOnlyCustomEmoji = _t->_isIsolatedEmoji = false;
 		}
 		if (!_t->_hasNotEmojiAndSpaces) {
-			if (block->type() == TextBlockTText) {
+			if (block->type() == TextBlockType::Text) {
 				if (spacesCheckFrom == uint16(-1)) {
-					spacesCheckFrom = block->from();
+					spacesCheckFrom = block->position();
 				}
 			} else if (spacesCheckFrom != uint16(-1)) {
-				const auto checkTill = block->from();
+				const auto checkTill = block->position();
 				for (auto i = spacesCheckFrom; i != checkTill; ++i) {
 					Assert(i < length);
 					if (!_t->_text[i].isSpace()) {
@@ -640,35 +651,35 @@ void Parser::finalize(const TextParseOptions &options) {
 			}
 		}
 		if (_t->_isIsolatedEmoji) {
-			if (block->type() == TextBlockTCustomEmoji
-				|| block->type() == TextBlockTEmoji) {
+			if (block->type() == TextBlockType::CustomEmoji
+				|| block->type() == TextBlockType::Emoji) {
 				if (++isolatedEmojiCount > kIsolatedEmojiLimit) {
 					_t->_isIsolatedEmoji = false;
 				}
-			} else if (block->type() != TextBlockTSkip) {
+			} else if (block->type() != TextBlockType::Skip) {
 				_t->_isIsolatedEmoji = false;
 			}
 		}
-		if (block->spoilerIndex()) {
+		if (block->flags() & TextBlockFlag::Spoiler) {
 			if (!_t->_spoiler.data) {
 				_t->_spoiler.data = std::make_unique<SpoilerData>(
 					Integration::Instance().createSpoilerRepaint(_context));
 			}
 		}
-		const auto shiftedIndex = block->lnkIndex();
+		const auto shiftedIndex = block->linkIndex();
 		auto useCustomIndex = false;
 		if (shiftedIndex <= kStringLinkIndexShift) {
 			if (IsMono(block->flags()) && shiftedIndex) {
 				const auto monoIndex = shiftedIndex;
 
 				if (lastHandlerIndex.mono == monoIndex) {
-					block->setLnkIndex(currentIndex);
+					block->setLinkIndex(currentIndex);
 					continue; // Optimization.
 				} else {
 					currentIndex++;
 				}
 				avoidIntersectionsWithCustom();
-				block->setLnkIndex(currentIndex);
+				block->setLinkIndex(currentIndex);
 				const auto handler = Integration::Instance().createLinkHandler(
 					_monos[monoIndex - 1],
 					_context);
@@ -693,7 +704,7 @@ void Parser::finalize(const TextParseOptions &options) {
 			? shiftedIndex
 			: (shiftedIndex - kStringLinkIndexShift);
 		if (lastHandlerIndex.lnk == realIndex) {
-			block->setLnkIndex(usedIndex());
+			block->setLinkIndex(usedIndex());
 			continue; // Optimization.
 		} else {
 			(useCustomIndex ? counterCustomIndex : currentIndex)++;
@@ -701,7 +712,7 @@ void Parser::finalize(const TextParseOptions &options) {
 		if (!useCustomIndex) {
 			avoidIntersectionsWithCustom();
 		}
-		block->setLnkIndex(usedIndex());
+		block->setLinkIndex(usedIndex());
 
 		_t->_links.resize(std::max(usedIndex(), uint16(_t->_links.size())));
 		const auto handler = Integration::Instance().createLinkHandler(
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index 528fc5a..eb4f3a7 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -28,8 +28,8 @@ private:
 			Flags,
 			Link,
 			IndexedLink,
-			Spoiler,
 			CustomEmoji,
+			Colorized,
 		};
 
 		explicit StartedEntity(TextBlockFlags flags);
@@ -37,8 +37,8 @@ private:
 
 		[[nodiscard]] Type type() const;
 		[[nodiscard]] std::optional<TextBlockFlags> flags() const;
-		[[nodiscard]] std::optional<uint16> lnkIndex() const;
-		[[nodiscard]] std::optional<uint16> spoilerIndex() const;
+		[[nodiscard]] std::optional<uint16> linkIndex() const;
+		[[nodiscard]] std::optional<uint16> colorIndex() const;
 
 	private:
 		const int _value = 0;
@@ -96,23 +96,22 @@ private:
 	std::vector<uint16> _linksIndexes;
 
 	std::vector<EntityLinkData> _links;
-	std::vector<EntityLinkData> _spoilers;
 	std::vector<EntityLinkData> _monos;
 	base::flat_map<
 		const QChar*,
 		std::vector<StartedEntity>> _startedEntities;
 
-	uint16 _maxLnkIndex = 0;
-	uint16 _maxShiftedLnkIndex = 0;
+	uint16 _maxLinkIndex = 0;
+	uint16 _maxShiftedLinkIndex = 0;
 
 	// current state
-	int32 _flags = 0;
-	uint16 _lnkIndex = 0;
-	uint16 _spoilerIndex = 0;
+	TextBlockFlags _flags;
+	uint16 _linkIndex = 0;
+	uint16 _colorIndex = 0;
 	uint16 _monoIndex = 0;
 	EmojiPtr _emoji = nullptr; // current emoji, if current word is an emoji, or zero
 	int32 _blockStart = 0; // offset in result, from which current parsed block is started
-	int32 _diacs = 0; // diac chars skipped without good char
+	int32 _diacritics = 0; // diacritic chars skipped without good char
 	QFixed _sumWidth;
 	bool _sumFinished = false;
 	bool _newlineAwaited = false;
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 89074df..db95239 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -173,6 +173,7 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 	_p = &p;
 	_p->setFont(_t->_st->font);
 	_palette = context.palette ? context.palette : &st::defaultTextPalette;
+	_colors = context.colors;
 	_originalPen = _p->pen();
 	_originalPenSelected = (_palette->selectFg->c.alphaF() == 0)
 		? _originalPen
@@ -184,18 +185,19 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 	_yTo = context.clip.isNull()
 		? -1
 		: (context.clip.y() + context.clip.height());
-	if (const auto lines = context.elisionLines) {
-		if (_yTo < 0 || (_y + (lines - 1) * _t->_st->font->height) < _yTo) {
-			_yTo = _y + (lines * _t->_st->font->height);
-			_elideLast = true;
-			_elideRemoveFromEnd = context.elisionRemoveFromEnd;
-		}
-		_breakEverywhere = context.elisionBreakEverywhere;
-	}
+	_geometry = context.geometry.layout
+		? context.geometry
+		: SimpleGeometry(
+			context.availableWidth,
+			_t->_st->font->height,
+			context.elisionHeight,
+			context.elisionRemoveFromEnd,
+			context.elisionOneLine,
+			context.elisionBreakEverywhere);
+	_breakEverywhere = _geometry.breakEverywhere;
 	_spoilerCache = context.spoiler;
 	_selection = context.selection;
 	_fullWidthSelection = context.fullWidthSelection;
-	_w = context.availableWidth;
 	_align = context.align;
 	_cachedNow = context.now;
 	_pausedEmoji = context.paused || context.pausedEmoji;
@@ -209,34 +211,26 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 
 void Renderer::enumerate() {
 	_blocksSize = _t->_blocks.size();
-	_wLeft = _w;
-	if (_elideLast) {
-		_yToElide = _yTo;
-		if (_elideRemoveFromEnd > 0 && !_t->_blocks.empty()) {
-			int firstBlockHeight = CountBlockHeight(_t->_blocks.front().get(), _t->_st);
-			if (_y + firstBlockHeight >= _yToElide) {
-				_wLeft -= _elideRemoveFromEnd;
-			}
-		}
-	}
 	_str = _t->_text.unicode();
 
 	if (_p) {
-		auto clip = _p->hasClipping() ? _p->clipBoundingRect() : QRect();
+		const auto clip = _p->hasClipping() ? _p->clipBoundingRect() : QRect();
 		if (clip.width() > 0 || clip.height() > 0) {
-			if (_yFrom < clip.y()) _yFrom = clip.y();
-			if (_yTo < 0 || _yTo > clip.y() + clip.height()) _yTo = clip.y() + clip.height();
+			if (_yFrom < clip.y()) {
+				_yFrom = clip.y();
+			}
+			if (_yTo < 0 || _yTo > clip.y() + clip.height()) {
+				_yTo = clip.y() + clip.height();
+			}
 		}
 	}
 
-	_parDirection = _t->_startDir;
-	if (_parDirection == Qt::LayoutDirectionAuto) _parDirection = style::LayoutDirection();
-	if ((*_t->_blocks.cbegin())->type() != TextBlockTNewline) {
-		initNextParagraph(_t->_blocks.cbegin());
-	}
+	_startLeft = _x.toInt();
+	_startTop = _y;
 
-	_lineStart = 0;
-	_lineStartBlock = 0;
+	if ((*_t->_blocks.cbegin())->type() != TextBlockType::Newline) {
+		initNextParagraph(_t->_blocks.cbegin(), _t->_startDirection);
+	}
 
 	_lineHeight = 0;
 	_fontHeight = _t->_st->font->height;
@@ -257,27 +251,23 @@ void Renderer::enumerate() {
 		auto _btype = b->type();
 		auto blockHeight = CountBlockHeight(b, _t->_st);
 
-		if (_btype == TextBlockTNewline) {
-			if (!_lineHeight) _lineHeight = blockHeight;
-			if (!drawLine((*i)->from(), i, e)) {
+		if (_btype == TextBlockType::Newline) {
+			if (!_lineHeight) {
+				_lineHeight = blockHeight;
+			}
+			if (!drawLine((*i)->position(), i, e)) {
 				return;
 			}
 
 			_y += _lineHeight;
 			_lineHeight = 0;
-			_lineStart = _t->countBlockEnd(i, e);
-			_lineStartBlock = blockIndex + 1;
 
-			last_rBearing = b->f_rbearing();
-			_last_rPadding = b->f_rpadding();
-			_wLeft = _w - (b->f_width() - last_rBearing);
-			if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
-				_wLeft -= _elideRemoveFromEnd;
-			}
+			last_rBearing = 0;
+			_last_rPadding = 0;
 
-			_parDirection = static_cast<const NewlineBlock*>(b)->nextDirection();
-			if (_parDirection == Qt::LayoutDirectionAuto) _parDirection = style::LayoutDirection();
-			initNextParagraph(i + 1);
+			initNextParagraph(
+				i + 1,
+				static_cast<const NewlineBlock*>(b)->nextDirection());
 
 			longWordLine = true;
 			continue;
@@ -296,7 +286,7 @@ void Renderer::enumerate() {
 			continue;
 		}
 
-		if (_btype == TextBlockTText) {
+		if (_btype == TextBlockType::Text) {
 			auto t = static_cast<const TextBlock*>(b);
 			if (t->_words.isEmpty()) { // no words in this block, spaces only => layout this block in the same line
 				_last_rPadding += b->f_rpadding();
@@ -332,10 +322,8 @@ void Renderer::enumerate() {
 					continue;
 				}
 
-				auto elidedLineHeight = qMax(_lineHeight, blockHeight);
-				auto elidedLine = _elideLast && (_y + elidedLineHeight >= _yToElide);
-				if (elidedLine) {
-					_lineHeight = elidedLineHeight;
+				if (_elidedLine) {
+					_lineHeight = qMax(_lineHeight, blockHeight);
 				} else if (f != j && !_breakEverywhere) {
 					// word did not fit completely, so we roll back the state to the beginning of this long word
 					j = f;
@@ -343,20 +331,24 @@ void Renderer::enumerate() {
 					_lineHeight = f_lineHeight;
 					j_width = (j->f_width() >= 0) ? j->f_width() : -j->f_width();
 				}
-				if (!drawLine(elidedLine ? ((j + 1 == en) ? _t->countBlockEnd(i, e) : (j + 1)->from()) : j->from(), i, e)) {
+				const auto lineEnd = !_elidedLine
+					? j->position()
+					: (j + 1 != en)
+					? (j + 1)->position()
+					: _t->countBlockEnd(i, e);
+				if (!drawLine(lineEnd, i, e)) {
 					return;
 				}
 				_y += _lineHeight;
 				_lineHeight = qMax(0, blockHeight);
-				_lineStart = j->from();
+				_lineStart = j->position();
 				_lineStartBlock = blockIndex;
+				_paragraphWidthRemaining -= (_lineWidth - _wLeft) - _last_rPadding + last_rBearing;
+				initNextLine();
 
 				last_rBearing = j->f_rbearing();
 				_last_rPadding = j->f_rpadding();
-				_wLeft = _w - (j_width - last_rBearing);
-				if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
-					_wLeft -= _elideRemoveFromEnd;
-				}
+				_wLeft -= j_width - last_rBearing;
 
 				longWordLine = !wordEndsHere;
 				f = j + 1;
@@ -366,31 +358,33 @@ void Renderer::enumerate() {
 			continue;
 		}
 
-		auto elidedLineHeight = qMax(_lineHeight, blockHeight);
-		auto elidedLine = _elideLast && (_y + elidedLineHeight >= _yToElide);
-		if (elidedLine) {
-			_lineHeight = elidedLineHeight;
+		if (_elidedLine) {
+			_lineHeight = qMax(_lineHeight, blockHeight);
 		}
-		if (!drawLine(elidedLine ? _t->countBlockEnd(i, e) : b->from(), i, e)) {
+		const auto lineEnd = !_elidedLine
+			? b->position()
+			: _t->countBlockEnd(i, e);
+		if (!drawLine(lineEnd, i, e)) {
 			return;
 		}
 		_y += _lineHeight;
 		_lineHeight = qMax(0, blockHeight);
-		_lineStart = b->from();
+		_lineStart = b->position();
 		_lineStartBlock = blockIndex;
+		_paragraphWidthRemaining -= (_lineWidth - _wLeft) - _last_rPadding + last_rBearing;
+		initNextLine();
 
 		last_rBearing = b__f_rbearing;
 		_last_rPadding = b->f_rpadding();
-		_wLeft = _w - (b->f_width() - last_rBearing);
-		if (_elideLast && _elideRemoveFromEnd > 0 && (_y + blockHeight >= _yToElide)) {
-			_wLeft -= _elideRemoveFromEnd;
-		}
+		_wLeft -= b->f_width() - last_rBearing;
 
 		longWordLine = true;
 		continue;
 	}
 	if (_lineStart < _t->_text.size()) {
-		if (!drawLine(_t->_text.size(), e, e)) return;
+		if (!drawLine(_t->_text.size(), e, e)) {
+			return;
+		}
 	}
 	if (!_p && _lookupSymbol) {
 		_lookupResult.symbol = _t->_text.size();
@@ -398,7 +392,10 @@ void Renderer::enumerate() {
 	}
 }
 
-StateResult Renderer::getState(QPoint point, int w, StateRequest request) {
+StateResult Renderer::getState(
+		QPoint point,
+		GeometryDescriptor geometry,
+		StateRequest request) {
 	if (_t->isEmpty() || point.y() < 0) {
 		return {};
 	}
@@ -406,41 +403,13 @@ StateResult Renderer::getState(QPoint point, int w, StateRequest request) {
 	_lookupX = point.x();
 	_lookupY = point.y();
 
-	_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
 	_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
 	_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
-	if (!_lookupSymbol && (_lookupX < 0 || _lookupX >= w)) {
+	if (!_lookupSymbol && _lookupX < 0) {
 		return {};
 	}
-	_w = w;
-	_yFrom = _lookupY;
-	_yTo = _lookupY + 1;
-	_align = _lookupRequest.align;
-	enumerate();
-	return _lookupResult;
-}
-
-StateResult Renderer::getStateElided(QPoint point, int w, StateRequestElided request) {
-	if (_t->isEmpty() || point.y() < 0 || request.lines <= 0) {
-		return {};
-	}
-	_lookupRequest = request;
-	_lookupX = point.x();
-	_lookupY = point.y();
-
-	_breakEverywhere = (_lookupRequest.flags & StateRequest::Flag::BreakEverywhere);
-	_lookupSymbol = (_lookupRequest.flags & StateRequest::Flag::LookupSymbol);
-	_lookupLink = (_lookupRequest.flags & StateRequest::Flag::LookupLink);
-	if (!_lookupSymbol && (_lookupX < 0 || _lookupX >= w)) {
-		return {};
-	}
-	int yTo = _lookupY + 1;
-	if (yTo < 0 || (request.lines - 1) * _t->_st->font->height < yTo) {
-		yTo = request.lines * _t->_st->font->height;
-		_elideLast = true;
-		_elideRemoveFromEnd = request.removeFromEnd;
-	}
-	_w = w;
+	_geometry = std::move(geometry);
+	_breakEverywhere = _geometry.breakEverywhere;
 	_yFrom = _lookupY;
 	_yTo = _lookupY + 1;
 	_align = _lookupRequest.align;
@@ -455,26 +424,58 @@ crl::time Renderer::now() const {
 	return _cachedNow;
 }
 
-void Renderer::initNextParagraph(String::TextBlocks::const_iterator i) {
+void Renderer::initNextParagraph(
+		String::TextBlocks::const_iterator i,
+		Qt::LayoutDirection direction) {
+	_parDirection = (direction == Qt::LayoutDirectionAuto)
+		? style::LayoutDirection()
+		: direction;
 	_parStartBlock = i;
+	_paragraphWidthRemaining = 0;
 	const auto e = _t->_blocks.cend();
 	if (i == e) {
-		_parStart = _t->_text.size();
+		_lineStart = _parStart = _t->_text.size();
+		_lineStartBlock = _t->_blocks.size();
 		_parLength = 0;
 	} else {
-		_parStart = (*i)->from();
+		_lineStart = _parStart = (*i)->position();
+		_lineStartBlock = i - _t->_blocks.cbegin();
+
+		auto last_rPadding = QFixed(0);
+		auto last_rBearing = QFixed(0);
 		for (; i != e; ++i) {
-			if ((*i)->type() == TextBlockTNewline) {
+			if ((*i)->type() == TextBlockType::Newline) {
 				break;
 			}
+			const auto rBearing = (*i)->f_rbearing();
+			_paragraphWidthRemaining += last_rBearing
+				+ last_rPadding
+				+ (*i)->f_width()
+				- rBearing;
+			last_rBearing = rBearing;
 		}
-		_parLength = ((i == e) ? _t->_text.size() : (*i)->from()) - _parStart;
+		_parLength = ((i == e) ? _t->_text.size() : (*i)->position()) - _parStart;
 	}
 	_parAnalysis.resize(0);
+	initNextLine();
+}
+
+void Renderer::initNextLine() {
+	const auto line = _geometry.layout({
+		.left = 0,
+		.top = (_y - _startTop),
+		.width = _paragraphWidthRemaining.ceil().toInt(),
+	}, _lineStart);
+	_x = _startLeft + line.left;
+	_y = _startTop + line.top;
+	_lineWidth = _wLeft = line.width;
+	_elidedLine = line.elided;
 }
 
 void Renderer::initParagraphBidi() {
-	if (!_parLength || !_parAnalysis.isEmpty()) return;
+	if (!_parLength || !_parAnalysis.isEmpty()) {
+		return;
+	}
 
 	String::TextBlocks::const_iterator i = _parStartBlock, e = _t->_blocks.cend(), n = i + 1;
 
@@ -486,13 +487,13 @@ void Renderer::initParagraphBidi() {
 		const ushort *curr = start;
 		const ushort *end = start + _parLength;
 		while (curr < end) {
-			while (n != e && (*n)->from() <= _parStart + (curr - start)) {
+			while (n != e && (*n)->position() <= _parStart + (curr - start)) {
 				i = n;
 				++n;
 			}
 			const auto type = (*i)->type();
-			if (type != TextBlockTEmoji
-				&& type != TextBlockTCustomEmoji
+			if (type != TextBlockType::Emoji
+				&& type != TextBlockType::CustomEmoji
 				&& *curr >= 0x590) {
 				ignore = false;
 				break;
@@ -521,13 +522,15 @@ void Renderer::initParagraphBidi() {
 
 bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterator &_endBlockIter, const String::TextBlocks::const_iterator &_end) {
 	_yDelta = (_lineHeight - _fontHeight) / 2;
-	if (_yTo >= 0 && (_y + _yDelta >= _yTo || _y >= _yTo)) return false;
+	if (_yTo >= 0 && (_y + _yDelta >= _yTo || _y >= _yTo)) {
+		return false;
+	}
 	if (_y + _yDelta + _fontHeight <= _yFrom) {
 		if (_lookupSymbol) {
 			_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
 			_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
 		}
-		return true;
+		return !_elidedLine;
 	}
 
 	// Trimming pending spaces, because they sometimes don't fit on the line.
@@ -542,16 +545,15 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 	}
 
 	auto _endBlock = (_endBlockIter == _end) ? nullptr : _endBlockIter->get();
-	auto elidedLine = _elideLast && (_y + _lineHeight >= _yToElide);
-	if (elidedLine) {
+	if (_elidedLine) {
 		// If we decided to draw the last line elided only because of the skip block
 		// that did not fit on this line, we just draw the line till the very end.
 		// Skip block is ignored in the elided lines, instead "removeFromEnd" is used.
-		if (_endBlock && _endBlock->type() == TextBlockTSkip) {
+		if (_endBlock && _endBlock->type() == TextBlockType::Skip) {
 			_endBlock = nullptr;
 		}
 		if (!_endBlock) {
-			elidedLine = false;
+			_elidedLine = false;
 		}
 	}
 
@@ -559,11 +561,11 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 	auto currentBlock = _t->_blocks[blockIndex].get();
 	auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
 
-	const auto extendLeft = (currentBlock->from() < _lineStart)
-		? qMin(_lineStart - currentBlock->from(), 2)
+	const auto extendLeft = (currentBlock->position() < _lineStart)
+		? qMin(_lineStart - currentBlock->position(), 2)
 		: 0;
 	_localFrom = _lineStart - extendLeft;
-	const auto extendedLineEnd = (_endBlock && _endBlock->from() < trimmedLineEnd && !elidedLine)
+	const auto extendedLineEnd = (_endBlock && _endBlock->position() < trimmedLineEnd && !_elidedLine)
 		? qMin(uint16(trimmedLineEnd + 2), _t->countBlockEnd(_endBlockIter, _end))
 		: trimmedLineEnd;
 
@@ -571,7 +573,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 	auto lineStart = extendLeft;
 	auto lineLength = trimmedLineEnd - _lineStart;
 
-	if (elidedLine) {
+	if (_elidedLine) {
 		initParagraphBidi();
 		prepareElidedLine(lineText, lineStart, lineLength, _endBlock);
 	}
@@ -589,7 +591,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 				if (_parDirection == Qt::RightToLeft) {
 					_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
 					_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
-					//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
+					//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockType::Skip)) ? true : false;
 				} else {
 					_lookupResult.symbol = _lineStart;
 					_lookupResult.afterSymbol = false;
@@ -601,7 +603,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 			}
 			_lookupResult.uponSymbol = false;
 			return false;
-		} else if (_lookupX >= x + (_w - _wLeft)) {
+		} else if (_lookupX >= x + (_lineWidth - _wLeft)) {
 			if (_parDirection == Qt::RightToLeft) {
 				_lookupResult.symbol = _lineStart;
 				_lookupResult.afterSymbol = false;
@@ -609,7 +611,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 			} else {
 				_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
 				_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
-				//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockTSkip)) ? true : false;
+				//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockType::Skip)) ? true : false;
 			}
 			if (_lookupLink) {
 				_lookupResult.link = nullptr;
@@ -626,7 +628,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 		const auto selectTillEnd = (_selection.to > trimmedLineEnd)
 			&& (trimmedLineEnd < _t->_text.size())
 			&& (_selection.from <= trimmedLineEnd)
-			&& (!_endBlock || _endBlock->type() != TextBlockTSkip);
+			&& (!_endBlock || _endBlock->type() != TextBlockType::Skip);
 
 		if ((selectFromStart && _parDirection == Qt::LeftToRight)
 			|| (selectTillEnd && _parDirection == Qt::RightToLeft)) {
@@ -637,15 +639,17 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 		if ((selectTillEnd && _parDirection == Qt::LeftToRight)
 			|| (selectFromStart && _parDirection == Qt::RightToLeft)) {
 			if (x < _x + _wLeft) {
-				fillSelectRange({ x + _w - _wLeft, _x + _w });
+				fillSelectRange({ x + _lineWidth - _wLeft, _x + _lineWidth });
 			}
 		}
 	}
-	if (trimmedLineEnd == _lineStart && !elidedLine) {
+	if (trimmedLineEnd == _lineStart && !_elidedLine) {
 		return true;
 	}
 
-	if (!elidedLine) initParagraphBidi(); // if was not inited
+	if (!_elidedLine) {
+		initParagraphBidi(); // if was not inited
+	}
 
 	_f = _t->_st->font;
 	QStackTextEngine engine(lineText, _f->f);
@@ -662,7 +666,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 	int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
 	int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0;
 	if (!nItems) {
-		return true;
+		return !_elidedLine;
 	}
 
 	int skipIndex = -1;
@@ -670,23 +674,23 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 	QVarLengthArray<uchar> levels(nItems);
 	for (int i = 0; i < nItems; ++i) {
 		auto &si = engine.layoutData->items[firstItem + i];
-		while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
+		while (nextBlock && nextBlock->position() <= _localFrom + si.position) {
 			currentBlock = nextBlock;
 			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
 		}
 		auto _type = currentBlock->type();
-		if (_type == TextBlockTSkip) {
+		if (_type == TextBlockType::Skip) {
 			levels[i] = si.analysis.bidiLevel = 0;
 			skipIndex = i;
 		} else {
 			levels[i] = si.analysis.bidiLevel;
 		}
 		if (si.analysis.flags == QScriptAnalysis::Object) {
-			if (_type == TextBlockTEmoji
-				|| _type == TextBlockTCustomEmoji
-				|| _type == TextBlockTSkip) {
+			if (_type == TextBlockType::Emoji
+				|| _type == TextBlockType::CustomEmoji
+				|| _type == TextBlockType::Skip) {
 				si.width = currentBlock->f_width()
-					+ (nextBlock == _endBlock && (!nextBlock || nextBlock->from() >= trimmedLineEnd)
+					+ (nextBlock == _endBlock && (!nextBlock || nextBlock->position() >= trimmedLineEnd)
 						? 0
 						: currentBlock->f_rpadding());
 			}
@@ -714,12 +718,12 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 		const auto &si = engine.layoutData->items.at(item);
 		const auto rtl = (si.analysis.bidiLevel % 2);
 
-		while (blockIndex > _lineStartBlock + 1 && _t->_blocks[blockIndex - 1]->from() > _localFrom + si.position) {
+		while (blockIndex > _lineStartBlock + 1 && _t->_blocks[blockIndex - 1]->position() > _localFrom + si.position) {
 			nextBlock = currentBlock;
 			currentBlock = _t->_blocks[--blockIndex - 1].get();
 			applyBlockProperties(currentBlock);
 		}
-		while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
+		while (nextBlock && nextBlock->position() <= _localFrom + si.position) {
 			currentBlock = nextBlock;
 			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
 			applyBlockProperties(currentBlock);
@@ -734,11 +738,11 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 						}
 					}
 				}
-				if (_type != TextBlockTSkip) {
+				if (_type != TextBlockType::Skip) {
 					_lookupResult.uponSymbol = true;
 				}
 				if (_lookupSymbol) {
-					if (_type == TextBlockTSkip) {
+					if (_type == TextBlockType::Skip) {
 						if (_parDirection == Qt::RightToLeft) {
 							_lookupResult.symbol = _lineStart;
 							_lookupResult.afterSymbol = false;
@@ -750,8 +754,8 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					}
 
 					// Emoji with spaces after symbol lookup
-					auto chFrom = _str + currentBlock->from();
-					auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
+					auto chFrom = _str + currentBlock->position();
+					auto chTo = chFrom + ((nextBlock ? nextBlock->position() : _t->_text.size()) - currentBlock->position());
 					auto spacesWidth = (si.width - currentBlock->f_width());
 					auto spacesCount = 0;
 					while (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space) {
@@ -780,7 +784,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					}
 				}
 				return false;
-			} else if (_p && (_type == TextBlockTEmoji || _type == TextBlockTCustomEmoji)) {
+			} else if (_p && (_type == TextBlockType::Emoji || _type == TextBlockType::CustomEmoji)) {
 				auto glyphX = x;
 				auto spacesWidth = (si.width - currentBlock->f_width());
 				if (rtl) {
@@ -791,8 +795,8 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 				if (_background.selectActiveBlock) {
 					fillSelect = { x, x + si.width };
 				} else if (_localFrom + si.position < _selection.to) {
-					auto chFrom = _str + currentBlock->from();
-					auto chTo = chFrom + ((nextBlock ? nextBlock->from() : _t->_text.size()) - currentBlock->from());
+					auto chFrom = _str + currentBlock->position();
+					auto chTo = chFrom + ((nextBlock ? nextBlock->position() : _t->_text.size()) - currentBlock->position());
 					if (_localFrom + si.position >= _selection.from) { // could be without space
 						if (chTo == chFrom || (chTo - 1)->unicode() != QChar::Space || _selection.to >= (chTo - _str)) {
 							fillSelect = { x, x + si.width };
@@ -820,7 +824,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					}
 					const auto x = (glyphX + st::emojiPadding).toInt();
 					const auto y = _y + _yDelta + emojiY;
-					if (_type == TextBlockTEmoji) {
+					if (_type == TextBlockType::Emoji) {
 						Emoji::Draw(
 							*_p,
 							static_cast<const EmojiBlock*>(currentBlock)->_emoji,
@@ -1015,7 +1019,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					: QRegion();
 				if (complexClipping) {
 					const auto elided = (_indexOfElidedBlock == blockIndex)
-						? (_elideRemoveFromEnd + _f->elidew)
+						? _f->elidew
 						: 0;
 					_p->setClipRect(
 						QRect(
@@ -1046,9 +1050,9 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 						const auto externalClipping = clippingEnabled
 							? clippingRegion
 							: QRegion(QRect(
-								(_x - _w).toInt(),
+								(_x - _lineWidth).toInt(),
 								_y - _lineHeight,
-								(_x + 2 * _w).toInt(),
+								(_x + 2 * _lineWidth).toInt(),
 								_y + 2 * _lineHeight));
 						_p->setClipRegion(externalClipping - selectedRect);
 						_p->setPen(*_currentPen);
@@ -1089,7 +1093,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 		x += itemWidth;
 	}
 	fillSpoilerRects();
-	return true;
+	return !_elidedLine;
 }
 
 void Renderer::fillSelectRange(FixedRange range) {
@@ -1108,9 +1112,7 @@ void Renderer::pushSpoilerRange(
 	if (!_background.spoiler || !_spoiler) {
 		return;
 	}
-	const auto elided = isElidedItem
-		? (_elideRemoveFromEnd + _f->elidew)
-		: 0;
+	const auto elided = isElidedItem ? _f->elidew : 0;
 	range.till -= elided;
 	if (range.empty()) {
 		return;
@@ -1204,9 +1206,18 @@ void Renderer::elideSaveBlock(int32 blockIndex, const AbstractBlock *&_endBlock,
 	_elideSavedIndex = blockIndex;
 	auto mutableText = const_cast<String*>(_t);
 	_elideSavedBlock = std::move(mutableText->_blocks[blockIndex]);
-	mutableText->_blocks[blockIndex] = Block::Text(_t->_st->font, _t->_text, QFIXED_MAX, elideStart, 0, (*_elideSavedBlock)->flags(), (*_elideSavedBlock)->lnkIndex(), (*_elideSavedBlock)->spoilerIndex());
+	mutableText->_blocks[blockIndex] = Block::Text(
+		_t->_st->font,
+		_t->_text,
+		elideStart, 0,
+		(*_elideSavedBlock)->flags(),
+		(*_elideSavedBlock)->linkIndex(),
+		(*_elideSavedBlock)->colorIndex(),
+		QFIXED_MAX);
 	_blocksSize = blockIndex + 1;
-	_endBlock = (blockIndex + 1 < _t->_blocks.size() ? _t->_blocks[blockIndex + 1].get() : nullptr);
+	_endBlock = (blockIndex + 1 < _t->_blocks.size())
+		? _t->_blocks[blockIndex + 1].get()
+		: nullptr;
 }
 
 void Renderer::setElideBidi(int32 elideStart, int32 elideLen) {
@@ -1237,40 +1248,40 @@ void Renderer::prepareElidedLine(QString &lineText, int32 lineStart, int32 &line
 	eShapeLine(line);
 
 	auto elideWidth = _f->elidew;
-	_wLeft = _w - elideWidth - _elideRemoveFromEnd;
+	_wLeft = _lineWidth - elideWidth;
 
 	int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
 	int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0, i;
 
 	for (i = 0; i < nItems; ++i) {
 		QScriptItem &si(engine.layoutData->items[firstItem + i]);
-		while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
+		while (nextBlock && nextBlock->position() <= _localFrom + si.position) {
 			currentBlock = nextBlock;
 			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
 		}
 		TextBlockType _type = currentBlock->type();
 		if (si.analysis.flags == QScriptAnalysis::Object) {
-			if (_type == TextBlockTEmoji
-				|| _type == TextBlockTCustomEmoji
-				|| _type == TextBlockTSkip) {
+			if (_type == TextBlockType::Emoji
+				|| _type == TextBlockType::CustomEmoji
+				|| _type == TextBlockType::Skip) {
 				si.width = currentBlock->f_width() + currentBlock->f_rpadding();
 			}
 		}
-		if (_type == TextBlockTEmoji
-			|| _type == TextBlockTCustomEmoji
-			|| _type == TextBlockTSkip
-			|| _type == TextBlockTNewline) {
+		if (_type == TextBlockType::Emoji
+			|| _type == TextBlockType::CustomEmoji
+			|| _type == TextBlockType::Skip
+			|| _type == TextBlockType::Newline) {
 			if (_wLeft < si.width) {
-				lineText = lineText.mid(0, currentBlock->from() - _localFrom) + kQEllipsis;
-				lineLength = currentBlock->from() + kQEllipsis.size() - _lineStart;
-				_selection.to = qMin(_selection.to, currentBlock->from());
+				lineText = lineText.mid(0, currentBlock->position() - _localFrom) + kQEllipsis;
+				lineLength = currentBlock->position() + kQEllipsis.size() - _lineStart;
+				_selection.to = qMin(_selection.to, currentBlock->position());
 				_indexOfElidedBlock = blockIndex + (nextBlock ? 1 : 0);
-				setElideBidi(currentBlock->from(), kQEllipsis.size());
-				elideSaveBlock(blockIndex - 1, _endBlock, currentBlock->from(), elideWidth);
+				setElideBidi(currentBlock->position(), kQEllipsis.size());
+				elideSaveBlock(blockIndex - 1, _endBlock, currentBlock->position(), elideWidth);
 				return;
 			}
 			_wLeft -= si.width;
-		} else if (_type == TextBlockTText) {
+		} else if (_type == TextBlockType::Text) {
 			unsigned short *logClusters = engine.logClusters(&si);
 			QGlyphLayout glyphs = engine.shapedGlyphs(&si);
 
@@ -1325,7 +1336,7 @@ void Renderer::prepareElidedLine(QString &lineText, int32 lineStart, int32 &line
 	lineLength += kQEllipsis.size();
 
 	if (!repeat) {
-		for (; blockIndex < _blocksSize && _t->_blocks[blockIndex].get() != _endBlock && _t->_blocks[blockIndex]->from() < elideStart; ++blockIndex) {
+		for (; blockIndex < _blocksSize && _t->_blocks[blockIndex].get() != _endBlock && _t->_blocks[blockIndex]->position() < elideStart; ++blockIndex) {
 		}
 		if (blockIndex < _blocksSize) {
 			elideSaveBlock(blockIndex, _endBlock, elideStart, elideWidth);
@@ -1371,65 +1382,46 @@ void Renderer::eAppendItems(QScriptAnalysis *analysis, int &start, int &stop, co
 
 void Renderer::eShapeLine(const QScriptLine &line) {
 	int item = _e->findItem(line.from);
-	if (item == -1)
+	if (item == -1) {
 		return;
+	}
 
 	auto end = _e->findItem(line.from + line.length - 1, item);
 	auto blockIndex = _lineStartBlock;
 	auto currentBlock = _t->_blocks[blockIndex].get();
-	auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+	auto nextBlock = (++blockIndex < _blocksSize)
+		? _t->_blocks[blockIndex].get()
+		: nullptr;
 	eSetFont(currentBlock);
 	for (; item <= end; ++item) {
 		QScriptItem &si = _e->layoutData->items[item];
-		while (nextBlock && nextBlock->from() <= _localFrom + si.position) {
+		while (nextBlock && nextBlock->position() <= _localFrom + si.position) {
 			currentBlock = nextBlock;
-			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
+			nextBlock = (++blockIndex < _blocksSize)
+				? _t->_blocks[blockIndex].get()
+				: nullptr;
 			eSetFont(currentBlock);
 		}
 		_e->shape(item);
 	}
 }
 
-style::font Renderer::applyFlags(int32 flags, const style::font &f) {
-	if (!flags) {
-		return f;
-	}
-	auto result = f;
-	if (IsMono(flags)) {
-		result = result->monospace();
-	} else {
-		if (flags & TextBlockFBold) {
-			result = result->bold();
-		} else if (flags & TextBlockFSemibold) {
-			result = result->semibold();
-		}
-		if (flags & TextBlockFItalic) result = result->italic();
-		if (flags & TextBlockFUnderline) result = result->underline();
-		if (flags & TextBlockFStrikeOut) result = result->strikeout();
-		if (flags & TextBlockFTilde) { // tilde fix in OpenSans
-			result = result->semibold();
-		}
-	}
-	return result;
-}
-
 void Renderer::eSetFont(const AbstractBlock *block) {
 	const auto flags = block->flags();
 	const auto usedFont = [&] {
-		if (const auto index = block->lnkIndex()) {
-			const auto active = ClickHandler::showAsActive(
-				_t->_links.at(index - 1)
-			) || (_palette && _palette->linkAlwaysActive > 0);
+		if (const auto index = block->linkIndex()) {
+			const auto active = (_palette && _palette->linkAlwaysActive)
+				|| ClickHandler::showAsActive(_t->_links.at(index - 1));
 			return active
 				? _t->_st->linkFontOver
 				: _t->_st->linkFont;
 		}
 		return _t->_st->font;
 	}();
-	const auto newFont = applyFlags(flags, usedFont);
+	const auto newFont = WithFlags(usedFont, flags);
 	if (newFont != _f) {
 		_f = (newFont->family() == _t->_st->font->family())
-			? applyFlags(flags | newFont->flags(), _t->_st->font)
+			? WithFlags(_t->_st->font, flags, newFont->flags())
 			: newFont;
 		_e->fnt = _f->f;
 		_e->resetFontEngineCache();
@@ -1479,14 +1471,14 @@ void Renderer::eItemize() {
 	auto start = string;
 	auto end = start + length;
 	while (start < end) {
-		while (nextBlock && nextBlock->from() <= _localFrom + (start - string)) {
+		while (nextBlock && nextBlock->position() <= _localFrom + (start - string)) {
 			currentBlock = nextBlock;
 			nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
 		}
 		auto _type = currentBlock->type();
-		if (_type == TextBlockTEmoji
-			|| _type == TextBlockTCustomEmoji
-			|| _type == TextBlockTSkip) {
+		if (_type == TextBlockType::Emoji
+			|| _type == TextBlockType::CustomEmoji
+			|| _type == TextBlockType::Skip) {
 			analysis->script = QChar::Script_Common;
 			analysis->flags = QScriptAnalysis::Object;
 		} else {
@@ -1515,7 +1507,7 @@ void Renderer::eItemize() {
 		auto start = 0;
 		auto end = start + length;
 		for (int i = start + 1; i < end; ++i) {
-			while (nextBlock && nextBlock->from() <= _localFrom + i) {
+			while (nextBlock && nextBlock->position() <= _localFrom + i) {
 				currentBlock = nextBlock;
 				nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
 			}
@@ -1545,20 +1537,23 @@ void Renderer::eItemize() {
 	}
 }
 
-QChar::Direction Renderer::eSkipBoundryNeutrals(QScriptAnalysis *analysis,
-	const ushort *unicode,
-	int &sor, int &eor, BidiControl &control,
-	String::TextBlocks::const_iterator i) {
+QChar::Direction Renderer::eSkipBoundryNeutrals(
+		QScriptAnalysis *analysis,
+		const ushort *unicode,
+		int &sor,
+		int &eor,
+		BidiControl &control,
+		String::TextBlocks::const_iterator i) {
 	String::TextBlocks::const_iterator e = _t->_blocks.cend(), n = i + 1;
 
 	QChar::Direction dir = control.basicDirection();
 	int level = sor > 0 ? analysis[sor - 1].bidiLevel : control.level;
 	while (sor <= _parLength) {
-		while (i != _parStartBlock && (*i)->from() > _parStart + sor) {
+		while (i != _parStartBlock && (*i)->position() > _parStart + sor) {
 			n = i;
 			--i;
 		}
-		while (n != e && (*n)->from() <= _parStart + sor) {
+		while (n != e && (*n)->position() <= _parStart + sor) {
 			i = n;
 			++n;
 		}
@@ -1566,10 +1561,10 @@ QChar::Direction Renderer::eSkipBoundryNeutrals(QScriptAnalysis *analysis,
 		TextBlockType _itype = (*i)->type();
 		if (eor == _parLength)
 			dir = control.basicDirection();
-		else if (_itype == TextBlockTEmoji
-			|| _itype == TextBlockTCustomEmoji)
+		else if (_itype == TextBlockType::Emoji
+			|| _itype == TextBlockType::CustomEmoji)
 			dir = QChar::DirCS;
-		else if (_itype == TextBlockTSkip)
+		else if (_itype == TextBlockType::Skip)
 			dir = QChar::DirCS;
 		else
 			dir = QChar::direction(unicode[sor]);
@@ -1602,9 +1597,9 @@ bool Renderer::eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
 
 	QChar::Direction sdir;
 	TextBlockType _stype = (*_parStartBlock)->type();
-	if (_stype == TextBlockTEmoji || _stype == TextBlockTCustomEmoji)
+	if (_stype == TextBlockType::Emoji || _stype == TextBlockType::CustomEmoji)
 		sdir = QChar::DirCS;
-	else if (_stype == TextBlockTSkip)
+	else if (_stype == TextBlockType::Skip)
 		sdir = QChar::DirCS;
 	else
 		sdir = QChar::direction(*unicode);
@@ -1619,7 +1614,7 @@ bool Renderer::eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
 	status.dir = sdir;
 
 	while (current <= _parLength) {
-		while (n != e && (*n)->from() <= _parStart + current) {
+		while (n != e && (*n)->position() <= _parStart + current) {
 			i = n;
 			++n;
 		}
@@ -1628,10 +1623,10 @@ bool Renderer::eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
 		TextBlockType _itype = (*i)->type();
 		if (current == (int)_parLength)
 			dirCurrent = control.basicDirection();
-		else if (_itype == TextBlockTEmoji
-			|| _itype == TextBlockTCustomEmoji)
+		else if (_itype == TextBlockType::Emoji
+			|| _itype == TextBlockType::CustomEmoji)
 			dirCurrent = QChar::DirCS;
-		else if (_itype == TextBlockTSkip)
+		else if (_itype == TextBlockType::Skip)
 			dirCurrent = QChar::DirCS;
 		else
 			dirCurrent = QChar::direction(unicode[current]);
@@ -2009,23 +2004,34 @@ bool Renderer::eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
 void Renderer::applyBlockProperties(const AbstractBlock *block) {
 	eSetFont(block);
 	if (_p) {
-		const auto isMono = IsMono(block->flags());
+		const auto flags = block->flags();
+		const auto isMono = IsMono(flags);
 		_background = {};
-		if (block->spoilerIndex() && _spoiler) {
+		if ((flags & TextBlockFlag::Spoiler) && _spoiler) {
 			_background.spoiler = true;
 		}
 		if (isMono
-			&& block->lnkIndex()
+			&& block->linkIndex()
 			&& (!_background.spoiler || _spoiler->revealed)) {
 			_background.selectActiveBlock = ClickHandler::showAsPressed(
-				_t->_links.at(block->lnkIndex() - 1));
+				_t->_links.at(block->linkIndex() - 1));
 		}
 
-		if (isMono) {
+		if (const auto color = block->colorIndex()) {
+			if (color == 1) {
+				_currentPen = &_palette->linkFg->p;
+				_currentPenSelected = &_palette->selectLinkFg->p;
+			} else if (color - 1 <= _colors.size()) {
+				_currentPen = _colors[color - 2].pen;
+				_currentPenSelected = _colors[color - 2].penSelected;
+			} else {
+				_currentPen = &_originalPen;
+				_currentPenSelected = &_originalPenSelected;
+			}
+		} else if (isMono) {
 			_currentPen = &_palette->monoFg->p;
 			_currentPenSelected = &_palette->selectMonoFg->p;
-		} else if (block->lnkIndex()
-			|| (block->flags() & TextBlockFPlainLink)) {
+		} else if (block->linkIndex()) {
 			_currentPen = &_palette->linkFg->p;
 			_currentPenSelected = &_palette->selectLinkFg->p;
 		} else {
@@ -2038,12 +2044,12 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 ClickHandlerPtr Renderer::lookupLink(const AbstractBlock *block) const {
 	const auto spoilerLink = (_spoiler
 		&& !_spoiler->revealed
-		&& block->spoilerIndex())
+		&& (block->flags() & TextBlockFlag::Spoiler))
 		? _spoiler->link
 		: ClickHandlerPtr();
-	return (spoilerLink || !block->lnkIndex())
+	return (spoilerLink || !block->linkIndex())
 		? spoilerLink
-		: _t->_links.at(block->lnkIndex() - 1);
+		: _t->_links.at(block->linkIndex() - 1);
 }
 
 } // namespace Ui::Text
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index b89254b..184c1f3 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -37,12 +37,8 @@ public:
 	void draw(QPainter &p, const PaintContext &context);
 	[[nodiscard]] StateResult getState(
 		QPoint point,
-		int w,
+		GeometryDescriptor geometry,
 		StateRequest request);
-	[[nodiscard]] StateResult getStateElided(
-		QPoint point,
-		int w,
-		StateRequestElided request);
 
 private:
 	static constexpr int kSpoilersRectsSize = 512;
@@ -52,7 +48,10 @@ private:
 	void enumerate();
 
 	[[nodiscard]] crl::time now() const;
-	void initNextParagraph(String::TextBlocks::const_iterator i);
+	void initNextParagraph(
+		String::TextBlocks::const_iterator i,
+		Qt::LayoutDirection direction);
+	void initNextLine();
 	void initParagraphBidi();
 	bool drawLine(
 		uint16 _lineEnd,
@@ -94,7 +93,6 @@ private:
 		const BidiControl &control,
 		QChar::Direction dir);
 	void eShapeLine(const QScriptLine &line);
-	[[nodiscard]] style::font applyFlags(int32 flags, const style::font &f);
 	void eSetFont(const AbstractBlock *block);
 	void eItemize();
 	QChar::Direction eSkipBoundryNeutrals(
@@ -111,13 +109,12 @@ private:
 		const AbstractBlock *block) const;
 
 	const String *_t = nullptr;
+	GeometryDescriptor _geometry;
 	SpoilerData *_spoiler = nullptr;
 	SpoilerMessCache *_spoilerCache = nullptr;
 	QPainter *_p = nullptr;
 	const style::TextPalette *_palette = nullptr;
-	bool _elideLast = false;
-	bool _breakEverywhere = false;
-	int _elideRemoveFromEnd = 0;
+	std::span<SpecialColor> _colors;
 	bool _pausedEmoji = false;
 	bool _pausedSpoiler = false;
 	style::align _align = style::al_topleft;
@@ -131,7 +128,6 @@ private:
 	} _background;
 	int _yFrom = 0;
 	int _yTo = 0;
-	int _yToElide = 0;
 	TextSelection _selection = { 0, 0 };
 	bool _fullWidthSelection = true;
 	const QChar *_str = nullptr;
@@ -158,11 +154,15 @@ private:
 	// current line data
 	QTextEngine *_e = nullptr;
 	style::font _f;
-	QFixed _x, _w, _wLeft, _last_rPadding;
+	int _startLeft = 0;
+	int _startTop = 0;
+	QFixed _x, _wLeft, _last_rPadding;
 	int _y = 0;
 	int _yDelta = 0;
 	int _lineHeight = 0;
 	int _fontHeight = 0;
+	bool _breakEverywhere = false;
+	bool _elidedLine = false;
 
 	// elided hack support
 	int _blocksSize = 0;
@@ -172,6 +172,8 @@ private:
 	int _lineStart = 0;
 	int _localFrom = 0;
 	int _lineStartBlock = 0;
+	QFixed _lineWidth = 0;
+	QFixed _paragraphWidthRemaining = 0;
 
 	// link and symbol resolve
 	QFixed _lookupX = 0;
diff --git a/ui/text/text_utilities.cpp b/ui/text/text_utilities.cpp
index c2c5114..35d4f35 100644
--- a/ui/text/text_utilities.cpp
+++ b/ui/text/text_utilities.cpp
@@ -54,12 +54,14 @@ TextWithEntities Link(TextWithEntities text, int index) {
 	return Link(std::move(text), u"internal:index"_q + QChar(index));
 }
 
-TextWithEntities PlainLink(const QString &text) {
-	return WithSingleEntity(text, EntityType::PlainLink);
+TextWithEntities Colorized(const QString &text, int index) {
+	const auto data = index ? QString(QChar(index)) : QString();
+	return WithSingleEntity(text, EntityType::Colorized, data);
 }
 
-TextWithEntities PlainLink(TextWithEntities text) {
-	return Wrapped(std::move(text), EntityType::PlainLink, QString());
+TextWithEntities Colorized(TextWithEntities text, int index) {
+	const auto data = index ? QString(QChar(index)) : QString();
+	return Wrapped(std::move(text), EntityType::Colorized, data);
 }
 
 TextWithEntities Wrapped(
diff --git a/ui/text/text_utilities.h b/ui/text/text_utilities.h
index e493cec..1391759 100644
--- a/ui/text/text_utilities.h
+++ b/ui/text/text_utilities.h
@@ -35,8 +35,12 @@ inline constexpr auto Upper = details::ToUpperType{};
 	TextWithEntities text,
 	const QString &url = u"internal:action"_q);
 [[nodiscard]] TextWithEntities Link(TextWithEntities text, int index);
-[[nodiscard]] TextWithEntities PlainLink(const QString &text);
-[[nodiscard]] TextWithEntities PlainLink(TextWithEntities text);
+[[nodiscard]] TextWithEntities Colorized(
+	const QString &text,
+	int index = 0);
+[[nodiscard]] TextWithEntities Colorized(
+	TextWithEntities text,
+	int index = 0);
 [[nodiscard]] TextWithEntities Wrapped(
 	TextWithEntities text,
 	EntityType type,
diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index c676776..6849046 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -173,14 +173,13 @@ void Widget::paintEvent(QPaintEvent *e) {
 			width());
 	}
 
-	const auto lines = _maxTextHeight / _st->style.font->height;
 	p.setPen(st::toastFg);
 	_text.draw(p, {
 		.position = { _st->padding.left(), _textTop },
 		.availableWidth = _textWidth + 1,
 		.palette = &_st->palette,
 		.spoiler = Ui::Text::DefaultSpoilerCache(),
-		.elisionLines = lines,
+		.elisionHeight = _maxTextHeight,
 	});
 }
 
diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index c589dcf..8aabbc5 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -587,8 +587,8 @@ void Checkbox::setTextBreakEverywhere(bool allow) {
 	_textBreakEverywhere = allow;
 }
 
-void Checkbox::setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk) {
-	_text.setLink(lnkIndex, lnk);
+void Checkbox::setLink(uint16 index, const ClickHandlerPtr &lnk) {
+	_text.setLink(index, lnk);
 }
 
 void Checkbox::setLinksTrusted() {
diff --git a/ui/widgets/checkbox.h b/ui/widgets/checkbox.h
index 79fa5f4..06da21b 100644
--- a/ui/widgets/checkbox.h
+++ b/ui/widgets/checkbox.h
@@ -185,7 +185,7 @@ public:
 	void setAllowTextLines(int lines = 0);
 	void setTextBreakEverywhere(bool allow = true);
 
-	void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk);
+	void setLink(uint16 index, const ClickHandlerPtr &lnk);
 	void setLinksTrusted();
 
 	using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index daf48c9..8b6dcaa 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -368,8 +368,8 @@ void FlatLabel::refreshSize() {
 	resize(fullWidth, fullHeight);
 }
 
-void FlatLabel::setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk) {
-	_text.setLink(lnkIndex, lnk);
+void FlatLabel::setLink(uint16 index, const ClickHandlerPtr &lnk) {
+	_text.setLink(index, lnk);
 }
 
 void FlatLabel::setLinksTrusted() {
@@ -795,7 +795,9 @@ CrossFadeAnimation::Data FlatLabel::crossFadeData(
 	auto result = CrossFadeAnimation::Data();
 	result.full = GrabWidgetToImage(this, QRect(), bg->c);
 	const auto textWidth = width() - _st.margin.left() - _st.margin.right();
-	_text.countLineWidths(textWidth, &result.lineWidths, _breakEverywhere);
+	result.lineWidths = _text.countLineWidths(textWidth, {
+		.breakEverywhere = _breakEverywhere,
+	});
 	result.lineHeight = _st.style.font->height;
 	const auto addedHeight = (_st.style.lineHeight - result.lineHeight);
 	if (addedHeight > 0) {
@@ -961,11 +963,11 @@ void FlatLabel::paintEvent(QPaintEvent *e) {
 		&& (_st.maxHeight < _fullTextHeight || textWidth < _text.maxWidth());
 	const auto renderElided = _breakEverywhere || heightExceeded;
 	const auto lineHeight = qMax(_st.style.lineHeight, _st.style.font->height);
-	const auto lines = !renderElided
+	const auto elisionHeight = !renderElided
 		? 0
 		: _st.maxHeight
-		? qMax(_st.maxHeight / lineHeight, 1)
-		: ((height() / lineHeight) + 2);
+		? qMax(_st.maxHeight, lineHeight)
+		: height();
 	const auto paused = _animationsPausedCallback
 		? _animationsPausedCallback()
 		: WhichAnimationsPaused::None;
@@ -982,7 +984,7 @@ void FlatLabel::paintEvent(QPaintEvent *e) {
 		.pausedSpoiler = (paused == WhichAnimationsPaused::Spoiler
 			|| paused == WhichAnimationsPaused::All),
 		.selection = selection,
-		.elisionLines = lines,
+		.elisionHeight = elisionHeight,
 		.elisionBreakEverywhere = renderElided && _breakEverywhere,
 	});
 }
diff --git a/ui/widgets/labels.h b/ui/widgets/labels.h
index 46552d4..cb66f5c 100644
--- a/ui/widgets/labels.h
+++ b/ui/widgets/labels.h
@@ -26,7 +26,7 @@ class CrossFadeAnimation {
 public:
 	struct Data {
 		QImage full;
-		QVector<int> lineWidths;
+		std::vector<int> lineWidths;
 		QPoint position;
 		style::align align;
 		style::font font;
@@ -143,7 +143,7 @@ public:
 	int naturalWidth() const override;
 	QMargins getMargins() const override;
 
-	void setLink(uint16 lnkIndex, const ClickHandlerPtr &lnk);
+	void setLink(uint16 index, const ClickHandlerPtr &lnk);
 	void setLinksTrusted();
 
 	using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
diff --git a/ui/widgets/side_bar_button.cpp b/ui/widgets/side_bar_button.cpp
index c3d5d81..470d94a 100644
--- a/ui/widgets/side_bar_button.cpp
+++ b/ui/widgets/side_bar_button.cpp
@@ -166,10 +166,10 @@ void SideBarButton::paintEvent(QPaintEvent *e) {
 	}
 
 	if (_lock.locked) {
-		auto lineWidths = QVector<int>();
-		lineWidths.reserve(kMaxLabelLines);
-		_text.countLineWidths(width() - 2 * _st.textSkip, &lineWidths);
-		if (lineWidths.isEmpty()) {
+		const auto lineWidths = _text.countLineWidths(
+			width() - 2 * _st.textSkip,
+			{ .reserve = kMaxLabelLines });
+		if (lineWidths.empty()) {
 			return;
 		}
 		validateLockIconCache();

From 0d8717d48ac3f2228399a1de78a28f0a7bbd0023 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 4 Oct 2023 20:26:22 +0400
Subject: [PATCH 518/635] Allow sending pre-blocks with language.

---
 ui/text/text_entity.cpp           | 36 ++++++++++++++++++-------
 ui/widgets/fields/input_field.cpp | 45 ++++++++++++++++++++++++-------
 2 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 05633ec..4ca1999 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -2032,6 +2032,7 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 	};
 	struct State {
 		QString link;
+		QString language;
 		uint32 mask = 0;
 
 		void set(EntityType type) {
@@ -2118,28 +2119,34 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 		}
 		for (const auto type : kInMaskTypes) {
 			if (nextState.has(type) && !state.has(type)) {
-				openType(type);
+				openType(type, nextState.language);
 			}
 		}
 		state = nextState;
 	};
 	const auto stateForTag = [&](const QString &tag) {
+		using Tags = Ui::InputField;
 		auto result = State();
 		const auto list = SplitTags(tag);
+		const auto languageStart = Tags::kTagPre.size();
 		for (const auto &single : list) {
-			if (single == Ui::InputField::kTagBold) {
+			if (single == Tags::kTagBold) {
 				result.set(EntityType::Bold);
-			} else if (single == Ui::InputField::kTagItalic) {
+			} else if (single == Tags::kTagItalic) {
 				result.set(EntityType::Italic);
-			} else if (single == Ui::InputField::kTagUnderline) {
+			} else if (single == Tags::kTagUnderline) {
 				result.set(EntityType::Underline);
-			} else if (single == Ui::InputField::kTagStrikeOut) {
+			} else if (single == Tags::kTagStrikeOut) {
 				result.set(EntityType::StrikeOut);
-			} else if (single == Ui::InputField::kTagCode) {
+			} else if (single == Tags::kTagCode) {
 				result.set(EntityType::Code);
-			} else if (single == Ui::InputField::kTagPre) {
+			} else if (single == Tags::kTagPre) {
 				result.set(EntityType::Pre);
-			} else if (single == Ui::InputField::kTagSpoiler) {
+			} else if (single.size() > languageStart
+				&& single.startsWith(Tags::kTagPre)) {
+				result.set(EntityType::Pre);
+				result.language = single.mid(languageStart).toString();
+			} else if (single == Tags::kTagSpoiler) {
 				result.set(EntityType::Spoiler);
 			} else {
 				result.link = single.toString();
@@ -2235,8 +2242,17 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 		case EntityType::StrikeOut:
 			push(Ui::InputField::kTagStrikeOut);
 			break;
-		case EntityType::Code: push(Ui::InputField::kTagCode); break; // #TODO entities
-		case EntityType::Pre: push(Ui::InputField::kTagPre); break;
+		case EntityType::Code: push(Ui::InputField::kTagCode); break;
+		case EntityType::Pre: {
+			if (!entity.data().isEmpty()) {
+				const auto language = QRegularExpression("^[a-z0-9\\-]+$");
+				if (language.match(entity.data()).hasMatch()) {
+					push(Ui::InputField::kTagPre + entity.data());
+					break;
+				}
+			}
+			push(Ui::InputField::kTagPre);
+		} break;
 		case EntityType::Spoiler: push(Ui::InputField::kTagSpoiler); break;
 		}
 	}
diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 795228e..660ca56 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -65,6 +65,10 @@ const auto kNewlineChars = QString("\r\n")
 // QTextCharFormat with the same properties, including kCustomEmojiText.
 auto GlobalCustomEmojiCounter = 0;
 
+[[nodiscard]] bool IsTagPre(QStringView tag) {
+	return tag.startsWith(kTagPre);
+}
+
 class InputDocument : public QTextDocument {
 public:
 	InputDocument(QObject *parent, const style::InputField &st);
@@ -169,7 +173,7 @@ bool IsNewline(QChar ch) {
 		}
 		auto found = false;
 		for (const auto &single : TextUtilities::SplitTags(existing.id)) {
-			const auto normalized = (single == QStringView(kTagPre))
+			const auto normalized = IsTagPre(single)
 				? QStringView(kTagCode)
 				: single;
 			if (checkingLink && IsValidMarkdownLink(single)) {
@@ -207,6 +211,17 @@ bool IsNewline(QChar ch) {
 	return !CheckFullTextTag(textWithTags, tag).isEmpty();
 }
 
+[[nodiscard]] QString ReadPreLanguageName(
+		const QString &text,
+		int preStart,
+		int preLength) {
+	auto view = QStringView(text).mid(preStart, preLength);
+	static const auto expression = QRegularExpression(
+		"^([a-zA-Z0-9\\-]+)[\\r\\n]");
+	const auto m = expression.match(view);
+	return m.hasMatch() ? m.captured(1).toLower() : QString();
+}
+
 class TagAccumulator {
 public:
 	TagAccumulator(TextWithTags::Tags &tags) : _tags(tags) {
@@ -739,7 +754,7 @@ QTextCharFormat PrepareTagFormat(
 			font = font->underline();
 		} else if (tag == kTagStrikeOut) {
 			font = font->strikeout();
-		} else if (tag == kTagCode || tag == kTagPre) {
+		} else if (tag == kTagCode || IsTagPre(tag)) {
 			color = st::defaultTextPalette.monoFg;
 			font = font->monospace();
 		} else if (tag == kTagSpoiler) {
@@ -2668,11 +2683,21 @@ TextWithTags InputField::getTextWithAppliedMarkdown() const {
 		}
 		addOriginalTextUpTill(tag.adjustedStart);
 
+		auto tagId = tag.tag;
 		auto entityStart = tag.adjustedStart + tagLength;
-		if (tag.tag == kTagPre) {
+		if (tagId == kTagPre) {
 			// Remove redundant newlines for pre.
 			// If ``` is on a separate line add only one newline.
-			if (IsNewline(originalText[entityStart])
+			const auto languageName = ReadPreLanguageName(
+				originalText,
+				entityStart,
+				entityLength);
+			if (!languageName.isEmpty()) {
+				// ```language-name{\n}code
+				entityStart += languageName.size() + 1;
+				entityLength -= languageName.size() + 1;
+				tagId += languageName;
+			} else if (IsNewline(originalText[entityStart])
 				&& (result.text.isEmpty()
 					|| IsNewline(result.text[result.text.size() - 1]))) {
 				++entityStart;
@@ -2691,7 +2716,7 @@ TextWithTags InputField::getTextWithAppliedMarkdown() const {
 			result.tags.push_back(TextWithTags::Tag{
 				int(result.text.size()),
 				entityLength,
-				tag.tag });
+				tagId });
 			result.text.append(base::StringViewMid(
 				originalText,
 				entityStart,
@@ -3121,7 +3146,7 @@ void InputField::processInstantReplaces(const QString &appended) {
 	for (const auto &tag : _lastMarkdownTags) {
 		if (tag.internalStart < position
 			&& tag.internalStart + tag.internalLength >= position
-			&& (tag.tag == kTagCode || tag.tag == kTagPre)) {
+			&& (tag.tag == kTagCode || IsTagPre(tag.tag))) {
 			return;
 		}
 	}
@@ -3197,10 +3222,10 @@ void InputField::commitInstantReplacement(
 		const auto currentTag = cursor.charFormat().property(
 			kTagProperty
 		).toString();
-		const auto currentTags = TextUtilities::SplitTags(currentTag);
-		if (currentTags.contains(QStringView(kTagPre))
-			|| currentTags.contains(QStringView(kTagCode))) {
-			return;
+		for (const auto &tag : TextUtilities::SplitTags(currentTag)) {
+			if (tag == kTagCode || IsTagPre(tag)) {
+				return;
+			}
 		}
 	}
 	cursor.setPosition(from);

From 3698eb53827dc9929e583666a8e7f6462741d1a6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Oct 2023 10:34:16 +0400
Subject: [PATCH 519/635] Allow settings selected menu item.

---
 ui/widgets/menu/menu.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/menu/menu.h b/ui/widgets/menu/menu.h
index c471ac9..576562f 100644
--- a/ui/widgets/menu/menu.h
+++ b/ui/widgets/menu/menu.h
@@ -101,6 +101,8 @@ public:
 	}
 	void handleMouseRelease(QPoint globalPosition);
 
+	void setSelected(int selected, bool isMouseSelection);
+
 	[[nodiscard]] rpl::producer<> resizesFromInner() const;
 	[[nodiscard]] rpl::producer<ScrollToRequest> scrollToRequests() const;
 
@@ -119,7 +121,6 @@ private:
 		const style::icon *icon = nullptr,
 		const style::icon *iconOver = nullptr);
 
-	void setSelected(int selected, bool isMouseSelection);
 	void clearMouseSelection();
 
 	void itemPressed(TriggeredSource source);

From 68b89a6ba971114f83b8cb0f5e4222fbae3ac919 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Oct 2023 13:00:30 +0400
Subject: [PATCH 520/635] Fix possible crash in new Text geometries.

---
 ui/text/text.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 41addf1..33774e1 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -682,7 +682,9 @@ void String::drawElided(Painter &p, int32 left, int32 top, int32 w, int32 lines,
 		.palette = &p.textPalette(),
 		.paused = p.inactive(),
 		.selection = selection,
-		.elisionHeight = (lines > 1) ? (lines * _st->font->height) : 0,
+		.elisionHeight = ((!isEmpty() && lines > 1)
+			? (lines * _st->font->height)
+			: 0),
 		.elisionRemoveFromEnd = removeFromEnd,
 		.elisionOneLine = (lines == 1),
 	});
@@ -716,6 +718,9 @@ void String::drawRightElided(Painter &p, int32 right, int32 top, int32 width, in
 }
 
 StateResult String::getState(QPoint point, int width, StateRequest request) const {
+	if (isEmpty()) {
+		return {};
+	}
 	return Renderer(*this).getState(
 		point,
 		SimpleGeometry(width, _st->font->height, 0, 0, false, false),
@@ -727,6 +732,9 @@ StateResult String::getStateLeft(QPoint point, int width, int outerw, StateReque
 }
 
 StateResult String::getStateElided(QPoint point, int width, StateRequestElided request) const {
+	if (isEmpty()) {
+		return {};
+	}
 	return Renderer(*this).getState(point, SimpleGeometry(
 		width,
 		_st->font->height,

From c317f2a3534706e88ea841badc7ebe07ea2d9d52 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 5 Oct 2023 11:46:48 +0400
Subject: [PATCH 521/635] Partially (italic+colored) support blockquotes.

---
 ui/integration.cpp                |   4 ++
 ui/integration.h                  |   1 +
 ui/text/text.cpp                  |   1 +
 ui/text/text_block.cpp            |   4 +-
 ui/text/text_block.h              |  19 +++---
 ui/text/text_entity.cpp           |  20 +++++-
 ui/text/text_entity.h             |   1 +
 ui/text/text_parser.cpp           |  34 +++++++---
 ui/text/text_parser.h             |   1 +
 ui/text/text_renderer.cpp         |   2 +-
 ui/widgets/fields/input_field.cpp | 103 ++++++++++++++++++++----------
 ui/widgets/fields/input_field.h   |   2 +
 12 files changed, 134 insertions(+), 58 deletions(-)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index 7de629b..620b9d0 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -148,6 +148,10 @@ QString Integration::phraseFormattingStrikeOut() {
 	return "Strike-through";
 }
 
+QString Integration::phraseFormattingBlockquote() {
+	return "Quote";
+}
+
 QString Integration::phraseFormattingMonospace() {
 	return "Monospace";
 }
diff --git a/ui/integration.h b/ui/integration.h
index 77f5f80..e6847f6 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -83,6 +83,7 @@ public:
 	[[nodiscard]] virtual QString phraseFormattingItalic();
 	[[nodiscard]] virtual QString phraseFormattingUnderline();
 	[[nodiscard]] virtual QString phraseFormattingStrikeOut();
+	[[nodiscard]] virtual QString phraseFormattingBlockquote();
 	[[nodiscard]] virtual QString phraseFormattingMonospace();
 	[[nodiscard]] virtual QString phraseFormattingSpoiler();
 	[[nodiscard]] virtual QString phraseButtonOk();
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 33774e1..1327251 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -1006,6 +1006,7 @@ TextForMimeData String::toText(
 			{ TextBlockFlag::StrikeOut, EntityType::StrikeOut },
 			{ TextBlockFlag::Code, EntityType::Code }, // #TODO entities
 			{ TextBlockFlag::Pre, EntityType::Pre },
+			{ TextBlockFlag::Blockquote, EntityType::Blockquote },
 		} : std::vector<MarkdownTagTracker>();
 	const auto flagsChangeCallback = [&](int32 oldFlags, int32 newFlags) {
 		if (!composeEntities) {
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index f7ad545..c5ce3d9 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -392,7 +392,9 @@ style::font WithFlags(
 		|| (fontFlags & FontSemibold)) {
 		result = result->semibold();
 	}
-	if ((flags & TextBlockFlag::Italic) || (fontFlags & FontItalic)) {
+	if ((flags & TextBlockFlag::Italic)
+		|| (fontFlags & FontItalic)
+		|| (flags & TextBlockFlag::Blockquote)) {
 		result = result->italic();
 	}
 	if ((flags & TextBlockFlag::Underline) || (fontFlags & FontUnderline)) {
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index dfb7ba5..b0e7168 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -30,15 +30,16 @@ enum class TextBlockType : uint16 {
 };
 
 enum class TextBlockFlag : uint16 {
-	Bold      = 0x001,
-	Italic    = 0x002,
-	Underline = 0x004,
-	StrikeOut = 0x008,
-	Tilde     = 0x010, // Tilde fix in OpenSans.
-	Semibold  = 0x020,
-	Code      = 0x040,
-	Pre       = 0x080,
-	Spoiler   = 0x100,
+	Bold       = 0x001,
+	Italic     = 0x002,
+	Underline  = 0x004,
+	StrikeOut  = 0x008,
+	Tilde      = 0x010, // Tilde fix in OpenSans.
+	Semibold   = 0x020,
+	Code       = 0x040,
+	Pre        = 0x080,
+	Spoiler    = 0x100,
+	Blockquote = 0x200,
 };
 inline constexpr bool is_flag_type(TextBlockFlag) { return true; }
 using TextBlockFlags = base::flags<TextBlockFlag>;
diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 4ca1999..c2d48ef 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -1438,7 +1438,9 @@ bool CutPart(TextWithEntities &sending, TextWithEntities &left, int32 limit) {
 		if (s > half) {
 			bool inEntity = (currentEntity < entityCount) && (ch > start + left.entities[currentEntity].offset()) && (ch < start + left.entities[currentEntity].offset() + left.entities[currentEntity].length());
 			EntityType entityType = (currentEntity < entityCount) ? left.entities[currentEntity].type() : EntityType::Invalid;
-			bool canBreakEntity = (entityType == EntityType::Pre || entityType == EntityType::Code); // #TODO entities
+			bool canBreakEntity = (entityType == EntityType::Pre)
+				|| (entityType == EntityType::Blockquote)
+				|| (entityType == EntityType::Code); // #TODO entities
 			int32 noEntityLevel = inEntity ? 0 : 1;
 
 			auto markGoodAsLevel = [&](int newLevel) {
@@ -1464,9 +1466,15 @@ bool CutPart(TextWithEntities &sending, TextWithEntities &left, int32 limit) {
 						}
 					} else if (ch + 1 < end && IsNewline(*(ch + 1))) {
 						markGoodAsLevel(15);
-					} else if (currentEntity < entityCount && ch + 1 == start + left.entities[currentEntity].offset() && left.entities[currentEntity].type() == EntityType::Pre) {
+					} else if (currentEntity < entityCount
+						&& ch + 1 == start + left.entities[currentEntity].offset()
+						&& (left.entities[currentEntity].type() == EntityType::Pre
+							|| left.entities[currentEntity].type() == EntityType::Blockquote)) {
 						markGoodAsLevel(14);
-					} else if (currentEntity > 0 && ch == start + left.entities[currentEntity - 1].offset() + left.entities[currentEntity - 1].length() && left.entities[currentEntity - 1].type() == EntityType::Pre) {
+					} else if (currentEntity > 0
+						&& ch == start + left.entities[currentEntity - 1].offset() + left.entities[currentEntity - 1].length()
+						&& (left.entities[currentEntity - 1].type() == EntityType::Pre
+							|| left.entities[currentEntity - 1].type() == EntityType::Blockquote)) {
 						markGoodAsLevel(14);
 					} else {
 						markGoodAsLevel(13);
@@ -2029,6 +2037,7 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 		EntityType::Spoiler,
 		EntityType::Code,
 		EntityType::Pre,
+		EntityType::Blockquote,
 	};
 	struct State {
 		QString link;
@@ -2146,6 +2155,8 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 				&& single.startsWith(Tags::kTagPre)) {
 				result.set(EntityType::Pre);
 				result.language = single.mid(languageStart).toString();
+			} else if (single == Tags::kTagBlockquote) {
+				result.set(EntityType::Blockquote);
 			} else if (single == Tags::kTagSpoiler) {
 				result.set(EntityType::Spoiler);
 			} else {
@@ -2253,6 +2264,9 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 			}
 			push(Ui::InputField::kTagPre);
 		} break;
+		case EntityType::Blockquote:
+			push(Ui::InputField::kTagBlockquote);
+			break;
 		case EntityType::Spoiler: push(Ui::InputField::kTagSpoiler); break;
 		}
 	}
diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 336d136..15236c2 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -35,6 +35,7 @@ enum class EntityType : uchar {
 	StrikeOut,
 	Code, // inline
 	Pre,  // block
+	Blockquote,
 	Spoiler,
 };
 
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 8eb925a..79a0e45 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -53,7 +53,8 @@ constexpr auto kMaxDiacAfterSymbol = 2;
 						|| type == EntityType::Colorized
 						|| type == EntityType::Spoiler
 						|| type == EntityType::Code
-						|| type == EntityType::Pre))) {
+						|| type == EntityType::Pre
+						|| type == EntityType::Blockquote))) {
 					continue;
 				}
 				result.entities.push_back(preparsed.at(i));
@@ -226,6 +227,17 @@ void Parser::createNewlineBlock() {
 	createBlock();
 }
 
+void Parser::ensureAtNewline() {
+	const auto lastType = _t->_blocks.empty()
+		? TextBlockType::Newline
+		: _t->_blocks.back()->type();
+	if (lastType != TextBlockType::Newline) {
+		auto saved = base::take(_customEmojiData);
+		createNewlineBlock();
+		_customEmojiData = base::take(saved);
+	}
+}
+
 void Parser::finishEntities() {
 	while (!_startedEntities.empty()
 		&& (_ptr >= _startedEntities.begin()->first || _ptr >= _end)) {
@@ -239,9 +251,13 @@ void Parser::finishEntities() {
 				if (_flags & (*flags)) {
 					createBlock();
 					_flags &= ~(*flags);
-					if (((*flags) & TextBlockFlag::Pre)
-						&& !_t->_blocks.empty()
-						&& _t->_blocks.back()->type() != TextBlockType::Newline) {
+					const auto lastType = _t->_blocks.empty()
+						? TextBlockType::Newline
+						: _t->_blocks.back()->type();
+					if ((lastType != TextBlockType::Newline)
+						&& ((*flags)
+							& (TextBlockFlag::Pre
+								| TextBlockFlag::Blockquote))) {
 						_newlineAwaited = true;
 					}
 					if (IsMono(*flags)) {
@@ -320,11 +336,7 @@ bool Parser::checkEntities() {
 		} else {
 			flags = TextBlockFlag::Pre;
 			createBlock();
-			if (!_t->_blocks.empty()
-				&& _t->_blocks.back()->type() != TextBlockType::Newline
-				&& _customEmojiData.isEmpty()) {
-				createNewlineBlock();
-			}
+			ensureAtNewline();
 		}
 		const auto text = QString(entityBegin, entityLength);
 
@@ -338,6 +350,10 @@ bool Parser::checkEntities() {
 			_monos.push_back({ .text = text, .type = entityType });
 			monoIndex = _monos.size();
 		}
+	} else if (entityType == EntityType::Blockquote) {
+		flags = TextBlockFlag::Blockquote;
+		createBlock();
+		ensureAtNewline();
 	} else if (entityType == EntityType::Url
 		|| entityType == EntityType::Email
 		|| entityType == EntityType::Mention
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index eb4f3a7..f50e452 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -57,6 +57,7 @@ private:
 	void blockCreated();
 	void createBlock(int32 skipBack = 0);
 	void createNewlineBlock();
+	void ensureAtNewline();
 
 	// Returns true if at least one entity was parsed in the current position.
 	bool checkEntities();
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index db95239..121d611 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -2028,7 +2028,7 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 				_currentPen = &_originalPen;
 				_currentPenSelected = &_originalPenSelected;
 			}
-		} else if (isMono) {
+		} else if (isMono || (flags & TextBlockFlag::Blockquote)) {
 			_currentPen = &_palette->monoFg->p;
 			_currentPenSelected = &_palette->selectMonoFg->p;
 		} else if (block->linkIndex()) {
diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 660ca56..d88b93e 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -52,6 +52,7 @@ const auto &kTagUnderline = InputField::kTagUnderline;
 const auto &kTagStrikeOut = InputField::kTagStrikeOut;
 const auto &kTagCode = InputField::kTagCode;
 const auto &kTagPre = InputField::kTagPre;
+const auto &kTagBlockquote = InputField::kTagBlockquote;
 const auto &kTagSpoiler = InputField::kTagSpoiler;
 const auto &kCustomEmojiFormat = InputField::kCustomEmojiFormat;
 const auto kTagCheckLinkMeta = u"^:/:/:^"_q;
@@ -754,6 +755,9 @@ QTextCharFormat PrepareTagFormat(
 			font = font->underline();
 		} else if (tag == kTagStrikeOut) {
 			font = font->strikeout();
+		} else if (tag == kTagBlockquote) {
+			color = st::defaultTextPalette.monoFg;
+			font = font->italic();
 		} else if (tag == kTagCode || IsTagPre(tag)) {
 			color = st::defaultTextPalette.monoFg;
 			font = font->monospace();
@@ -931,13 +935,14 @@ struct FormattingAction {
 
 // kTagUnderline is not used for Markdown.
 
-const QString InputField::kTagBold = QStringLiteral("**");
-const QString InputField::kTagItalic = QStringLiteral("__");
-const QString InputField::kTagUnderline = QStringLiteral("^^");
-const QString InputField::kTagStrikeOut = QStringLiteral("~~");
-const QString InputField::kTagCode = QStringLiteral("`");
-const QString InputField::kTagPre = QStringLiteral("```");
-const QString InputField::kTagSpoiler = QStringLiteral("||");
+const QString InputField::kTagBold = u"**"_q;
+const QString InputField::kTagItalic = u"__"_q;
+const QString InputField::kTagUnderline = u"^^"_q;
+const QString InputField::kTagStrikeOut = u"~~"_q;
+const QString InputField::kTagCode = u"`"_q;
+const QString InputField::kTagPre = u"```"_q;
+const QString InputField::kTagSpoiler = u"||"_q;
+const QString InputField::kTagBlockquote = u">"_q;
 const QString InputField::kCustomEmojiTagStart = u"custom-emoji://"_q;
 const int InputField::kCustomEmojiFormat
 	= QTextFormat::UserObject + 1;
@@ -2903,6 +2908,14 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
 		const auto events = QKeySequence(searchKey);
 		return sequence.matches(events) == QKeySequence::ExactMatch;
 	};
+	const auto matchesCtrlShiftDot = [&] {
+		// We can't match ctrl+shift+. with QKeySequence because
+		// shift+. gives us '>' and ctrl+shift+> is not the same.
+		// So we check by nativeVirtualKey instead.
+		return e->modifiers().testFlag(Qt::ControlModifier)
+			&& e->modifiers().testFlag(Qt::ShiftModifier)
+			&& (e->nativeVirtualKey() == 190);
+	};
 	if (e == QKeySequence::Bold) {
 		toggleSelectionMarkdown(kTagBold);
 	} else if (e == QKeySequence::Italic) {
@@ -2913,6 +2926,8 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
 		toggleSelectionMarkdown(kTagStrikeOut);
 	} else if (matches(kMonospaceSequence)) {
 		toggleSelectionMarkdown(kTagCode);
+	} else if (matches(kBlockquoteSequence) || matchesCtrlShiftDot()) {
+		toggleSelectionMarkdown(kTagBlockquote);
 	}  else if (matches(kSpoilerSequence)) {
 		toggleSelectionMarkdown(kTagSpoiler);
 	} else if (matches(kClearFormatSequence)) {
@@ -3518,9 +3533,9 @@ void InputField::commitMarkdownLinkEdit(
 void InputField::toggleSelectionMarkdown(const QString &tag) {
 	_reverseMarkdownReplacement = false;
 	const auto cursor = textCursor();
-	const auto position = cursor.position();
-	const auto from = cursor.selectionStart();
-	const auto till = cursor.selectionEnd();
+	auto position = cursor.position();
+	auto from = cursor.selectionStart();
+	auto till = cursor.selectionEnd();
 	if (from == till) {
 		return;
 	}
@@ -3529,33 +3544,50 @@ void InputField::toggleSelectionMarkdown(const QString &tag) {
 	} else if (HasFullTextTag(getTextWithTagsSelected(), tag)) {
 		removeMarkdownTag(from, till, tag);
 	} else {
-		const auto useTag = [&] {
-			if (tag != kTagCode) {
-				return tag;
+		const auto leftForBlock = [&] {
+			if (!from) {
+				return true;
 			}
-			const auto leftForBlock = [&] {
-				if (!from) {
-					return true;
-				}
-				const auto text = getTextWithTagsPart(
-					from - 1,
-					from + 1
-				).text;
-				return text.isEmpty()
-					|| IsNewline(text[0])
-					|| IsNewline(text[text.size() - 1]);
-			}();
-			const auto rightForBlock = [&] {
-				const auto text = getTextWithTagsPart(
-					till - 1,
-					till + 1
-				).text;
-				return text.isEmpty()
-					|| IsNewline(text[0])
-					|| IsNewline(text[text.size() - 1]);
-			}();
-			return (leftForBlock && rightForBlock) ? kTagPre : kTagCode;
+			const auto text = getTextWithTagsPart(
+				from - 1,
+				from + 1
+			).text;
+			return text.isEmpty()
+				|| IsNewline(text[0])
+				|| IsNewline(text[text.size() - 1]);
 		}();
+		const auto rightForBlock = [&] {
+			const auto text = getTextWithTagsPart(
+				till - 1,
+				till + 1
+			).text;
+			return text.isEmpty()
+				|| IsNewline(text[0])
+				|| IsNewline(text[text.size() - 1]);
+		}();
+
+		const auto useTag = (tag != kTagCode)
+			? tag
+			: (leftForBlock && rightForBlock)
+			? kTagPre
+			: kTagCode;
+		if (tag == kTagBlockquote) {
+			QTextCursor(document()).beginEditBlock();
+			if (!leftForBlock) {
+				auto copy = textCursor();
+				copy.setPosition(from);
+				copy.insertText(u"\n"_q);
+				++position;
+				++from;
+				++till;
+			}
+			if (!rightForBlock) {
+				auto copy = textCursor();
+				copy.setPosition(till);
+				copy.insertText(u"\n"_q);
+			}
+			QTextCursor(document()).endEditBlock();
+		}
 		addMarkdownTag(from, till, useTag);
 	}
 	auto restorePosition = textCursor();
@@ -3738,6 +3770,7 @@ void InputField::addMarkdownActions(
 	addtag(integration.phraseFormattingItalic(), QKeySequence::Italic, kTagItalic);
 	addtag(integration.phraseFormattingUnderline(), QKeySequence::Underline, kTagUnderline);
 	addtag(integration.phraseFormattingStrikeOut(), kStrikeOutSequence, kTagStrikeOut);
+	addtag(integration.phraseFormattingBlockquote(), kBlockquoteSequence, kTagBlockquote);
 	addtag(integration.phraseFormattingMonospace(), kMonospaceSequence, kTagCode);
 	addtag(integration.phraseFormattingSpoiler(), kSpoilerSequence, kTagSpoiler);
 
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index 13a5603..afb4f6f 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -35,6 +35,7 @@ namespace Ui {
 
 const auto kClearFormatSequence = QKeySequence("ctrl+shift+n");
 const auto kStrikeOutSequence = QKeySequence("ctrl+shift+x");
+const auto kBlockquoteSequence = QKeySequence("ctrl+shift+.");
 const auto kMonospaceSequence = QKeySequence("ctrl+shift+m");
 const auto kEditLinkSequence = QKeySequence("ctrl+k");
 const auto kSpoilerSequence = QKeySequence("ctrl+shift+p");
@@ -133,6 +134,7 @@ public:
 	static const QString kTagCode;
 	static const QString kTagPre;
 	static const QString kTagSpoiler;
+	static const QString kTagBlockquote;
 	static const QString kCustomEmojiTagStart;
 	static const int kCustomEmojiFormat;
 

From 84cc457af999dcd679d3ed1ca2adfc89177e030c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 11 Oct 2023 08:43:16 +0400
Subject: [PATCH 522/635] Use three-way comparison for TextWithTags.

---
 ui/text/text_entity.h | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 15236c2..2c919e2 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -6,6 +6,7 @@
 //
 #pragma once
 
+#include "base/qt/qt_compare.h"
 #include "base/basic_types.h"
 #include "base/algorithm.h"
 
@@ -262,6 +263,9 @@ struct TextWithTags {
 		int offset = 0;
 		int length = 0;
 		QString id;
+
+		friend inline auto operator<=>(const Tag &, const Tag &) = default;
+		friend inline bool operator==(const Tag &, const Tag &) = default;
 	};
 	using Tags = QVector<Tag>;
 
@@ -271,22 +275,14 @@ struct TextWithTags {
 	[[nodiscard]] bool empty() const {
 		return text.isEmpty();
 	}
+	friend inline auto operator<=>(
+		const TextWithTags &,
+		const TextWithTags &) = default;
+	friend inline bool operator==(
+		const TextWithTags &,
+		const TextWithTags &) = default;
 };
 
-inline bool operator==(const TextWithTags::Tag &a, const TextWithTags::Tag &b) {
-	return (a.offset == b.offset) && (a.length == b.length) && (a.id == b.id);
-}
-inline bool operator!=(const TextWithTags::Tag &a, const TextWithTags::Tag &b) {
-	return !(a == b);
-}
-
-inline bool operator==(const TextWithTags &a, const TextWithTags &b) {
-	return (a.text == b.text) && (a.tags == b.tags);
-}
-inline bool operator!=(const TextWithTags &a, const TextWithTags &b) {
-	return !(a == b);
-}
-
 // Parsing helpers.
 
 namespace TextUtilities {

From 45ffbdeef992207065b320d1aabd71fc4186722f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 11 Oct 2023 21:49:00 +0400
Subject: [PATCH 523/635] Track Ui::Text::String modifications on parse.

---
 ui/text/text.h          |  4 ++++
 ui/text/text_entity.cpp |  2 +-
 ui/text/text_entity.h   | 46 ++++++++++++++++++++---------------------
 ui/text/text_parser.cpp | 23 +++++++++++++++------
 ui/text/text_parser.h   |  2 +-
 5 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/ui/text/text.h b/ui/text/text.h
index 2b32bb8..a627a56 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -293,6 +293,9 @@ public:
 	[[nodiscard]] OnlyCustomEmoji toOnlyCustomEmoji() const;
 
 	[[nodiscard]] bool hasNotEmojiAndSpaces() const;
+	[[nodiscard]] const base::flat_map<int, int> &modifications() const {
+		return _modifications;
+	}
 
 	[[nodiscard]] const style::TextStyle *style() const {
 		return _st;
@@ -350,6 +353,7 @@ private:
 	bool _hasNotEmojiAndSpaces : 1 = false;
 
 	QString _text;
+	base::flat_map<int, int> _modifications;
 	const style::TextStyle *_st = nullptr;
 
 	TextBlocks _blocks;
diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index c2d48ef..9d25dd6 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -1890,7 +1890,7 @@ void Trim(TextWithEntities &result) {
 }
 
 int SerializeTagsSize(const TextWithTags::Tags &tags) {
-	auto result = qint32(0);
+	auto result = int(sizeof(qint32)); // QByteArray size
 	if (tags.isEmpty()) {
 		return result;
 	}
diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 2c919e2..2aa8385 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -50,10 +50,17 @@ struct EntityLinkData {
 	QString data;
 	EntityType type = EntityType::Invalid;
 	EntityLinkShown shown = EntityLinkShown::Full;
+
+	friend inline auto operator<=>(
+		const EntityLinkData &,
+		const EntityLinkData &) = default;
+	friend inline bool operator==(
+		const EntityLinkData &,
+		const EntityLinkData &) = default;
 };
 
 class EntityInText;
-using EntitiesInText = QList<EntityInText>;
+using EntitiesInText = QVector<EntityInText>;
 
 class EntityInText {
 public:
@@ -113,6 +120,13 @@ public:
 		return type() != EntityType::Invalid;
 	}
 
+	friend inline auto operator<=>(
+		const EntityInText &,
+		const EntityInText &) = default;
+	friend inline bool operator==(
+		const EntityInText &,
+		const EntityInText &) = default;
+
 private:
 	EntityType _type = EntityType::Invalid;
 	int _offset = 0;
@@ -121,17 +135,6 @@ private:
 
 };
 
-inline bool operator==(const EntityInText &a, const EntityInText &b) {
-	return (a.type() == b.type())
-		&& (a.offset() == b.offset())
-		&& (a.length() == b.length())
-		&& (a.data() == b.data());
-}
-
-inline bool operator!=(const EntityInText &a, const EntityInText &b) {
-	return !(a == b);
-}
-
 struct TextWithEntities {
 	QString text;
 	EntitiesInText entities;
@@ -182,20 +185,15 @@ struct TextWithEntities {
 		result.text = simple;
 		return result;
 	}
+
+	friend inline auto operator<=>(
+		const TextWithEntities &,
+		const TextWithEntities &) = default;
+	friend inline bool operator==(
+		const TextWithEntities &,
+		const TextWithEntities &) = default;
 };
 
-inline bool operator==(
-		const TextWithEntities &a,
-		const TextWithEntities &b) {
-	return (a.text == b.text) && (a.entities == b.entities);
-}
-
-inline bool operator!=(
-		const TextWithEntities &a,
-		const TextWithEntities &b) {
-	return !(a == b);
-}
-
 struct TextForMimeData {
 	QString expanded;
 	TextWithEntities rich;
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 79a0e45..72ef261 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -182,6 +182,7 @@ void Parser::createBlock(int32 skipBack) {
 	if (_newlineAwaited) {
 		_newlineAwaited = false;
 		if (!newline) {
+			++_t->_modifications[_blockStart];
 			_t->_text.insert(_blockStart, QChar::LineFeed);
 			createBlock(skipBack - length);
 		}
@@ -220,20 +221,23 @@ void Parser::createBlock(int32 skipBack) {
 	blockCreated();
 }
 
-void Parser::createNewlineBlock() {
-	createBlock();
+void Parser::createNewlineBlock(bool fromOriginalText) {
+	if (!fromOriginalText) {
+		++_t->_modifications[_t->_text.size()];
+	}
 	_t->_text.push_back(QChar::LineFeed);
 	_allowDiacritic = false;
 	createBlock();
 }
 
 void Parser::ensureAtNewline() {
+	createBlock();
 	const auto lastType = _t->_blocks.empty()
 		? TextBlockType::Newline
 		: _t->_blocks.back()->type();
 	if (lastType != TextBlockType::Newline) {
 		auto saved = base::take(_customEmojiData);
-		createNewlineBlock();
+		createNewlineBlock(false);
 		_customEmojiData = base::take(saved);
 	}
 }
@@ -335,7 +339,6 @@ bool Parser::checkEntities() {
 			flags = TextBlockFlag::Code;
 		} else {
 			flags = TextBlockFlag::Pre;
-			createBlock();
 			ensureAtNewline();
 		}
 		const auto text = QString(entityBegin, entityLength);
@@ -352,7 +355,6 @@ bool Parser::checkEntities() {
 		}
 	} else if (entityType == EntityType::Blockquote) {
 		flags = TextBlockFlag::Blockquote;
-		createBlock();
 		ensureAtNewline();
 	} else if (entityType == EntityType::Url
 		|| entityType == EntityType::Email
@@ -498,6 +500,7 @@ void Parser::parseCurrentChar() {
 	}
 
 	if (skip) {
+		--_t->_modifications[_t->_text.size()];
 		_ch = 0;
 		_allowDiacritic = false;
 	} else {
@@ -513,7 +516,8 @@ void Parser::parseCurrentChar() {
 			}
 		}
 		if (isNewLine) {
-			createNewlineBlock();
+			createBlock();
+			createNewlineBlock(true);
 		} else if (replaceWithSpace) {
 			_t->_text.push_back(QChar::Space);
 			_allowDiacritic = false;
@@ -545,6 +549,7 @@ void Parser::parseEmojiFromCurrent() {
 		Assert(!_t->_text.isEmpty());
 		const auto last = _t->_text[_t->_text.size() - 1];
 		if (last.unicode() != Emoji::kPostfix) {
+			++_t->_modifications[_t->_text.size()];
 			_t->_text.push_back(QChar(Emoji::kPostfix));
 			++len;
 		}
@@ -579,8 +584,13 @@ void Parser::parse(const TextParseOptions &options) {
 	trimSourceRange();
 
 	_t->_text.resize(0);
+	_t->_modifications = {};
 	_t->_text.reserve(_end - _ptr);
 
+	if (_ptr > _start) {
+		_t->_modifications[0] = -(_ptr - _start);
+	}
+
 	for (; _ptr <= _end; ++_ptr) {
 		while (checkEntities()) {
 		}
@@ -758,6 +768,7 @@ void Parser::finalize(const TextParseOptions &options) {
 	_t->_links.squeeze();
 	_t->_blocks.shrink_to_fit();
 	_t->_text.squeeze();
+	_t->_modifications.shrink_to_fit();
 }
 
 void Parser::computeLinkText(
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index f50e452..d844edf 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -56,7 +56,7 @@ private:
 	void trimSourceRange();
 	void blockCreated();
 	void createBlock(int32 skipBack = 0);
-	void createNewlineBlock();
+	void createNewlineBlock(bool fromOriginalText);
 	void ensureAtNewline();
 
 	// Returns true if at least one entity was parsed in the current position.

From 44f8d862ff03390217841fb282cb8dd55e0d5d7d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 12 Oct 2023 10:52:59 +0400
Subject: [PATCH 524/635] Simplify TextStyle: remove linkFont/linkFontOver.

---
 ui/basic.style                         | 20 +++++++++++++-------
 ui/layers/layers.style                 |  4 ----
 ui/platform/mac/ui_window_title_mac.mm |  2 --
 ui/text/text_renderer.cpp              | 13 ++++++++-----
 ui/widgets/widgets.style               | 14 ++------------
 5 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index 6073a2f..0c0417f 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -21,11 +21,17 @@ TextPalette {
 
 TextStyle {
 	font: font;
-	linkFont: font;
-	linkFontOver: font;
+	linkUnderline: int;
+	blockPadding: margins;
+	blockOutline: pixels;
+	preScrollable: bool;
 	lineHeight: pixels;
 }
 
+kLinkUnderlineNever: 0;
+kLinkUnderlineActive: 1;
+kLinkUnderlineAlways: 2;
+
 fsize: 13px;
 normalFont: font(fsize);
 semiboldFont: font(fsize semibold);
@@ -50,14 +56,14 @@ defaultTextPalette: TextPalette {
 }
 defaultTextStyle: TextStyle {
 	font: normalFont;
-	linkFont: normalFont;
-	linkFontOver: font(fsize underline);
+	linkUnderline: kLinkUnderlineActive;
+	blockPadding: margins(10px, 4px, 6px, 4px);
+	blockOutline: 3px;
+	preScrollable: true;
 	lineHeight: 0px;
 }
 semiboldTextStyle: TextStyle(defaultTextStyle) {
 	font: semiboldFont;
-	linkFont: semiboldFont;
-	linkFontOver: font(fsize semibold underline);
 }
 
 slideDuration: 240;
@@ -69,7 +75,7 @@ fadeWrapDuration: 200;
 
 linkCropLimit: 360px;
 linkFont: normalFont;
-linkOverFont: font(fsize underline);
+linkFontOver: font(fsize underline);
 
 roundRadiusLarge: 6px;
 roundRadiusSmall: 3px;
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 1f7f897..8da1f07 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -82,8 +82,6 @@ boxTitle: FlatLabel(defaultFlatLabel) {
 	maxHeight: 24px;
 	style: TextStyle(defaultTextStyle) {
 		font: boxTitleFont;
-		linkFont: boxTitleFont;
-		linkFontOver: font(16px semibold underline);
 	}
 }
 boxTitlePosition: point(24px, 18px);
@@ -187,8 +185,6 @@ separatePanelTitle: FlatLabel(defaultFlatLabel) {
 	maxHeight: 26px;
 	style: TextStyle(defaultTextStyle) {
 		font: separatePanelTitleFont;
-		linkFont: separatePanelTitleFont;
-		linkFontOver: font(18px semibold underline);
 	}
 }
 separatePanelTitleTop: 18px;
diff --git a/ui/platform/mac/ui_window_title_mac.mm b/ui/platform/mac/ui_window_title_mac.mm
index be22393..4b1100b 100644
--- a/ui/platform/mac/ui_window_title_mac.mm
+++ b/ui/platform/mac/ui_window_title_mac.mm
@@ -88,8 +88,6 @@ void TitleWidget::init(int height) {
 	const auto setFromFont = [&](const style::font &font) {
 		_textStyle = std::make_unique<style::TextStyle>(style::TextStyle{
 			.font = font,
-			.linkFont = font,
-			.linkFontOver = font,
 		});
 	};
 
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 121d611..83fd50a 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -1410,11 +1410,14 @@ void Renderer::eSetFont(const AbstractBlock *block) {
 	const auto flags = block->flags();
 	const auto usedFont = [&] {
 		if (const auto index = block->linkIndex()) {
-			const auto active = (_palette && _palette->linkAlwaysActive)
-				|| ClickHandler::showAsActive(_t->_links.at(index - 1));
-			return active
-				? _t->_st->linkFontOver
-				: _t->_st->linkFont;
+			const auto underline = _t->_st->linkUnderline;
+			const auto underlined = (underline == st::kLinkUnderlineNever)
+				? false
+				: (underline == st::kLinkUnderlineActive)
+				? ((_palette && _palette->linkAlwaysActive)
+					|| ClickHandler::showAsActive(_t->_links.at(index - 1)))
+				: true;
+			return underlined ? _t->_st->font->underline() : _t->_st->font;
 		}
 		return _t->_st->font;
 	}();
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 8b90876..0a9624b 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -641,7 +641,7 @@ defaultLinkButton: LinkButton {
 	color: windowActiveTextFg;
 	overColor: windowActiveTextFg;
 	font: linkFont;
-	overFont: linkOverFont;
+	overFont: linkFontOver;
 }
 
 defaultRippleAnimation: RippleAnimation {
@@ -1145,8 +1145,6 @@ defaultImportantTooltip: ImportantTooltip {
 defaultImportantTooltipLabel: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
 		font: font(11px);
-		linkFont: font(11px);
-		linkFontOver: font(11px underline);
 	}
 	textFg: importantTooltipFg;
 	palette: TextPalette(defaultTextPalette) {
@@ -1252,11 +1250,7 @@ defaultPeerListItem: PeerListItem {
 	height: 58px;
 	photoPosition: point(12px, 6px);
 	namePosition: point(68px, 11px);
-	nameStyle: TextStyle(defaultTextStyle) {
-		font: semiboldFont;
-		linkFont: semiboldFont;
-		linkFontOver: semiboldFont;
-	}
+	nameStyle: semiboldTextStyle;
 	nameFg: contactsNameFg;
 	nameFgChecked: windowActiveTextFg;
 	statusPosition: point(68px, 31px);
@@ -1271,8 +1265,6 @@ defaultPeerListItem: PeerListItem {
 
 boxTextStyle: TextStyle(defaultTextStyle) {
 	font: font(boxFontSize);
-	linkFont: font(boxFontSize);
-	linkFontOver: font(boxFontSize underline);
 }
 
 defaultPeerListAbout: FlatLabel(defaultFlatLabel) {
@@ -1437,8 +1429,6 @@ defaultWindowTitle: WindowTitle {
 	fgActive: titleFgActive;
 	style: TextStyle(defaultTextStyle) {
 		font: font(semibold 12px);
-		linkFont: font(semibold 12px);
-		linkFontOver: font(semibold 12px underline);
 	}
 	minimize: IconButton(windowTitleButton) {
 		icon: icon {

From ab5057f001633af05f54d995a0322ed73abe4c2c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 12 Oct 2023 13:29:17 +0400
Subject: [PATCH 525/635] Optimize simple Ui::Text::String instances.

---
 CMakeLists.txt                                |   4 +-
 ui/text/text.cpp                              | 172 +++++++++++-------
 ui/text/text.h                                | 116 +++++++-----
 ui/text/text_block.cpp                        |  12 +-
 ui/text/text_block.h                          |  19 +-
 ...poiler_data.cpp => text_extended_data.cpp} |   2 +-
 ...xt_spoiler_data.h => text_extended_data.h} |  18 ++
 ui/text/text_isolated_emoji.h                 |   1 +
 ui/text/text_parser.cpp                       |  55 ++++--
 ui/text/text_parser.h                         |   3 +
 ui/text/text_renderer.cpp                     |  28 ++-
 ui/text/text_renderer.h                       |   4 +
 ui/toast/toast_widget.cpp                     |   2 +-
 ui/widgets/checkbox.cpp                       |   2 +-
 ui/widgets/labels.cpp                         |   8 +-
 ui/widgets/time_input.cpp                     |   1 +
 ui/widgets/tooltip.cpp                        |   3 +-
 17 files changed, 291 insertions(+), 159 deletions(-)
 rename ui/text/{text_spoiler_data.cpp => text_extended_data.cpp} (95%)
 rename ui/text/{text_spoiler_data.h => text_extended_data.h} (73%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d03d8b..281dbb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,13 +165,13 @@ PRIVATE
     ui/text/text_custom_emoji.h
     ui/text/text_entity.cpp
     ui/text/text_entity.h
+    ui/text/text_extended_data.cpp
+    ui/text/text_extended_data.h
     ui/text/text_isolated_emoji.h
     ui/text/text_parser.cpp
     ui/text/text_parser.h
     ui/text/text_renderer.cpp
     ui/text/text_renderer.h
-    ui/text/text_spoiler_data.cpp
-    ui/text/text_spoiler_data.h
     ui/text/text_utilities.cpp
     ui/text/text_utilities.h
     ui/text/text_variant.cpp
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 1327251..0044a9e 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -6,10 +6,11 @@
 //
 #include "ui/text/text.h"
 
+#include "ui/effects/spoiler_mess.h"
+#include "ui/text/text_extended_data.h"
 #include "ui/text/text_isolated_emoji.h"
 #include "ui/text/text_parser.h"
 #include "ui/text/text_renderer.h"
-#include "ui/text/text_spoiler_data.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/painter.h"
 #include "base/platform/base_platform_info.h"
@@ -91,12 +92,19 @@ const TextParseOptions kPlainTextOptions = {
 
 namespace Ui::Text {
 
+struct SpoilerMessCache::Entry {
+	SpoilerMessCached mess;
+	QColor color;
+};
+
 SpoilerMessCache::SpoilerMessCache(int capacity) : _capacity(capacity) {
 	Expects(capacity > 0);
 
 	_cache.reserve(capacity);
 }
 
+SpoilerMessCache::~SpoilerMessCache() = default;
+
 not_null<SpoilerMessCached*> SpoilerMessCache::lookup(QColor color) {
 	for (auto &entry : _cache) {
 		if (entry.color == color) {
@@ -139,25 +147,25 @@ GeometryDescriptor SimpleGeometry(
 		bool elisionOneLine,
 		bool elisionBreakEverywhere) {
 	constexpr auto wrap = [](
-			Fn<LineGeometry(LineGeometry, uint16)> layout,
+			Fn<LineGeometry(LineGeometry)> layout,
 			bool breakEverywhere = false) {
 		return GeometryDescriptor{ std::move(layout), breakEverywhere };
 	};
 
 	// Try to minimize captured values (to minimize Fn allocations).
 	if (!elisionOneLine && !elisionHeight) {
-		return wrap([=](LineGeometry line, uint16 positino) {
+		return wrap([=](LineGeometry line) {
 			line.width = availableWidth;
 			return line;
 		});
 	} else if (elisionOneLine) {
-		return wrap([=](LineGeometry line, uint16 position) {
+		return wrap([=](LineGeometry line) {
 			line.elided = true;
 			line.width = availableWidth - elisionRemoveFromEnd;
 			return line;
 		}, elisionBreakEverywhere);
 	} else if (!elisionRemoveFromEnd) {
-		return wrap([=](LineGeometry line, uint16 position) {
+		return wrap([=](LineGeometry line) {
 			if (line.top + fontHeight * 2 > elisionHeight) {
 				line.elided = true;
 			}
@@ -165,7 +173,7 @@ GeometryDescriptor SimpleGeometry(
 			return line;
 		});
 	} else {
-		return wrap([=](LineGeometry line, uint16 position) {
+		return wrap([=](LineGeometry line) {
 			if (line.top + fontHeight * 2 > elisionHeight) {
 				line.elided = true;
 				line.width = availableWidth - elisionRemoveFromEnd;
@@ -177,27 +185,44 @@ GeometryDescriptor SimpleGeometry(
 	}
 };
 
-String::SpoilerDataWrap::SpoilerDataWrap() noexcept = default;
+String::ExtendedWrap::ExtendedWrap() noexcept = default;
 
-String::SpoilerDataWrap::SpoilerDataWrap(SpoilerDataWrap &&other) noexcept
-: data(std::move(other.data)) {
+String::ExtendedWrap::ExtendedWrap(ExtendedWrap &&other) noexcept
+: unique_ptr(std::move(other)) {
 	adjustFrom(&other);
 }
 
-String::SpoilerDataWrap &String::SpoilerDataWrap::operator=(
-		SpoilerDataWrap &&other) noexcept {
-	data = std::move(other.data);
+String::ExtendedWrap &String::ExtendedWrap::operator=(
+		ExtendedWrap &&other) noexcept {
+	*static_cast<unique_ptr*>(this) = std::move(other);
 	adjustFrom(&other);
 	return *this;
 }
 
-void String::SpoilerDataWrap::adjustFrom(const SpoilerDataWrap *other) {
-	if (data && data->link) {
+String::ExtendedWrap::ExtendedWrap(
+	std::unique_ptr<ExtendedData> &&other) noexcept
+: unique_ptr(std::move(other)) {
+	Assert(!get() || !get()->spoiler);
+}
+
+String::ExtendedWrap &String::ExtendedWrap::operator=(
+		std::unique_ptr<ExtendedData> &&other) noexcept {
+	*static_cast<unique_ptr*>(this) = std::move(other);
+	Assert(!get() || !get()->spoiler);
+	return *this;
+}
+
+String::ExtendedWrap::~ExtendedWrap() = default;
+
+void String::ExtendedWrap::adjustFrom(const ExtendedWrap *other) {
+	const auto data = get();
+	if (data && data->spoiler) {
 		const auto raw = [](auto pointer) {
 			return reinterpret_cast<quintptr>(pointer);
 		};
-		data->link->setText(reinterpret_cast<String*>(
-			raw(data->link->text().get()) + raw(this) - raw(other)));
+		const auto otherText = raw(data->spoiler->link->text().get());
+		data->spoiler->link->setText(
+			reinterpret_cast<String*>(otherText + raw(this) - raw(other)));
 	}
 }
 
@@ -243,31 +268,35 @@ void String::setText(const style::TextStyle &st, const QString &text, const Text
 void String::recountNaturalSize(
 		bool initial,
 		Qt::LayoutDirection optionsDirection) {
-	NewlineBlock *lastNewline = 0;
+	auto lastNewline = (NewlineBlock*)nullptr;
+	auto lastNewlineStart = 0;
+	const auto computeParagraphDirection = [&](int paragraphEnd) {
+		const auto direction = (optionsDirection != Qt::LayoutDirectionAuto)
+			? optionsDirection
+			: StringDirection(_text, lastNewlineStart, paragraphEnd);
+		if (lastNewline) {
+			lastNewline->_paragraphLTR = (direction == Qt::LeftToRight);
+			lastNewline->_paragraphRTL = (direction == Qt::RightToLeft);
+		} else {
+			_startParagraphLTR = (direction == Qt::LeftToRight);
+			_startParagraphRTL = (direction == Qt::RightToLeft);
+		}
+	};
 
 	_maxWidth = _minHeight = 0;
 	int32 lineHeight = 0;
-	int32 lastNewlineStart = 0;
-	QFixed _width = 0, last_rBearing = 0, last_rPadding = 0;
+	QFixed maxWidth = 0;
+	QFixed width = 0, last_rBearing = 0, last_rPadding = 0;
 	for (auto &block : _blocks) {
 		auto b = block.get();
 		auto _btype = b->type();
 		auto blockHeight = CountBlockHeight(b, _st);
 		if (_btype == TextBlockType::Newline) {
-			if (!lineHeight) lineHeight = blockHeight;
+			if (!lineHeight) {
+				lineHeight = blockHeight;
+			}
 			if (initial) {
-				Qt::LayoutDirection direction = optionsDirection;
-				if (direction == Qt::LayoutDirectionAuto) {
-					direction = StringDirection(
-						_text,
-						lastNewlineStart,
-						b->position());
-				}
-				if (lastNewline) {
-					lastNewline->_nextDirection = direction;
-				} else {
-					_startDirection = direction;
-				}
+				computeParagraphDirection(b->position());
 			}
 			lastNewlineStart = b->position();
 			lastNewline = &block.unsafe<NewlineBlock>();
@@ -277,8 +306,8 @@ void String::recountNaturalSize(
 			last_rBearing = b->f_rbearing();
 			last_rPadding = b->f_rpadding();
 
-			accumulate_max(_maxWidth, _width);
-			_width = (b->f_width() - last_rBearing);
+			accumulate_max(maxWidth, width);
+			width = (b->f_width() - last_rBearing);
 			continue;
 		}
 
@@ -291,9 +320,9 @@ void String::recountNaturalSize(
 		// But when we layout block and we're sure that _maxWidth is enough
 		// for all the blocks to fit on their line we check each block, even the
 		// intermediate one with a large negative right bearing.
-		accumulate_max(_maxWidth, _width);
+		accumulate_max(maxWidth, width);
 
-		_width += last_rBearing + (last_rPadding + b->f_width() - b__f_rbearing);
+		width += last_rBearing + (last_rPadding + b->f_width() - b__f_rbearing);
 		lineHeight = qMax(lineHeight, blockHeight);
 
 		last_rBearing = b__f_rbearing;
@@ -301,21 +330,14 @@ void String::recountNaturalSize(
 		continue;
 	}
 	if (initial) {
-		Qt::LayoutDirection direction = optionsDirection;
-		if (direction == Qt::LayoutDirectionAuto) {
-			direction = StringDirection(_text, lastNewlineStart, _text.size());
-		}
-		if (lastNewline) {
-			lastNewline->_nextDirection = direction;
-		} else {
-			_startDirection = direction;
-		}
+		computeParagraphDirection(_text.size());
 	}
-	if (_width > 0) {
+	if (width > 0) {
 		if (!lineHeight) lineHeight = CountBlockHeight(_blocks.back().get(), _st);
 		_minHeight += lineHeight;
-		accumulate_max(_maxWidth, _width);
+		accumulate_max(maxWidth, width);
 	}
+	_maxWidth = maxWidth.ceil().toInt();
 }
 
 int String::countMaxMonospaceWidth() const {
@@ -405,13 +427,14 @@ void String::setMarkedText(const style::TextStyle &st, const TextWithEntities &t
 }
 
 void String::setLink(uint16 index, const ClickHandlerPtr &link) {
-	if (index > 0 && index <= _links.size()) {
-		_links[index - 1] = link;
+	const auto extended = _extended.get();
+	if (extended && index > 0 && index <= extended->links.size()) {
+		extended->links[index - 1] = link;
 	}
 }
 
 void String::setSpoilerRevealed(bool revealed, anim::type animated) {
-	const auto data = _spoiler.data.get();
+	const auto data = _extended ? _extended->spoiler.get() : nullptr;
 	if (!data) {
 		return;
 	} else if (data->revealed == revealed) {
@@ -436,19 +459,19 @@ void String::setSpoilerRevealed(bool revealed, anim::type animated) {
 }
 
 void String::setSpoilerLinkFilter(Fn<bool(const ClickContext&)> filter) {
-	Expects(_spoiler.data != nullptr);
+	Expects(_extended && _extended->spoiler);
 
-	_spoiler.data->link = std::make_shared<SpoilerClickHandler>(
+	_extended->spoiler->link = std::make_shared<SpoilerClickHandler>(
 		this,
 		std::move(filter));
 }
 
 bool String::hasLinks() const {
-	return !_links.isEmpty();
+	return _extended && !_extended->links.empty();
 }
 
 bool String::hasSpoilers() const {
-	return (_spoiler.data != nullptr);
+	return _extended && (_extended->spoiler != nullptr);
 }
 
 bool String::hasSkipBlock() const {
@@ -490,7 +513,7 @@ bool String::removeSkipBlock() {
 
 int String::countWidth(int width, bool breakEverywhere) const {
 	if (QFixed(width) >= _maxWidth) {
-		return _maxWidth.ceil().toInt();
+		return _maxWidth;
 	}
 
 	QFixed maxLineWidth = 0;
@@ -822,6 +845,13 @@ bool String::isEmpty() const {
 	return _blocks.empty() || _blocks[0]->type() == TextBlockType::Skip;
 }
 
+not_null<ExtendedData*> String::ensureExtended() {
+	if (!_extended) {
+		_extended = std::make_unique<ExtendedData>();
+	}
+	return _extended.get();
+}
+
 uint16 String::countBlockEnd(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const {
 	return (i + 1 == e) ? _text.size() : (*(i + 1))->position();
 }
@@ -857,7 +887,9 @@ void String::enumerateText(
 				return 0;
 			}
 			const auto result = (*i)->linkIndex();
-			return (result && _links.at(result - 1)) ? result : 0;
+			return (result && _extended && _extended->links[result - 1])
+				? result
+				: 0;
 		}();
 		if (blockLinkIndex != linkIndex) {
 			if (linkIndex) {
@@ -866,9 +898,11 @@ void String::enumerateText(
 				if (rangeTo > rangeFrom) { // handle click handler
 					const auto r = base::StringViewMid(_text, rangeFrom, rangeTo - rangeFrom);
 					// Ignore links that are partially copied.
-					const auto handler = (linkPosition != rangeFrom || blockPosition != rangeTo)
+					const auto handler = (linkPosition != rangeFrom
+						|| blockPosition != rangeTo
+						|| !_extended)
 						? nullptr
-						: _links.at(linkIndex - 1);
+						: _extended->links[linkIndex - 1];
 					const auto type = handler
 						? handler->getTextEntity().type
 						: EntityType::Invalid;
@@ -878,7 +912,9 @@ void String::enumerateText(
 			linkIndex = blockLinkIndex;
 			if (linkIndex) {
 				linkPosition = blockPosition;
-				const auto handler = _links.at(linkIndex - 1);
+				const auto handler = _extended
+					? _extended->links[linkIndex - 1]
+					: nullptr;
 				clickHandlerStartCallback(handler
 					? handler->getTextEntity().type
 					: EntityType::Invalid);
@@ -916,7 +952,7 @@ void String::enumerateText(
 }
 
 bool String::hasPersistentAnimation() const {
-	return _hasCustomEmoji || _spoiler.data;
+	return _hasCustomEmoji || hasSpoilers();
 }
 
 void String::unloadPersistentAnimation() {
@@ -958,6 +994,11 @@ bool String::hasNotEmojiAndSpaces() const {
 	return _hasNotEmojiAndSpaces;
 }
 
+const base::flat_map<int, int> &String::modifications() const {
+	static const auto kEmpty = base::flat_map<int, int>();
+	return _extended ? _extended->modifications : kEmpty;
+}
+
 QString String::toString(TextSelection selection) const {
 	return toText(selection, false, false).rich.text;
 }
@@ -1141,16 +1182,13 @@ IsolatedEmoji String::toIsolatedEmoji() const {
 }
 
 void String::clear() {
-	clearFields();
 	_text.clear();
-}
-
-void String::clearFields() {
 	_blocks.clear();
-	_links.clear();
-	_spoiler.data = nullptr;
+	_extended = nullptr;
 	_maxWidth = _minHeight = 0;
-	_startDirection = Qt::LayoutDirectionAuto;
+	_startParagraphIndex = 0;
+	_startParagraphLTR = false;
+	_startParagraphRTL = false;
 }
 
 bool IsBad(QChar ch) {
diff --git a/ui/text/text.h b/ui/text/text.h
index a627a56..e90f2b9 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -7,12 +7,12 @@
 #pragma once
 
 #include "ui/text/text_entity.h"
-#include "ui/text/text_block.h"
-#include "ui/effects/spoiler_mess.h"
 #include "ui/click_handler.h"
 #include "base/flags.h"
+#include "ui/style/style_core_types.h"
+
+#include <crl/crl_time.h>
 
-#include <private/qfixed_p.h>
 #include <any>
 
 class Painter;
@@ -22,11 +22,18 @@ enum class type : uchar;
 } // namespace anim
 
 namespace style {
+struct TextStyle;
 struct TextPalette;
 } // namespace style
 
 namespace Ui {
+
+class SpoilerMessCached;
+
 extern const QString kQEllipsis;
+
+inline constexpr auto kQFixedMax = (INT_MAX / 256);
+
 } // namespace Ui
 
 struct TextParseOptions {
@@ -68,9 +75,12 @@ static constexpr TextSelection AllTextSelection = { 0, 0xFFFF };
 
 namespace Ui::Text {
 
+struct Block;
 struct IsolatedEmoji;
 struct OnlyCustomEmoji;
 struct SpoilerData;
+struct ParagraphDetails;
+struct ExtendedData;
 
 struct StateRequest {
 	enum class Flag {
@@ -108,15 +118,13 @@ struct StateRequestElided : StateRequest {
 class SpoilerMessCache {
 public:
 	explicit SpoilerMessCache(int capacity);
+	~SpoilerMessCache();
 
 	[[nodiscard]] not_null<SpoilerMessCached*> lookup(QColor color);
 	void reset();
 
 private:
-	struct Entry {
-		SpoilerMessCached mess;
-		QColor color;
-	};
+	struct Entry;
 
 	std::vector<Entry> _cache;
 	const int _capacity = 0;
@@ -135,7 +143,7 @@ struct LineGeometry {
 	bool elided = false;
 };
 struct GeometryDescriptor {
-	Fn<LineGeometry(LineGeometry line, uint16 position)> layout;
+	Fn<LineGeometry(LineGeometry line)> layout;
 	bool breakEverywhere = false;
 };
 
@@ -176,17 +184,17 @@ struct PaintContext {
 
 class String {
 public:
-	String(int32 minResizeWidth = QFIXED_MAX);
+	String(int minResizeWidth = kQFixedMax);
 	String(
 		const style::TextStyle &st,
 		const QString &text,
 		const TextParseOptions &options = kDefaultTextOptions,
-		int32 minResizeWidth = QFIXED_MAX);
+		int minResizeWidth = kQFixedMax);
 	String(
 		const style::TextStyle &st,
 		const TextWithEntities &textWithEntities,
 		const TextParseOptions &options = kMarkupTextOptions,
-		int32 minResizeWidth = QFIXED_MAX,
+		int minResizeWidth = kQFixedMax,
 		const std::any &context = {});
 	String(String &&other);
 	String &operator=(String &&other);
@@ -238,7 +246,7 @@ public:
 	bool removeSkipBlock();
 
 	[[nodiscard]] int maxWidth() const {
-		return _maxWidth.ceil().toInt();
+		return _maxWidth;
 	}
 	[[nodiscard]] int minHeight() const {
 		return _minHeight;
@@ -293,9 +301,7 @@ public:
 	[[nodiscard]] OnlyCustomEmoji toOnlyCustomEmoji() const;
 
 	[[nodiscard]] bool hasNotEmojiAndSpaces() const;
-	[[nodiscard]] const base::flat_map<int, int> &modifications() const {
-		return _modifications;
-	}
+	[[nodiscard]] const base::flat_map<int, int> &modifications() const;
 
 	[[nodiscard]] const style::TextStyle *style() const {
 		return _st;
@@ -305,64 +311,80 @@ public:
 
 private:
 	using TextBlocks = std::vector<Block>;
-	using TextLinks = QVector<ClickHandlerPtr>;
 
-	class SpoilerDataWrap {
+	class ExtendedWrap : public std::unique_ptr<ExtendedData> {
 	public:
-		SpoilerDataWrap() noexcept;
-		SpoilerDataWrap(SpoilerDataWrap &&other) noexcept;
-		SpoilerDataWrap &operator=(SpoilerDataWrap &&other) noexcept;
+		ExtendedWrap() noexcept;
+		ExtendedWrap(ExtendedWrap &&other) noexcept;
+		ExtendedWrap &operator=(ExtendedWrap &&other) noexcept;
+		~ExtendedWrap();
 
-		std::unique_ptr<SpoilerData> data;
+		ExtendedWrap(
+			std::unique_ptr<ExtendedData> &&other) noexcept;
+		ExtendedWrap &operator=(
+			std::unique_ptr<ExtendedData> &&other) noexcept;
 
 	private:
-		void adjustFrom(const SpoilerDataWrap *other);
+		void adjustFrom(const ExtendedWrap *other);
 
 	};
 
-	uint16 countBlockEnd(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const;
-	uint16 countBlockLength(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const;
+	[[nodiscard]] not_null<ExtendedData*> ensureExtended();
+
+	[[nodiscard]] uint16 countBlockEnd(
+		const TextBlocks::const_iterator &i,
+		const TextBlocks::const_iterator &e) const;
+	[[nodiscard]] uint16 countBlockLength(
+		const TextBlocks::const_iterator &i,
+		const TextBlocks::const_iterator &e) const;
 
 	// Template method for originalText(), originalTextWithEntities().
-	template <typename AppendPartCallback, typename ClickHandlerStartCallback, typename ClickHandlerFinishCallback, typename FlagsChangeCallback>
-	void enumerateText(TextSelection selection, AppendPartCallback appendPartCallback, ClickHandlerStartCallback clickHandlerStartCallback, ClickHandlerFinishCallback clickHandlerFinishCallback, FlagsChangeCallback flagsChangeCallback) const;
+	template <
+		typename AppendPartCallback,
+		typename ClickHandlerStartCallback,
+		typename ClickHandlerFinishCallback,
+		typename FlagsChangeCallback>
+	void enumerateText(
+		TextSelection selection,
+		AppendPartCallback appendPartCallback,
+		ClickHandlerStartCallback clickHandlerStartCallback,
+		ClickHandlerFinishCallback clickHandlerFinishCallback,
+		FlagsChangeCallback flagsChangeCallback) const;
 
 	// Template method for countWidth(), countHeight(), countLineWidths().
 	// callback(lineWidth, lineHeight) will be called for all lines with:
 	// QFixed lineWidth, int lineHeight
 	template <typename Callback>
-	void enumerateLines(int w, bool breakEverywhere, Callback callback) const;
+	void enumerateLines(
+		int w,
+		bool breakEverywhere,
+		Callback callback) const;
 
-	void recountNaturalSize(bool initial, Qt::LayoutDirection optionsDir = Qt::LayoutDirectionAuto);
+	void recountNaturalSize(
+		bool initial,
+		Qt::LayoutDirection optionsDir = Qt::LayoutDirectionAuto);
 
-	// clear() deletes all blocks and calls this method
-	// it is also called from move constructor / assignment operator
-	void clearFields();
-
-	TextForMimeData toText(
+	[[nodiscard]] TextForMimeData toText(
 		TextSelection selection,
 		bool composeExpanded,
 		bool composeEntities) const;
 
-	QFixed _minResizeWidth;
-	QFixed _maxWidth = 0;
-	int32 _minHeight = 0;
+	const style::TextStyle *_st = nullptr;
+	QString _text;
+	TextBlocks _blocks;
+	ExtendedWrap _extended;
+
+	int _minResizeWidth = 0;
+	int _maxWidth = 0;
+	int _minHeight = 0;
+	int16 _startParagraphIndex = 0;
+	bool _startParagraphLTR : 1 = false;
+	bool _startParagraphRTL : 1 = false;
 	bool _hasCustomEmoji : 1 = false;
 	bool _isIsolatedEmoji : 1 = false;
 	bool _isOnlyCustomEmoji : 1 = false;
 	bool _hasNotEmojiAndSpaces : 1 = false;
 
-	QString _text;
-	base::flat_map<int, int> _modifications;
-	const style::TextStyle *_st = nullptr;
-
-	TextBlocks _blocks;
-	TextLinks _links;
-
-	Qt::LayoutDirection _startDirection = Qt::LayoutDirectionAuto;
-
-	SpoilerDataWrap _spoiler;
-
 	friend class Parser;
 	friend class Renderer;
 
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index c5ce3d9..4e0b8cf 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -409,6 +409,14 @@ style::font WithFlags(
 	return result;
 }
 
+Qt::LayoutDirection UnpackParagraphDirection(bool ltr, bool rtl) {
+	return ltr
+		? Qt::LeftToRight
+		: rtl
+		? Qt::RightToLeft
+		: Qt::LayoutDirectionAuto;
+}
+
 AbstractBlock::AbstractBlock(
 	const style::font &font,
 	const QString &text,
@@ -580,10 +588,6 @@ NewlineBlock::NewlineBlock(
 	colorIndex) {
 }
 
-Qt::LayoutDirection NewlineBlock::nextDirection() const {
-	return _nextDirection;
-}
-
 SkipBlock::SkipBlock(
 	const style::font &font,
 	const QString &text,
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index b0e7168..1c6a3c1 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -11,10 +11,10 @@
 #include "ui/style/style_core.h"
 #include "ui/emoji_config.h"
 
-#include <private/qfixed_p.h>
-
 #include <crl/crl_time.h>
 
+#include <private/qfixed_p.h>
+
 namespace style {
 struct TextStyle;
 } // namespace style
@@ -49,6 +49,10 @@ using TextBlockFlags = base::flags<TextBlockFlag>;
 	TextBlockFlags flags,
 	uint32 fontFlags = 0);
 
+[[nodiscard]] Qt::LayoutDirection UnpackParagraphDirection(
+	bool ltr,
+	bool rtl);
+
 class AbstractBlock {
 public:
 	[[nodiscard]] uint16 position() const;
@@ -103,10 +107,17 @@ public:
 		uint16 linkIndex,
 		uint16 colorIndex);
 
-	[[nodiscard]] Qt::LayoutDirection nextDirection() const;
+	[[nodiscard]] int16 paragraphIndex() const {
+		return _paragraphIndex;
+	}
+	[[nodiscard]] Qt::LayoutDirection paragraphDirection() const {
+		return UnpackParagraphDirection(_paragraphLTR, _paragraphRTL);
+	}
 
 private:
-	Qt::LayoutDirection _nextDirection = Qt::LayoutDirectionAuto;
+	int16 _paragraphIndex = 0;
+	bool _paragraphLTR : 1 = false;
+	bool _paragraphRTL : 1 = false;
 
 	friend class String;
 	friend class Parser;
diff --git a/ui/text/text_spoiler_data.cpp b/ui/text/text_extended_data.cpp
similarity index 95%
rename from ui/text/text_spoiler_data.cpp
rename to ui/text/text_extended_data.cpp
index 57127bc..38cb0e7 100644
--- a/ui/text/text_spoiler_data.cpp
+++ b/ui/text/text_extended_data.cpp
@@ -4,7 +4,7 @@
 // For license and copyright information please follow this link:
 // https://github.com/desktop-app/legal/blob/master/LEGAL
 //
-#include "ui/text/text_spoiler_data.h"
+#include "ui/text/text_extended_data.h"
 
 #include "ui/text/text.h"
 
diff --git a/ui/text/text_spoiler_data.h b/ui/text/text_extended_data.h
similarity index 73%
rename from ui/text/text_spoiler_data.h
rename to ui/text/text_extended_data.h
index 5a20926..210d3af 100644
--- a/ui/text/text_spoiler_data.h
+++ b/ui/text/text_extended_data.h
@@ -42,4 +42,22 @@ struct SpoilerData {
 	bool revealed = false;
 };
 
+struct ParagraphDetails {
+	QString language;
+	ClickHandlerPtr copy;
+	int copyWidth = 0;
+	int maxWidth = 0;
+	int minHeight = 0;
+	int scrollLeft = 0;
+	bool blockquote = false;
+	bool pre = false;
+};
+
+struct ExtendedData {
+	std::vector<ClickHandlerPtr> links;
+	std::vector<ParagraphDetails> paragraphs;
+	std::unique_ptr<SpoilerData> spoiler;
+	base::flat_map<int, int> modifications;
+};
+
 } // namespace Ui::Text
diff --git a/ui/text/text_isolated_emoji.h b/ui/text/text_isolated_emoji.h
index d73ef66..54707e7 100644
--- a/ui/text/text_isolated_emoji.h
+++ b/ui/text/text_isolated_emoji.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/variant.h"
+#include "ui/emoji_config.h"
 
 namespace Ui::Text {
 
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 72ef261..8491d95 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -8,11 +8,12 @@
 
 #include "base/platform/base_platform_info.h"
 #include "ui/integration.h"
+#include "ui/text/text_extended_data.h"
 #include "ui/text/text_isolated_emoji.h"
-#include "ui/text/text_spoiler_data.h"
 #include "styles/style_basic.h"
 
 #include <QtCore/QUrl>
+#include <private/qfixed_p.h>
 
 namespace Ui::Text {
 namespace {
@@ -182,7 +183,7 @@ void Parser::createBlock(int32 skipBack) {
 	if (_newlineAwaited) {
 		_newlineAwaited = false;
 		if (!newline) {
-			++_t->_modifications[_blockStart];
+			updateModifications(_blockStart, 1);
 			_t->_text.insert(_blockStart, QChar::LineFeed);
 			createBlock(skipBack - length);
 		}
@@ -223,7 +224,7 @@ void Parser::createBlock(int32 skipBack) {
 
 void Parser::createNewlineBlock(bool fromOriginalText) {
 	if (!fromOriginalText) {
-		++_t->_modifications[_t->_text.size()];
+		updateModifications(_t->_text.size(), 1);
 	}
 	_t->_text.push_back(QChar::LineFeed);
 	_allowDiacritic = false;
@@ -500,7 +501,7 @@ void Parser::parseCurrentChar() {
 	}
 
 	if (skip) {
-		--_t->_modifications[_t->_text.size()];
+		updateModifications(_t->_text.size(), -1);
 		_ch = 0;
 		_allowDiacritic = false;
 	} else {
@@ -549,7 +550,7 @@ void Parser::parseEmojiFromCurrent() {
 		Assert(!_t->_text.isEmpty());
 		const auto last = _t->_text[_t->_text.size() - 1];
 		if (last.unicode() != Emoji::kPostfix) {
-			++_t->_modifications[_t->_text.size()];
+			updateModifications(_t->_text.size(), 1);
 			_t->_text.push_back(QChar(Emoji::kPostfix));
 			++len;
 		}
@@ -579,16 +580,22 @@ bool Parser::isLinkEntity(const EntityInText &entity) const {
 	return ranges::find(urls, type) != std::end(urls);
 }
 
+void Parser::updateModifications(int index, int delta) {
+	_t->ensureExtended()->modifications[index] += delta;
+}
+
 void Parser::parse(const TextParseOptions &options) {
 	skipBadEntities();
 	trimSourceRange();
 
 	_t->_text.resize(0);
-	_t->_modifications = {};
+	if (_t->_extended) {
+		base::take(_t->_extended->modifications);
+	}
 	_t->_text.reserve(_end - _ptr);
 
 	if (_ptr > _start) {
-		_t->_modifications[0] = -(_ptr - _start);
+		updateModifications(0, -(_ptr - _start));
 	}
 
 	for (; _ptr <= _end; ++_ptr) {
@@ -631,7 +638,12 @@ void Parser::trimSourceRange() {
 // }
 
 void Parser::finalize(const TextParseOptions &options) {
-	_t->_links.resize(_maxLinkIndex + _maxShiftedLinkIndex);
+	auto links = (_maxLinkIndex || _maxShiftedLinkIndex)
+		? &_t->ensureExtended()->links
+		: nullptr;
+	if (links) {
+		links->resize(_maxLinkIndex + _maxShiftedLinkIndex);
+	}
 	auto counterCustomIndex = uint16(0);
 	auto currentIndex = uint16(0); // Current the latest index of _t->_links.
 	struct {
@@ -687,8 +699,9 @@ void Parser::finalize(const TextParseOptions &options) {
 			}
 		}
 		if (block->flags() & TextBlockFlag::Spoiler) {
-			if (!_t->_spoiler.data) {
-				_t->_spoiler.data = std::make_unique<SpoilerData>(
+			auto &spoiler = _t->ensureExtended()->spoiler;
+			if (!spoiler) {
+				spoiler = std::make_unique<SpoilerData>(
 					Integration::Instance().createSpoilerRepaint(_context));
 			}
 		}
@@ -709,7 +722,10 @@ void Parser::finalize(const TextParseOptions &options) {
 				const auto handler = Integration::Instance().createLinkHandler(
 					_monos[monoIndex - 1],
 					_context);
-				_t->_links.resize(currentIndex);
+				if (!links) {
+					links = &_t->ensureExtended()->links;
+				}
+				links->resize(currentIndex);
 				if (handler) {
 					_t->setLink(currentIndex, handler);
 				}
@@ -740,7 +756,9 @@ void Parser::finalize(const TextParseOptions &options) {
 		}
 		block->setLinkIndex(usedIndex());
 
-		_t->_links.resize(std::max(usedIndex(), uint16(_t->_links.size())));
+		if (links) {
+			links->resize(std::max(usedIndex(), uint16(links->size())));
+		}
 		const auto handler = Integration::Instance().createLinkHandler(
 			_links[realIndex - 1],
 			_context);
@@ -749,10 +767,11 @@ void Parser::finalize(const TextParseOptions &options) {
 		}
 		lastHandlerIndex.lnk = realIndex;
 	}
-	if (!_t->_hasCustomEmoji || _t->_spoiler.data) {
+	const auto hasSpoiler = (_t->_extended && _t->_extended->spoiler);
+	if (!_t->_hasCustomEmoji || hasSpoiler) {
 		_t->_isOnlyCustomEmoji = false;
 	}
-	if (_t->_blocks.empty() || _t->_spoiler.data) {
+	if (_t->_blocks.empty() || hasSpoiler) {
 		_t->_isIsolatedEmoji = false;
 	}
 	if (!_t->_hasNotEmojiAndSpaces && spacesCheckFrom != uint16(-1)) {
@@ -765,10 +784,12 @@ void Parser::finalize(const TextParseOptions &options) {
 			}
 		}
 	}
-	_t->_links.squeeze();
-	_t->_blocks.shrink_to_fit();
 	_t->_text.squeeze();
-	_t->_modifications.shrink_to_fit();
+	_t->_blocks.shrink_to_fit();
+	if (const auto extended = _t->_extended.get()) {
+		extended->links.shrink_to_fit();
+		extended->modifications.shrink_to_fit();
+	}
 }
 
 void Parser::computeLinkText(
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index d844edf..2401b59 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "ui/text/text.h"
+#include "ui/text/text_block.h"
 
 namespace Ui::Text {
 
@@ -80,6 +81,8 @@ private:
 		QString *outLinkText,
 		EntityLinkShown *outShown);
 
+	void updateModifications(int index, int delta);
+
 	const not_null<String*> _t;
 	const TextWithEntities _source;
 	const std::any &_context;
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 83fd50a..0b2ac5d 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -6,7 +6,7 @@
 //
 #include "ui/text/text_renderer.h"
 
-#include "ui/text/text_spoiler_data.h"
+#include "ui/text/text_extended_data.h"
 #include "styles/style_basic.h"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -155,7 +155,7 @@ bool Distinct(FixedRange a, FixedRange b) {
 
 Renderer::Renderer(const Ui::Text::String &t)
 : _t(&t)
-, _spoiler(_t->_spoiler.data.get()) {
+, _spoiler(_t->_extended ? _t->_extended->spoiler.get() : nullptr) {
 }
 
 Renderer::~Renderer() {
@@ -229,7 +229,11 @@ void Renderer::enumerate() {
 	_startTop = _y;
 
 	if ((*_t->_blocks.cbegin())->type() != TextBlockType::Newline) {
-		initNextParagraph(_t->_blocks.cbegin(), _t->_startDirection);
+		initNextParagraph(
+			_t->_blocks.cbegin(),
+			UnpackParagraphDirection(
+				_t->_startParagraphLTR,
+				_t->_startParagraphRTL));
 	}
 
 	_lineHeight = 0;
@@ -267,7 +271,7 @@ void Renderer::enumerate() {
 
 			initNextParagraph(
 				i + 1,
-				static_cast<const NewlineBlock*>(b)->nextDirection());
+				static_cast<const NewlineBlock*>(b)->paragraphDirection());
 
 			longWordLine = true;
 			continue;
@@ -465,7 +469,7 @@ void Renderer::initNextLine() {
 		.left = 0,
 		.top = (_y - _startTop),
 		.width = _paragraphWidthRemaining.ceil().toInt(),
-	}, _lineStart);
+	});
 	_x = _startLeft + line.left;
 	_y = _startTop + line.top;
 	_lineWidth = _wLeft = line.width;
@@ -1415,7 +1419,9 @@ void Renderer::eSetFont(const AbstractBlock *block) {
 				? false
 				: (underline == st::kLinkUnderlineActive)
 				? ((_palette && _palette->linkAlwaysActive)
-					|| ClickHandler::showAsActive(_t->_links.at(index - 1)))
+					|| ClickHandler::showAsActive(_t->_extended
+						? _t->_extended->links[index - 1]
+						: nullptr))
 				: true;
 			return underlined ? _t->_st->font->underline() : _t->_st->font;
 		}
@@ -2016,8 +2022,10 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 		if (isMono
 			&& block->linkIndex()
 			&& (!_background.spoiler || _spoiler->revealed)) {
-			_background.selectActiveBlock = ClickHandler::showAsPressed(
-				_t->_links.at(block->linkIndex() - 1));
+			const auto pressed = ClickHandler::showAsPressed(_t->_extended
+				? _t->_extended->links[block->linkIndex() - 1]
+				: nullptr);
+			_background.selectActiveBlock = pressed;
 		}
 
 		if (const auto color = block->colorIndex()) {
@@ -2050,9 +2058,9 @@ ClickHandlerPtr Renderer::lookupLink(const AbstractBlock *block) const {
 		&& (block->flags() & TextBlockFlag::Spoiler))
 		? _spoiler->link
 		: ClickHandlerPtr();
-	return (spoilerLink || !block->linkIndex())
+	return (spoilerLink || !block->linkIndex() || !_t->_extended)
 		? spoilerLink
-		: _t->_links.at(block->linkIndex() - 1);
+		: _t->_extended->links[block->linkIndex() - 1];
 }
 
 } // namespace Ui::Text
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 184c1f3..3210900 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -7,6 +7,8 @@
 #pragma once
 
 #include "ui/text/text.h"
+#include "ui/text/text_block.h"
+#include "ui/text/text_custom_emoji.h"
 
 #include <private/qtextengine_p.h>
 
@@ -15,6 +17,8 @@ struct QScriptLine;
 
 namespace Ui::Text {
 
+struct AbstractBlock;
+
 struct FixedRange {
 	QFixed from;
 	QFixed till;
diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index 6849046..a1b8cd7 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -45,7 +45,7 @@ Widget::Widget(QWidget *parent, const Config &config)
 , _maxTextWidth(widthWithoutPadding(_st->maxWidth))
 , _maxTextHeight(
 	config.st->style.font->height * (_multiline ? config.maxLines : 1))
-, _text(_multiline ? widthWithoutPadding(config.st->minWidth) : QFIXED_MAX)
+, _text(_multiline ? widthWithoutPadding(config.st->minWidth) : kQFixedMax)
 , _clickHandlerFilter(config.filter) {
 	const auto toastOptions = TextParseOptions{
 		TextParseMultiline,
diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index 8aabbc5..d17184d 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -544,7 +544,7 @@ int Checkbox::countTextMinWidth() const {
 		+ _st.textPosition.x();
 	return (_st.width > 0)
 		? std::max(_st.width - leftSkip, 1)
-		: QFIXED_MAX;
+		: kQFixedMax;
 }
 
 QRect Checkbox::checkRect() const {
diff --git a/ui/widgets/labels.cpp b/ui/widgets/labels.cpp
index 8b6dcaa..8b75997 100644
--- a/ui/widgets/labels.cpp
+++ b/ui/widgets/labels.cpp
@@ -199,7 +199,7 @@ FlatLabel::FlatLabel(
 	const style::FlatLabel &st,
 	const style::PopupMenu &stMenu)
 : RpWidget(parent)
-, _text(st.minWidth ? st.minWidth : QFIXED_MAX)
+, _text(st.minWidth ? st.minWidth : kQFixedMax)
 , _st(st)
 , _stMenu(stMenu) {
 	init();
@@ -211,7 +211,7 @@ FlatLabel::FlatLabel(
 	const style::FlatLabel &st,
 	const style::PopupMenu &stMenu)
 : RpWidget(parent)
-, _text(st.minWidth ? st.minWidth : QFIXED_MAX)
+, _text(st.minWidth ? st.minWidth : kQFixedMax)
 , _st(st)
 , _stMenu(stMenu) {
 	setText(text);
@@ -224,7 +224,7 @@ FlatLabel::FlatLabel(
 	const style::FlatLabel &st,
 	const style::PopupMenu &stMenu)
 : RpWidget(parent)
-, _text(st.minWidth ? st.minWidth : QFIXED_MAX)
+, _text(st.minWidth ? st.minWidth : kQFixedMax)
 , _st(st)
 , _stMenu(stMenu) {
 	textUpdated();
@@ -242,7 +242,7 @@ FlatLabel::FlatLabel(
 	const style::FlatLabel &st,
 	const style::PopupMenu &stMenu)
 : RpWidget(parent)
-, _text(st.minWidth ? st.minWidth : QFIXED_MAX)
+, _text(st.minWidth ? st.minWidth : kQFixedMax)
 , _st(st)
 , _stMenu(stMenu)
 , _touchSelectTimer([=] { touchSelect(); }) {
diff --git a/ui/widgets/time_input.cpp b/ui/widgets/time_input.cpp
index d40aa26..1317f3a 100644
--- a/ui/widgets/time_input.cpp
+++ b/ui/widgets/time_input.cpp
@@ -7,6 +7,7 @@
 #include "ui/widgets/time_input.h"
 
 #include "ui/widgets/fields/time_part_input.h"
+#include "base/qt/qt_string_view.h"
 #include "base/invoke_queued.h"
 
 #include <QtCore/QRegularExpression>
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index bd05590..317c6b3 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -159,7 +159,8 @@ void Tooltip::paintEvent(QPaintEvent *e) {
 		p.fillRect(QRect(0, st::lineWidth, st::lineWidth, height() - 2 * st::lineWidth), _st->textBorder);
 		p.fillRect(QRect(width() - st::lineWidth, st::lineWidth, st::lineWidth, height() - 2 * st::lineWidth), _st->textBorder);
 	}
-	int32 lines = qFloor((height() - 2 * st::lineWidth - _st->textPadding.top() - _st->textPadding.bottom()) / _st->textStyle.font->height);
+	const auto lines = (height() - 2 * st::lineWidth - _st->textPadding.top() - _st->textPadding.bottom())
+		/ _st->textStyle.font->height;
 
 	p.setPen(_st->textFg);
 	_text.drawElided(p, st::lineWidth + _st->textPadding.left(), st::lineWidth + _st->textPadding.top(), width() - 2 * st::lineWidth - _st->textPadding.left() - _st->textPadding.right(), lines);

From a38b60636a42932b5e4d3d2391769a34876a2626 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 13 Oct 2023 10:03:40 +0400
Subject: [PATCH 526/635] Paint nice code blocks.

---
 ui/basic.style               |   7 +-
 ui/text/text.cpp             | 295 +++++++++++++++++++++++++++++++----
 ui/text/text.h               |  51 +++++-
 ui/text/text_block.h         |   4 +-
 ui/text/text_extended_data.h |   4 +-
 ui/text/text_parser.cpp      |  45 ++++--
 ui/text/text_parser.h        |   5 +-
 ui/text/text_renderer.cpp    |  61 +++++++-
 ui/text/text_renderer.h      |  12 ++
 9 files changed, 431 insertions(+), 53 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index 0c0417f..faab247 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -23,7 +23,11 @@ TextStyle {
 	font: font;
 	linkUnderline: int;
 	blockPadding: margins;
+	blockVerticalSkip: pixels;
+	blockHeader: pixels;
+	blockHeaderPosition: point;
 	blockOutline: pixels;
+	blockRadius: pixels;
 	preScrollable: bool;
 	lineHeight: pixels;
 }
@@ -57,9 +61,6 @@ defaultTextPalette: TextPalette {
 defaultTextStyle: TextStyle {
 	font: normalFont;
 	linkUnderline: kLinkUnderlineActive;
-	blockPadding: margins(10px, 4px, 6px, 4px);
-	blockOutline: 3px;
-	preScrollable: true;
 	lineHeight: 0px;
 }
 semiboldTextStyle: TextStyle(defaultTextStyle) {
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 0044a9e..5b21a63 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -185,6 +185,144 @@ GeometryDescriptor SimpleGeometry(
 	}
 };
 
+
+void ValidateBlockPaintCache(
+		BlockPaintCache &cache,
+		const style::TextStyle &st) {
+	if (!cache.corners.isNull()
+		&& cache.bgCached == cache.bg
+		&& cache.outlineCached == cache.outline
+		&& (!cache.withHeader || cache.headerCached == cache.header)
+		&& (!cache.topright || cache.iconCached == cache.icon)) {
+		return;
+	}
+	cache.bgCached = cache.bg;
+	cache.outlineCached = cache.outline;
+	if (cache.withHeader) {
+		cache.headerCached = cache.header;
+	}
+	if (cache.topright) {
+		cache.iconCached = cache.icon;
+	}
+	const auto radius = st.blockRadius;
+	const auto header = cache.withHeader ? st.blockHeader : 0;
+	const auto outline = st.blockOutline;
+	const auto corner = std::max({ header, radius, outline });
+	const auto middle = st::lineWidth;
+	const auto side = 2 * corner + middle;
+	const auto full = QSize(side, side);
+	const auto ratio = style::DevicePixelRatio();
+	auto image = QImage(full * ratio, QImage::Format_ARGB32_Premultiplied);
+	image.fill(Qt::transparent);
+	image.setDevicePixelRatio(ratio);
+	auto p = QPainter(&image);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+
+	auto rect = QRect(QPoint(), full);
+	if (header) {
+		p.setBrush(cache.header);
+		p.setClipRect(outline, 0, side - outline, header);
+		p.drawRoundedRect(0, 0, side, corner + radius, radius, radius);
+	}
+	if (outline) {
+		p.setBrush(cache.outline);
+		p.setClipRect(0, 0, outline, side);
+		p.drawRoundedRect(0, 0, outline + radius * 2, side, radius, radius);
+	}
+	p.setBrush(cache.bg);
+	p.setClipRect(outline, header, side - outline, side - header);
+	p.drawRoundedRect(0, 0, side, side, radius, radius);
+
+	p.end();
+	cache.corners = std::move(image);
+}
+
+void FillBlockPaint(
+		QPainter &p,
+		QRect rect,
+		const BlockPaintCache &cache,
+		const style::TextStyle &st,
+		SkipBlockPaintParts parts) {
+	const auto &image = cache.corners;
+	const auto ratio = int(image.devicePixelRatio());
+	const auto iwidth = image.width() / ratio;
+	const auto iheight = image.height() / ratio;
+	const auto imiddle = st::lineWidth;
+	const auto ihalf = (iheight - imiddle) / 2;
+	const auto x = rect.left();
+	const auto width = rect.width();
+	auto y = rect.top();
+	auto height = rect.height();
+	if (!parts.skipTop) {
+		const auto top = std::min(height, ihalf);
+		p.drawImage(
+			QRect(x, y, ihalf, top),
+			image,
+			QRect(0, 0, ihalf * ratio, top * ratio));
+		p.drawImage(
+			QRect(x + width - ihalf, y, ihalf, top),
+			image,
+			QRect((iwidth - ihalf) * ratio, 0, ihalf * ratio, top * ratio));
+		if (const auto middle = width - 2 * ihalf) {
+			const auto header = cache.withHeader ? st.blockHeader : 0;
+			const auto fillHeader = std::min(header, top);
+			if (fillHeader) {
+				p.fillRect(x + ihalf, y, middle, fillHeader, cache.header);
+			}
+			if (const auto fillBody = top - fillHeader) {
+				p.fillRect(
+					QRect(x + ihalf, y + fillHeader, middle, fillBody),
+					cache.bg);
+			}
+		}
+		height -= top;
+		if (!height) {
+			return;
+		}
+		y += top;
+		rect.setTop(y);
+	}
+	if (!parts.skipBottom) {
+		const auto bottom = std::min(height, ihalf);
+		p.drawImage(
+			QRect(x, y + height - bottom, ihalf, bottom),
+			image,
+			QRect(
+				0,
+				(iheight - bottom) * ratio,
+				ihalf * ratio,
+				bottom * ratio));
+		p.drawImage(
+			QRect(
+				x + width - ihalf,
+				y + height - bottom,
+				ihalf,
+				bottom),
+			image,
+			QRect(
+				(iwidth - ihalf) * ratio,
+				(iheight - bottom) * ratio,
+				ihalf * ratio,
+				bottom * ratio));
+		if (const auto middle = width - 2 * ihalf) {
+			p.fillRect(
+				QRect(x + ihalf, y + height - bottom, middle, bottom),
+				cache.bg);
+		}
+		height -= bottom;
+		if (!height) {
+			return;
+		}
+		rect.setHeight(height);
+	}
+	const auto outline = st.blockOutline;
+	if (outline) {
+		p.fillRect(x, y, outline, height, cache.outline);
+	}
+	p.fillRect(x + outline, y, width - outline, height, cache.bg);
+}
+
 String::ExtendedWrap::ExtendedWrap() noexcept = default;
 
 String::ExtendedWrap::ExtendedWrap(ExtendedWrap &&other) noexcept
@@ -283,18 +421,34 @@ void String::recountNaturalSize(
 		}
 	};
 
-	_maxWidth = _minHeight = 0;
-	int32 lineHeight = 0;
-	QFixed maxWidth = 0;
-	QFixed width = 0, last_rBearing = 0, last_rPadding = 0;
+	auto pindex = paragraphIndex(nullptr);
+	auto paragraph = paragraphByIndex(pindex);
+	auto ppadding = paragraphPadding(paragraph);
+
+	_maxWidth = 0;
+	_minHeight = ppadding.top();
+	auto lineHeight = 0;
+	auto maxWidth = QFixed();
+	auto width = QFixed(ppadding.left() + ppadding.right());
+	auto last_rBearing = QFixed();
+	auto last_rPadding = QFixed();
 	for (auto &block : _blocks) {
-		auto b = block.get();
-		auto _btype = b->type();
-		auto blockHeight = CountBlockHeight(b, _st);
+		const auto b = block.get();
+		const auto _btype = b->type();
+		const auto blockHeight = CountBlockHeight(b, _st);
 		if (_btype == TextBlockType::Newline) {
 			if (!lineHeight) {
 				lineHeight = blockHeight;
 			}
+			const auto index = paragraphIndex(b);
+			if (pindex != index) {
+				_minHeight += ppadding.bottom();
+				pindex = index;
+				paragraph = paragraphByIndex(pindex);
+				ppadding = paragraphPadding(paragraph);
+				_minHeight += ppadding.top();
+				ppadding.setTop(0);
+			}
 			if (initial) {
 				computeParagraphDirection(b->position());
 			}
@@ -303,11 +457,12 @@ void String::recountNaturalSize(
 
 			_minHeight += lineHeight;
 			lineHeight = 0;
-			last_rBearing = b->f_rbearing();
-			last_rPadding = b->f_rpadding();
+			last_rBearing = 0;// b->f_rbearing(); (0 for newline)
+			last_rPadding = 0;// b->f_rpadding(); (0 for newline)
 
 			accumulate_max(maxWidth, width);
-			width = (b->f_width() - last_rBearing);
+			width = ppadding.left() + ppadding.right();
+			// + (b->f_width() - last_rBearing); (0 for newline)
 			continue;
 		}
 
@@ -333,11 +488,14 @@ void String::recountNaturalSize(
 		computeParagraphDirection(_text.size());
 	}
 	if (width > 0) {
-		if (!lineHeight) lineHeight = CountBlockHeight(_blocks.back().get(), _st);
-		_minHeight += lineHeight;
+		if (!lineHeight) {
+			lineHeight = CountBlockHeight(_blocks.back().get(), _st);
+		}
+		_minHeight += ppadding.top() + lineHeight + ppadding.bottom();
 		accumulate_max(maxWidth, width);
 	}
 	_maxWidth = maxWidth.ceil().toInt();
+	_endsWithParagraphDetails = (pindex != 0);
 }
 
 int String::countMaxMonospaceWidth() const {
@@ -487,6 +645,17 @@ bool String::updateSkipBlock(int width, int height) {
 		}
 		_text.resize(block->position());
 		_blocks.pop_back();
+	} else if (_endsWithParagraphDetails) {
+		_text.push_back(QChar::LineFeed);
+		_blocks.push_back(Block::Newline(
+			_st->font,
+			_text,
+			_text.size() - 1,
+			1,
+			0,
+			0,
+			0));
+		_skipBlockAddedNewline = true;
 	}
 	_text.push_back('_');
 	_blocks.push_back(Block::Skip(
@@ -504,9 +673,15 @@ bool String::updateSkipBlock(int width, int height) {
 bool String::removeSkipBlock() {
 	if (_blocks.empty() || _blocks.back()->type() != TextBlockType::Skip) {
 		return false;
+	} else if (_skipBlockAddedNewline) {
+		_text.resize(_blocks.back()->position() - 1);
+		_blocks.pop_back();
+		_blocks.pop_back();
+		_skipBlockAddedNewline = false;
+	} else {
+		_text.resize(_blocks.back()->position());
+		_blocks.pop_back();
 	}
-	_text.resize(_blocks.back()->position());
-	_blocks.pop_back();
 	recountNaturalSize(false);
 	return true;
 }
@@ -558,24 +733,42 @@ void String::enumerateLines(
 		int w,
 		bool breakEverywhere,
 		Callback callback) const {
-	QFixed width = w;
-	if (width < _minResizeWidth) width = _minResizeWidth;
+	const auto width = QFixed(std::max(w, _minResizeWidth));
 
-	int lineHeight = 0;
-	QFixed widthLeft = width, last_rBearing = 0, last_rPadding = 0;
+	auto pindex = paragraphIndex(nullptr);
+	auto paragraph = paragraphByIndex(pindex);
+	auto ppadding = paragraphPadding(paragraph);
+	auto widthLeft = width - ppadding.left() - ppadding.right();
+	auto lineHeight = 0;
+	auto last_rBearing = QFixed();
+	auto last_rPadding = QFixed();
 	bool longWordLine = true;
 	for (auto &b : _blocks) {
 		auto _btype = b->type();
-		int blockHeight = CountBlockHeight(b.get(), _st);
+		const auto blockHeight = CountBlockHeight(b.get(), _st);
 
 		if (_btype == TextBlockType::Newline) {
-			if (!lineHeight) lineHeight = blockHeight;
+			if (!lineHeight) {
+				lineHeight = blockHeight;
+			}
+			lineHeight += ppadding.top();
+			const auto index = paragraphIndex(b.get());
+			if (pindex != index) {
+				lineHeight += ppadding.bottom();
+				pindex = index;
+				paragraph = paragraphByIndex(pindex);
+				ppadding = paragraphPadding(paragraph);
+			} else {
+				ppadding.setTop(0);
+			}
+
 			callback(width - widthLeft, lineHeight);
 
 			lineHeight = 0;
-			last_rBearing = b->f_rbearing();
-			last_rPadding = b->f_rpadding();
-			widthLeft = width - (b->f_width() - last_rBearing);
+			last_rBearing = 0;// b->f_rbearing(); (0 for newline)
+			last_rPadding = 0;// b->f_rpadding(); (0 for newline)
+			widthLeft = width - ppadding.left() - ppadding.right();
+			// - (b->f_width() - last_rBearing); (0 for newline)
 
 			longWordLine = true;
 			continue;
@@ -636,12 +829,16 @@ void String::enumerateLines(
 					j_width = (j->f_width() >= 0) ? j->f_width() : -j->f_width();
 				}
 
-				callback(width - widthLeft, lineHeight);
+				callback(width - widthLeft, lineHeight + ppadding.top());
+				ppadding.setTop(0);
 
 				lineHeight = qMax(0, blockHeight);
 				last_rBearing = j->f_rbearing();
 				last_rPadding = j->f_rpadding();
-				widthLeft = width - (j_width - last_rBearing);
+				widthLeft = width
+					- ppadding.left()
+					- ppadding.right()
+					- (j_width - last_rBearing);
 
 				longWordLine = !wordEndsHere;
 				f = j + 1;
@@ -651,18 +848,24 @@ void String::enumerateLines(
 			continue;
 		}
 
-		callback(width - widthLeft, lineHeight);
+		callback(width - widthLeft, lineHeight + ppadding.top());
+		ppadding.setTop(0);
 
 		lineHeight = qMax(0, blockHeight);
 		last_rBearing = b__f_rbearing;
 		last_rPadding = b->f_rpadding();
-		widthLeft = width - (b->f_width() - last_rBearing);
+		widthLeft = width
+			- ppadding.left()
+			- ppadding.right()
+			- (b->f_width() - last_rBearing);
 
 		longWordLine = true;
 		continue;
 	}
 	if (widthLeft < width) {
-		callback(width - widthLeft, lineHeight);
+		callback(
+			width - widthLeft,
+			lineHeight + ppadding.top() + ppadding.bottom());
 	}
 }
 
@@ -852,14 +1055,42 @@ not_null<ExtendedData*> String::ensureExtended() {
 	return _extended.get();
 }
 
-uint16 String::countBlockEnd(const TextBlocks::const_iterator &i, const TextBlocks::const_iterator &e) const {
+uint16 String::countBlockEnd(
+		const TextBlocks::const_iterator &i,
+		const TextBlocks::const_iterator &e) const {
 	return (i + 1 == e) ? _text.size() : (*(i + 1))->position();
 }
 
-uint16 String::countBlockLength(const String::TextBlocks::const_iterator &i, const String::TextBlocks::const_iterator &e) const {
+uint16 String::countBlockLength(
+		const TextBlocks::const_iterator &i,
+		const TextBlocks::const_iterator &e) const {
 	return countBlockEnd(i, e) - (*i)->position();
 }
 
+ParagraphDetails *String::paragraphByIndex(int index) const {
+	Expects(!index
+		|| (_extended && index <= _extended->paragraphs.size()));
+
+	return index ? &_extended->paragraphs[index - 1] : nullptr;
+}
+
+int String::paragraphIndex(const AbstractBlock *block) const {
+	Expects(!block || block->type() == TextBlockType::Newline);
+
+	return block
+		? static_cast<const NewlineBlock*>(block)->paragraphIndex()
+		: _startParagraphIndex;
+}
+
+QMargins String::paragraphPadding(ParagraphDetails *info) const {
+	if (!info) {
+		return {};
+	}
+	const auto skip = _st->blockVerticalSkip;
+	const auto top = info->pre ? _st->blockHeader : 0;
+	return _st->blockPadding + QMargins(0, top + skip, 0, skip);
+}
+
 template <
 	typename AppendPartCallback,
 	typename ClickHandlerStartCallback,
@@ -994,8 +1225,8 @@ bool String::hasNotEmojiAndSpaces() const {
 	return _hasNotEmojiAndSpaces;
 }
 
-const base::flat_map<int, int> &String::modifications() const {
-	static const auto kEmpty = base::flat_map<int, int>();
+const base::flat_map<int, Deltas> &String::modifications() const {
+	static const auto kEmpty = base::flat_map<int, Deltas>();
 	return _extended ? _extended->modifications : kEmpty;
 }
 
diff --git a/ui/text/text.h b/ui/text/text.h
index e90f2b9..4792391 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -76,12 +76,18 @@ static constexpr TextSelection AllTextSelection = { 0, 0xFFFF };
 namespace Ui::Text {
 
 struct Block;
+class AbstractBlock;
 struct IsolatedEmoji;
 struct OnlyCustomEmoji;
 struct SpoilerData;
 struct ParagraphDetails;
 struct ExtendedData;
 
+struct Deltas {
+	uint16 added = 0;
+	uint16 removed = 0;
+};
+
 struct StateRequest {
 	enum class Flag {
 		BreakEverywhere = (1 << 0),
@@ -157,6 +163,38 @@ struct GeometryDescriptor {
 	bool elisionOneLine,
 	bool elisionBreakEverywhere);
 
+struct BlockPaintCache {
+	QImage corners;
+	QColor headerCached;
+	QColor bgCached;
+	QColor outlineCached;
+	QColor iconCached;
+
+	QColor header;
+	QColor bg;
+	QColor outline;
+	QColor icon;
+
+	const style::icon *topright = nullptr;
+	QPoint toprightPosition;
+	bool withHeader = false;
+};
+
+void ValidateBlockPaintCache(
+	BlockPaintCache &cache,
+	const style::TextStyle &st);
+
+struct SkipBlockPaintParts {
+	bool skipTop : 1 = false;
+	bool skipBottom : 1 = false;
+};
+void FillBlockPaint(
+	QPainter &p,
+	QRect rect,
+	const BlockPaintCache &cache,
+	const style::TextStyle &st,
+	SkipBlockPaintParts parts = {});
+
 struct PaintContext {
 	QPoint position;
 	int outerWidth = 0; // For automatic RTL Ui inversion.
@@ -166,6 +204,8 @@ struct PaintContext {
 	QRect clip;
 
 	const style::TextPalette *palette = nullptr;
+	BlockPaintCache *pre = nullptr;
+	BlockPaintCache *blockquote = nullptr;
 	std::span<SpecialColor> colors;
 	SpoilerMessCache *spoiler = nullptr;
 	crl::time now = 0;
@@ -301,7 +341,7 @@ public:
 	[[nodiscard]] OnlyCustomEmoji toOnlyCustomEmoji() const;
 
 	[[nodiscard]] bool hasNotEmojiAndSpaces() const;
-	[[nodiscard]] const base::flat_map<int, int> &modifications() const;
+	[[nodiscard]] const base::flat_map<int, Deltas> &modifications() const;
 
 	[[nodiscard]] const style::TextStyle *style() const {
 		return _st;
@@ -337,6 +377,11 @@ private:
 	[[nodiscard]] uint16 countBlockLength(
 		const TextBlocks::const_iterator &i,
 		const TextBlocks::const_iterator &e) const;
+	[[nodiscard]] ParagraphDetails *paragraphByIndex(int index) const;
+	[[nodiscard]] QMargins paragraphPadding(ParagraphDetails *info) const;
+
+	// block must be either nullptr or a pointer to a NewlineBlock.
+	[[nodiscard]] int paragraphIndex(const AbstractBlock *block) const;
 
 	// Template method for originalText(), originalTextWithEntities().
 	template <
@@ -377,13 +422,15 @@ private:
 	int _minResizeWidth = 0;
 	int _maxWidth = 0;
 	int _minHeight = 0;
-	int16 _startParagraphIndex = 0;
+	uint16 _startParagraphIndex = 0;
 	bool _startParagraphLTR : 1 = false;
 	bool _startParagraphRTL : 1 = false;
 	bool _hasCustomEmoji : 1 = false;
 	bool _isIsolatedEmoji : 1 = false;
 	bool _isOnlyCustomEmoji : 1 = false;
 	bool _hasNotEmojiAndSpaces : 1 = false;
+	bool _skipBlockAddedNewline : 1 = false;
+	bool _endsWithParagraphDetails : 1 = false;
 
 	friend class Parser;
 	friend class Renderer;
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index 1c6a3c1..ae7a4ce 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -107,7 +107,7 @@ public:
 		uint16 linkIndex,
 		uint16 colorIndex);
 
-	[[nodiscard]] int16 paragraphIndex() const {
+	[[nodiscard]] uint16 paragraphIndex() const {
 		return _paragraphIndex;
 	}
 	[[nodiscard]] Qt::LayoutDirection paragraphDirection() const {
@@ -115,7 +115,7 @@ public:
 	}
 
 private:
-	int16 _paragraphIndex = 0;
+	uint16 _paragraphIndex = 0;
 	bool _paragraphLTR : 1 = false;
 	bool _paragraphRTL : 1 = false;
 
diff --git a/ui/text/text_extended_data.h b/ui/text/text_extended_data.h
index 210d3af..a4151ea 100644
--- a/ui/text/text_extended_data.h
+++ b/ui/text/text_extended_data.h
@@ -12,6 +12,8 @@
 
 namespace Ui::Text {
 
+struct Deltas;
+
 class String;
 
 class SpoilerClickHandler final : public ClickHandler {
@@ -57,7 +59,7 @@ struct ExtendedData {
 	std::vector<ClickHandlerPtr> links;
 	std::vector<ParagraphDetails> paragraphs;
 	std::unique_ptr<SpoilerData> spoiler;
-	base::flat_map<int, int> modifications;
+	base::flat_map<int, Deltas> modifications;
 };
 
 } // namespace Ui::Text
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 8491d95..bd66466 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -211,6 +211,8 @@ void Parser::createBlock(int32 skipBack) {
 		push(&Block::Emoji, _emoji);
 	} else if (newline) {
 		push(&Block::Newline);
+		auto &newline = _t->_blocks.back().unsafe<NewlineBlock>();
+		newline._paragraphIndex = _paragraphIndex;
 	} else {
 		push(&Block::Text, _t->_minResizeWidth);
 	}
@@ -231,7 +233,7 @@ void Parser::createNewlineBlock(bool fromOriginalText) {
 	createBlock();
 }
 
-void Parser::ensureAtNewline() {
+void Parser::ensureAtNewline(ParagraphDetails details) {
 	createBlock();
 	const auto lastType = _t->_blocks.empty()
 		? TextBlockType::Newline
@@ -241,6 +243,16 @@ void Parser::ensureAtNewline() {
 		createNewlineBlock(false);
 		_customEmojiData = base::take(saved);
 	}
+	auto &paragraphs = _t->ensureExtended()->paragraphs;
+	paragraphs.push_back(std::move(details));
+	const auto index = _paragraphIndex = int(paragraphs.size());
+	if (_t->_blocks.empty()) {
+		_t->_startParagraphIndex = index;
+	} else {
+		auto &last = _t->_blocks.back();
+		Assert(last->type() == TextBlockType::Newline);
+		last.unsafe<NewlineBlock>()._paragraphIndex = index;
+	}
 }
 
 void Parser::finishEntities() {
@@ -259,11 +271,18 @@ void Parser::finishEntities() {
 					const auto lastType = _t->_blocks.empty()
 						? TextBlockType::Newline
 						: _t->_blocks.back()->type();
-					if ((lastType != TextBlockType::Newline)
-						&& ((*flags)
-							& (TextBlockFlag::Pre
-								| TextBlockFlag::Blockquote))) {
-						_newlineAwaited = true;
+					if ((*flags)
+						& (TextBlockFlag::Pre
+							| TextBlockFlag::Blockquote)) {
+						_paragraphIndex = 0;
+						if (lastType != TextBlockType::Newline) {
+							_newlineAwaited = true;
+						} else if (_t->_blocks.empty()) {
+							_t->_startParagraphIndex = 0;
+						} else {
+							auto &last = _t->_blocks.back();
+							last.unsafe<NewlineBlock>()._paragraphIndex = 0;
+						}
 					}
 					if (IsMono(*flags)) {
 						_monoIndex = 0;
@@ -340,7 +359,10 @@ bool Parser::checkEntities() {
 			flags = TextBlockFlag::Code;
 		} else {
 			flags = TextBlockFlag::Pre;
-			ensureAtNewline();
+			ensureAtNewline({
+				.language = _waitingEntity->data(),
+				.pre = true,
+			});
 		}
 		const auto text = QString(entityBegin, entityLength);
 
@@ -356,7 +378,7 @@ bool Parser::checkEntities() {
 		}
 	} else if (entityType == EntityType::Blockquote) {
 		flags = TextBlockFlag::Blockquote;
-		ensureAtNewline();
+		ensureAtNewline({ .blockquote = true });
 	} else if (entityType == EntityType::Url
 		|| entityType == EntityType::Email
 		|| entityType == EntityType::Mention
@@ -581,7 +603,12 @@ bool Parser::isLinkEntity(const EntityInText &entity) const {
 }
 
 void Parser::updateModifications(int index, int delta) {
-	_t->ensureExtended()->modifications[index] += delta;
+	auto &deltas = _t->ensureExtended()->modifications[index];
+	if (delta > 0) {
+		deltas.added += delta;
+	} else {
+		deltas.removed -= delta;
+	}
 }
 
 void Parser::parse(const TextParseOptions &options) {
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index 2401b59..20be972 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -11,6 +11,8 @@
 
 namespace Ui::Text {
 
+struct ParagraphDetails;
+
 class Parser {
 public:
 	Parser(
@@ -58,7 +60,7 @@ private:
 	void blockCreated();
 	void createBlock(int32 skipBack = 0);
 	void createNewlineBlock(bool fromOriginalText);
-	void ensureAtNewline();
+	void ensureAtNewline(ParagraphDetails details);
 
 	// Returns true if at least one entity was parsed in the current position.
 	bool checkEntities();
@@ -113,6 +115,7 @@ private:
 	uint16 _linkIndex = 0;
 	uint16 _colorIndex = 0;
 	uint16 _monoIndex = 0;
+	uint16 _paragraphIndex = 0;
 	EmojiPtr _emoji = nullptr; // current emoji, if current word is an emoji, or zero
 	int32 _blockStart = 0; // offset in result, from which current parsed block is started
 	int32 _diacritics = 0; // diacritic chars skipped without good char
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 0b2ac5d..9d4eb0c 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -206,6 +206,8 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 		? (1. - _spoiler->revealAnimation.value(
 			_spoiler->revealed ? 1. : 0.))
 		: 0.;
+	_preBlockCache = context.pre;
+	_blockquoteBlockCache = context.blockquote;
 	enumerate();
 }
 
@@ -231,6 +233,7 @@ void Renderer::enumerate() {
 	if ((*_t->_blocks.cbegin())->type() != TextBlockType::Newline) {
 		initNextParagraph(
 			_t->_blocks.cbegin(),
+			_t->_startParagraphIndex,
 			UnpackParagraphDirection(
 				_t->_startParagraphLTR,
 				_t->_startParagraphRTL));
@@ -259,6 +262,9 @@ void Renderer::enumerate() {
 			if (!_lineHeight) {
 				_lineHeight = blockHeight;
 			}
+			const auto pindex = static_cast<const NewlineBlock*>(b)->paragraphIndex();
+			const auto changed = (_pindex != pindex);
+			fillParagraphBg(changed ? _ppadding.bottom() : 0);
 			if (!drawLine((*i)->position(), i, e)) {
 				return;
 			}
@@ -271,6 +277,7 @@ void Renderer::enumerate() {
 
 			initNextParagraph(
 				i + 1,
+				pindex,
 				static_cast<const NewlineBlock*>(b)->paragraphDirection());
 
 			longWordLine = true;
@@ -340,6 +347,7 @@ void Renderer::enumerate() {
 					: (j + 1 != en)
 					? (j + 1)->position()
 					: _t->countBlockEnd(i, e);
+				fillParagraphBg(0);
 				if (!drawLine(lineEnd, i, e)) {
 					return;
 				}
@@ -368,6 +376,7 @@ void Renderer::enumerate() {
 		const auto lineEnd = !_elidedLine
 			? b->position()
 			: _t->countBlockEnd(i, e);
+		fillParagraphBg(0);
 		if (!drawLine(lineEnd, i, e)) {
 			return;
 		}
@@ -386,6 +395,7 @@ void Renderer::enumerate() {
 		continue;
 	}
 	if (_lineStart < _t->_text.size()) {
+		fillParagraphBg(_ppadding.bottom());
 		if (!drawLine(_t->_text.size(), e, e)) {
 			return;
 		}
@@ -396,6 +406,37 @@ void Renderer::enumerate() {
 	}
 }
 
+void Renderer::fillParagraphBg(int paddingBottom) {
+	const auto cache = (!_p || !_paragraph)
+		? nullptr
+		: _paragraph->pre
+		? _preBlockCache
+		: _paragraph->blockquote
+		? _blockquoteBlockCache
+		: nullptr;
+	if (cache) {
+		auto &valid = _paragraph->pre
+			? _preBlockCacheValid
+			: _blockquoteBlockCacheValid;
+		if (!valid) {
+			valid = true;
+			ValidateBlockPaintCache(*cache, *_t->_st);
+		}
+		const auto skip = _t->_st->blockVerticalSkip;
+		const auto isTop = (_y != _blockLineTop);
+		const auto isBottom = (paddingBottom != 0);
+		const auto top = _blockLineTop + (isTop ? skip : 0);
+		const auto fill = _y + _lineHeight + paddingBottom - top
+			- (isBottom ? skip : 0);
+		const auto rect = QRect(_startLeft, top, _startLineWidth, fill);
+		FillBlockPaint(*_p, rect, *cache, *_t->_st, {
+			.skipTop = !isTop,
+			.skipBottom = !isBottom,
+		});
+	}
+	_blockLineTop = _y + _lineHeight + paddingBottom;
+}
+
 StateResult Renderer::getState(
 		QPoint point,
 		GeometryDescriptor geometry,
@@ -430,12 +471,22 @@ crl::time Renderer::now() const {
 
 void Renderer::initNextParagraph(
 		String::TextBlocks::const_iterator i,
+		int16 paragraphIndex,
 		Qt::LayoutDirection direction) {
 	_parDirection = (direction == Qt::LayoutDirectionAuto)
 		? style::LayoutDirection()
 		: direction;
 	_parStartBlock = i;
 	_paragraphWidthRemaining = 0;
+	if (_pindex != paragraphIndex) {
+		_y += _ppadding.bottom();
+		_pindex = paragraphIndex;
+		_paragraph = _t->paragraphByIndex(paragraphIndex);
+		_ppadding = _t->paragraphPadding(_paragraph);
+		_blockLineTop = _y;
+		_y += _ppadding.top();
+		_ppadding.setTop(0);
+	}
 	const auto e = _t->_blocks.cend();
 	if (i == e) {
 		_lineStart = _parStart = _t->_text.size();
@@ -461,6 +512,7 @@ void Renderer::initNextParagraph(
 		_parLength = ((i == e) ? _t->_text.size() : (*i)->position()) - _parStart;
 	}
 	_parAnalysis.resize(0);
+	_paragraphWidthRemaining += _ppadding.left() + _ppadding.right();
 	initNextLine();
 }
 
@@ -470,9 +522,12 @@ void Renderer::initNextLine() {
 		.top = (_y - _startTop),
 		.width = _paragraphWidthRemaining.ceil().toInt(),
 	});
-	_x = _startLeft + line.left;
+	_blockLineTop += _startTop + line.top - _y;
+	_x = _startLeft + line.left + _ppadding.left();
 	_y = _startTop + line.top;
-	_lineWidth = _wLeft = line.width;
+	_startLineWidth = line.width;
+	_lineWidth = _startLineWidth - _ppadding.left() - _ppadding.right();
+	_wLeft = _lineWidth;
 	_elidedLine = line.elided;
 }
 
@@ -1252,7 +1307,7 @@ void Renderer::prepareElidedLine(QString &lineText, int32 lineStart, int32 &line
 	eShapeLine(line);
 
 	auto elideWidth = _f->elidew;
-	_wLeft = _lineWidth - elideWidth;
+	_wLeft = _lineWidth - _ppadding.left() - _ppadding.right() - elideWidth;
 
 	int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
 	int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0, i;
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 3210900..08bc5de 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -54,6 +54,7 @@ private:
 	[[nodiscard]] crl::time now() const;
 	void initNextParagraph(
 		String::TextBlocks::const_iterator i,
+		int16 paragraphIndex,
 		Qt::LayoutDirection direction);
 	void initNextLine();
 	void initParagraphBidi();
@@ -89,6 +90,8 @@ private:
 		int repeat = 0);
 	void restoreAfterElided();
 
+	void fillParagraphBg(int paddingBottom);
+
 	// COPIED FROM qtextengine.cpp AND MODIFIED
 	static void eAppendItems(
 		QScriptAnalysis *analysis,
@@ -154,12 +157,21 @@ private:
 	int _parLength = 0;
 	bool _parHasBidi = false;
 	QVarLengthArray<QScriptAnalysis, 4096> _parAnalysis;
+	ParagraphDetails *_paragraph = nullptr;
+	int _pindex = 0;
+	QMargins _ppadding;
+	int _blockLineTop = 0;
+	BlockPaintCache *_preBlockCache = nullptr;
+	BlockPaintCache *_blockquoteBlockCache = nullptr;
+	bool _preBlockCacheValid = false;
+	bool _blockquoteBlockCacheValid = false;
 
 	// current line data
 	QTextEngine *_e = nullptr;
 	style::font _f;
 	int _startLeft = 0;
 	int _startTop = 0;
+	int _startLineWidth = 0;
 	QFixed _x, _wLeft, _last_rPadding;
 	int _y = 0;
 	int _yDelta = 0;

From 7ed87d049f1fdd21e4e1d36743bb3cbefe069a0d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 13 Oct 2023 10:06:15 +0400
Subject: [PATCH 527/635] Fix build with GCC.

---
 ui/text/text_block.cpp   | 4 ----
 ui/wrap/table_layout.cpp | 1 -
 2 files changed, 5 deletions(-)

diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index 4e0b8cf..478c69e 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -133,10 +133,6 @@ QFixed LineBreakHelper::negativeRightBearing() const {
 	return qAbs(rightBearing);
 }
 
-QString DebugCurrentParsingString, DebugCurrentParsingPart;
-int DebugCurrentParsingFrom = 0;
-int DebugCurrentParsingLength = 0;
-
 void addNextCluster(
 		int &pos,
 		int end,
diff --git a/ui/wrap/table_layout.cpp b/ui/wrap/table_layout.cpp
index feecc1a..efd032c 100644
--- a/ui/wrap/table_layout.cpp
+++ b/ui/wrap/table_layout.cpp
@@ -39,7 +39,6 @@ void TableLayout::paintEvent(QPaintEvent *e) {
 
 	auto path = QPainterPath();
 	path.addRoundedRect(inner, _st.radius, _st.radius);
-	auto top = half;
 	for (auto i = 1, count = int(_rows.size()); i != count; ++i) {
 		const auto y = _rows[i].top - half;
 		path.moveTo(half, y);

From 6e7c4c1c4d08992b37190ae22f6401b32dcebc2b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 13 Oct 2023 15:14:58 +0400
Subject: [PATCH 528/635] Improve blockquote / pre layout.

---
 ui/text/text.cpp             |  4 ++--
 ui/text/text.h               |  9 +++++----
 ui/text/text_block.cpp       |  4 +---
 ui/text/text_extended_data.h |  5 ++---
 ui/text/text_parser.cpp      | 22 ++++++++++++++++++----
 ui/text/text_renderer.cpp    | 14 +++++++++++++-
 6 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 5b21a63..f53e648 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -1225,8 +1225,8 @@ bool String::hasNotEmojiAndSpaces() const {
 	return _hasNotEmojiAndSpaces;
 }
 
-const base::flat_map<int, Deltas> &String::modifications() const {
-	static const auto kEmpty = base::flat_map<int, Deltas>();
+const std::vector<Modification> &String::modifications() const {
+	static const auto kEmpty = std::vector<Modification>();
 	return _extended ? _extended->modifications : kEmpty;
 }
 
diff --git a/ui/text/text.h b/ui/text/text.h
index 4792391..00c63a8 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -83,9 +83,10 @@ struct SpoilerData;
 struct ParagraphDetails;
 struct ExtendedData;
 
-struct Deltas {
-	uint16 added = 0;
-	uint16 removed = 0;
+struct Modification {
+	int position = 0;
+	uint16 skipped = 0;
+	bool added = false;
 };
 
 struct StateRequest {
@@ -341,7 +342,7 @@ public:
 	[[nodiscard]] OnlyCustomEmoji toOnlyCustomEmoji() const;
 
 	[[nodiscard]] bool hasNotEmojiAndSpaces() const;
-	[[nodiscard]] const base::flat_map<int, Deltas> &modifications() const;
+	[[nodiscard]] const std::vector<Modification> &modifications() const;
 
 	[[nodiscard]] const style::TextStyle *style() const {
 		return _st;
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index 478c69e..43c5288 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -388,9 +388,7 @@ style::font WithFlags(
 		|| (fontFlags & FontSemibold)) {
 		result = result->semibold();
 	}
-	if ((flags & TextBlockFlag::Italic)
-		|| (fontFlags & FontItalic)
-		|| (flags & TextBlockFlag::Blockquote)) {
+	if ((flags & TextBlockFlag::Italic) || (fontFlags & FontItalic)) {
 		result = result->italic();
 	}
 	if ((flags & TextBlockFlag::Underline) || (fontFlags & FontUnderline)) {
diff --git a/ui/text/text_extended_data.h b/ui/text/text_extended_data.h
index a4151ea..f8901ca 100644
--- a/ui/text/text_extended_data.h
+++ b/ui/text/text_extended_data.h
@@ -12,8 +12,7 @@
 
 namespace Ui::Text {
 
-struct Deltas;
-
+struct Modification;
 class String;
 
 class SpoilerClickHandler final : public ClickHandler {
@@ -59,7 +58,7 @@ struct ExtendedData {
 	std::vector<ClickHandlerPtr> links;
 	std::vector<ParagraphDetails> paragraphs;
 	std::unique_ptr<SpoilerData> spoiler;
-	base::flat_map<int, Deltas> modifications;
+	std::vector<Modification> modifications;
 };
 
 } // namespace Ui::Text
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index bd66466..080b138 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -603,11 +603,25 @@ bool Parser::isLinkEntity(const EntityInText &entity) const {
 }
 
 void Parser::updateModifications(int index, int delta) {
-	auto &deltas = _t->ensureExtended()->modifications[index];
-	if (delta > 0) {
-		deltas.added += delta;
+	auto &modifications = _t->ensureExtended()->modifications;
+	auto i = end(modifications);
+	while (i != begin(modifications) && (--i)->position >= index) {
+		if (i->position < index) {
+			break;
+		} else if (delta > 0) {
+			++i->position;
+		} else if (i->position == index) {
+			break;
+		}
+	}
+	if (i != end(modifications) && i->position == index) {
+		++i->skipped;
 	} else {
-		deltas.removed -= delta;
+		modifications.insert(i, {
+			.position = index,
+			.skipped = uint16(delta < 0 ? 1 : 0),
+			.added = (delta > 0),
+		});
 	}
 }
 
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 9d4eb0c..896ca0c 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -433,6 +433,18 @@ void Renderer::fillParagraphBg(int paddingBottom) {
 			.skipTop = !isTop,
 			.skipBottom = !isBottom,
 		});
+
+		if (isTop && cache->withHeader) {
+			const auto font = _t->_st->font->monospace();
+			const auto topleft = rect.topLeft();
+			const auto position = topleft + _t->_st->blockHeaderPosition;
+			const auto baseline = position + QPoint(0, font->ascent);
+			_p->setFont(font);
+			_p->setPen(_palette->monoFg->p);
+			_p->drawText(baseline, _paragraph->language.isEmpty()
+				? u"code"_q
+				: _paragraph->language);
+		}
 	}
 	_blockLineTop = _y + _lineHeight + paddingBottom;
 }
@@ -2094,7 +2106,7 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 				_currentPen = &_originalPen;
 				_currentPenSelected = &_originalPenSelected;
 			}
-		} else if (isMono || (flags & TextBlockFlag::Blockquote)) {
+		} else if (isMono) {
 			_currentPen = &_palette->monoFg->p;
 			_currentPenSelected = &_palette->selectMonoFg->p;
 		} else if (block->linkIndex()) {

From 46465fc5ce14c4ca356870f0a8d51eb0285112a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 13 Oct 2023 16:13:08 +0400
Subject: [PATCH 529/635] Support quote icon in blockquote.

---
 ui/basic.style            | 25 ++++++++++++++++-------
 ui/text/text.cpp          | 43 ++++++++++++++++++++++++---------------
 ui/text/text.h            |  9 +++-----
 ui/text/text_renderer.cpp | 13 +++++++-----
 4 files changed, 56 insertions(+), 34 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index faab247..c0de76f 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -19,17 +19,24 @@ TextPalette {
 	linkAlwaysActive: bool;
 }
 
+ParagraphStyle {
+	padding: margins;
+	verticalSkip: pixels;
+	header: pixels;
+	headerPosition: point;
+	icon: icon;
+	iconPosition: point;
+	outline: pixels;
+	radius: pixels;
+	scrollable: bool;
+}
+
 TextStyle {
 	font: font;
 	linkUnderline: int;
-	blockPadding: margins;
-	blockVerticalSkip: pixels;
-	blockHeader: pixels;
-	blockHeaderPosition: point;
-	blockOutline: pixels;
-	blockRadius: pixels;
-	preScrollable: bool;
 	lineHeight: pixels;
+	blockquote: ParagraphStyle;
+	pre: ParagraphStyle;
 }
 
 kLinkUnderlineNever: 0;
@@ -58,10 +65,14 @@ defaultTextPalette: TextPalette {
 	selectSpoilerFg: msgInDateFgSelected;
 	selectOverlay: msgSelectOverlay;
 }
+defaultParagraphStyle: ParagraphStyle {
+}
 defaultTextStyle: TextStyle {
 	font: normalFont;
 	linkUnderline: kLinkUnderlineActive;
 	lineHeight: 0px;
+	blockquote: defaultParagraphStyle;
+	pre: defaultParagraphStyle;
 }
 semiboldTextStyle: TextStyle(defaultTextStyle) {
 	font: semiboldFont;
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index f53e648..fc14c68 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -185,29 +185,34 @@ GeometryDescriptor SimpleGeometry(
 	}
 };
 
-
 void ValidateBlockPaintCache(
 		BlockPaintCache &cache,
-		const style::TextStyle &st) {
+		const style::ParagraphStyle &st) {
+	const auto icon = st.icon.empty() ? nullptr : &st.icon;
 	if (!cache.corners.isNull()
 		&& cache.bgCached == cache.bg
 		&& cache.outlineCached == cache.outline
-		&& (!cache.withHeader || cache.headerCached == cache.header)
-		&& (!cache.topright || cache.iconCached == cache.icon)) {
+		&& (!st.header || cache.headerCached == cache.header)
+		&& (!icon || cache.iconCached == cache.icon)) {
 		return;
 	}
 	cache.bgCached = cache.bg;
 	cache.outlineCached = cache.outline;
-	if (cache.withHeader) {
+	if (st.header) {
 		cache.headerCached = cache.header;
 	}
-	if (cache.topright) {
+	if (!st.icon.empty()) {
 		cache.iconCached = cache.icon;
 	}
-	const auto radius = st.blockRadius;
-	const auto header = cache.withHeader ? st.blockHeader : 0;
-	const auto outline = st.blockOutline;
-	const auto corner = std::max({ header, radius, outline });
+	const auto radius = st.radius;
+	const auto header = st.header;
+	const auto outline = st.outline;
+	const auto iconsize = icon
+		? std::max(
+			icon->width() + st.iconPosition.x(),
+			icon->height() + st.iconPosition.y())
+		: 0;
+	const auto corner = std::max({ header, radius, outline, iconsize });
 	const auto middle = st::lineWidth;
 	const auto side = 2 * corner + middle;
 	const auto full = QSize(side, side);
@@ -233,6 +238,11 @@ void ValidateBlockPaintCache(
 	p.setBrush(cache.bg);
 	p.setClipRect(outline, header, side - outline, side - header);
 	p.drawRoundedRect(0, 0, side, side, radius, radius);
+	if (icon) {
+		const auto left = side - icon->width() - st.iconPosition.x();
+		const auto top = st.iconPosition.y();
+		icon->paint(p, left, top, side, cache.icon);
+	}
 
 	p.end();
 	cache.corners = std::move(image);
@@ -242,7 +252,7 @@ void FillBlockPaint(
 		QPainter &p,
 		QRect rect,
 		const BlockPaintCache &cache,
-		const style::TextStyle &st,
+		const style::ParagraphStyle &st,
 		SkipBlockPaintParts parts) {
 	const auto &image = cache.corners;
 	const auto ratio = int(image.devicePixelRatio());
@@ -265,7 +275,7 @@ void FillBlockPaint(
 			image,
 			QRect((iwidth - ihalf) * ratio, 0, ihalf * ratio, top * ratio));
 		if (const auto middle = width - 2 * ihalf) {
-			const auto header = cache.withHeader ? st.blockHeader : 0;
+			const auto header = st.header;
 			const auto fillHeader = std::min(header, top);
 			if (fillHeader) {
 				p.fillRect(x + ihalf, y, middle, fillHeader, cache.header);
@@ -316,7 +326,7 @@ void FillBlockPaint(
 		}
 		rect.setHeight(height);
 	}
-	const auto outline = st.blockOutline;
+	const auto outline = st.outline;
 	if (outline) {
 		p.fillRect(x, y, outline, height, cache.outline);
 	}
@@ -1086,9 +1096,10 @@ QMargins String::paragraphPadding(ParagraphDetails *info) const {
 	if (!info) {
 		return {};
 	}
-	const auto skip = _st->blockVerticalSkip;
-	const auto top = info->pre ? _st->blockHeader : 0;
-	return _st->blockPadding + QMargins(0, top + skip, 0, skip);
+	const auto &st = info->pre ? _st->pre : _st->blockquote;
+	const auto skip = st.verticalSkip;
+	const auto top = st.header;
+	return st.padding + QMargins(0, top + skip, 0, skip);
 }
 
 template <
diff --git a/ui/text/text.h b/ui/text/text.h
index 00c63a8..9e33d56 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -24,6 +24,7 @@ enum class type : uchar;
 namespace style {
 struct TextStyle;
 struct TextPalette;
+struct ParagraphStyle;
 } // namespace style
 
 namespace Ui {
@@ -175,15 +176,11 @@ struct BlockPaintCache {
 	QColor bg;
 	QColor outline;
 	QColor icon;
-
-	const style::icon *topright = nullptr;
-	QPoint toprightPosition;
-	bool withHeader = false;
 };
 
 void ValidateBlockPaintCache(
 	BlockPaintCache &cache,
-	const style::TextStyle &st);
+	const style::ParagraphStyle &st);
 
 struct SkipBlockPaintParts {
 	bool skipTop : 1 = false;
@@ -193,7 +190,7 @@ void FillBlockPaint(
 	QPainter &p,
 	QRect rect,
 	const BlockPaintCache &cache,
-	const style::TextStyle &st,
+	const style::ParagraphStyle &st,
 	SkipBlockPaintParts parts = {});
 
 struct PaintContext {
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 896ca0c..fa6adca 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -415,29 +415,32 @@ void Renderer::fillParagraphBg(int paddingBottom) {
 		? _blockquoteBlockCache
 		: nullptr;
 	if (cache) {
+		const auto &st = _paragraph->pre
+			? _t->_st->pre
+			: _t->_st->blockquote;
 		auto &valid = _paragraph->pre
 			? _preBlockCacheValid
 			: _blockquoteBlockCacheValid;
 		if (!valid) {
 			valid = true;
-			ValidateBlockPaintCache(*cache, *_t->_st);
+			ValidateBlockPaintCache(*cache, st);
 		}
-		const auto skip = _t->_st->blockVerticalSkip;
+		const auto skip = st.verticalSkip;
 		const auto isTop = (_y != _blockLineTop);
 		const auto isBottom = (paddingBottom != 0);
 		const auto top = _blockLineTop + (isTop ? skip : 0);
 		const auto fill = _y + _lineHeight + paddingBottom - top
 			- (isBottom ? skip : 0);
 		const auto rect = QRect(_startLeft, top, _startLineWidth, fill);
-		FillBlockPaint(*_p, rect, *cache, *_t->_st, {
+		FillBlockPaint(*_p, rect, *cache, st, {
 			.skipTop = !isTop,
 			.skipBottom = !isBottom,
 		});
 
-		if (isTop && cache->withHeader) {
+		if (isTop && st.header > 0) {
 			const auto font = _t->_st->font->monospace();
 			const auto topleft = rect.topLeft();
-			const auto position = topleft + _t->_st->blockHeaderPosition;
+			const auto position = topleft + st.headerPosition;
 			const auto baseline = position + QPoint(0, font->ascent);
 			_p->setFont(font);
 			_p->setPen(_palette->monoFg->p);

From 48012d7f4add33a4f6a857e2236dee0dcf968e44 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 13 Oct 2023 17:27:00 +0400
Subject: [PATCH 530/635] Count correct initial size for code blocks.

---
 ui/text/text.cpp          | 58 ++++++++++++++++++++++++++++++++++++---
 ui/text/text.h            |  5 ++++
 ui/text/text_renderer.cpp |  8 ++----
 3 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index fc14c68..11e9b2a 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -434,12 +434,15 @@ void String::recountNaturalSize(
 	auto pindex = paragraphIndex(nullptr);
 	auto paragraph = paragraphByIndex(pindex);
 	auto ppadding = paragraphPadding(paragraph);
+	auto pminwidth = paragraphMinWidth(paragraph);
+	auto pmaxwidth = QFixed(pminwidth);
+	auto poldheight = 0;
 
 	_maxWidth = 0;
 	_minHeight = ppadding.top();
 	auto lineHeight = 0;
 	auto maxWidth = QFixed();
-	auto width = QFixed(ppadding.left() + ppadding.right());
+	auto width = QFixed(pminwidth);
 	auto last_rBearing = QFixed();
 	auto last_rPadding = QFixed();
 	for (auto &block : _blocks) {
@@ -453,9 +456,16 @@ void String::recountNaturalSize(
 			const auto index = paragraphIndex(b);
 			if (pindex != index) {
 				_minHeight += ppadding.bottom();
+				if (paragraph) {
+					paragraph->maxWidth = pmaxwidth.ceil().toInt();
+					paragraph->minHeight = _minHeight - poldheight;
+				}
+				poldheight = _minHeight;
 				pindex = index;
 				paragraph = paragraphByIndex(pindex);
 				ppadding = paragraphPadding(paragraph);
+				pminwidth = paragraphMinWidth(paragraph);
+				pmaxwidth = pminwidth;
 				_minHeight += ppadding.top();
 				ppadding.setTop(0);
 			}
@@ -471,7 +481,8 @@ void String::recountNaturalSize(
 			last_rPadding = 0;// b->f_rpadding(); (0 for newline)
 
 			accumulate_max(maxWidth, width);
-			width = ppadding.left() + ppadding.right();
+			accumulate_max(pmaxwidth, width);
+			width = pminwidth;
 			// + (b->f_width() - last_rBearing); (0 for newline)
 			continue;
 		}
@@ -486,6 +497,7 @@ void String::recountNaturalSize(
 		// for all the blocks to fit on their line we check each block, even the
 		// intermediate one with a large negative right bearing.
 		accumulate_max(maxWidth, width);
+		accumulate_max(pmaxwidth, width);
 
 		width += last_rBearing + (last_rPadding + b->f_width() - b__f_rbearing);
 		lineHeight = qMax(lineHeight, blockHeight);
@@ -503,9 +515,16 @@ void String::recountNaturalSize(
 		}
 		_minHeight += ppadding.top() + lineHeight + ppadding.bottom();
 		accumulate_max(maxWidth, width);
+		accumulate_max(pmaxwidth, width);
 	}
 	_maxWidth = maxWidth.ceil().toInt();
-	_endsWithParagraphDetails = (pindex != 0);
+	if (paragraph) {
+		paragraph->maxWidth = pmaxwidth.ceil().toInt();
+		paragraph->minHeight = _minHeight - poldheight;
+		_endsWithParagraphDetails = true;
+	} else {
+		_endsWithParagraphDetails = false;
+	}
 }
 
 int String::countMaxMonospaceWidth() const {
@@ -1092,16 +1111,47 @@ int String::paragraphIndex(const AbstractBlock *block) const {
 		: _startParagraphIndex;
 }
 
+const style::ParagraphStyle &String::paragraphStyle(
+		not_null<ParagraphDetails*> info) const {
+	return info->pre ? _st->pre : _st->blockquote;
+}
+
 QMargins String::paragraphPadding(ParagraphDetails *info) const {
 	if (!info) {
 		return {};
 	}
-	const auto &st = info->pre ? _st->pre : _st->blockquote;
+	const auto &st = paragraphStyle(info);
 	const auto skip = st.verticalSkip;
 	const auto top = st.header;
 	return st.padding + QMargins(0, top + skip, 0, skip);
 }
 
+int String::paragraphMinWidth(ParagraphDetails *info) const {
+	if (!info) {
+		return 0;
+	}
+	const auto ppadding = paragraphPadding(info);
+	const auto &pheader = paragraphHeaderText(info);
+	const auto pst = info ? &paragraphStyle(info) : nullptr;
+	return ppadding.left()
+		+ (pheader.isEmpty() ? 0 : _st->font->monospace()->width(pheader))
+		+ std::max(
+			ppadding.right(),
+			((pst && !pst->icon.empty())
+				? (pst->iconPosition.x() + pst->icon.width())
+				: 0));
+}
+
+const QString &String::paragraphHeaderText(ParagraphDetails *info) const {
+	static const auto kEmptyHeader = QString();
+	static const auto kDefaultHeader = u"code"_q;
+	return (!info || !info->pre)
+		? kEmptyHeader
+		: info->language.isEmpty()
+		? kDefaultHeader
+		: info->language;
+}
+
 template <
 	typename AppendPartCallback,
 	typename ClickHandlerStartCallback,
diff --git a/ui/text/text.h b/ui/text/text.h
index 9e33d56..9fe60dd 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -376,7 +376,12 @@ private:
 		const TextBlocks::const_iterator &i,
 		const TextBlocks::const_iterator &e) const;
 	[[nodiscard]] ParagraphDetails *paragraphByIndex(int index) const;
+	[[nodiscard]] const style::ParagraphStyle &paragraphStyle(
+		not_null<ParagraphDetails*> info) const;
 	[[nodiscard]] QMargins paragraphPadding(ParagraphDetails *info) const;
+	[[nodiscard]] int paragraphMinWidth(ParagraphDetails *info) const;
+	[[nodiscard]] const QString &paragraphHeaderText(
+		ParagraphDetails *info) const;
 
 	// block must be either nullptr or a pointer to a NewlineBlock.
 	[[nodiscard]] int paragraphIndex(const AbstractBlock *block) const;
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index fa6adca..e7ec3c0 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -415,9 +415,7 @@ void Renderer::fillParagraphBg(int paddingBottom) {
 		? _blockquoteBlockCache
 		: nullptr;
 	if (cache) {
-		const auto &st = _paragraph->pre
-			? _t->_st->pre
-			: _t->_st->blockquote;
+		const auto &st = _t->paragraphStyle(_paragraph);
 		auto &valid = _paragraph->pre
 			? _preBlockCacheValid
 			: _blockquoteBlockCacheValid;
@@ -444,9 +442,7 @@ void Renderer::fillParagraphBg(int paddingBottom) {
 			const auto baseline = position + QPoint(0, font->ascent);
 			_p->setFont(font);
 			_p->setPen(_palette->monoFg->p);
-			_p->drawText(baseline, _paragraph->language.isEmpty()
-				? u"code"_q
-				: _paragraph->language);
+			_p->drawText(baseline, _t->paragraphHeaderText(_paragraph));
 		}
 	}
 	_blockLineTop = _y + _lineHeight + paddingBottom;

From 9eb9fcf043276bb3a73f1fc25531e4f4862d6fc9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 13 Oct 2023 18:23:56 +0400
Subject: [PATCH 531/635] Use quote instead of paragraph for quotes.

---
 ui/basic.style               |  12 +-
 ui/text/text.cpp             | 179 ++++++++++++++---------------
 ui/text/text.h               |  41 ++++---
 ui/text/text_block.h         |   6 +-
 ui/text/text_extended_data.h |   4 +-
 ui/text/text_parser.cpp      |  20 ++--
 ui/text/text_parser.h        |   6 +-
 ui/text/text_renderer.cpp    | 213 ++++++++++++++++++++---------------
 ui/text/text_renderer.h      |  34 +++---
 9 files changed, 275 insertions(+), 240 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index c0de76f..a2831c0 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -19,7 +19,7 @@ TextPalette {
 	linkAlwaysActive: bool;
 }
 
-ParagraphStyle {
+QuoteStyle {
 	padding: margins;
 	verticalSkip: pixels;
 	header: pixels;
@@ -35,8 +35,8 @@ TextStyle {
 	font: font;
 	linkUnderline: int;
 	lineHeight: pixels;
-	blockquote: ParagraphStyle;
-	pre: ParagraphStyle;
+	blockquote: QuoteStyle;
+	pre: QuoteStyle;
 }
 
 kLinkUnderlineNever: 0;
@@ -65,14 +65,14 @@ defaultTextPalette: TextPalette {
 	selectSpoilerFg: msgInDateFgSelected;
 	selectOverlay: msgSelectOverlay;
 }
-defaultParagraphStyle: ParagraphStyle {
+defaultQuoteStyle: QuoteStyle {
 }
 defaultTextStyle: TextStyle {
 	font: normalFont;
 	linkUnderline: kLinkUnderlineActive;
 	lineHeight: 0px;
-	blockquote: defaultParagraphStyle;
-	pre: defaultParagraphStyle;
+	blockquote: defaultQuoteStyle;
+	pre: defaultQuoteStyle;
 }
 semiboldTextStyle: TextStyle(defaultTextStyle) {
 	font: semiboldFont;
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 11e9b2a..a4ba32e 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -185,9 +185,9 @@ GeometryDescriptor SimpleGeometry(
 	}
 };
 
-void ValidateBlockPaintCache(
-		BlockPaintCache &cache,
-		const style::ParagraphStyle &st) {
+void ValidateQuotePaintCache(
+		QuotePaintCache &cache,
+		const style::QuoteStyle &st) {
 	const auto icon = st.icon.empty() ? nullptr : &st.icon;
 	if (!cache.corners.isNull()
 		&& cache.bgCached == cache.bg
@@ -248,11 +248,11 @@ void ValidateBlockPaintCache(
 	cache.corners = std::move(image);
 }
 
-void FillBlockPaint(
+void FillQuotePaint(
 		QPainter &p,
 		QRect rect,
-		const BlockPaintCache &cache,
-		const style::ParagraphStyle &st,
+		const QuotePaintCache &cache,
+		const style::QuoteStyle &st,
 		SkipBlockPaintParts parts) {
 	const auto &image = cache.corners;
 	const auto ratio = int(image.devicePixelRatio());
@@ -431,18 +431,18 @@ void String::recountNaturalSize(
 		}
 	};
 
-	auto pindex = paragraphIndex(nullptr);
-	auto paragraph = paragraphByIndex(pindex);
-	auto ppadding = paragraphPadding(paragraph);
-	auto pminwidth = paragraphMinWidth(paragraph);
-	auto pmaxwidth = QFixed(pminwidth);
-	auto poldheight = 0;
+	auto qindex = quoteIndex(nullptr);
+	auto quote = quoteByIndex(qindex);
+	auto qpadding = quotePadding(quote);
+	auto qminwidth = quoteMinWidth(quote);
+	auto qmaxwidth = QFixed(qminwidth);
+	auto qoldheight = 0;
 
 	_maxWidth = 0;
-	_minHeight = ppadding.top();
+	_minHeight = qpadding.top();
 	auto lineHeight = 0;
 	auto maxWidth = QFixed();
-	auto width = QFixed(pminwidth);
+	auto width = QFixed(qminwidth);
 	auto last_rBearing = QFixed();
 	auto last_rPadding = QFixed();
 	for (auto &block : _blocks) {
@@ -453,21 +453,24 @@ void String::recountNaturalSize(
 			if (!lineHeight) {
 				lineHeight = blockHeight;
 			}
-			const auto index = paragraphIndex(b);
-			if (pindex != index) {
-				_minHeight += ppadding.bottom();
-				if (paragraph) {
-					paragraph->maxWidth = pmaxwidth.ceil().toInt();
-					paragraph->minHeight = _minHeight - poldheight;
+			accumulate_max(maxWidth, width);
+			accumulate_max(qmaxwidth, width);
+
+			const auto index = quoteIndex(b);
+			if (qindex != index) {
+				_minHeight += qpadding.bottom();
+				if (quote) {
+					quote->maxWidth = qmaxwidth.ceil().toInt();
+					quote->minHeight = _minHeight - qoldheight;
 				}
-				poldheight = _minHeight;
-				pindex = index;
-				paragraph = paragraphByIndex(pindex);
-				ppadding = paragraphPadding(paragraph);
-				pminwidth = paragraphMinWidth(paragraph);
-				pmaxwidth = pminwidth;
-				_minHeight += ppadding.top();
-				ppadding.setTop(0);
+				qoldheight = _minHeight;
+				qindex = index;
+				quote = quoteByIndex(qindex);
+				qpadding = quotePadding(quote);
+				qminwidth = quoteMinWidth(quote);
+				qmaxwidth = qminwidth;
+				_minHeight += qpadding.top();
+				qpadding.setTop(0);
 			}
 			if (initial) {
 				computeParagraphDirection(b->position());
@@ -480,9 +483,7 @@ void String::recountNaturalSize(
 			last_rBearing = 0;// b->f_rbearing(); (0 for newline)
 			last_rPadding = 0;// b->f_rpadding(); (0 for newline)
 
-			accumulate_max(maxWidth, width);
-			accumulate_max(pmaxwidth, width);
-			width = pminwidth;
+			width = qminwidth;
 			// + (b->f_width() - last_rBearing); (0 for newline)
 			continue;
 		}
@@ -497,7 +498,7 @@ void String::recountNaturalSize(
 		// for all the blocks to fit on their line we check each block, even the
 		// intermediate one with a large negative right bearing.
 		accumulate_max(maxWidth, width);
-		accumulate_max(pmaxwidth, width);
+		accumulate_max(qmaxwidth, width);
 
 		width += last_rBearing + (last_rPadding + b->f_width() - b__f_rbearing);
 		lineHeight = qMax(lineHeight, blockHeight);
@@ -513,17 +514,17 @@ void String::recountNaturalSize(
 		if (!lineHeight) {
 			lineHeight = CountBlockHeight(_blocks.back().get(), _st);
 		}
-		_minHeight += ppadding.top() + lineHeight + ppadding.bottom();
+		_minHeight += qpadding.top() + lineHeight + qpadding.bottom();
 		accumulate_max(maxWidth, width);
-		accumulate_max(pmaxwidth, width);
+		accumulate_max(qmaxwidth, width);
 	}
 	_maxWidth = maxWidth.ceil().toInt();
-	if (paragraph) {
-		paragraph->maxWidth = pmaxwidth.ceil().toInt();
-		paragraph->minHeight = _minHeight - poldheight;
-		_endsWithParagraphDetails = true;
+	if (quote) {
+		quote->maxWidth = qmaxwidth.ceil().toInt();
+		quote->minHeight = _minHeight - qoldheight;
+		_endsWithQuote = true;
 	} else {
-		_endsWithParagraphDetails = false;
+		_endsWithQuote = false;
 	}
 }
 
@@ -674,7 +675,7 @@ bool String::updateSkipBlock(int width, int height) {
 		}
 		_text.resize(block->position());
 		_blocks.pop_back();
-	} else if (_endsWithParagraphDetails) {
+	} else if (_endsWithQuote) {
 		_text.push_back(QChar::LineFeed);
 		_blocks.push_back(Block::Newline(
 			_st->font,
@@ -764,10 +765,10 @@ void String::enumerateLines(
 		Callback callback) const {
 	const auto width = QFixed(std::max(w, _minResizeWidth));
 
-	auto pindex = paragraphIndex(nullptr);
-	auto paragraph = paragraphByIndex(pindex);
-	auto ppadding = paragraphPadding(paragraph);
-	auto widthLeft = width - ppadding.left() - ppadding.right();
+	auto qindex = quoteIndex(nullptr);
+	auto quote = quoteByIndex(qindex);
+	auto qpadding = quotePadding(quote);
+	auto widthLeft = width - qpadding.left() - qpadding.right();
 	auto lineHeight = 0;
 	auto last_rBearing = QFixed();
 	auto last_rPadding = QFixed();
@@ -780,15 +781,15 @@ void String::enumerateLines(
 			if (!lineHeight) {
 				lineHeight = blockHeight;
 			}
-			lineHeight += ppadding.top();
-			const auto index = paragraphIndex(b.get());
-			if (pindex != index) {
-				lineHeight += ppadding.bottom();
-				pindex = index;
-				paragraph = paragraphByIndex(pindex);
-				ppadding = paragraphPadding(paragraph);
+			lineHeight += qpadding.top();
+			const auto index = quoteIndex(b.get());
+			if (qindex != index) {
+				lineHeight += qpadding.bottom();
+				qindex = index;
+				quote = quoteByIndex(qindex);
+				qpadding = quotePadding(quote);
 			} else {
-				ppadding.setTop(0);
+				qpadding.setTop(0);
 			}
 
 			callback(width - widthLeft, lineHeight);
@@ -796,7 +797,7 @@ void String::enumerateLines(
 			lineHeight = 0;
 			last_rBearing = 0;// b->f_rbearing(); (0 for newline)
 			last_rPadding = 0;// b->f_rpadding(); (0 for newline)
-			widthLeft = width - ppadding.left() - ppadding.right();
+			widthLeft = width - qpadding.left() - qpadding.right();
 			// - (b->f_width() - last_rBearing); (0 for newline)
 
 			longWordLine = true;
@@ -858,15 +859,15 @@ void String::enumerateLines(
 					j_width = (j->f_width() >= 0) ? j->f_width() : -j->f_width();
 				}
 
-				callback(width - widthLeft, lineHeight + ppadding.top());
-				ppadding.setTop(0);
+				callback(width - widthLeft, lineHeight + qpadding.top());
+				qpadding.setTop(0);
 
 				lineHeight = qMax(0, blockHeight);
 				last_rBearing = j->f_rbearing();
 				last_rPadding = j->f_rpadding();
 				widthLeft = width
-					- ppadding.left()
-					- ppadding.right()
+					- qpadding.left()
+					- qpadding.right()
 					- (j_width - last_rBearing);
 
 				longWordLine = !wordEndsHere;
@@ -877,15 +878,15 @@ void String::enumerateLines(
 			continue;
 		}
 
-		callback(width - widthLeft, lineHeight + ppadding.top());
-		ppadding.setTop(0);
+		callback(width - widthLeft, lineHeight + qpadding.top());
+		qpadding.setTop(0);
 
 		lineHeight = qMax(0, blockHeight);
 		last_rBearing = b__f_rbearing;
 		last_rPadding = b->f_rpadding();
 		widthLeft = width
-			- ppadding.left()
-			- ppadding.right()
+			- qpadding.left()
+			- qpadding.right()
 			- (b->f_width() - last_rBearing);
 
 		longWordLine = true;
@@ -894,7 +895,7 @@ void String::enumerateLines(
 	if (widthLeft < width) {
 		callback(
 			width - widthLeft,
-			lineHeight + ppadding.top() + ppadding.bottom());
+			lineHeight + qpadding.top() + qpadding.bottom());
 	}
 }
 
@@ -1096,60 +1097,60 @@ uint16 String::countBlockLength(
 	return countBlockEnd(i, e) - (*i)->position();
 }
 
-ParagraphDetails *String::paragraphByIndex(int index) const {
+QuoteDetails *String::quoteByIndex(int index) const {
 	Expects(!index
-		|| (_extended && index <= _extended->paragraphs.size()));
+		|| (_extended && index <= _extended->quotes.size()));
 
-	return index ? &_extended->paragraphs[index - 1] : nullptr;
+	return index ? &_extended->quotes[index - 1] : nullptr;
 }
 
-int String::paragraphIndex(const AbstractBlock *block) const {
+int String::quoteIndex(const AbstractBlock *block) const {
 	Expects(!block || block->type() == TextBlockType::Newline);
 
 	return block
-		? static_cast<const NewlineBlock*>(block)->paragraphIndex()
-		: _startParagraphIndex;
+		? static_cast<const NewlineBlock*>(block)->quoteIndex()
+		: _startQuoteIndex;
 }
 
-const style::ParagraphStyle &String::paragraphStyle(
-		not_null<ParagraphDetails*> info) const {
-	return info->pre ? _st->pre : _st->blockquote;
+const style::QuoteStyle &String::quoteStyle(
+		not_null<QuoteDetails*> quote) const {
+	return quote->pre ? _st->pre : _st->blockquote;
 }
 
-QMargins String::paragraphPadding(ParagraphDetails *info) const {
-	if (!info) {
+QMargins String::quotePadding(QuoteDetails *quote) const {
+	if (!quote) {
 		return {};
 	}
-	const auto &st = paragraphStyle(info);
+	const auto &st = quoteStyle(quote);
 	const auto skip = st.verticalSkip;
 	const auto top = st.header;
 	return st.padding + QMargins(0, top + skip, 0, skip);
 }
 
-int String::paragraphMinWidth(ParagraphDetails *info) const {
-	if (!info) {
+int String::quoteMinWidth(QuoteDetails *quote) const {
+	if (!quote) {
 		return 0;
 	}
-	const auto ppadding = paragraphPadding(info);
-	const auto &pheader = paragraphHeaderText(info);
-	const auto pst = info ? &paragraphStyle(info) : nullptr;
-	return ppadding.left()
-		+ (pheader.isEmpty() ? 0 : _st->font->monospace()->width(pheader))
+	const auto qpadding = quotePadding(quote);
+	const auto &qheader = quoteHeaderText(quote);
+	const auto qst = quote ? &quoteStyle(quote) : nullptr;
+	return qpadding.left()
+		+ (qheader.isEmpty() ? 0 : _st->font->monospace()->width(qheader))
 		+ std::max(
-			ppadding.right(),
-			((pst && !pst->icon.empty())
-				? (pst->iconPosition.x() + pst->icon.width())
+			qpadding.right(),
+			((qst && !qst->icon.empty())
+				? (qst->iconPosition.x() + qst->icon.width())
 				: 0));
 }
 
-const QString &String::paragraphHeaderText(ParagraphDetails *info) const {
+const QString &String::quoteHeaderText(QuoteDetails *quote) const {
 	static const auto kEmptyHeader = QString();
 	static const auto kDefaultHeader = u"code"_q;
-	return (!info || !info->pre)
+	return (!quote || !quote->pre)
 		? kEmptyHeader
-		: info->language.isEmpty()
+		: quote->language.isEmpty()
 		? kDefaultHeader
-		: info->language;
+		: quote->language;
 }
 
 template <
@@ -1478,7 +1479,7 @@ void String::clear() {
 	_blocks.clear();
 	_extended = nullptr;
 	_maxWidth = _minHeight = 0;
-	_startParagraphIndex = 0;
+	_startQuoteIndex = 0;
 	_startParagraphLTR = false;
 	_startParagraphRTL = false;
 }
diff --git a/ui/text/text.h b/ui/text/text.h
index 9fe60dd..4ee53ec 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -24,7 +24,7 @@ enum class type : uchar;
 namespace style {
 struct TextStyle;
 struct TextPalette;
-struct ParagraphStyle;
+struct QuoteStyle;
 } // namespace style
 
 namespace Ui {
@@ -81,7 +81,7 @@ class AbstractBlock;
 struct IsolatedEmoji;
 struct OnlyCustomEmoji;
 struct SpoilerData;
-struct ParagraphDetails;
+struct QuoteDetails;
 struct ExtendedData;
 
 struct Modification {
@@ -165,7 +165,7 @@ struct GeometryDescriptor {
 	bool elisionOneLine,
 	bool elisionBreakEverywhere);
 
-struct BlockPaintCache {
+struct QuotePaintCache {
 	QImage corners;
 	QColor headerCached;
 	QColor bgCached;
@@ -178,19 +178,19 @@ struct BlockPaintCache {
 	QColor icon;
 };
 
-void ValidateBlockPaintCache(
-	BlockPaintCache &cache,
-	const style::ParagraphStyle &st);
+void ValidateQuotePaintCache(
+	QuotePaintCache &cache,
+	const style::QuoteStyle &st);
 
 struct SkipBlockPaintParts {
 	bool skipTop : 1 = false;
 	bool skipBottom : 1 = false;
 };
-void FillBlockPaint(
+void FillQuotePaint(
 	QPainter &p,
 	QRect rect,
-	const BlockPaintCache &cache,
-	const style::ParagraphStyle &st,
+	const QuotePaintCache &cache,
+	const style::QuoteStyle &st,
 	SkipBlockPaintParts parts = {});
 
 struct PaintContext {
@@ -202,8 +202,8 @@ struct PaintContext {
 	QRect clip;
 
 	const style::TextPalette *palette = nullptr;
-	BlockPaintCache *pre = nullptr;
-	BlockPaintCache *blockquote = nullptr;
+	QuotePaintCache *pre = nullptr;
+	QuotePaintCache *blockquote = nullptr;
 	std::span<SpecialColor> colors;
 	SpoilerMessCache *spoiler = nullptr;
 	crl::time now = 0;
@@ -375,16 +375,15 @@ private:
 	[[nodiscard]] uint16 countBlockLength(
 		const TextBlocks::const_iterator &i,
 		const TextBlocks::const_iterator &e) const;
-	[[nodiscard]] ParagraphDetails *paragraphByIndex(int index) const;
-	[[nodiscard]] const style::ParagraphStyle &paragraphStyle(
-		not_null<ParagraphDetails*> info) const;
-	[[nodiscard]] QMargins paragraphPadding(ParagraphDetails *info) const;
-	[[nodiscard]] int paragraphMinWidth(ParagraphDetails *info) const;
-	[[nodiscard]] const QString &paragraphHeaderText(
-		ParagraphDetails *info) const;
+	[[nodiscard]] QuoteDetails *quoteByIndex(int index) const;
+	[[nodiscard]] const style::QuoteStyle &quoteStyle(
+		not_null<QuoteDetails*> quote) const;
+	[[nodiscard]] QMargins quotePadding(QuoteDetails *quote) const;
+	[[nodiscard]] int quoteMinWidth(QuoteDetails *quote) const;
+	[[nodiscard]] const QString &quoteHeaderText(QuoteDetails *quote) const;
 
 	// block must be either nullptr or a pointer to a NewlineBlock.
-	[[nodiscard]] int paragraphIndex(const AbstractBlock *block) const;
+	[[nodiscard]] int quoteIndex(const AbstractBlock *block) const;
 
 	// Template method for originalText(), originalTextWithEntities().
 	template <
@@ -425,7 +424,7 @@ private:
 	int _minResizeWidth = 0;
 	int _maxWidth = 0;
 	int _minHeight = 0;
-	uint16 _startParagraphIndex = 0;
+	uint16 _startQuoteIndex = 0;
 	bool _startParagraphLTR : 1 = false;
 	bool _startParagraphRTL : 1 = false;
 	bool _hasCustomEmoji : 1 = false;
@@ -433,7 +432,7 @@ private:
 	bool _isOnlyCustomEmoji : 1 = false;
 	bool _hasNotEmojiAndSpaces : 1 = false;
 	bool _skipBlockAddedNewline : 1 = false;
-	bool _endsWithParagraphDetails : 1 = false;
+	bool _endsWithQuote : 1 = false;
 
 	friend class Parser;
 	friend class Renderer;
diff --git a/ui/text/text_block.h b/ui/text/text_block.h
index ae7a4ce..aa51882 100644
--- a/ui/text/text_block.h
+++ b/ui/text/text_block.h
@@ -107,15 +107,15 @@ public:
 		uint16 linkIndex,
 		uint16 colorIndex);
 
-	[[nodiscard]] uint16 paragraphIndex() const {
-		return _paragraphIndex;
+	[[nodiscard]] uint16 quoteIndex() const {
+		return _quoteIndex;
 	}
 	[[nodiscard]] Qt::LayoutDirection paragraphDirection() const {
 		return UnpackParagraphDirection(_paragraphLTR, _paragraphRTL);
 	}
 
 private:
-	uint16 _paragraphIndex = 0;
+	uint16 _quoteIndex = 0;
 	bool _paragraphLTR : 1 = false;
 	bool _paragraphRTL : 1 = false;
 
diff --git a/ui/text/text_extended_data.h b/ui/text/text_extended_data.h
index f8901ca..f86177f 100644
--- a/ui/text/text_extended_data.h
+++ b/ui/text/text_extended_data.h
@@ -43,7 +43,7 @@ struct SpoilerData {
 	bool revealed = false;
 };
 
-struct ParagraphDetails {
+struct QuoteDetails {
 	QString language;
 	ClickHandlerPtr copy;
 	int copyWidth = 0;
@@ -56,7 +56,7 @@ struct ParagraphDetails {
 
 struct ExtendedData {
 	std::vector<ClickHandlerPtr> links;
-	std::vector<ParagraphDetails> paragraphs;
+	std::vector<QuoteDetails> quotes;
 	std::unique_ptr<SpoilerData> spoiler;
 	std::vector<Modification> modifications;
 };
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 080b138..393c59e 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -212,7 +212,7 @@ void Parser::createBlock(int32 skipBack) {
 	} else if (newline) {
 		push(&Block::Newline);
 		auto &newline = _t->_blocks.back().unsafe<NewlineBlock>();
-		newline._paragraphIndex = _paragraphIndex;
+		newline._quoteIndex = _quoteIndex;
 	} else {
 		push(&Block::Text, _t->_minResizeWidth);
 	}
@@ -233,7 +233,7 @@ void Parser::createNewlineBlock(bool fromOriginalText) {
 	createBlock();
 }
 
-void Parser::ensureAtNewline(ParagraphDetails details) {
+void Parser::ensureAtNewline(QuoteDetails quote) {
 	createBlock();
 	const auto lastType = _t->_blocks.empty()
 		? TextBlockType::Newline
@@ -243,15 +243,15 @@ void Parser::ensureAtNewline(ParagraphDetails details) {
 		createNewlineBlock(false);
 		_customEmojiData = base::take(saved);
 	}
-	auto &paragraphs = _t->ensureExtended()->paragraphs;
-	paragraphs.push_back(std::move(details));
-	const auto index = _paragraphIndex = int(paragraphs.size());
+	auto &quotes = _t->ensureExtended()->quotes;
+	quotes.push_back(std::move(quote));
+	const auto index = _quoteIndex = int(quotes.size());
 	if (_t->_blocks.empty()) {
-		_t->_startParagraphIndex = index;
+		_t->_startQuoteIndex = index;
 	} else {
 		auto &last = _t->_blocks.back();
 		Assert(last->type() == TextBlockType::Newline);
-		last.unsafe<NewlineBlock>()._paragraphIndex = index;
+		last.unsafe<NewlineBlock>()._quoteIndex = index;
 	}
 }
 
@@ -274,14 +274,14 @@ void Parser::finishEntities() {
 					if ((*flags)
 						& (TextBlockFlag::Pre
 							| TextBlockFlag::Blockquote)) {
-						_paragraphIndex = 0;
+						_quoteIndex = 0;
 						if (lastType != TextBlockType::Newline) {
 							_newlineAwaited = true;
 						} else if (_t->_blocks.empty()) {
-							_t->_startParagraphIndex = 0;
+							_t->_startQuoteIndex = 0;
 						} else {
 							auto &last = _t->_blocks.back();
-							last.unsafe<NewlineBlock>()._paragraphIndex = 0;
+							last.unsafe<NewlineBlock>()._quoteIndex = 0;
 						}
 					}
 					if (IsMono(*flags)) {
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index 20be972..c245e8f 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -11,7 +11,7 @@
 
 namespace Ui::Text {
 
-struct ParagraphDetails;
+struct QuoteDetails;
 
 class Parser {
 public:
@@ -60,7 +60,7 @@ private:
 	void blockCreated();
 	void createBlock(int32 skipBack = 0);
 	void createNewlineBlock(bool fromOriginalText);
-	void ensureAtNewline(ParagraphDetails details);
+	void ensureAtNewline(QuoteDetails quote);
 
 	// Returns true if at least one entity was parsed in the current position.
 	bool checkEntities();
@@ -115,7 +115,7 @@ private:
 	uint16 _linkIndex = 0;
 	uint16 _colorIndex = 0;
 	uint16 _monoIndex = 0;
-	uint16 _paragraphIndex = 0;
+	uint16 _quoteIndex = 0;
 	EmojiPtr _emoji = nullptr; // current emoji, if current word is an emoji, or zero
 	int32 _blockStart = 0; // offset in result, from which current parsed block is started
 	int32 _diacritics = 0; // diacritic chars skipped without good char
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index e7ec3c0..7e75bc0 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -179,8 +179,8 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 		? _originalPen
 		: _palette->selectFg->p;
 
-	_x = context.position.x();
-	_y = context.position.y();
+	_x = _startLeft = context.position.x();
+	_y = _startTop = context.position.y();
 	_yFrom = context.clip.isNull() ? 0 : context.clip.y();
 	_yTo = context.clip.isNull()
 		? -1
@@ -206,8 +206,8 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 		? (1. - _spoiler->revealAnimation.value(
 			_spoiler->revealed ? 1. : 0.))
 		: 0.;
-	_preBlockCache = context.pre;
-	_blockquoteBlockCache = context.blockquote;
+	_quotePreCache = context.pre;
+	_quoteBlockquoteCache = context.blockquote;
 	enumerate();
 }
 
@@ -227,13 +227,10 @@ void Renderer::enumerate() {
 		}
 	}
 
-	_startLeft = _x.toInt();
-	_startTop = _y;
-
 	if ((*_t->_blocks.cbegin())->type() != TextBlockType::Newline) {
 		initNextParagraph(
 			_t->_blocks.cbegin(),
-			_t->_startParagraphIndex,
+			_t->_startQuoteIndex,
 			UnpackParagraphDirection(
 				_t->_startParagraphLTR,
 				_t->_startParagraphRTL));
@@ -262,9 +259,9 @@ void Renderer::enumerate() {
 			if (!_lineHeight) {
 				_lineHeight = blockHeight;
 			}
-			const auto pindex = static_cast<const NewlineBlock*>(b)->paragraphIndex();
-			const auto changed = (_pindex != pindex);
-			fillParagraphBg(changed ? _ppadding.bottom() : 0);
+			const auto qindex = static_cast<const NewlineBlock*>(b)->quoteIndex();
+			const auto changed = (_quoteIndex != qindex);
+			fillParagraphBg(changed ? _quotePadding.bottom() : 0);
 			if (!drawLine((*i)->position(), i, e)) {
 				return;
 			}
@@ -277,7 +274,7 @@ void Renderer::enumerate() {
 
 			initNextParagraph(
 				i + 1,
-				pindex,
+				qindex,
 				static_cast<const NewlineBlock*>(b)->paragraphDirection());
 
 			longWordLine = true;
@@ -395,7 +392,7 @@ void Renderer::enumerate() {
 		continue;
 	}
 	if (_lineStart < _t->_text.size()) {
-		fillParagraphBg(_ppadding.bottom());
+		fillParagraphBg(_quotePadding.bottom());
 		if (!drawLine(_t->_text.size(), e, e)) {
 			return;
 		}
@@ -407,30 +404,31 @@ void Renderer::enumerate() {
 }
 
 void Renderer::fillParagraphBg(int paddingBottom) {
-	const auto cache = (!_p || !_paragraph)
+	const auto cache = (!_p || !_quote)
 		? nullptr
-		: _paragraph->pre
-		? _preBlockCache
-		: _paragraph->blockquote
-		? _blockquoteBlockCache
+		: _quote->pre
+		? _quotePreCache
+		: _quote->blockquote
+		? _quoteBlockquoteCache
 		: nullptr;
 	if (cache) {
-		const auto &st = _t->paragraphStyle(_paragraph);
-		auto &valid = _paragraph->pre
-			? _preBlockCacheValid
-			: _blockquoteBlockCacheValid;
+		const auto &st = _t->quoteStyle(_quote);
+		auto &valid = _quote->pre
+			? _quotePreValid
+			: _quoteBlockquoteValid;
 		if (!valid) {
 			valid = true;
-			ValidateBlockPaintCache(*cache, st);
+			ValidateQuotePaintCache(*cache, st);
 		}
 		const auto skip = st.verticalSkip;
-		const auto isTop = (_y != _blockLineTop);
+		const auto isTop = (_y != _quoteLineTop);
 		const auto isBottom = (paddingBottom != 0);
-		const auto top = _blockLineTop + (isTop ? skip : 0);
+		const auto left = _startLeft + _quoteShift;
+		const auto top = _quoteLineTop + (isTop ? skip : 0);
 		const auto fill = _y + _lineHeight + paddingBottom - top
 			- (isBottom ? skip : 0);
-		const auto rect = QRect(_startLeft, top, _startLineWidth, fill);
-		FillBlockPaint(*_p, rect, *cache, st, {
+		const auto rect = QRect(left, top, _startLineWidth, fill);
+		FillQuotePaint(*_p, rect, *cache, st, {
 			.skipTop = !isTop,
 			.skipBottom = !isBottom,
 		});
@@ -442,10 +440,10 @@ void Renderer::fillParagraphBg(int paddingBottom) {
 			const auto baseline = position + QPoint(0, font->ascent);
 			_p->setFont(font);
 			_p->setPen(_palette->monoFg->p);
-			_p->drawText(baseline, _t->paragraphHeaderText(_paragraph));
+			_p->drawText(baseline, _t->quoteHeaderText(_quote));
 		}
 	}
-	_blockLineTop = _y + _lineHeight + paddingBottom;
+	_quoteLineTop = _y + _lineHeight + paddingBottom;
 }
 
 StateResult Renderer::getState(
@@ -484,27 +482,28 @@ void Renderer::initNextParagraph(
 		String::TextBlocks::const_iterator i,
 		int16 paragraphIndex,
 		Qt::LayoutDirection direction) {
-	_parDirection = (direction == Qt::LayoutDirectionAuto)
+	_paragraphDirection = (direction == Qt::LayoutDirectionAuto)
 		? style::LayoutDirection()
 		: direction;
-	_parStartBlock = i;
+	_paragraphStartBlock = i;
 	_paragraphWidthRemaining = 0;
-	if (_pindex != paragraphIndex) {
-		_y += _ppadding.bottom();
-		_pindex = paragraphIndex;
-		_paragraph = _t->paragraphByIndex(paragraphIndex);
-		_ppadding = _t->paragraphPadding(_paragraph);
-		_blockLineTop = _y;
-		_y += _ppadding.top();
-		_ppadding.setTop(0);
+	if (_quoteIndex != paragraphIndex) {
+		_y += _quotePadding.bottom();
+		_quoteIndex = paragraphIndex;
+		_quote = _t->quoteByIndex(paragraphIndex);
+		_quotePadding = _t->quotePadding(_quote);
+		_quoteLineTop = _y;
+		_y += _quotePadding.top();
+		_quotePadding.setTop(0);
+		_quoteDirection = _paragraphDirection;
 	}
 	const auto e = _t->_blocks.cend();
 	if (i == e) {
-		_lineStart = _parStart = _t->_text.size();
+		_lineStart = _paragraphStart = _t->_text.size();
 		_lineStartBlock = _t->_blocks.size();
-		_parLength = 0;
+		_paragraphLength = 0;
 	} else {
-		_lineStart = _parStart = (*i)->position();
+		_lineStart = _paragraphStart = (*i)->position();
 		_lineStartBlock = i - _t->_blocks.cbegin();
 
 		auto last_rPadding = QFixed(0);
@@ -520,10 +519,13 @@ void Renderer::initNextParagraph(
 				- rBearing;
 			last_rBearing = rBearing;
 		}
-		_parLength = ((i == e) ? _t->_text.size() : (*i)->position()) - _parStart;
+		_paragraphLength = ((i == e)
+			? _t->_text.size()
+			: (*i)->position())
+			- _paragraphStart;
 	}
-	_parAnalysis.resize(0);
-	_paragraphWidthRemaining += _ppadding.left() + _ppadding.right();
+	_paragraphAnalysis.resize(0);
+	_paragraphWidthRemaining += _quotePadding.left() + _quotePadding.right();
 	initNextLine();
 }
 
@@ -533,31 +535,48 @@ void Renderer::initNextLine() {
 		.top = (_y - _startTop),
 		.width = _paragraphWidthRemaining.ceil().toInt(),
 	});
-	_blockLineTop += _startTop + line.top - _y;
-	_x = _startLeft + line.left + _ppadding.left();
+	_quoteLineTop += _startTop + line.top - _y;
+	_x = _startLeft + line.left + _quotePadding.left();
 	_y = _startTop + line.top;
 	_startLineWidth = line.width;
-	_lineWidth = _startLineWidth - _ppadding.left() - _ppadding.right();
+	_quoteShift = 0;
+	if (_quote && _quote->maxWidth < _startLineWidth) {
+		const auto delta = _startLineWidth - _quote->maxWidth;
+		_startLineWidth = _quote->maxWidth;
+
+		if (_align & Qt::AlignHCenter) {
+			_quoteShift = delta / 2;
+		} else if (((_align & Qt::AlignLeft)
+			&& (_quoteDirection == Qt::RightToLeft))
+			|| ((_align & Qt::AlignRight)
+				&& (_quoteDirection == Qt::LeftToRight))) {
+			_quoteShift = delta;
+		}
+		_x += _quoteShift;
+	}
+	_lineWidth = _startLineWidth
+		- _quotePadding.left()
+		- _quotePadding.right();
 	_wLeft = _lineWidth;
 	_elidedLine = line.elided;
 }
 
 void Renderer::initParagraphBidi() {
-	if (!_parLength || !_parAnalysis.isEmpty()) {
+	if (!_paragraphLength || !_paragraphAnalysis.isEmpty()) {
 		return;
 	}
 
-	String::TextBlocks::const_iterator i = _parStartBlock, e = _t->_blocks.cend(), n = i + 1;
+	String::TextBlocks::const_iterator i = _paragraphStartBlock, e = _t->_blocks.cend(), n = i + 1;
 
 	bool ignore = false;
-	bool rtl = (_parDirection == Qt::RightToLeft);
+	bool rtl = (_paragraphDirection == Qt::RightToLeft);
 	if (!ignore && !rtl) {
 		ignore = true;
-		const ushort *start = reinterpret_cast<const ushort*>(_str) + _parStart;
+		const ushort *start = reinterpret_cast<const ushort*>(_str) + _paragraphStart;
 		const ushort *curr = start;
-		const ushort *end = start + _parLength;
+		const ushort *end = start + _paragraphLength;
 		while (curr < end) {
-			while (n != e && (*n)->position() <= _parStart + (curr - start)) {
+			while (n != e && (*n)->position() <= _paragraphStart + (curr - start)) {
 				i = n;
 				++n;
 			}
@@ -572,21 +591,21 @@ void Renderer::initParagraphBidi() {
 		}
 	}
 
-	_parAnalysis.resize(_parLength);
-	QScriptAnalysis *analysis = _parAnalysis.data();
+	_paragraphAnalysis.resize(_paragraphLength);
+	QScriptAnalysis *analysis = _paragraphAnalysis.data();
 
 	BidiControl control(rtl);
 
-	_parHasBidi = false;
+	_paragraphHasBidi = false;
 	if (ignore) {
-		memset(analysis, 0, _parLength * sizeof(QScriptAnalysis));
+		memset(analysis, 0, _paragraphLength * sizeof(QScriptAnalysis));
 		if (rtl) {
-			for (int i = 0; i < _parLength; ++i)
+			for (int i = 0; i < _paragraphLength; ++i)
 				analysis[i].bidiLevel = 1;
-			_parHasBidi = true;
+			_paragraphHasBidi = true;
 		}
 	} else {
-		_parHasBidi = eBidiItemize(analysis, control);
+		_paragraphHasBidi = eBidiItemize(analysis, control);
 	}
 }
 
@@ -651,14 +670,17 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 	auto x = _x;
 	if (_align & Qt::AlignHCenter) {
 		x += (_wLeft / 2).toInt();
-	} else if (((_align & Qt::AlignLeft) && _parDirection == Qt::RightToLeft) || ((_align & Qt::AlignRight) && _parDirection == Qt::LeftToRight)) {
+	} else if (((_align & Qt::AlignLeft)
+		&& (_paragraphDirection == Qt::RightToLeft))
+		|| ((_align & Qt::AlignRight)
+			&& (_paragraphDirection == Qt::LeftToRight))) {
 		x += _wLeft;
 	}
 
 	if (!_p) {
 		if (_lookupX < x) {
 			if (_lookupSymbol) {
-				if (_parDirection == Qt::RightToLeft) {
+				if (_paragraphDirection == Qt::RightToLeft) {
 					_lookupResult.symbol = (_lineEnd > _lineStart) ? (_lineEnd - 1) : _lineStart;
 					_lookupResult.afterSymbol = (_lineEnd > _lineStart) ? true : false;
 					//						_lookupResult.uponSymbol = ((_lookupX >= _x) && (_lineEnd < _t->_text.size()) && (!_endBlock || _endBlock->type() != TextBlockType::Skip)) ? true : false;
@@ -674,7 +696,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 			_lookupResult.uponSymbol = false;
 			return false;
 		} else if (_lookupX >= x + (_lineWidth - _wLeft)) {
-			if (_parDirection == Qt::RightToLeft) {
+			if (_paragraphDirection == Qt::RightToLeft) {
 				_lookupResult.symbol = _lineStart;
 				_lookupResult.afterSymbol = false;
 				//					_lookupResult.uponSymbol = ((_lookupX < _x + _w) && (_lineStart > 0)) ? true : false;
@@ -700,14 +722,14 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 			&& (_selection.from <= trimmedLineEnd)
 			&& (!_endBlock || _endBlock->type() != TextBlockType::Skip);
 
-		if ((selectFromStart && _parDirection == Qt::LeftToRight)
-			|| (selectTillEnd && _parDirection == Qt::RightToLeft)) {
+		if ((selectFromStart && _paragraphDirection == Qt::LeftToRight)
+			|| (selectTillEnd && _paragraphDirection == Qt::RightToLeft)) {
 			if (x > _x) {
 				fillSelectRange({ _x, x });
 			}
 		}
-		if ((selectTillEnd && _parDirection == Qt::LeftToRight)
-			|| (selectFromStart && _parDirection == Qt::RightToLeft)) {
+		if ((selectTillEnd && _paragraphDirection == Qt::LeftToRight)
+			|| (selectFromStart && _paragraphDirection == Qt::RightToLeft)) {
 			if (x < _x + _wLeft) {
 				fillSelectRange({ x + _lineWidth - _wLeft, _x + _lineWidth });
 			}
@@ -723,7 +745,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 
 	_f = _t->_st->font;
 	QStackTextEngine engine(lineText, _f->f);
-	engine.option.setTextDirection(_parDirection);
+	engine.option.setTextDirection(_paragraphDirection);
 	_e = &engine;
 
 	eItemize();
@@ -813,7 +835,7 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 				}
 				if (_lookupSymbol) {
 					if (_type == TextBlockType::Skip) {
-						if (_parDirection == Qt::RightToLeft) {
+						if (_paragraphDirection == Qt::RightToLeft) {
 							_lookupResult.symbol = _lineStart;
 							_lookupResult.afterSymbol = false;
 						} else {
@@ -1291,19 +1313,25 @@ void Renderer::elideSaveBlock(int32 blockIndex, const AbstractBlock *&_endBlock,
 }
 
 void Renderer::setElideBidi(int32 elideStart, int32 elideLen) {
-	int32 newParLength = elideStart + elideLen - _parStart;
-	if (newParLength > _parAnalysis.size()) {
-		_parAnalysis.resize(newParLength);
+	int32 newParLength = elideStart + elideLen - _paragraphStart;
+	if (newParLength > _paragraphAnalysis.size()) {
+		_paragraphAnalysis.resize(newParLength);
 	}
 	for (int32 i = elideLen; i > 0; --i) {
-		_parAnalysis[newParLength - i].bidiLevel = (_parDirection == Qt::RightToLeft) ? 1 : 0;
+		_paragraphAnalysis[newParLength - i].bidiLevel
+			= (_paragraphDirection == Qt::RightToLeft) ? 1 : 0;
 	}
 }
 
-void Renderer::prepareElidedLine(QString &lineText, int32 lineStart, int32 &lineLength, const AbstractBlock *&_endBlock, int repeat) {
+void Renderer::prepareElidedLine(
+		QString &lineText,
+		int32 lineStart,
+		int32 &lineLength,
+		const AbstractBlock *&_endBlock,
+		int repeat) {
 	_f = _t->_st->font;
 	QStackTextEngine engine(lineText, _f->f);
-	engine.option.setTextDirection(_parDirection);
+	engine.option.setTextDirection(_paragraphDirection);
 	_e = &engine;
 
 	eItemize();
@@ -1318,7 +1346,10 @@ void Renderer::prepareElidedLine(QString &lineText, int32 lineStart, int32 &line
 	eShapeLine(line);
 
 	auto elideWidth = _f->elidew;
-	_wLeft = _lineWidth - _ppadding.left() - _ppadding.right() - elideWidth;
+	_wLeft = _lineWidth
+		- _quotePadding.left()
+		- _quotePadding.right()
+		- elideWidth;
 
 	int firstItem = engine.findItem(line.from), lastItem = engine.findItem(line.from + line.length - 1);
 	int nItems = (firstItem >= 0 && lastItem >= firstItem) ? (lastItem - firstItem + 1) : 0, i;
@@ -1518,8 +1549,8 @@ void Renderer::eItemize() {
 	auto currentBlock = _t->_blocks[blockIndex].get();
 	auto nextBlock = (++blockIndex < _blocksSize) ? _t->_blocks[blockIndex].get() : nullptr;
 
-	_e->layoutData->hasBidi = _parHasBidi;
-	auto analysis = _parAnalysis.data() + (_localFrom - _parStart);
+	_e->layoutData->hasBidi = _paragraphHasBidi;
+	auto analysis = _paragraphAnalysis.data() + (_localFrom - _paragraphStart);
 
 	{
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
@@ -1568,7 +1599,7 @@ void Renderer::eItemize() {
 
 	{
 		auto i_string = &_e->layoutData->string;
-		auto i_analysis = _parAnalysis.data() + (_localFrom - _parStart);
+		auto i_analysis = _paragraphAnalysis.data() + (_localFrom - _paragraphStart);
 		auto i_items = &_e->layoutData->items;
 
 		blockIndex = _lineStartBlock;
@@ -1623,18 +1654,18 @@ QChar::Direction Renderer::eSkipBoundryNeutrals(
 
 	QChar::Direction dir = control.basicDirection();
 	int level = sor > 0 ? analysis[sor - 1].bidiLevel : control.level;
-	while (sor <= _parLength) {
-		while (i != _parStartBlock && (*i)->position() > _parStart + sor) {
+	while (sor <= _paragraphLength) {
+		while (i != _paragraphStartBlock && (*i)->position() > _paragraphStart + sor) {
 			n = i;
 			--i;
 		}
-		while (n != e && (*n)->position() <= _parStart + sor) {
+		while (n != e && (*n)->position() <= _paragraphStart + sor) {
 			i = n;
 			++n;
 		}
 
 		TextBlockType _itype = (*i)->type();
-		if (eor == _parLength)
+		if (eor == _paragraphLength)
 			dir = control.basicDirection();
 		else if (_itype == TextBlockType::Emoji
 			|| _itype == TextBlockType::CustomEmoji)
@@ -1662,16 +1693,16 @@ bool Renderer::eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
 	int sor = 0;
 	int eor = -1;
 
-	const ushort *unicode = reinterpret_cast<const ushort*>(_t->_text.unicode()) + _parStart;
+	const ushort *unicode = reinterpret_cast<const ushort*>(_t->_text.unicode()) + _paragraphStart;
 	int current = 0;
 
 	QChar::Direction dir = rightToLeft ? QChar::DirR : QChar::DirL;
 	BidiStatus status;
 
-	String::TextBlocks::const_iterator i = _parStartBlock, e = _t->_blocks.cend(), n = i + 1;
+	String::TextBlocks::const_iterator i = _paragraphStartBlock, e = _t->_blocks.cend(), n = i + 1;
 
 	QChar::Direction sdir;
-	TextBlockType _stype = (*_parStartBlock)->type();
+	TextBlockType _stype = (*_paragraphStartBlock)->type();
 	if (_stype == TextBlockType::Emoji || _stype == TextBlockType::CustomEmoji)
 		sdir = QChar::DirCS;
 	else if (_stype == TextBlockType::Skip)
@@ -1688,15 +1719,15 @@ bool Renderer::eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
 	status.last = status.lastStrong;
 	status.dir = sdir;
 
-	while (current <= _parLength) {
-		while (n != e && (*n)->position() <= _parStart + current) {
+	while (current <= _paragraphLength) {
+		while (n != e && (*n)->position() <= _paragraphStart + current) {
 			i = n;
 			++n;
 		}
 
 		QChar::Direction dirCurrent;
 		TextBlockType _itype = (*i)->type();
-		if (current == (int)_parLength)
+		if (current == (int)_paragraphLength)
 			dirCurrent = control.basicDirection();
 		else if (_itype == TextBlockType::Emoji
 			|| _itype == TextBlockType::CustomEmoji)
@@ -2020,7 +2051,7 @@ bool Renderer::eBidiItemize(QScriptAnalysis *analysis, BidiControl &control) {
 			break;
 		}
 
-		if (current >= (int)_parLength) break;
+		if (current >= (int)_paragraphLength) break;
 
 		// set status.last as needed.
 		switch (dirCurrent) {
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 08bc5de..3d39c6f 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -151,20 +151,25 @@ private:
 	int _indexOfElidedBlock = -1; // For spoilers.
 
 	// current paragraph data
-	String::TextBlocks::const_iterator _parStartBlock;
-	Qt::LayoutDirection _parDirection = Qt::LayoutDirectionAuto;
-	int _parStart = 0;
-	int _parLength = 0;
-	bool _parHasBidi = false;
-	QVarLengthArray<QScriptAnalysis, 4096> _parAnalysis;
-	ParagraphDetails *_paragraph = nullptr;
-	int _pindex = 0;
-	QMargins _ppadding;
-	int _blockLineTop = 0;
-	BlockPaintCache *_preBlockCache = nullptr;
-	BlockPaintCache *_blockquoteBlockCache = nullptr;
-	bool _preBlockCacheValid = false;
-	bool _blockquoteBlockCacheValid = false;
+	String::TextBlocks::const_iterator _paragraphStartBlock;
+	Qt::LayoutDirection _paragraphDirection = Qt::LayoutDirectionAuto;
+	int _paragraphStart = 0;
+	int _paragraphLength = 0;
+	bool _paragraphHasBidi = false;
+	QVarLengthArray<QScriptAnalysis, 4096> _paragraphAnalysis;
+	QFixed _paragraphWidthRemaining = 0;
+
+	// current quote data
+	QuoteDetails *_quote = nullptr;
+	Qt::LayoutDirection _quoteDirection = Qt::LayoutDirectionAuto;
+	int _quoteShift = 0;
+	int _quoteIndex = 0;
+	QMargins _quotePadding;
+	int _quoteLineTop = 0;
+	QuotePaintCache *_quotePreCache = nullptr;
+	QuotePaintCache *_quoteBlockquoteCache = nullptr;
+	bool _quotePreValid = false;
+	bool _quoteBlockquoteValid = false;
 
 	// current line data
 	QTextEngine *_e = nullptr;
@@ -189,7 +194,6 @@ private:
 	int _localFrom = 0;
 	int _lineStartBlock = 0;
 	QFixed _lineWidth = 0;
-	QFixed _paragraphWidthRemaining = 0;
 
 	// link and symbol resolve
 	QFixed _lookupX = 0;

From 8915f5d40d1040f8408a59dfb552aaee73705a4e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 17 Oct 2023 12:01:50 +0400
Subject: [PATCH 532/635] Fix modifications tracking with skip block.

---
 ui/text/text.cpp        | 57 ++++++++++++++++++++++++++++++++++++++---
 ui/text/text.h          |  2 ++
 ui/text/text_parser.cpp | 35 +++++--------------------
 3 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index a4ba32e..af66be4 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -673,9 +673,12 @@ bool String::updateSkipBlock(int width, int height) {
 		if (block->f_width().toInt() == width && block->height() == height) {
 			return false;
 		}
-		_text.resize(block->position());
+		const auto size = block->position();
+		_text.resize(size);
 		_blocks.pop_back();
+		removeModificationsAfter(size);
 	} else if (_endsWithQuote) {
+		insertModifications(_text.size(), 1);
 		_text.push_back(QChar::LineFeed);
 		_blocks.push_back(Block::Newline(
 			_st->font,
@@ -687,6 +690,7 @@ bool String::updateSkipBlock(int width, int height) {
 			0));
 		_skipBlockAddedNewline = true;
 	}
+	insertModifications(_text.size(), 1);
 	_text.push_back('_');
 	_blocks.push_back(Block::Skip(
 		_st->font,
@@ -704,18 +708,65 @@ bool String::removeSkipBlock() {
 	if (_blocks.empty() || _blocks.back()->type() != TextBlockType::Skip) {
 		return false;
 	} else if (_skipBlockAddedNewline) {
-		_text.resize(_blocks.back()->position() - 1);
+		const auto size = _blocks.back()->position() - 1;
+		_text.resize(size);
 		_blocks.pop_back();
 		_blocks.pop_back();
 		_skipBlockAddedNewline = false;
+		removeModificationsAfter(size);
 	} else {
-		_text.resize(_blocks.back()->position());
+		const auto size = _blocks.back()->position();
+		_text.resize(size);
 		_blocks.pop_back();
+		removeModificationsAfter(size);
 	}
 	recountNaturalSize(false);
 	return true;
 }
 
+void String::insertModifications(int position, int delta) {
+	auto &modifications = ensureExtended()->modifications;
+	auto i = end(modifications);
+	while (i != begin(modifications) && (--i)->position >= position) {
+		if (i->position < position) {
+			break;
+		} else if (delta > 0) {
+			++i->position;
+		} else if (i->position == position) {
+			break;
+		}
+	}
+	if (i != end(modifications) && i->position == position) {
+		++i->skipped;
+	} else {
+		modifications.insert(i, {
+			.position = position,
+			.skipped = uint16(delta < 0 ? (-delta) : 0),
+			.added = (delta > 0),
+		});
+	}
+}
+
+void String::removeModificationsAfter(int size) {
+	if (!_extended) {
+		return;
+	}
+	auto &modifications = _extended->modifications;
+	for (auto i = end(modifications); i != begin(modifications);) {
+		--i;
+		if (i->position > size) {
+			i = modifications.erase(i);
+		} else if (i->position == size) {
+			i->added = false;
+			if (!i->skipped) {
+				i = modifications.erase(i);
+			}
+		} else {
+			break;
+		}
+	}
+}
+
 int String::countWidth(int width, bool breakEverywhere) const {
 	if (QFixed(width) >= _maxWidth) {
 		return _maxWidth;
diff --git a/ui/text/text.h b/ui/text/text.h
index 4ee53ec..bb412a1 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -407,6 +407,8 @@ private:
 		bool breakEverywhere,
 		Callback callback) const;
 
+	void insertModifications(int position, int delta);
+	void removeModificationsAfter(int size);
 	void recountNaturalSize(
 		bool initial,
 		Qt::LayoutDirection optionsDir = Qt::LayoutDirectionAuto);
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 393c59e..27de57a 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -183,7 +183,7 @@ void Parser::createBlock(int32 skipBack) {
 	if (_newlineAwaited) {
 		_newlineAwaited = false;
 		if (!newline) {
-			updateModifications(_blockStart, 1);
+			_t->insertModifications(_blockStart, 1);
 			_t->_text.insert(_blockStart, QChar::LineFeed);
 			createBlock(skipBack - length);
 		}
@@ -226,7 +226,7 @@ void Parser::createBlock(int32 skipBack) {
 
 void Parser::createNewlineBlock(bool fromOriginalText) {
 	if (!fromOriginalText) {
-		updateModifications(_t->_text.size(), 1);
+		_t->insertModifications(_t->_text.size(), 1);
 	}
 	_t->_text.push_back(QChar::LineFeed);
 	_allowDiacritic = false;
@@ -523,7 +523,9 @@ void Parser::parseCurrentChar() {
 	}
 
 	if (skip) {
-		updateModifications(_t->_text.size(), -1);
+		if (_ptr < _end) {
+			_t->insertModifications(_t->_text.size(), -1);
+		}
 		_ch = 0;
 		_allowDiacritic = false;
 	} else {
@@ -572,7 +574,7 @@ void Parser::parseEmojiFromCurrent() {
 		Assert(!_t->_text.isEmpty());
 		const auto last = _t->_text[_t->_text.size() - 1];
 		if (last.unicode() != Emoji::kPostfix) {
-			updateModifications(_t->_text.size(), 1);
+			_t->insertModifications(_t->_text.size(), 1);
 			_t->_text.push_back(QChar(Emoji::kPostfix));
 			++len;
 		}
@@ -602,29 +604,6 @@ bool Parser::isLinkEntity(const EntityInText &entity) const {
 	return ranges::find(urls, type) != std::end(urls);
 }
 
-void Parser::updateModifications(int index, int delta) {
-	auto &modifications = _t->ensureExtended()->modifications;
-	auto i = end(modifications);
-	while (i != begin(modifications) && (--i)->position >= index) {
-		if (i->position < index) {
-			break;
-		} else if (delta > 0) {
-			++i->position;
-		} else if (i->position == index) {
-			break;
-		}
-	}
-	if (i != end(modifications) && i->position == index) {
-		++i->skipped;
-	} else {
-		modifications.insert(i, {
-			.position = index,
-			.skipped = uint16(delta < 0 ? 1 : 0),
-			.added = (delta > 0),
-		});
-	}
-}
-
 void Parser::parse(const TextParseOptions &options) {
 	skipBadEntities();
 	trimSourceRange();
@@ -636,7 +615,7 @@ void Parser::parse(const TextParseOptions &options) {
 	_t->_text.reserve(_end - _ptr);
 
 	if (_ptr > _start) {
-		updateModifications(0, -(_ptr - _start));
+		_t->insertModifications(0, -(_ptr - _start));
 	}
 
 	for (; _ptr <= _end; ++_ptr) {

From 5ffbb90fd6c16f4ce2f62b6d81685d20acb71e4f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 17 Oct 2023 20:12:53 +0400
Subject: [PATCH 533/635] Fix build with Xcode.

---
 ui/text/text.h          | 2 +-
 ui/text/text_renderer.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/text/text.h b/ui/text/text.h
index bb412a1..d275895 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -76,7 +76,7 @@ static constexpr TextSelection AllTextSelection = { 0, 0xFFFF };
 
 namespace Ui::Text {
 
-struct Block;
+class Block;
 class AbstractBlock;
 struct IsolatedEmoji;
 struct OnlyCustomEmoji;
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 3d39c6f..600ce62 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -17,7 +17,7 @@ struct QScriptLine;
 
 namespace Ui::Text {
 
-struct AbstractBlock;
+class AbstractBlock;
 
 struct FixedRange {
 	QFixed from;

From 17d73a5c0cb7350a2330b85347a919ad639ad1cf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 19 Oct 2023 16:09:38 +0400
Subject: [PATCH 534/635] Add copy code blocks on header click.

---
 ui/integration.cpp             |   6 ++
 ui/integration.h               |   1 +
 ui/text/text.cpp               | 101 ++++++++++++++++++++++++++-------
 ui/text/text_extended_data.cpp |  37 ++++++++++++
 ui/text/text_extended_data.h   |  18 +++++-
 ui/text/text_parser.cpp        |  13 +++++
 ui/text/text_parser.h          |   1 +
 ui/text/text_renderer.cpp      |  67 +++++++++++++---------
 8 files changed, 196 insertions(+), 48 deletions(-)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index 620b9d0..5d23a95 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -9,6 +9,7 @@
 #include "ui/gl/gl_detection.h"
 #include "ui/text/text_entity.h"
 #include "ui/text/text_block.h"
+#include "ui/toast/toast.h"
 #include "ui/basic_click_handlers.h"
 #include "base/platform/base_platform_info.h"
 
@@ -88,6 +89,11 @@ bool Integration::handleUrlClick(
 	return false;
 }
 
+bool Integration::copyPreOnClick(const QVariant &context) {
+	Toast::Show(u"Code copied to clipboard."_q);
+	return true;
+}
+
 QString Integration::convertTagToMimeTag(const QString &tagId) {
 	return tagId;
 }
diff --git a/ui/integration.h b/ui/integration.h
index e6847f6..ae169b4 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -57,6 +57,7 @@ public:
 	[[nodiscard]] virtual bool handleUrlClick(
 		const QString &url,
 		const QVariant &context);
+	[[nodiscard]] virtual bool copyPreOnClick(const QVariant &context);
 	[[nodiscard]] virtual QString convertTagToMimeTag(const QString &tagId);
 	[[nodiscard]] virtual const Emoji::One *defaultEmojiVariant(
 		const Emoji::One *emoji);
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index af66be4..9360676 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -239,6 +239,7 @@ void ValidateQuotePaintCache(
 	p.setClipRect(outline, header, side - outline, side - header);
 	p.drawRoundedRect(0, 0, side, side, radius, radius);
 	if (icon) {
+		p.setClipping(false);
 		const auto left = side - icon->width() - st.iconPosition.x();
 		const auto top = st.iconPosition.y();
 		icon->paint(p, left, top, side, cache.icon);
@@ -364,13 +365,23 @@ String::ExtendedWrap::~ExtendedWrap() = default;
 
 void String::ExtendedWrap::adjustFrom(const ExtendedWrap *other) {
 	const auto data = get();
-	if (data && data->spoiler) {
-		const auto raw = [](auto pointer) {
-			return reinterpret_cast<quintptr>(pointer);
-		};
-		const auto otherText = raw(data->spoiler->link->text().get());
-		data->spoiler->link->setText(
+	const auto raw = [](auto pointer) {
+		return reinterpret_cast<quintptr>(pointer);
+	};
+	const auto adjust = [&](auto &link) {
+		const auto otherText = raw(link->text().get());
+		link->setText(
 			reinterpret_cast<String*>(otherText + raw(this) - raw(other)));
+	};
+	if (data) {
+		if (data->spoiler) {
+			adjust(data->spoiler->link);
+		}
+		for (auto &quote : data->quotes) {
+			if (quote.copy) {
+				adjust(quote.copy);
+			}
+		}
 	}
 }
 
@@ -1184,14 +1195,27 @@ int String::quoteMinWidth(QuoteDetails *quote) const {
 	}
 	const auto qpadding = quotePadding(quote);
 	const auto &qheader = quoteHeaderText(quote);
-	const auto qst = quote ? &quoteStyle(quote) : nullptr;
-	return qpadding.left()
-		+ (qheader.isEmpty() ? 0 : _st->font->monospace()->width(qheader))
+	const auto &qst = quoteStyle(quote);
+	const auto radius = qst.radius;
+	const auto header = qst.header;
+	const auto outline = qst.outline;
+	const auto iconsize = (!qst.icon.empty())
+		? std::max(
+			qst.icon.width() + qst.iconPosition.x(),
+			qst.icon.height() + qst.iconPosition.y())
+		: 0;
+	const auto corner = std::max({ header, radius, outline, iconsize });
+	const auto top = qpadding.left()
+		+ (qheader.isEmpty()
+			? 0
+			: (_st->font->monospace()->width(qheader)
+				+ _st->pre.headerPosition.x()))
 		+ std::max(
 			qpadding.right(),
-			((qst && !qst->icon.empty())
-				? (qst->iconPosition.x() + qst->icon.width())
+			(!qst.icon.empty()
+				? (qst.iconPosition.x() + qst.icon.width())
 				: 0));
+	return std::max(top, 2 * corner);
 }
 
 const QString &String::quoteHeaderText(QuoteDetails *quote) const {
@@ -1221,11 +1245,19 @@ void String::enumerateText(
 
 	int linkIndex = 0;
 	uint16 linkPosition = 0;
+	int quoteIndex = _startQuoteIndex;
 
-	int32 flags = 0;
+	TextBlockFlags flags = {};
 	for (auto i = _blocks.cbegin(), e = _blocks.cend(); true; ++i) {
-		const auto blockPosition = (i == e) ? uint16(_text.size()) : (*i)->position();
+		const auto blockPosition = (i == e)
+			? uint16(_text.size())
+			: (*i)->position();
 		const auto blockFlags = (i == e) ? TextBlockFlags() : (*i)->flags();
+		const auto blockQuoteIndex = (i == e)
+			? 0
+			: ((*i)->type() != TextBlockType::Newline)
+			? quoteIndex
+			: static_cast<const NewlineBlock*>(i->get())->quoteIndex();
 		const auto blockLinkIndex = [&] {
 			if (IsMono(blockFlags) || (i == e)) {
 				return 0;
@@ -1240,7 +1272,10 @@ void String::enumerateText(
 				auto rangeFrom = qMax(selection.from, linkPosition);
 				auto rangeTo = qMin(selection.to, blockPosition);
 				if (rangeTo > rangeFrom) { // handle click handler
-					const auto r = base::StringViewMid(_text, rangeFrom, rangeTo - rangeFrom);
+					const auto r = base::StringViewMid(
+						_text,
+						rangeFrom,
+						rangeTo - rangeFrom);
 					// Ignore links that are partially copied.
 					const auto handler = (linkPosition != rangeFrom
 						|| blockPosition != rangeTo
@@ -1267,11 +1302,20 @@ void String::enumerateText(
 
 		const auto checkBlockFlags = (blockPosition >= selection.from)
 			&& (blockPosition <= selection.to);
-		if (checkBlockFlags && blockFlags != flags) {
-			flagsChangeCallback(flags, blockFlags);
+		if (checkBlockFlags
+			&& (blockFlags != flags
+				|| ((flags & TextBlockFlag::Pre)
+					&& blockQuoteIndex != quoteIndex))) {
+			flagsChangeCallback(
+				flags,
+				quoteIndex,
+				blockFlags,
+				blockQuoteIndex);
 			flags = blockFlags;
 		}
-		if (i == e || (linkIndex ? linkPosition : blockPosition) >= selection.to) {
+		quoteIndex = blockQuoteIndex;
+		if (i == e
+			|| (linkIndex ? linkPosition : blockPosition) >= selection.to) {
 			break;
 		}
 
@@ -1393,18 +1437,33 @@ TextForMimeData String::toText(
 			{ TextBlockFlag::Pre, EntityType::Pre },
 			{ TextBlockFlag::Blockquote, EntityType::Blockquote },
 		} : std::vector<MarkdownTagTracker>();
-	const auto flagsChangeCallback = [&](int32 oldFlags, int32 newFlags) {
+	const auto flagsChangeCallback = [&](
+			TextBlockFlags oldFlags,
+			int oldQuoteIndex,
+			TextBlockFlags newFlags,
+			int newQuoteIndex) {
 		if (!composeEntities) {
 			return;
 		}
 		for (auto &tracker : markdownTrackers) {
 			const auto flag = tracker.flag;
-			if ((oldFlags & flag) && !(newFlags & flag)) {
+			const auto quoteWithLanguage = (flag == TextBlockFlag::Pre);
+			const auto quoteWithLanguageChanged = quoteWithLanguage
+				&& (oldQuoteIndex != newQuoteIndex);
+			const auto data = (quoteWithLanguage && oldQuoteIndex)
+				? _extended->quotes[oldQuoteIndex - 1].language
+				: QString();
+			if (((oldFlags & flag) && !(newFlags & flag))
+				|| quoteWithLanguageChanged) {
 				insertEntity({
 					tracker.type,
 					tracker.start,
-					int(result.rich.text.size()) - tracker.start });
-			} else if ((newFlags & flag) && !(oldFlags & flag)) {
+					int(result.rich.text.size()) - tracker.start,
+					data,
+				});
+			}
+			if (((newFlags & flag) && !(oldFlags & flag))
+				|| quoteWithLanguageChanged) {
 				tracker.start = result.rich.text.size();
 			}
 		}
diff --git a/ui/text/text_extended_data.cpp b/ui/text/text_extended_data.cpp
index 38cb0e7..dbae483 100644
--- a/ui/text/text_extended_data.cpp
+++ b/ui/text/text_extended_data.cpp
@@ -7,6 +7,7 @@
 #include "ui/text/text_extended_data.h"
 
 #include "ui/text/text.h"
+#include "ui/integration.h"
 
 namespace Ui::Text {
 
@@ -32,5 +33,41 @@ void SpoilerClickHandler::onClick(ClickContext context) const {
 	_text->setSpoilerRevealed(true, anim::type::normal);
 }
 
+PreClickHandler::PreClickHandler(
+	not_null<String*> text,
+	uint16 offset,
+	uint16 length)
+: _text(text)
+, _offset(offset)
+, _length(length) {
+}
+
+not_null<String*> PreClickHandler::text() const {
+	return _text;
+}
+
+void PreClickHandler::setText(not_null<String*> text) {
+	_text = text;
+}
+
+void PreClickHandler::onClick(ClickContext context) const {
+	if (context.button != Qt::LeftButton) {
+		return;
+	}
+	const auto till = uint16(_offset + _length);
+	auto text = _text->toTextForMimeData({ _offset, till });
+	if (text.empty()) {
+		return;
+	} else if (!text.rich.text.endsWith('\n')) {
+		text.rich.text.append('\n');
+	}
+	if (!text.expanded.endsWith('\n')) {
+		text.expanded.append('\n');
+	}
+	if (Integration::Instance().copyPreOnClick(context.other)) {
+		TextUtilities::SetClipboardText(std::move(text));
+	}
+}
+
 } // namespace Ui::Text
 
diff --git a/ui/text/text_extended_data.h b/ui/text/text_extended_data.h
index f86177f..a0b25fa 100644
--- a/ui/text/text_extended_data.h
+++ b/ui/text/text_extended_data.h
@@ -32,6 +32,22 @@ private:
 
 };
 
+class PreClickHandler final : public ClickHandler {
+public:
+	PreClickHandler(not_null<String*> text, uint16 offset, uint16 length);
+
+	[[nodiscard]] not_null<String*> text() const;
+	void setText(not_null<String*> text);
+
+	void onClick(ClickContext context) const override;
+
+private:
+	not_null<String*> _text;
+	uint16 _offset = 0;
+	uint16 _length = 0;
+
+};
+
 struct SpoilerData {
 	explicit SpoilerData(Fn<void()> repaint)
 	: animation(std::move(repaint)) {
@@ -45,7 +61,7 @@ struct SpoilerData {
 
 struct QuoteDetails {
 	QString language;
-	ClickHandlerPtr copy;
+	std::shared_ptr<PreClickHandler> copy;
 	int copyWidth = 0;
 	int maxWidth = 0;
 	int minHeight = 0;
diff --git a/ui/text/text_parser.cpp b/ui/text/text_parser.cpp
index 27de57a..816eab6 100644
--- a/ui/text/text_parser.cpp
+++ b/ui/text/text_parser.cpp
@@ -243,6 +243,7 @@ void Parser::ensureAtNewline(QuoteDetails quote) {
 		createNewlineBlock(false);
 		_customEmojiData = base::take(saved);
 	}
+	_quoteStartPosition = _t->_text.size();
 	auto &quotes = _t->ensureExtended()->quotes;
 	quotes.push_back(std::move(quote));
 	const auto index = _quoteIndex = int(quotes.size());
@@ -274,6 +275,18 @@ void Parser::finishEntities() {
 					if ((*flags)
 						& (TextBlockFlag::Pre
 							| TextBlockFlag::Blockquote)) {
+						if (_quoteIndex) {
+							auto &quotes = _t->ensureExtended()->quotes;
+							auto &quote = quotes[_quoteIndex - 1];
+							const auto from = _quoteStartPosition;
+							const auto till = _t->_text.size();
+							if (quote.pre && till > from) {
+								quote.copy = std::make_shared<PreClickHandler>(
+									_t,
+									from,
+									till - from);
+							}
+						}
 						_quoteIndex = 0;
 						if (lastType != TextBlockType::Newline) {
 							_newlineAwaited = true;
diff --git a/ui/text/text_parser.h b/ui/text/text_parser.h
index c245e8f..847aca9 100644
--- a/ui/text/text_parser.h
+++ b/ui/text/text_parser.h
@@ -116,6 +116,7 @@ private:
 	uint16 _colorIndex = 0;
 	uint16 _monoIndex = 0;
 	uint16 _quoteIndex = 0;
+	int _quoteStartPosition = 0;
 	EmojiPtr _emoji = nullptr; // current emoji, if current word is an emoji, or zero
 	int32 _blockStart = 0; // offset in result, from which current parsed block is started
 	int32 _diacritics = 0; // diacritic chars skipped without good char
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 7e75bc0..70eae12 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -404,22 +404,8 @@ void Renderer::enumerate() {
 }
 
 void Renderer::fillParagraphBg(int paddingBottom) {
-	const auto cache = (!_p || !_quote)
-		? nullptr
-		: _quote->pre
-		? _quotePreCache
-		: _quote->blockquote
-		? _quoteBlockquoteCache
-		: nullptr;
-	if (cache) {
+	if (_quote) {
 		const auto &st = _t->quoteStyle(_quote);
-		auto &valid = _quote->pre
-			? _quotePreValid
-			: _quoteBlockquoteValid;
-		if (!valid) {
-			valid = true;
-			ValidateQuotePaintCache(*cache, st);
-		}
 		const auto skip = st.verticalSkip;
 		const auto isTop = (_y != _quoteLineTop);
 		const auto isBottom = (paddingBottom != 0);
@@ -428,19 +414,48 @@ void Renderer::fillParagraphBg(int paddingBottom) {
 		const auto fill = _y + _lineHeight + paddingBottom - top
 			- (isBottom ? skip : 0);
 		const auto rect = QRect(left, top, _startLineWidth, fill);
-		FillQuotePaint(*_p, rect, *cache, st, {
-			.skipTop = !isTop,
-			.skipBottom = !isBottom,
-		});
 
+		const auto cache = (!_p || !_quote)
+			? nullptr
+			: _quote->pre
+			? _quotePreCache
+			: _quote->blockquote
+			? _quoteBlockquoteCache
+			: nullptr;
+		if (cache) {
+			auto &valid = _quote->pre
+				? _quotePreValid
+				: _quoteBlockquoteValid;
+			if (!valid) {
+				valid = true;
+				ValidateQuotePaintCache(*cache, st);
+			}
+			FillQuotePaint(*_p, rect, *cache, st, {
+				.skipTop = !isTop,
+				.skipBottom = !isBottom,
+			});
+		}
 		if (isTop && st.header > 0) {
-			const auto font = _t->_st->font->monospace();
-			const auto topleft = rect.topLeft();
-			const auto position = topleft + st.headerPosition;
-			const auto baseline = position + QPoint(0, font->ascent);
-			_p->setFont(font);
-			_p->setPen(_palette->monoFg->p);
-			_p->drawText(baseline, _t->quoteHeaderText(_quote));
+			if (_p) {
+				const auto font = _t->_st->font->monospace();
+				const auto topleft = rect.topLeft();
+				const auto position = topleft + st.headerPosition;
+				const auto lbaseline = position + QPoint(0, font->ascent);
+				_p->setFont(font);
+				_p->setPen(_palette->monoFg->p);
+				_p->drawText(lbaseline, _t->quoteHeaderText(_quote));
+			} else if (_lookupX >= left
+				&& _lookupX < left + _startLineWidth
+				&& _lookupY >= top
+				&& _lookupY < top + st.header) {
+				if (_lookupLink) {
+					_lookupResult.link = _quote->copy;
+				}
+				if (_lookupSymbol) {
+					_lookupResult.symbol = _lineStart;
+					_lookupResult.afterSymbol = false;
+				}
+			}
 		}
 	}
 	_quoteLineTop = _y + _lineHeight + paddingBottom;

From 1a9c4162cc7230ccc9179bb813a05ca3f713c4a5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 21 Oct 2023 22:28:06 +0400
Subject: [PATCH 535/635] Fix build with GCC.

---
 ui/text/text.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 9360676..3b162e8 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -224,7 +224,6 @@ void ValidateQuotePaintCache(
 	auto hq = PainterHighQualityEnabler(p);
 	p.setPen(Qt::NoPen);
 
-	auto rect = QRect(QPoint(), full);
 	if (header) {
 		p.setBrush(cache.header);
 		p.setClipRect(outline, 0, side - outline, header);

From 4d1a5686a7620b163639492e1b81101b677d2472 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 23 Oct 2023 08:49:34 +0400
Subject: [PATCH 536/635] Fix crash in non-clickable spoilers.

---
 ui/text/text.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 3b162e8..25c983a 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -373,8 +373,10 @@ void String::ExtendedWrap::adjustFrom(const ExtendedWrap *other) {
 			reinterpret_cast<String*>(otherText + raw(this) - raw(other)));
 	};
 	if (data) {
-		if (data->spoiler) {
-			adjust(data->spoiler->link);
+		if (const auto spoiler = data->spoiler.get()) {
+			if (spoiler->link) {
+				adjust(spoiler->link);
+			}
 		}
 		for (auto &quote : data->quotes) {
 			if (quote.copy) {

From 71d24af3a840d15a6cc0a3a8a1e9cbe77a604739 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 23 Oct 2023 14:58:10 +0400
Subject: [PATCH 537/635] Support two-color quote outlines.

---
 ui/text/text.cpp          | 154 ++++++++++++++++++++++++--------------
 ui/text/text.h            |  14 +++-
 ui/text/text_renderer.cpp |   5 +-
 ui/text/text_renderer.h   |   1 +
 4 files changed, 112 insertions(+), 62 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 25c983a..2e5e570 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -191,13 +191,15 @@ void ValidateQuotePaintCache(
 	const auto icon = st.icon.empty() ? nullptr : &st.icon;
 	if (!cache.corners.isNull()
 		&& cache.bgCached == cache.bg
-		&& cache.outlineCached == cache.outline
+		&& cache.outline1Cached == cache.outline1
+		&& cache.outline2Cached == cache.outline2
 		&& (!st.header || cache.headerCached == cache.header)
 		&& (!icon || cache.iconCached == cache.icon)) {
 		return;
 	}
 	cache.bgCached = cache.bg;
-	cache.outlineCached = cache.outline;
+	cache.outline1Cached = cache.outline1;
+	cache.outline2Cached = cache.outline2;
 	if (st.header) {
 		cache.headerCached = cache.header;
 	}
@@ -217,6 +219,28 @@ void ValidateQuotePaintCache(
 	const auto side = 2 * corner + middle;
 	const auto full = QSize(side, side);
 	const auto ratio = style::DevicePixelRatio();
+
+	if (cache.outline1 == cache.outline2) {
+		cache.outline = QImage();
+	} else if (const auto outline = st.outline) {
+		const auto size = QSize(outline, outline * 6);
+		cache.outline = QImage(
+			size * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		cache.outline.fill(cache.outline1);
+		cache.outline.setDevicePixelRatio(ratio);
+		auto p = QPainter(&cache.outline);
+		p.setCompositionMode(QPainter::CompositionMode_Source);
+		auto hq = PainterHighQualityEnabler(p);
+		auto path = QPainterPath();
+		path.moveTo(outline, outline);
+		path.lineTo(outline, outline * 4);
+		path.lineTo(0, outline * 5);
+		path.lineTo(0, outline * 2);
+		path.lineTo(outline, outline);
+		p.fillPath(path, cache.outline2);
+	}
+
 	auto image = QImage(full * ratio, QImage::Format_ARGB32_Premultiplied);
 	image.fill(Qt::transparent);
 	image.setDevicePixelRatio(ratio);
@@ -230,9 +254,16 @@ void ValidateQuotePaintCache(
 		p.drawRoundedRect(0, 0, side, corner + radius, radius, radius);
 	}
 	if (outline) {
-		p.setBrush(cache.outline);
-		p.setClipRect(0, 0, outline, side);
-		p.drawRoundedRect(0, 0, outline + radius * 2, side, radius, radius);
+		const auto rect = QRect(0, 0, outline + radius * 2, side);
+		if (!cache.outline.isNull()) {
+			p.setBrush(cache.outline);
+			p.setClipRect(0, 0, outline, side);
+			p.drawRoundedRect(rect, radius, radius);
+		} else {
+			p.setBrush(cache.outline1);
+			p.setClipRect(0, 0, outline, side);
+			p.drawRoundedRect(rect, radius, radius);
+		}
 	}
 	p.setBrush(cache.bg);
 	p.setClipRect(outline, header, side - outline, side - header);
@@ -264,7 +295,7 @@ void FillQuotePaint(
 	const auto width = rect.width();
 	auto y = rect.top();
 	auto height = rect.height();
-	if (!parts.skipTop) {
+	if (!parts.skippedTop) {
 		const auto top = std::min(height, ihalf);
 		p.drawImage(
 			QRect(x, y, ihalf, top),
@@ -293,15 +324,17 @@ void FillQuotePaint(
 		y += top;
 		rect.setTop(y);
 	}
+	const auto outline = st.outline;
 	if (!parts.skipBottom) {
 		const auto bottom = std::min(height, ihalf);
+		const auto skip = !cache.outline.isNull() ? outline : 0;
 		p.drawImage(
-			QRect(x, y + height - bottom, ihalf, bottom),
+			QRect(x + skip, y + height - bottom, ihalf - skip, bottom),
 			image,
 			QRect(
-				0,
+				skip * ratio,
 				(iheight - bottom) * ratio,
-				ihalf * ratio,
+				(ihalf - skip) * ratio,
 				bottom * ratio));
 		p.drawImage(
 			QRect(
@@ -320,15 +353,63 @@ void FillQuotePaint(
 				QRect(x + ihalf, y + height - bottom, middle, bottom),
 				cache.bg);
 		}
+		if (skip) {
+			if (cache.bottomCorner.size() != QSize(skip, ihalf)) {
+				cache.bottomCorner = QImage(
+					QSize(skip, ihalf) * ratio,
+					QImage::Format_ARGB32_Premultiplied);
+				cache.bottomCorner.setDevicePixelRatio(ratio);
+				cache.bottomCorner.fill(Qt::transparent);
+
+				cache.bottomRounding = QImage(
+					QSize(skip, ihalf) * ratio,
+					QImage::Format_ARGB32_Premultiplied);
+				cache.bottomRounding.setDevicePixelRatio(ratio);
+				cache.bottomRounding.fill(Qt::transparent);
+				const auto radius = st.radius;
+				auto q = QPainter(&cache.bottomRounding);
+				auto hq = PainterHighQualityEnabler(q);
+				q.setPen(Qt::NoPen);
+				q.setBrush(Qt::white);
+				q.drawRoundedRect(
+					0,
+					-2 * radius,
+					skip + 2 * radius,
+					ihalf + 2 * radius,
+					radius,
+					radius);
+			}
+			auto q = QPainter(&cache.bottomCorner);
+			const auto skipped = ihalf
+				+ int(parts.skippedTop)
+				+ (height - bottom);
+			q.translate(0, -skipped);
+			q.fillRect(0, skipped, skip, bottom, cache.outline);
+			q.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+			q.drawImage(0, skipped + bottom - ihalf, cache.bottomRounding);
+			q.end();
+
+			p.drawImage(
+				QRect(x, y + height - bottom, skip, bottom),
+				cache.bottomCorner,
+				QRect(0, 0, skip * ratio, bottom * ratio));
+		}
 		height -= bottom;
 		if (!height) {
 			return;
 		}
 		rect.setHeight(height);
 	}
-	const auto outline = st.outline;
 	if (outline) {
-		p.fillRect(x, y, outline, height, cache.outline);
+		if (!cache.outline.isNull()) {
+			const auto skipped = ihalf + int(parts.skippedTop);
+			const auto top = y - skipped;
+			p.translate(x, top);
+			p.fillRect(0, skipped, outline, height, cache.outline);
+			p.translate(-x, -top);
+		} else {
+			p.fillRect(x, y, outline, height, cache.outline1);
+		}
 	}
 	p.fillRect(x + outline, y, width - outline, height, cache.bg);
 }
@@ -541,54 +622,15 @@ void String::recountNaturalSize(
 }
 
 int String::countMaxMonospaceWidth() const {
-	auto result = QFixed();
-	auto paragraphWidth = QFixed();
-	auto fullMonospace = true;
-	QFixed _width = 0, last_rBearing = 0, last_rPadding = 0;
-	for (auto &block : _blocks) {
-		auto b = block.get();
-		auto _btype = b->type();
-		if (_btype == TextBlockType::Newline) {
-			last_rBearing = b->f_rbearing();
-			last_rPadding = b->f_rpadding();
-
-			if (fullMonospace) {
-				accumulate_max(paragraphWidth, _width);
-				accumulate_max(result, paragraphWidth);
-				paragraphWidth = 0;
-			} else {
-				fullMonospace = true;
+	auto result = 0;
+	if (_extended) {
+		for (const auto &quote : _extended->quotes) {
+			if (quote.pre) {
+				accumulate_max(result, quote.maxWidth);
 			}
-			_width = (b->f_width() - last_rBearing);
-			continue;
 		}
-		if (!(b->flags() & (TextBlockFlag::Pre | TextBlockFlag::Code))
-			&& (b->type() != TextBlockType::Skip)) {
-			fullMonospace = false;
-		}
-		auto b__f_rbearing = b->f_rbearing(); // cache
-
-		// We need to accumulate max width after each block, because
-		// some blocks have width less than -1 * previous right bearing.
-		// In that cases the _width gets _smaller_ after moving to the next block.
-		//
-		// But when we layout block and we're sure that _maxWidth is enough
-		// for all the blocks to fit on their line we check each block, even the
-		// intermediate one with a large negative right bearing.
-		if (fullMonospace) {
-			accumulate_max(paragraphWidth, _width);
-		}
-		_width += last_rBearing + (last_rPadding + b->f_width() - b__f_rbearing);
-
-		last_rBearing = b__f_rbearing;
-		last_rPadding = b->f_rpadding();
-		continue;
 	}
-	if (_width > 0 && fullMonospace) {
-		accumulate_max(paragraphWidth, _width);
-		accumulate_max(result, paragraphWidth);
-	}
-	return result.ceil().toInt();
+	return result;
 }
 
 void String::setMarkedText(const style::TextStyle &st, const TextWithEntities &textWithEntities, const TextParseOptions &options, const std::any &context) {
diff --git a/ui/text/text.h b/ui/text/text.h
index d275895..4d8f9b0 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -167,14 +167,20 @@ struct GeometryDescriptor {
 
 struct QuotePaintCache {
 	QImage corners;
+	QImage outline;
+	mutable QImage bottomCorner;
+	mutable QImage bottomRounding;
+
 	QColor headerCached;
 	QColor bgCached;
-	QColor outlineCached;
+	QColor outline1Cached;
+	QColor outline2Cached;
 	QColor iconCached;
 
 	QColor header;
 	QColor bg;
-	QColor outline;
+	QColor outline1;
+	QColor outline2;
 	QColor icon;
 };
 
@@ -183,8 +189,8 @@ void ValidateQuotePaintCache(
 	const style::QuoteStyle &st);
 
 struct SkipBlockPaintParts {
-	bool skipTop : 1 = false;
-	bool skipBottom : 1 = false;
+	uint32 skippedTop : 31 = 0;
+	uint32 skipBottom : 1 = 0;
 };
 void FillQuotePaint(
 	QPainter &p,
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 70eae12..dffcdfd 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -410,6 +410,7 @@ void Renderer::fillParagraphBg(int paddingBottom) {
 		const auto isTop = (_y != _quoteLineTop);
 		const auto isBottom = (paddingBottom != 0);
 		const auto left = _startLeft + _quoteShift;
+		const auto start = _quoteTop + skip;
 		const auto top = _quoteLineTop + (isTop ? skip : 0);
 		const auto fill = _y + _lineHeight + paddingBottom - top
 			- (isBottom ? skip : 0);
@@ -431,7 +432,7 @@ void Renderer::fillParagraphBg(int paddingBottom) {
 				ValidateQuotePaintCache(*cache, st);
 			}
 			FillQuotePaint(*_p, rect, *cache, st, {
-				.skipTop = !isTop,
+				.skippedTop = uint32(top - start),
 				.skipBottom = !isBottom,
 			});
 		}
@@ -507,7 +508,7 @@ void Renderer::initNextParagraph(
 		_quoteIndex = paragraphIndex;
 		_quote = _t->quoteByIndex(paragraphIndex);
 		_quotePadding = _t->quotePadding(_quote);
-		_quoteLineTop = _y;
+		_quoteTop = _quoteLineTop = _y;
 		_y += _quotePadding.top();
 		_quotePadding.setTop(0);
 		_quoteDirection = _paragraphDirection;
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 600ce62..a0be7b1 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -165,6 +165,7 @@ private:
 	int _quoteShift = 0;
 	int _quoteIndex = 0;
 	QMargins _quotePadding;
+	int _quoteTop = 0;
 	int _quoteLineTop = 0;
 	QuotePaintCache *_quotePreCache = nullptr;
 	QuotePaintCache *_quoteBlockquoteCache = nullptr;

From 127565a75b9cfc9385da23883fb38122a25057dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 25 Oct 2023 10:34:37 +0400
Subject: [PATCH 538/635] Move box title up a bit.

---
 ui/layers/layers.style | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 8da1f07..5c44c53 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -84,7 +84,7 @@ boxTitle: FlatLabel(defaultFlatLabel) {
 		font: boxTitleFont;
 	}
 }
-boxTitlePosition: point(24px, 18px);
+boxTitlePosition: point(24px, 13px);
 boxTitleHeight: 48px;
 boxTitleAdditionalSkip: 9px;
 boxTitleAdditionalFont: normalFont;

From c36559a6797f02d8a56a414ac91f9c6fd08b5270 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 25 Oct 2023 10:34:47 +0400
Subject: [PATCH 539/635] Allow pinned-to-bottom content in GenericBox.

---
 ui/layers/generic_box.cpp | 38 ++++++++++++++++++++++++++++++--------
 ui/layers/generic_box.h   |  9 +++++++++
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index d96a17a..8ce8c16 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -17,22 +17,28 @@ void GenericBox::prepare() {
 	_init(this);
 
 	const auto currentWidth = width();
-	const auto pinned = _pinnedToTopContent.data();
-	if (pinned) {
-		pinned->resizeToWidth(currentWidth);
+	const auto pinnedToTop = _pinnedToTopContent.data();
+	const auto pinnedToBottom = _pinnedToBottomContent.data();
+	if (pinnedToTop) {
+		pinnedToTop->resizeToWidth(currentWidth);
+	}
+	if (pinnedToBottom) {
+		pinnedToBottom->resizeToWidth(currentWidth);
 	}
 
 	auto wrap = object_ptr<Ui::OverrideMargins>(this, std::move(_owned));
 	wrap->resizeToWidth(currentWidth);
 	rpl::combine(
-		pinned ? pinned->heightValue() : rpl::single(0),
-		wrap->heightValue()
-	) | rpl::start_with_next([=](int top, int height) {
+		pinnedToTop ? pinnedToTop->heightValue() : rpl::single(0),
+		wrap->heightValue(),
+		pinnedToBottom ? pinnedToBottom->heightValue() : rpl::single(0)
+	) | rpl::start_with_next([=](int top, int height, int bottom) {
 		Expects(_minHeight >= 0);
 		Expects(!_maxHeight || _minHeight <= _maxHeight);
 
 		setInnerTopSkip(top);
-		const auto desired = top + height;
+		setInnerBottomSkip(bottom);
+		const auto desired = top + height + bottom;
 		setDimensions(
 			currentWidth,
 			std::clamp(
@@ -45,7 +51,17 @@ void GenericBox::prepare() {
 	setInnerWidget(
 		std::move(wrap),
 		_scrollSt ? *_scrollSt : st::boxScroll,
-		pinned ? pinned->height() : 0);
+		pinnedToTop ? pinnedToTop->height() : 0,
+		pinnedToBottom ? pinnedToBottom->height() : 0);
+
+	if (pinnedToBottom) {
+		rpl::combine(
+			heightValue(),
+			pinnedToBottom->heightValue()
+		) | rpl::start_with_next([=](int outer, int height) {
+			pinnedToBottom->move(0, outer - height);
+		}, pinnedToBottom->lifetime());
+	}
 }
 
 void GenericBox::addSkip(int height) {
@@ -58,6 +74,12 @@ not_null<Ui::RpWidget*> GenericBox::doSetPinnedToTopContent(
 	return _pinnedToTopContent.data();
 }
 
+not_null<Ui::RpWidget*> GenericBox::doSetPinnedToBottomContent(
+		object_ptr<Ui::RpWidget> content) {
+	_pinnedToBottomContent = std::move(content);
+	return _pinnedToBottomContent.data();
+}
+
 int GenericBox::rowsCount() const {
 	return _content->count();
 }
diff --git a/ui/layers/generic_box.h b/ui/layers/generic_box.h
index dd54c70..3bfd724 100644
--- a/ui/layers/generic_box.h
+++ b/ui/layers/generic_box.h
@@ -100,6 +100,12 @@ public:
 			doSetPinnedToTopContent(std::move(content)).get());
 	}
 
+	template <typename Widget>
+	not_null<Widget*> setPinnedToBottomContent(object_ptr<Widget> content) {
+		return static_cast<Widget*>(
+			doSetPinnedToBottomContent(std::move(content)).get());
+	}
+
 	[[nodiscard]] not_null<Ui::VerticalLayout*> verticalLayout();
 
 	using BoxContent::setNoContentMargin;
@@ -132,6 +138,8 @@ private:
 	void prepare() override;
 	not_null<Ui::RpWidget*> doSetPinnedToTopContent(
 		object_ptr<Ui::RpWidget> content);
+	not_null<Ui::RpWidget*> doSetPinnedToBottomContent(
+		object_ptr<Ui::RpWidget> content);
 
 	FnMut<void(not_null<GenericBox*>)> _init;
 	Fn<void()> _focus;
@@ -144,6 +152,7 @@ private:
 	int _maxHeight = 0;
 
 	object_ptr<Ui::RpWidget> _pinnedToTopContent = { nullptr };
+	object_ptr<Ui::RpWidget> _pinnedToBottomContent = { nullptr };
 
 };
 

From b05f7eb915a86f67249904061d70f293066de618 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 25 Oct 2023 21:23:30 +0400
Subject: [PATCH 540/635] Resize widgets after adding to VerticalLayout.

---
 ui/wrap/vertical_layout.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/wrap/vertical_layout.cpp b/ui/wrap/vertical_layout.cpp
index 4ebdeb9..88991ce 100644
--- a/ui/wrap/vertical_layout.cpp
+++ b/ui/wrap/vertical_layout.cpp
@@ -126,6 +126,10 @@ RpWidget *VerticalLayout::insertChild(
 		_rows.insert(
 			begin(_rows) + atPosition,
 			{ std::move(child), margin });
+		auto availRowWidth = widthNoMargins()
+			- margin.left()
+			- margin.right();
+		weak->resizeToNaturalWidth(availRowWidth);
 		weak->heightValue(
 		) | rpl::start_with_next_done([=] {
 			if (!_inResize) {

From 383b5b8f7e629475e5f22445167aaa7669c5cdd6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 26 Oct 2023 09:26:16 +0400
Subject: [PATCH 541/635] Make TextUtilities::CutPart more strict.

---
 ui/text/text_entity.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 9d25dd6..5adfe7c 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -1424,7 +1424,11 @@ QStringList PrepareSearchWords(
 }
 
 bool CutPart(TextWithEntities &sending, TextWithEntities &left, int32 limit) {
-	if (left.text.isEmpty() || !limit) return false;
+	Expects(limit > 0);
+
+	if (left.text.isEmpty()) {
+		return false;
+	}
 
 	int32 currentEntity = 0, goodEntity = currentEntity, entityCount = left.entities.size();
 	bool goodInEntity = false, goodCanBreakEntity = false;
@@ -1533,10 +1537,7 @@ bool CutPart(TextWithEntities &sending, TextWithEntities &left, int32 limit) {
 			return true;
 		}
 	}
-	sending.text = left.text;
-	left.text = QString();
-	sending.entities = left.entities;
-	left.entities = EntitiesInText();
+	sending = base::take(left);
 	return true;
 }
 

From 611224c52f3192f616018fc7a2c5930667531084 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 26 Oct 2023 23:40:26 +0400
Subject: [PATCH 542/635] Support three-color quote outlines.

---
 ui/basic.style   |  1 +
 ui/text/text.cpp | 52 +++++++++++++++++++++++++++++-------------------
 ui/text/text.h   |  8 ++++----
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index a2831c0..e67a9d4 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -27,6 +27,7 @@ QuoteStyle {
 	icon: icon;
 	iconPosition: point;
 	outline: pixels;
+	outlineShift: pixels;
 	radius: pixels;
 	scrollable: bool;
 }
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 2e5e570..ea8aa16 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -191,15 +191,13 @@ void ValidateQuotePaintCache(
 	const auto icon = st.icon.empty() ? nullptr : &st.icon;
 	if (!cache.corners.isNull()
 		&& cache.bgCached == cache.bg
-		&& cache.outline1Cached == cache.outline1
-		&& cache.outline2Cached == cache.outline2
+		&& cache.outlines == cache.outlines
 		&& (!st.header || cache.headerCached == cache.header)
 		&& (!icon || cache.iconCached == cache.icon)) {
 		return;
 	}
 	cache.bgCached = cache.bg;
-	cache.outline1Cached = cache.outline1;
-	cache.outline2Cached = cache.outline2;
+	cache.outlinesCached = cache.outlines;
 	if (st.header) {
 		cache.headerCached = cache.header;
 	}
@@ -220,25 +218,35 @@ void ValidateQuotePaintCache(
 	const auto full = QSize(side, side);
 	const auto ratio = style::DevicePixelRatio();
 
-	if (cache.outline1 == cache.outline2) {
+	if (!cache.outlines[1].alpha()) {
 		cache.outline = QImage();
 	} else if (const auto outline = st.outline) {
-		const auto size = QSize(outline, outline * 6);
+		const auto third = (cache.outlines[2].alpha() != 0);
+		const auto size = QSize(outline, outline * (third ? 6 : 4));
 		cache.outline = QImage(
 			size * ratio,
 			QImage::Format_ARGB32_Premultiplied);
-		cache.outline.fill(cache.outline1);
+		cache.outline.fill(cache.outlines[0]);
 		cache.outline.setDevicePixelRatio(ratio);
 		auto p = QPainter(&cache.outline);
 		p.setCompositionMode(QPainter::CompositionMode_Source);
 		auto hq = PainterHighQualityEnabler(p);
 		auto path = QPainterPath();
 		path.moveTo(outline, outline);
-		path.lineTo(outline, outline * 4);
-		path.lineTo(0, outline * 5);
+		path.lineTo(outline, outline * (third ? 4 : 3));
+		path.lineTo(0, outline * (third ? 5 : 4));
 		path.lineTo(0, outline * 2);
 		path.lineTo(outline, outline);
-		p.fillPath(path, cache.outline2);
+		p.fillPath(path, cache.outlines[third ? 2 : 1]);
+		if (third) {
+			auto path = QPainterPath();
+			path.moveTo(outline, outline * 3);
+			path.lineTo(outline, outline * 5);
+			path.lineTo(0, outline * 6);
+			path.lineTo(0, outline * 4);
+			path.lineTo(outline, outline * 3);
+			p.fillPath(path, cache.outlines[1]);
+		}
 	}
 
 	auto image = QImage(full * ratio, QImage::Format_ARGB32_Premultiplied);
@@ -256,11 +264,14 @@ void ValidateQuotePaintCache(
 	if (outline) {
 		const auto rect = QRect(0, 0, outline + radius * 2, side);
 		if (!cache.outline.isNull()) {
+			const auto shift = QPoint(0, st.outlineShift);
+			p.translate(shift);
 			p.setBrush(cache.outline);
-			p.setClipRect(0, 0, outline, side);
-			p.drawRoundedRect(rect, radius, radius);
+			p.setClipRect(QRect(-shift, QSize(outline, side)));
+			p.drawRoundedRect(rect.translated(-shift), radius, radius);
+			p.translate(-shift);
 		} else {
-			p.setBrush(cache.outline1);
+			p.setBrush(cache.outlines[0]);
 			p.setClipRect(0, 0, outline, side);
 			p.drawRoundedRect(rect, radius, radius);
 		}
@@ -380,9 +391,9 @@ void FillQuotePaint(
 					radius);
 			}
 			auto q = QPainter(&cache.bottomCorner);
-			const auto skipped = ihalf
-				+ int(parts.skippedTop)
-				+ (height - bottom);
+			const auto skipped = (height - bottom)
+				+ (parts.skippedTop ? int(parts.skippedTop) : ihalf)
+				- st.outlineShift;
 			q.translate(0, -skipped);
 			q.fillRect(0, skipped, skip, bottom, cache.outline);
 			q.setCompositionMode(QPainter::CompositionMode_DestinationIn);
@@ -402,13 +413,14 @@ void FillQuotePaint(
 	}
 	if (outline) {
 		if (!cache.outline.isNull()) {
-			const auto skipped = ihalf + int(parts.skippedTop);
-			const auto top = y - skipped;
+			const auto skipped = st.outlineShift
+				- (parts.skippedTop ? int(parts.skippedTop) : ihalf);
+			const auto top = y + skipped;
 			p.translate(x, top);
-			p.fillRect(0, skipped, outline, height, cache.outline);
+			p.fillRect(0, -skipped, outline, height, cache.outline);
 			p.translate(-x, -top);
 		} else {
-			p.fillRect(x, y, outline, height, cache.outline1);
+			p.fillRect(x, y, outline, height, cache.outlines[0]);
 		}
 	}
 	p.fillRect(x + outline, y, width - outline, height, cache.bg);
diff --git a/ui/text/text.h b/ui/text/text.h
index 4d8f9b0..e12c203 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -165,22 +165,22 @@ struct GeometryDescriptor {
 	bool elisionOneLine,
 	bool elisionBreakEverywhere);
 
+constexpr auto kMaxQuoteOutlines = 3;
+
 struct QuotePaintCache {
 	QImage corners;
 	QImage outline;
 	mutable QImage bottomCorner;
 	mutable QImage bottomRounding;
 
+	std::array<QColor, kMaxQuoteOutlines> outlinesCached;
 	QColor headerCached;
 	QColor bgCached;
-	QColor outline1Cached;
-	QColor outline2Cached;
 	QColor iconCached;
 
+	std::array<QColor, kMaxQuoteOutlines> outlines;
 	QColor header;
 	QColor bg;
-	QColor outline1;
-	QColor outline2;
 	QColor icon;
 };
 

From 272a23e9bce7d03cc167d3dd4589ce674398c795 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Oct 2023 20:48:29 +0400
Subject: [PATCH 543/635] Improve very small quote areas with icons.

---
 ui/text/text.cpp | 86 +++++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index ea8aa16..3161f81 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -207,15 +207,18 @@ void ValidateQuotePaintCache(
 	const auto radius = st.radius;
 	const auto header = st.header;
 	const auto outline = st.outline;
-	const auto iconsize = icon
-		? std::max(
-			icon->width() + st.iconPosition.x(),
-			icon->height() + st.iconPosition.y())
+	const auto wiconsize = icon
+		? (icon->width() + st.iconPosition.x())
 		: 0;
-	const auto corner = std::max({ header, radius, outline, iconsize });
+	const auto hiconsize = icon
+		? (icon->height() + st.iconPosition.y())
+		: 0;
+	const auto wcorner = std::max({ radius, outline, wiconsize });
+	const auto hcorner = std::max({ header, radius, hiconsize });
 	const auto middle = st::lineWidth;
-	const auto side = 2 * corner + middle;
-	const auto full = QSize(side, side);
+	const auto wside = 2 * wcorner + middle;
+	const auto hside = 2 * hcorner + middle;
+	const auto full = QSize(wside, hside);
 	const auto ratio = style::DevicePixelRatio();
 
 	if (!cache.outlines[1].alpha()) {
@@ -258,32 +261,32 @@ void ValidateQuotePaintCache(
 
 	if (header) {
 		p.setBrush(cache.header);
-		p.setClipRect(outline, 0, side - outline, header);
-		p.drawRoundedRect(0, 0, side, corner + radius, radius, radius);
+		p.setClipRect(outline, 0, wside - outline, header);
+		p.drawRoundedRect(0, 0, wside, hcorner + radius, radius, radius);
 	}
 	if (outline) {
-		const auto rect = QRect(0, 0, outline + radius * 2, side);
+		const auto rect = QRect(0, 0, outline + radius * 2, hside);
 		if (!cache.outline.isNull()) {
 			const auto shift = QPoint(0, st.outlineShift);
 			p.translate(shift);
 			p.setBrush(cache.outline);
-			p.setClipRect(QRect(-shift, QSize(outline, side)));
+			p.setClipRect(QRect(-shift, QSize(outline, hside)));
 			p.drawRoundedRect(rect.translated(-shift), radius, radius);
 			p.translate(-shift);
 		} else {
 			p.setBrush(cache.outlines[0]);
-			p.setClipRect(0, 0, outline, side);
+			p.setClipRect(0, 0, outline, hside);
 			p.drawRoundedRect(rect, radius, radius);
 		}
 	}
 	p.setBrush(cache.bg);
-	p.setClipRect(outline, header, side - outline, side - header);
-	p.drawRoundedRect(0, 0, side, side, radius, radius);
+	p.setClipRect(outline, header, wside - outline, hside - header);
+	p.drawRoundedRect(0, 0, wside, hside, radius, radius);
 	if (icon) {
 		p.setClipping(false);
-		const auto left = side - icon->width() - st.iconPosition.x();
+		const auto left = wside - icon->width() - st.iconPosition.x();
 		const auto top = st.iconPosition.y();
-		icon->paint(p, left, top, side, cache.icon);
+		icon->paint(p, left, top, wside, cache.icon);
 	}
 
 	p.end();
@@ -301,30 +304,31 @@ void FillQuotePaint(
 	const auto iwidth = image.width() / ratio;
 	const auto iheight = image.height() / ratio;
 	const auto imiddle = st::lineWidth;
-	const auto ihalf = (iheight - imiddle) / 2;
+	const auto whalf = (iwidth - imiddle) / 2;
+	const auto hhalf = (iheight - imiddle) / 2;
 	const auto x = rect.left();
 	const auto width = rect.width();
 	auto y = rect.top();
 	auto height = rect.height();
 	if (!parts.skippedTop) {
-		const auto top = std::min(height, ihalf);
+		const auto top = std::min(height, hhalf);
 		p.drawImage(
-			QRect(x, y, ihalf, top),
+			QRect(x, y, whalf, top),
 			image,
-			QRect(0, 0, ihalf * ratio, top * ratio));
+			QRect(0, 0, whalf * ratio, top * ratio));
 		p.drawImage(
-			QRect(x + width - ihalf, y, ihalf, top),
+			QRect(x + width - whalf, y, whalf, top),
 			image,
-			QRect((iwidth - ihalf) * ratio, 0, ihalf * ratio, top * ratio));
-		if (const auto middle = width - 2 * ihalf) {
+			QRect((iwidth - whalf) * ratio, 0, whalf * ratio, top * ratio));
+		if (const auto middle = width - 2 * whalf) {
 			const auto header = st.header;
 			const auto fillHeader = std::min(header, top);
 			if (fillHeader) {
-				p.fillRect(x + ihalf, y, middle, fillHeader, cache.header);
+				p.fillRect(x + whalf, y, middle, fillHeader, cache.header);
 			}
 			if (const auto fillBody = top - fillHeader) {
 				p.fillRect(
-					QRect(x + ihalf, y + fillHeader, middle, fillBody),
+					QRect(x + whalf, y + fillHeader, middle, fillBody),
 					cache.bg);
 			}
 		}
@@ -337,43 +341,43 @@ void FillQuotePaint(
 	}
 	const auto outline = st.outline;
 	if (!parts.skipBottom) {
-		const auto bottom = std::min(height, ihalf);
+		const auto bottom = std::min(height, hhalf);
 		const auto skip = !cache.outline.isNull() ? outline : 0;
 		p.drawImage(
-			QRect(x + skip, y + height - bottom, ihalf - skip, bottom),
+			QRect(x + skip, y + height - bottom, whalf - skip, bottom),
 			image,
 			QRect(
 				skip * ratio,
 				(iheight - bottom) * ratio,
-				(ihalf - skip) * ratio,
+				(whalf - skip) * ratio,
 				bottom * ratio));
 		p.drawImage(
 			QRect(
-				x + width - ihalf,
+				x + width - whalf,
 				y + height - bottom,
-				ihalf,
+				whalf,
 				bottom),
 			image,
 			QRect(
-				(iwidth - ihalf) * ratio,
+				(iwidth - whalf) * ratio,
 				(iheight - bottom) * ratio,
-				ihalf * ratio,
+				whalf * ratio,
 				bottom * ratio));
-		if (const auto middle = width - 2 * ihalf) {
+		if (const auto middle = width - 2 * whalf) {
 			p.fillRect(
-				QRect(x + ihalf, y + height - bottom, middle, bottom),
+				QRect(x + whalf, y + height - bottom, middle, bottom),
 				cache.bg);
 		}
 		if (skip) {
-			if (cache.bottomCorner.size() != QSize(skip, ihalf)) {
+			if (cache.bottomCorner.size() != QSize(skip, whalf)) {
 				cache.bottomCorner = QImage(
-					QSize(skip, ihalf) * ratio,
+					QSize(skip, hhalf) * ratio,
 					QImage::Format_ARGB32_Premultiplied);
 				cache.bottomCorner.setDevicePixelRatio(ratio);
 				cache.bottomCorner.fill(Qt::transparent);
 
 				cache.bottomRounding = QImage(
-					QSize(skip, ihalf) * ratio,
+					QSize(skip, hhalf) * ratio,
 					QImage::Format_ARGB32_Premultiplied);
 				cache.bottomRounding.setDevicePixelRatio(ratio);
 				cache.bottomRounding.fill(Qt::transparent);
@@ -386,18 +390,18 @@ void FillQuotePaint(
 					0,
 					-2 * radius,
 					skip + 2 * radius,
-					ihalf + 2 * radius,
+					hhalf + 2 * radius,
 					radius,
 					radius);
 			}
 			auto q = QPainter(&cache.bottomCorner);
 			const auto skipped = (height - bottom)
-				+ (parts.skippedTop ? int(parts.skippedTop) : ihalf)
+				+ (parts.skippedTop ? int(parts.skippedTop) : hhalf)
 				- st.outlineShift;
 			q.translate(0, -skipped);
 			q.fillRect(0, skipped, skip, bottom, cache.outline);
 			q.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-			q.drawImage(0, skipped + bottom - ihalf, cache.bottomRounding);
+			q.drawImage(0, skipped + bottom - hhalf, cache.bottomRounding);
 			q.end();
 
 			p.drawImage(
@@ -414,7 +418,7 @@ void FillQuotePaint(
 	if (outline) {
 		if (!cache.outline.isNull()) {
 			const auto skipped = st.outlineShift
-				- (parts.skippedTop ? int(parts.skippedTop) : ihalf);
+				- (parts.skippedTop ? int(parts.skippedTop) : hhalf);
 			const auto top = y + skipped;
 			p.translate(x, top);
 			p.fillRect(0, -skipped, outline, height, cache.outline);

From 92c447aa87754dc02774f4f2f12f93e705715cf1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Oct 2023 21:39:31 +0400
Subject: [PATCH 544/635] Crash on assertion instead of stack overflow.

---
 ui/style/style_core_scale.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ui/style/style_core_scale.h b/ui/style/style_core_scale.h
index f4b804e..025e364 100644
--- a/ui/style/style_core_scale.h
+++ b/ui/style/style_core_scale.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/algorithm.h"
+#include "base/assertion.h"
 
 #include <QtCore/QSize>
 
@@ -33,6 +34,7 @@ void SetScale(int scale);
 template <typename T>
 [[nodiscard]] inline T ConvertScale(T value, int scale) {
 	if (value < 0.) {
+		Assert(!(T(-value) < 0.)); // T = int, value = INT_MIN.
 		return -ConvertScale(-value, scale);
 	}
 	const auto result = T(base::SafeRound(

From 952c89687c9c162b37318e6dbfa11211ed2299e9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Oct 2023 21:51:25 +0400
Subject: [PATCH 545/635] Don't set box show crash annotation (GenericBox).

---
 ui/layers/box_layer_widget.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ui/layers/box_layer_widget.cpp b/ui/layers/box_layer_widget.cpp
index ad8b6f9..6f356f9 100644
--- a/ui/layers/box_layer_widget.cpp
+++ b/ui/layers/box_layer_widget.cpp
@@ -10,7 +10,6 @@
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/painter.h"
-#include "base/integration.h"
 #include "base/timer.h"
 #include "styles/style_layers.h"
 #include "styles/palette.h"
@@ -42,11 +41,6 @@ BoxLayerWidget::BoxLayerWidget(
 	_content->setParent(this);
 	_content->setDelegate(this);
 
-	const auto &object = *_content;
-	base::Integration::Instance().setCrashAnnotation(
-		"BoxName",
-		QString::fromUtf8(typeid(object).name()));
-
 	_additionalTitle.changes(
 	) | rpl::start_with_next([=] {
 		updateSize();

From 287af101d02089cafeba588f75057414fd96f476 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 28 Oct 2023 22:28:30 +0400
Subject: [PATCH 546/635] Use lang-packed "copy" instead of "code".

---
 ui/integration.cpp | 4 ++++
 ui/integration.h   | 1 +
 ui/text/text.cpp   | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/integration.cpp b/ui/integration.cpp
index 5d23a95..5306967 100644
--- a/ui/integration.cpp
+++ b/ui/integration.cpp
@@ -214,4 +214,8 @@ QString Integration::phraseBotAllowWriteConfirm() {
 	return "Allow";
 }
 
+QString Integration::phraseQuoteHeaderCopy() {
+	return "copy";
+}
+
 } // namespace Ui
diff --git a/ui/integration.h b/ui/integration.h
index ae169b4..4b3a9b4 100644
--- a/ui/integration.h
+++ b/ui/integration.h
@@ -99,6 +99,7 @@ public:
 	[[nodiscard]] virtual QString phraseBotAllowWrite();
 	[[nodiscard]] virtual QString phraseBotAllowWriteTitle();
 	[[nodiscard]] virtual QString phraseBotAllowWriteConfirm();
+	[[nodiscard]] virtual QString phraseQuoteHeaderCopy();
 
 };
 
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 3161f81..e5c9bcc 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -12,6 +12,7 @@
 #include "ui/text/text_parser.h"
 #include "ui/text/text_renderer.h"
 #include "ui/basic_click_handlers.h"
+#include "ui/integration.h"
 #include "ui/painter.h"
 #include "base/platform/base_platform_info.h"
 #include "styles/style_basic.h"
@@ -1279,7 +1280,8 @@ int String::quoteMinWidth(QuoteDetails *quote) const {
 
 const QString &String::quoteHeaderText(QuoteDetails *quote) const {
 	static const auto kEmptyHeader = QString();
-	static const auto kDefaultHeader = u"code"_q;
+	static const auto kDefaultHeader
+		= Integration::Instance().phraseQuoteHeaderCopy();
 	return (!quote || !quote->pre)
 		? kEmptyHeader
 		: quote->language.isEmpty()

From dc8313f6ae6c87572512424818b9e24e7ef2383e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 29 Oct 2023 07:08:52 +0400
Subject: [PATCH 547/635] Don't initially resizeToWidth(0).

---
 ui/wrap/vertical_layout.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/wrap/vertical_layout.cpp b/ui/wrap/vertical_layout.cpp
index 88991ce..2303637 100644
--- a/ui/wrap/vertical_layout.cpp
+++ b/ui/wrap/vertical_layout.cpp
@@ -129,7 +129,9 @@ RpWidget *VerticalLayout::insertChild(
 		auto availRowWidth = widthNoMargins()
 			- margin.left()
 			- margin.right();
-		weak->resizeToNaturalWidth(availRowWidth);
+		if (availRowWidth > 0) {
+			weak->resizeToNaturalWidth(availRowWidth);
+		}
 		weak->heightValue(
 		) | rpl::start_with_next_done([=] {
 			if (!_inResize) {

From 6dc93b53a1c4d237dea0a458d2b02c4171529f18 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 30 Oct 2023 21:53:22 +0400
Subject: [PATCH 548/635] Support filling highlight path in Text.

---
 ui/text/text.h            |   9 ++
 ui/text/text_renderer.cpp | 269 ++++++++++++++++++++++++++------------
 ui/text/text_renderer.h   |  26 +++-
 3 files changed, 221 insertions(+), 83 deletions(-)

diff --git a/ui/text/text.h b/ui/text/text.h
index e12c203..29c8fc1 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -199,6 +199,13 @@ void FillQuotePaint(
 	const style::QuoteStyle &st,
 	SkipBlockPaintParts parts = {});
 
+struct HighlightInfoRequest {
+	TextSelection range;
+	QRect interpolateTo;
+	float64 interpolateProgress = 0.;
+	QPainterPath *outPath = nullptr;
+};
+
 struct PaintContext {
 	QPoint position;
 	int outerWidth = 0; // For automatic RTL Ui inversion.
@@ -220,6 +227,8 @@ struct PaintContext {
 	TextSelection selection;
 	bool fullWidthSelection = true;
 
+	HighlightInfoRequest *highlight = nullptr;
+
 	int elisionHeight = 0;
 	int elisionRemoveFromEnd = 0;
 	bool elisionOneLine = false;
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index dffcdfd..059bad7 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -197,6 +197,7 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 	_breakEverywhere = _geometry.breakEverywhere;
 	_spoilerCache = context.spoiler;
 	_selection = context.selection;
+	_highlight = context.highlight;
 	_fullWidthSelection = context.fullWidthSelection;
 	_align = context.align;
 	_cachedNow = context.now;
@@ -245,6 +246,9 @@ void Renderer::enumerate() {
 		if (_p) {
 			paintSpoilerRects();
 		}
+		if (_highlight) {
+			composeHighlightPath();
+		}
 	});
 
 	auto blockIndex = 0;
@@ -892,39 +896,39 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 					}
 				}
 				return false;
-			} else if (_p && (_type == TextBlockType::Emoji || _type == TextBlockType::CustomEmoji)) {
+			} else if (_p
+				&& (_type == TextBlockType::Emoji
+					|| _type == TextBlockType::CustomEmoji)) {
 				auto glyphX = x;
 				auto spacesWidth = (si.width - currentBlock->f_width());
 				if (rtl) {
 					glyphX += spacesWidth;
 				}
-				FixedRange fillSelect;
-				FixedRange fillSpoiler;
-				if (_background.selectActiveBlock) {
-					fillSelect = { x, x + si.width };
-				} else if (_localFrom + si.position < _selection.to) {
-					auto chFrom = _str + currentBlock->position();
-					auto chTo = chFrom + ((nextBlock ? nextBlock->position() : _t->_text.size()) - currentBlock->position());
-					if (_localFrom + si.position >= _selection.from) { // could be without space
-						if (chTo == chFrom || (chTo - 1)->unicode() != QChar::Space || _selection.to >= (chTo - _str)) {
-							fillSelect = { x, x + si.width };
-						} else { // or with space
-							fillSelect = { glyphX, glyphX + currentBlock->f_width() };
-						}
-					} else if (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space && (chTo - 1 - _str) >= _selection.from) {
-						if (rtl) { // rtl space only
-							fillSelect = { x, glyphX };
-						} else { // ltr space only
-							fillSelect = { x + currentBlock->f_width(), x + si.width };
-						}
-					}
+				const auto fillSelect = _background.selectActiveBlock
+					? FixedRange{ x, x + si.width }
+					: findSelectEmojiRange(
+						si,
+						currentBlock,
+						nextBlock,
+						x,
+						glyphX,
+						_selection);
+				fillSelectRange(fillSelect);
+				if (_highlight) {
+					pushHighlightRange(findSelectEmojiRange(
+						si,
+						currentBlock,
+						nextBlock,
+						x,
+						glyphX,
+						_highlight->range));
 				}
+
 				const auto hasSpoiler = _background.spoiler
 					&& (_spoilerOpacity > 0.);
-				if (hasSpoiler) {
-					fillSpoiler = { x, x + si.width };
-				}
-				fillSelectRange(fillSelect);
+				const auto fillSpoiler = hasSpoiler
+					? FixedRange{ x, x + si.width }
+					: FixedRange();
 				const auto opacity = _p->opacity();
 				if (!hasSpoiler || _spoilerOpacity < 1.) {
 					if (hasSpoiler) {
@@ -1058,58 +1062,39 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 			gf.justified = false;
 			InitTextItemWithScriptItem(gf, si);
 
-			auto itemRange = FixedRange{ x, x + itemWidth };
-			auto fillSelect = FixedRange();
-			auto hasSelected = false;
-			auto hasNotSelected = true;
+			const auto itemRange = FixedRange{ x, x + itemWidth };
 			auto selectedRect = QRect();
-			if (_background.selectActiveBlock) {
-				fillSelect = itemRange;
-				fillSelectRange(fillSelect);
-			} else if (_localFrom + itemStart < _selection.to && _localFrom + itemEnd > _selection.from) {
-				hasSelected = true;
-				auto selX = x;
-				auto selWidth = itemWidth;
-				if (_localFrom + itemStart >= _selection.from && _localFrom + itemEnd <= _selection.to) {
-					hasNotSelected = false;
-				} else {
-					selWidth = 0;
-					int itemL = itemEnd - itemStart;
-					int selStart = _selection.from - (_localFrom + itemStart), selEnd = _selection.to - (_localFrom + itemStart);
-					if (selStart < 0) selStart = 0;
-					if (selEnd > itemL) selEnd = itemL;
-					for (int ch = 0, g; ch < selEnd;) {
-						g = logClusters[itemStart - si.position + ch];
-						QFixed gwidth = glyphs.effectiveAdvance(g);
-						// ch2 - glyph end, ch - glyph start, (ch2 - ch) - how much chars it takes
-						int ch2 = ch + 1;
-						while ((ch2 < itemL) && (g == logClusters[itemStart - si.position + ch2])) {
-							++ch2;
-						}
-						if (ch2 <= selStart) {
-							selX += gwidth;
-						} else if (ch >= selStart && ch2 <= selEnd) {
-							selWidth += gwidth;
-						} else {
-							int sStart = ch, sEnd = ch2;
-							if (ch < selStart) {
-								sStart = selStart;
-								selX += QFixed(sStart - ch) * gwidth / QFixed(ch2 - ch);
-							}
-							if (ch2 >= selEnd) {
-								sEnd = selEnd;
-								selWidth += QFixed(sEnd - sStart) * gwidth / QFixed(ch2 - ch);
-								break;
-							}
-							selWidth += QFixed(sEnd - sStart) * gwidth / QFixed(ch2 - ch);
-						}
-						ch = ch2;
-					}
-				}
-				if (rtl) selX = x + itemWidth - (selX - x) - selWidth;
-				selectedRect = QRect(selX.toInt(), _y + _yDelta, (selX + selWidth).toInt() - selX.toInt(), _fontHeight);
-				fillSelect = { selX, selX + selWidth };
-				fillSelectRange(fillSelect);
+			auto fillSelect = itemRange;
+			if (!_background.selectActiveBlock) {
+				fillSelect = findSelectTextRange(
+					si,
+					itemStart,
+					itemEnd,
+					x,
+					itemWidth,
+					gf,
+					_selection);
+				const auto from = fillSelect.from.toInt();
+				selectedRect = QRect(
+					from,
+					_y + _yDelta,
+					fillSelect.till.toInt() - from,
+					_fontHeight);
+			}
+			const auto hasSelected = !fillSelect.empty();
+			const auto hasNotSelected = (fillSelect.from != itemRange.from)
+				|| (fillSelect.till != itemRange.till);
+			fillSelectRange(fillSelect);
+
+			if (_highlight) {
+				pushHighlightRange(findSelectTextRange(
+					si,
+					itemStart,
+					itemEnd,
+					x,
+					itemWidth,
+					gf,
+					_highlight->range));
 			}
 			const auto hasSpoiler = _background.spoiler
 				&& (_spoilerOpacity > 0.);
@@ -1200,10 +1185,98 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 
 		x += itemWidth;
 	}
-	fillSpoilerRects();
+	fillRectsFromRanges();
 	return !_elidedLine;
 }
 
+FixedRange Renderer::findSelectEmojiRange(
+		const QScriptItem &si,
+		const Ui::Text::AbstractBlock *currentBlock,
+		const Ui::Text::AbstractBlock *nextBlock,
+		QFixed x,
+		QFixed glyphX,
+		TextSelection selection) const {
+	if (_localFrom + si.position >= selection.to) {
+		return {};
+	}
+	auto chFrom = _str + currentBlock->position();
+	auto chTo = chFrom + ((nextBlock ? nextBlock->position() : _t->_text.size()) - currentBlock->position());
+	if (_localFrom + si.position >= selection.from) { // could be without space
+		if (chTo == chFrom || (chTo - 1)->unicode() != QChar::Space || selection.to >= (chTo - _str)) {
+			return { x, x + si.width };
+		} else { // or with space
+			return { glyphX, glyphX + currentBlock->f_width() };
+		}
+	} else if (chTo > chFrom && (chTo - 1)->unicode() == QChar::Space && (chTo - 1 - _str) >= selection.from) {
+		const auto rtl = (si.analysis.bidiLevel % 2);
+		if (rtl) { // rtl space only
+			return { x, glyphX };
+		} else { // ltr space only
+			return { x + currentBlock->f_width(), x + si.width };
+		}
+	}
+	return {};
+}
+
+FixedRange Renderer::findSelectTextRange(
+		const QScriptItem &si,
+		int itemStart,
+		int itemEnd,
+		QFixed x,
+		QFixed itemWidth,
+		const QTextItemInt &gf,
+		TextSelection selection) const {
+	if (_localFrom + itemStart >= selection.to
+		|| _localFrom + itemEnd <= selection.from) {
+		return {};
+	}
+	auto selX = x;
+	auto selWidth = itemWidth;
+	const auto rtl = (si.analysis.bidiLevel % 2);
+	if (_localFrom + itemStart < selection.from
+		|| _localFrom + itemEnd > selection.to) {
+		selWidth = 0;
+		const auto itemL = itemEnd - itemStart;
+		const auto selStart = std::max(
+			selection.from - (_localFrom + itemStart),
+			0);
+		const auto selEnd = std::min(
+			selection.to - (_localFrom + itemStart),
+			itemL);
+		const auto lczero = gf.logClusters[0];
+		for (int ch = 0, g; ch < selEnd;) {
+			g = gf.logClusters[ch];
+			const auto gwidth = gf.glyphs.effectiveAdvance(g - lczero);
+			// ch2 - glyph end, ch - glyph start, (ch2 - ch) - how much chars it takes
+			int ch2 = ch + 1;
+			while ((ch2 < itemL) && (g == gf.logClusters[ch2])) {
+				++ch2;
+			}
+			if (ch2 <= selStart) {
+				selX += gwidth;
+			} else if (ch >= selStart && ch2 <= selEnd) {
+				selWidth += gwidth;
+			} else {
+				int sStart = ch, sEnd = ch2;
+				if (ch < selStart) {
+					sStart = selStart;
+					selX += QFixed(sStart - ch) * gwidth / QFixed(ch2 - ch);
+				}
+				if (ch2 >= selEnd) {
+					sEnd = selEnd;
+					selWidth += QFixed(sEnd - sStart) * gwidth / QFixed(ch2 - ch);
+					break;
+				}
+				selWidth += QFixed(sEnd - sStart) * gwidth / QFixed(ch2 - ch);
+			}
+			ch = ch2;
+		}
+	}
+	if (rtl) selX = x + itemWidth - (selX - x) - selWidth;
+
+	return { selX, selX + selWidth };
+}
+
 void Renderer::fillSelectRange(FixedRange range) {
 	if (range.empty()) {
 		return;
@@ -1213,6 +1286,13 @@ void Renderer::fillSelectRange(FixedRange range) {
 	_p->fillRect(left, _y + _yDelta, width, _fontHeight, _palette->selectBg);
 }
 
+void Renderer::pushHighlightRange(FixedRange range) {
+	if (range.empty()) {
+		return;
+	}
+	AppendRange(_highlightRanges, range);
+}
+
 void Renderer::pushSpoilerRange(
 		FixedRange range,
 		FixedRange selected,
@@ -1233,12 +1313,13 @@ void Renderer::pushSpoilerRange(
 	}
 }
 
-void Renderer::fillSpoilerRects() {
-	fillSpoilerRects(_spoilerRects, _spoilerRanges);
-	fillSpoilerRects(_spoilerSelectedRects, _spoilerSelectedRanges);
+void Renderer::fillRectsFromRanges() {
+	fillRectsFromRanges(_spoilerRects, _spoilerRanges);
+	fillRectsFromRanges(_spoilerSelectedRects, _spoilerSelectedRanges);
+	fillRectsFromRanges(_highlightRects, _highlightRanges);
 }
 
-void Renderer::fillSpoilerRects(
+void Renderer::fillRectsFromRanges(
 		QVarLengthArray<QRect, kSpoilersRectsSize> &rects,
 		QVarLengthArray<FixedRange> &ranges) {
 	if (ranges.empty()) {
@@ -1306,6 +1387,32 @@ void Renderer::paintSpoilerRects(
 	}
 }
 
+void Renderer::composeHighlightPath() {
+	Expects(_highlight != nullptr);
+	Expects(_highlight->outPath != nullptr);
+
+	if (_highlight->interpolateProgress >= 1.) {
+		_highlight->outPath->addRect(_highlight->interpolateTo);
+	} else if (_highlight->interpolateProgress <= 0.) {
+		for (const auto &rect : _highlightRects) {
+			_highlight->outPath->addRect(rect);
+		}
+	} else {
+		const auto to = _highlight->interpolateTo;
+		const auto progress = _highlight->interpolateProgress;
+		const auto lerp = [=](int from, int to) {
+			return from + (to - from) * progress;
+		};
+		for (const auto &rect : _highlightRects) {
+			_highlight->outPath->addRect(
+				lerp(rect.x(), to.x()),
+				lerp(rect.y(), to.y()),
+				lerp(rect.width(), to.width()),
+				lerp(rect.height(), to.height()));
+		}
+	}
+}
+
 void Renderer::elideSaveBlock(int32 blockIndex, const AbstractBlock *&_endBlock, int32 elideStart, int32 elideWidth) {
 	if (_elideSavedBlock) {
 		restoreAfterElided();
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index a0be7b1..e6b2e54 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -12,8 +12,10 @@
 
 #include <private/qtextengine_p.h>
 
+class QTextItemInt;
 struct QScriptAnalysis;
 struct QScriptLine;
+struct QScriptItem;
 
 namespace Ui::Text {
 
@@ -62,13 +64,29 @@ private:
 		uint16 _lineEnd,
 		const String::TextBlocks::const_iterator &_endBlockIter,
 		const String::TextBlocks::const_iterator &_end);
+	[[nodiscard]] FixedRange findSelectEmojiRange(
+		const QScriptItem &si,
+		const Ui::Text::AbstractBlock *currentBlock,
+		const Ui::Text::AbstractBlock *nextBlock,
+		QFixed x,
+		QFixed glyphX,
+		TextSelection selection) const;
+	[[nodiscard]] FixedRange findSelectTextRange(
+		const QScriptItem &si,
+		int itemStart,
+		int itemEnd,
+		QFixed x,
+		QFixed itemWidth,
+		const QTextItemInt &gf,
+		TextSelection selection) const;
 	void fillSelectRange(FixedRange range);
+	void pushHighlightRange(FixedRange range);
 	void pushSpoilerRange(
 		FixedRange range,
 		FixedRange selected,
 		bool isElidedItem);
-	void fillSpoilerRects();
-	void fillSpoilerRects(
+	void fillRectsFromRanges();
+	void fillRectsFromRanges(
 		QVarLengthArray<QRect, kSpoilersRectsSize> &rects,
 		QVarLengthArray<FixedRange> &ranges);
 	void paintSpoilerRects();
@@ -76,6 +94,7 @@ private:
 		const QVarLengthArray<QRect, kSpoilersRectsSize> &rects,
 		const style::color &color,
 		int index);
+	void composeHighlightPath();
 	void elideSaveBlock(
 		int32 blockIndex,
 		const AbstractBlock *&_endBlock,
@@ -137,13 +156,16 @@ private:
 	int _yTo = 0;
 	TextSelection _selection = { 0, 0 };
 	bool _fullWidthSelection = true;
+	HighlightInfoRequest *_highlight = nullptr;
 	const QChar *_str = nullptr;
 	mutable crl::time _cachedNow = 0;
 	float64 _spoilerOpacity = 0.;
 	QVarLengthArray<FixedRange> _spoilerRanges;
 	QVarLengthArray<FixedRange> _spoilerSelectedRanges;
+	QVarLengthArray<FixedRange> _highlightRanges;
 	QVarLengthArray<QRect, kSpoilersRectsSize> _spoilerRects;
 	QVarLengthArray<QRect, kSpoilersRectsSize> _spoilerSelectedRects;
+	QVarLengthArray<QRect, kSpoilersRectsSize> _highlightRects;
 
 	std::optional<CustomEmoji::Context> _customEmojiContext;
 	int _customEmojiSize = 0;

From 148be791963e32723056ae09de5f914f07df77b4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 31 Oct 2023 10:39:38 +0400
Subject: [PATCH 549/635] Override link colors in blockquotes.

---
 ui/text/text_renderer.cpp | 20 ++++++++++++++++----
 ui/text/text_renderer.h   |  1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 059bad7..6aea539 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -2250,8 +2250,14 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 
 		if (const auto color = block->colorIndex()) {
 			if (color == 1) {
-				_currentPen = &_palette->linkFg->p;
-				_currentPenSelected = &_palette->selectLinkFg->p;
+				if (_quote && _quote->blockquote && _quoteBlockquoteCache) {
+					_quoteLinkPenOverride = QPen(_quoteBlockquoteCache->outlines[0]);
+					_currentPen = &_quoteLinkPenOverride;
+					_currentPenSelected = &_quoteLinkPenOverride;
+				} else {
+					_currentPen = &_palette->linkFg->p;
+					_currentPenSelected = &_palette->selectLinkFg->p;
+				}
 			} else if (color - 1 <= _colors.size()) {
 				_currentPen = _colors[color - 2].pen;
 				_currentPenSelected = _colors[color - 2].penSelected;
@@ -2263,8 +2269,14 @@ void Renderer::applyBlockProperties(const AbstractBlock *block) {
 			_currentPen = &_palette->monoFg->p;
 			_currentPenSelected = &_palette->selectMonoFg->p;
 		} else if (block->linkIndex()) {
-			_currentPen = &_palette->linkFg->p;
-			_currentPenSelected = &_palette->selectLinkFg->p;
+			if (_quote && _quote->blockquote && _quoteBlockquoteCache) {
+				_quoteLinkPenOverride = QPen(_quoteBlockquoteCache->outlines[0]);
+				_currentPen = &_quoteLinkPenOverride;
+				_currentPenSelected = &_quoteLinkPenOverride;
+			} else {
+				_currentPen = &_palette->linkFg->p;
+				_currentPenSelected = &_palette->selectLinkFg->p;
+			}
 		} else {
 			_currentPen = &_originalPen;
 			_currentPenSelected = &_originalPenSelected;
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index e6b2e54..402caad 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -146,6 +146,7 @@ private:
 	style::align _align = style::al_topleft;
 	QPen _originalPen;
 	QPen _originalPenSelected;
+	QPen _quoteLinkPenOverride;
 	const QPen *_currentPen = nullptr;
 	const QPen *_currentPenSelected = nullptr;
 	struct {

From 835ba51f5e184b784bf676a36eda8e2d5f37d87b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 31 Oct 2023 12:47:22 +0400
Subject: [PATCH 550/635] Don't include newlines in format by default.

---
 ui/widgets/fields/input_field.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index d88b93e..1005389 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -2040,7 +2040,8 @@ QString InputField::getTextPart(
 		block = block.next();
 		if (block != till) {
 			tagAccumulator.feed(
-				TagWithoutCustomEmoji(tagAccumulator.currentTag()),
+				TagWithoutCustomEmoji(
+					block.charFormat().property(kTagProperty).toString()),
 				result.size());
 			result.append('\n');
 			markdownTagAccumulator.feed(newline, 1, lastTag);

From d7f12b083ee9901c5e5a95170559376d51b00f20 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 31 Oct 2023 12:47:48 +0400
Subject: [PATCH 551/635] Always make custom emoji most-inner tag.

---
 ui/text/text_entity.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 5adfe7c..383b3d0 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -2111,14 +2111,11 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 				closeType(type);
 			}
 		}
-		if (linkChanged && !nextState.link.isEmpty()) {
-			if (Ui::InputField::IsCustomEmojiLink(nextState.link)) {
-				const auto data = Ui::InputField::CustomEmojiEntityData(
-					nextState.link);
-				if (!data.isEmpty()) {
-					openType(EntityType::CustomEmoji, data);
-				}
-			} else if (IsMentionLink(nextState.link)) {
+		const auto openLink = linkChanged && !nextState.link.isEmpty();
+		const auto openCustomEmoji = openLink
+			&& Ui::InputField::IsCustomEmojiLink(nextState.link);
+		if (openLink && !openCustomEmoji) {
+			if (IsMentionLink(nextState.link)) {
 				const auto data = MentionEntityData(nextState.link);
 				if (!data.isEmpty()) {
 					openType(EntityType::MentionName, data);
@@ -2132,6 +2129,13 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 				openType(type, nextState.language);
 			}
 		}
+		if (openCustomEmoji) {
+			const auto data = Ui::InputField::CustomEmojiEntityData(
+				nextState.link);
+			if (!data.isEmpty()) {
+				openType(EntityType::CustomEmoji, data);
+			}
+		}
 		state = nextState;
 	};
 	const auto stateForTag = [&](const QString &tag) {

From 23ce4f09dfcc55888314299cb92baa77f082e309 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 1 Nov 2023 08:02:56 +0400
Subject: [PATCH 552/635] Rp{Widget,Window}NoRhi ->Rp{Widget,Window}OpenGL

This is more explicit
---
 ui/gl/gl_window.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/gl/gl_window.cpp b/ui/gl/gl_window.cpp
index 0495700..0f3fdd1 100644
--- a/ui/gl/gl_window.cpp
+++ b/ui/gl/gl_window.cpp
@@ -24,20 +24,20 @@ namespace {
 
 constexpr auto kUseNativeChild = false;// ::Platform::IsWindows();
 
-class RpWidgetNoRhi : public RpWidget {
+class RpWidgetOpenGL : public RpWidget {
 protected:
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
 	std::optional<QPlatformBackingStoreRhiConfig> rhiConfig() const override {
-		return QPlatformBackingStoreRhiConfig();
+		return { QPlatformBackingStoreRhiConfig::OpenGL };
 	}
 #endif // Qt >= 6.4.0
 };
 
-class RpWindowNoRhi : public RpWindow {
+class RpWindowOpenGL : public RpWindow {
 protected:
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
 	std::optional<QPlatformBackingStoreRhiConfig> rhiConfig() const override {
-		return QPlatformBackingStoreRhiConfig();
+		return { QPlatformBackingStoreRhiConfig::OpenGL };
 	}
 #endif // Qt >= 6.4.0
 };
@@ -79,7 +79,7 @@ not_null<RpWidget*> Window::widget() const {
 
 std::unique_ptr<RpWindow> Window::createWindow(
 		const Fn<Backend(Capabilities)> &chooseBackend) {
-	std::unique_ptr<RpWindow> result = std::make_unique<RpWindowNoRhi>();
+	std::unique_ptr<RpWindow> result = std::make_unique<RpWindowOpenGL>();
 	if constexpr (!kUseNativeChild) {
 		_backend = chooseBackend(CheckCapabilities(result.get()));
 		if (_backend != Backend::OpenGL) {
@@ -96,7 +96,7 @@ std::unique_ptr<RpWidget> Window::createNativeBodyWrap(
 		return nullptr;
 	}
 	const auto create = [] {
-		auto result = std::make_unique<RpWidgetNoRhi>();
+		auto result = std::make_unique<RpWidgetOpenGL>();
 		result->setWindowFlags(Qt::FramelessWindowHint | Qt::Window);
 		result->setAttribute(Qt::WA_NativeWindow);
 		result->setAttribute(Qt::WA_DontCreateNativeAncestors);

From 1ae65d2cba7e41f7bb43b490f2d0cc150a958163 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 2 Nov 2023 00:04:25 +0400
Subject: [PATCH 553/635] Switch Qt 6.4+ back to OpenGL on macOS

The flickering bug seem to be fixed with the sRGB hint
---
 ui/platform/mac/ui_window_mac.mm | 2 --
 ui/rp_widget.cpp                 | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/ui/platform/mac/ui_window_mac.mm b/ui/platform/mac/ui_window_mac.mm
index 9d91f3c..7b29363 100644
--- a/ui/platform/mac/ui_window_mac.mm
+++ b/ui/platform/mac/ui_window_mac.mm
@@ -273,9 +273,7 @@ void WindowHelper::Private::enforceStyle() {
 }
 
 void WindowHelper::Private::initOpenGL() {
-#if QT_VERSION < QT_VERSION_CHECK(6, 4, 0)
 	auto forceOpenGL = std::make_unique<QOpenGLWidget>(_owner->window());
-#endif // Qt < 6.4.0
 }
 
 void WindowHelper::Private::resolveWeakPointers() {
diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index a911a66..42d8e95 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -29,9 +29,6 @@ public:
 		if (const auto config = q->rhiConfig()) {
 			return *config;
 		}
-		if (::Platform::IsMac10_14OrGreater()) {
-			return { QPlatformBackingStoreRhiConfig::Metal };
-		}
 		// We can't specify the widget here as q_evaluateRhiConfig is called
 		// in QWidgetWindow constructor, while windowHandle is set right after
 		// the constructor is completed

From 3c645c8ea0e9f8b9afacc7918724e93276bf3ac6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 Nov 2023 13:33:31 +0400
Subject: [PATCH 554/635] Support internal static custom emoji.

---
 ui/text/custom_emoji_instance.cpp | 29 +++++++++++++++++++++++++++++
 ui/text/custom_emoji_instance.h   | 17 +++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index 65621cd..aadedce 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -858,4 +858,33 @@ void Object::repaint() {
 	_repaint();
 }
 
+Internal::Internal(QString entityData, QImage image, bool colored)
+: _entityData(std::move(entityData))
+, _image(std::move(image))
+, _colored(colored) {
+}
+
+QString Internal::entityData() {
+	return _entityData;
+}
+
+void Internal::paint(QPainter &p, const Context &context) {
+	context.internal.colorized = _colored;
+
+	const auto size = _image.size() / style::DevicePixelRatio();
+	const auto rect = QRect(context.position, size);
+	PaintScaledImage(p, rect, { &_image }, context);
+}
+
+void Internal::unload() {
+}
+
+bool Internal::ready() {
+	return true;
+}
+
+bool Internal::readyInDefaultState() {
+	return true;
+}
+
 } // namespace Ui::CustomEmoji
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
index c86010e..6e08bc1 100644
--- a/ui/text/custom_emoji_instance.h
+++ b/ui/text/custom_emoji_instance.h
@@ -273,4 +273,21 @@ private:
 
 };
 
+class Internal final : public Ui::Text::CustomEmoji {
+public:
+	Internal(QString entityData, QImage image, bool colored);
+
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	const QString _entityData;
+	const QImage _image;
+	const bool _colored = false;
+
+};
+
 } // namespace Ui::CustomEmoji

From 607c3909ddf6c0c8706f9eef5510adb03d16e58e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 Nov 2023 09:04:05 +0400
Subject: [PATCH 555/635] Fix links in multiline checkboxes.

---
 ui/widgets/checkbox.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index d17184d..bc3c6c7 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -807,8 +807,10 @@ Text::StateResult Checkbox::getTextState(const QPoint &m) const {
 		+ _st.textPosition.x();
 	const auto availableTextWidth = std::max(width() - textSkip, 1);
 	const auto textTop = _st.margin.top() + _st.textPosition.y();
+	auto request = Ui::Text::StateRequestElided();
+	request.lines = _allowTextLines;
 	return !_allowTextLines
-		? _text.getStateElided(
+		? _text.getState(
 			m - QPoint(textSkip, textTop),
 			availableTextWidth,
 			{})
@@ -816,7 +818,7 @@ Text::StateResult Checkbox::getTextState(const QPoint &m) const {
 			m - QPoint(textSkip, textTop),
 			availableTextWidth,
 			width(),
-			{});
+			request);
 }
 
 QPixmap Checkbox::grabCheckCache() const {

From 24390ae85300bc1aa261194b899d9c7bc50e3dca Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 2 Nov 2023 20:19:28 +0400
Subject: [PATCH 556/635] Support complex dimensions in Ui::Text::String.

---
 ui/text/custom_emoji_instance.cpp |   8 ++
 ui/text/custom_emoji_instance.h   |   4 +-
 ui/text/text.cpp                  | 163 ++++++++++++++++++++++--------
 ui/text/text.h                    |  11 +-
 ui/text/text_block.cpp            |   2 +-
 ui/text/text_custom_emoji.cpp     |  12 +++
 ui/text/text_custom_emoji.h       |   4 +
 ui/text/text_renderer.cpp         |   6 +-
 ui/text/text_renderer.h           |   1 -
 9 files changed, 161 insertions(+), 50 deletions(-)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index aadedce..29dec33 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -819,6 +819,10 @@ Object::~Object() {
 	unload();
 }
 
+int Object::width() {
+	return st::emojiSize + 2 * st::emojiPadding;
+}
+
 QString Object::entityData() {
 	return _instance->entityData();
 }
@@ -864,6 +868,10 @@ Internal::Internal(QString entityData, QImage image, bool colored)
 , _colored(colored) {
 }
 
+int Internal::width() {
+	return _image.width() / _image.devicePixelRatio();
+}
+
 QString Internal::entityData() {
 	return _entityData;
 }
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
index 6e08bc1..48ed3c3 100644
--- a/ui/text/custom_emoji_instance.h
+++ b/ui/text/custom_emoji_instance.h
@@ -258,6 +258,7 @@ public:
 	Object(not_null<Instance*> instance, Fn<void()> repaint);
 	~Object();
 
+	int width() override;
 	QString entityData() override;
 	void paint(QPainter &p, const Context &context) override;
 	void unload() override;
@@ -273,10 +274,11 @@ private:
 
 };
 
-class Internal final : public Ui::Text::CustomEmoji {
+class Internal final : public Text::CustomEmoji {
 public:
 	Internal(QString entityData, QImage image, bool colored);
 
+	int width() override;
 	QString entityData() override;
 	void paint(QPainter &p, const Context &context) override;
 	void unload() override;
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index e5c9bcc..e83bd06 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -838,13 +838,37 @@ void String::removeModificationsAfter(int size) {
 	}
 }
 
+String::DimensionsResult String::countDimensions(
+		GeometryDescriptor geometry) const {
+	return countDimensions(std::move(geometry), {});
+}
+
+String::DimensionsResult String::countDimensions(
+		GeometryDescriptor geometry,
+		DimensionsRequest request) const {
+	auto result = DimensionsResult();
+	if (request.lineWidths && request.reserve) {
+		result.lineWidths.reserve(request.reserve);
+	}
+	enumerateLines(geometry, [&](QFixed lineWidth, int lineBottom) {
+		const auto width = lineWidth.ceil().toInt();
+		if (request.lineWidths) {
+			result.lineWidths.push_back(width);
+		}
+		result.width = std::max(result.width, width);
+		result.height = lineBottom;
+	});
+	return result;
+
+}
+
 int String::countWidth(int width, bool breakEverywhere) const {
 	if (QFixed(width) >= _maxWidth) {
 		return _maxWidth;
 	}
 
 	QFixed maxLineWidth = 0;
-	enumerateLines(width, breakEverywhere, [&](QFixed lineWidth, int lineHeight) {
+	enumerateLines(width, breakEverywhere, [&](QFixed lineWidth, int) {
 		if (lineWidth > maxLineWidth) {
 			maxLineWidth = lineWidth;
 		}
@@ -857,8 +881,8 @@ int String::countHeight(int width, bool breakEverywhere) const {
 		return _minHeight;
 	}
 	int result = 0;
-	enumerateLines(width, breakEverywhere, [&](QFixed lineWidth, int lineHeight) {
-		result += lineHeight;
+	enumerateLines(width, breakEverywhere, [&](auto, int lineBottom) {
+		result = lineBottom;
 	});
 	return result;
 }
@@ -874,7 +898,7 @@ std::vector<int> String::countLineWidths(
 	if (options.reserve) {
 		result.reserve(options.reserve);
 	}
-	enumerateLines(width, options.breakEverywhere, [&](QFixed lineWidth, int lineHeight) {
+	enumerateLines(width, options.breakEverywhere, [&](QFixed lineWidth, int) {
 		result.push_back(lineWidth.ceil().toInt());
 	});
 	return result;
@@ -884,18 +908,85 @@ template <typename Callback>
 void String::enumerateLines(
 		int w,
 		bool breakEverywhere,
-		Callback callback) const {
-	const auto width = QFixed(std::max(w, _minResizeWidth));
+		Callback &&callback) const {
+	if (isEmpty()) {
+		return;
+	}
+	const auto width = std::max(w, _minResizeWidth);
+	auto g = SimpleGeometry(width, _st->font->height, 0, 0, false, false);
+	g.breakEverywhere = breakEverywhere;
+	enumerateLines(g, std::forward<Callback>(callback));
+}
+
+template <typename Callback>
+void String::enumerateLines(
+		GeometryDescriptor geometry,
+		Callback &&callback) const {
+	auto qindex = 0;
+	auto quote = (QuoteDetails*)nullptr;
+	auto qpadding = QMargins();
+
+	auto top = 0;
+	auto lineLeft = 0;
+	auto lineWidth = 0;
+	auto widthLeft = QFixed(0);
+	auto paragraphWidthRemaining = QFixed();
+	const auto initNextLine = [&] {
+		const auto line = geometry.layout({
+			.left = 0,
+			.top = top,
+			.width = paragraphWidthRemaining.ceil().toInt(),
+		});
+		lineLeft = line.left;
+		lineWidth = line.width;
+		if (quote && quote->maxWidth < lineWidth) {
+			const auto delta = lineWidth - quote->maxWidth;
+			lineWidth = quote->maxWidth;
+		}
+		widthLeft = lineWidth - qpadding.left() - qpadding.right();
+	};
+	const auto initNextParagraph = [&](
+			TextBlocks::const_iterator i,
+			int16 paragraphIndex) {
+		paragraphWidthRemaining = 0;
+		if (qindex != paragraphIndex) {
+			top += qpadding.bottom();
+			qindex = paragraphIndex;
+			quote = quoteByIndex(qindex);
+			qpadding = quotePadding(quote);
+			top += qpadding.top();
+			qpadding.setTop(0);
+		}
+		const auto e = _blocks.cend();
+		if (i != e) {
+			auto last_rPadding = QFixed(0);
+			auto last_rBearing = QFixed(0);
+			for (; i != e; ++i) {
+				if ((*i)->type() == TextBlockType::Newline) {
+					break;
+				}
+				const auto rBearing = (*i)->f_rbearing();
+				paragraphWidthRemaining += last_rBearing
+					+ last_rPadding
+					+ (*i)->f_width()
+					- rBearing;
+				last_rBearing = rBearing;
+			}
+		}
+		paragraphWidthRemaining += qpadding.left() + qpadding.right();
+		initNextLine();
+	};
+
+	if ((*_blocks.cbegin())->type() != TextBlockType::Newline) {
+		initNextParagraph(_blocks.cbegin(), _startQuoteIndex);
+	}
 
-	auto qindex = quoteIndex(nullptr);
-	auto quote = quoteByIndex(qindex);
-	auto qpadding = quotePadding(quote);
-	auto widthLeft = width - qpadding.left() - qpadding.right();
 	auto lineHeight = 0;
 	auto last_rBearing = QFixed();
 	auto last_rPadding = QFixed();
 	bool longWordLine = true;
-	for (auto &b : _blocks) {
+	for (auto i = _blocks.cbegin(); i != _blocks.cend(); ++i) {
+		const auto &b = *i;
 		auto _btype = b->type();
 		const auto blockHeight = CountBlockHeight(b.get(), _st);
 
@@ -903,25 +994,16 @@ void String::enumerateLines(
 			if (!lineHeight) {
 				lineHeight = blockHeight;
 			}
-			lineHeight += qpadding.top();
-			const auto index = quoteIndex(b.get());
-			if (qindex != index) {
+			const auto index = b.unsafe<const NewlineBlock>().quoteIndex();
+			const auto changed = (qindex != index);
+			if (changed) {
 				lineHeight += qpadding.bottom();
-				qindex = index;
-				quote = quoteByIndex(qindex);
-				qpadding = quotePadding(quote);
-			} else {
-				qpadding.setTop(0);
 			}
 
-			callback(width - widthLeft, lineHeight);
-
+			callback(lineLeft + lineWidth - widthLeft, top += lineHeight);
 			lineHeight = 0;
-			last_rBearing = 0;// b->f_rbearing(); (0 for newline)
-			last_rPadding = 0;// b->f_rpadding(); (0 for newline)
-			widthLeft = width - qpadding.left() - qpadding.right();
-			// - (b->f_width() - last_rBearing); (0 for newline)
 
+			initNextParagraph(i + 1, index);
 			longWordLine = true;
 			continue;
 		}
@@ -974,23 +1056,23 @@ void String::enumerateLines(
 					continue;
 				}
 
-				if (f != j && !breakEverywhere) {
+				if (f != j && !geometry.breakEverywhere) {
 					j = f;
 					widthLeft = f_wLeft;
 					lineHeight = f_lineHeight;
 					j_width = (j->f_width() >= 0) ? j->f_width() : -j->f_width();
 				}
 
-				callback(width - widthLeft, lineHeight + qpadding.top());
-				qpadding.setTop(0);
+				callback(lineLeft + lineWidth - widthLeft, top += lineHeight);
 
 				lineHeight = qMax(0, blockHeight);
+
+				paragraphWidthRemaining -= (lineWidth - widthLeft) - last_rPadding + last_rBearing;
+				initNextLine();
+
 				last_rBearing = j->f_rbearing();
 				last_rPadding = j->f_rpadding();
-				widthLeft = width
-					- qpadding.left()
-					- qpadding.right()
-					- (j_width - last_rBearing);
+				widthLeft -= j_width - last_rBearing;
 
 				longWordLine = !wordEndsHere;
 				f = j + 1;
@@ -1000,24 +1082,23 @@ void String::enumerateLines(
 			continue;
 		}
 
-		callback(width - widthLeft, lineHeight + qpadding.top());
-		qpadding.setTop(0);
+		callback(lineLeft + lineWidth - widthLeft, top += lineHeight);
 
 		lineHeight = qMax(0, blockHeight);
+		paragraphWidthRemaining -= (lineWidth - widthLeft) - last_rPadding + last_rBearing;
+		initNextLine();
+
 		last_rBearing = b__f_rbearing;
 		last_rPadding = b->f_rpadding();
-		widthLeft = width
-			- qpadding.left()
-			- qpadding.right()
-			- (b->f_width() - last_rBearing);
+		widthLeft -= b->f_width() - last_rBearing;
 
 		longWordLine = true;
 		continue;
 	}
-	if (widthLeft < width) {
+	if (widthLeft < lineWidth) {
 		callback(
-			width - widthLeft,
-			lineHeight + qpadding.top() + qpadding.bottom());
+			lineLeft + lineWidth - widthLeft,
+			top + lineHeight + qpadding.bottom());
 	}
 }
 
diff --git a/ui/text/text.h b/ui/text/text.h
index 29c8fc1..fc174d7 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -275,6 +275,7 @@ public:
 		std::vector<int> lineWidths;
 	};
 	struct DimensionsRequest {
+		bool breakEverywhere = false;
 		bool lineWidths = false;
 		int reserve = 0;
 	};
@@ -414,13 +415,17 @@ private:
 		FlagsChangeCallback flagsChangeCallback) const;
 
 	// Template method for countWidth(), countHeight(), countLineWidths().
-	// callback(lineWidth, lineHeight) will be called for all lines with:
-	// QFixed lineWidth, int lineHeight
+	// callback(lineWidth, lineBottom) will be called for all lines with:
+	// QFixed lineWidth, int lineBottom
 	template <typename Callback>
 	void enumerateLines(
 		int w,
 		bool breakEverywhere,
-		Callback callback) const;
+		Callback &&callback) const;
+	template <typename Callback>
+	void enumerateLines(
+		GeometryDescriptor geometry,
+		Callback &&callback) const;
 
 	void insertModifications(int position, int delta);
 	void removeModificationsAfter(int size);
diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index 43c5288..e24723d 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -551,7 +551,7 @@ CustomEmojiBlock::CustomEmojiBlock(
 	linkIndex,
 	colorIndex)
 , _custom(std::move(custom)) {
-	_width = int(st::emojiSize + 2 * st::emojiPadding);
+	_width = _custom->width();
 	_rpadding = 0;
 	for (auto i = length; i != 0;) {
 		auto ch = text[_position + (--i)];
diff --git a/ui/text/text_custom_emoji.cpp b/ui/text/text_custom_emoji.cpp
index 3faa371..165c632 100644
--- a/ui/text/text_custom_emoji.cpp
+++ b/ui/text/text_custom_emoji.cpp
@@ -19,6 +19,10 @@ ShiftedEmoji::ShiftedEmoji(
 , _shift(shift) {
 }
 
+int ShiftedEmoji::width() {
+	return _wrapped->width();
+}
+
 QString ShiftedEmoji::entityData() {
 	return _wrapped->entityData();
 }
@@ -45,6 +49,10 @@ FirstFrameEmoji::FirstFrameEmoji(std::unique_ptr<CustomEmoji> wrapped)
 : _wrapped(std::move(wrapped)) {
 }
 
+int FirstFrameEmoji::width() {
+	return _wrapped->width();
+}
+
 QString FirstFrameEmoji::entityData() {
 	return _wrapped->entityData();
 }
@@ -77,6 +85,10 @@ LimitedLoopsEmoji::LimitedLoopsEmoji(
 , _stopOnLast(stopOnLast) {
 }
 
+int LimitedLoopsEmoji::width() {
+	return _wrapped->width();
+}
+
 QString LimitedLoopsEmoji::entityData() {
 	return _wrapped->entityData();
 }
diff --git a/ui/text/text_custom_emoji.h b/ui/text/text_custom_emoji.h
index 76d525b..59b77a6 100644
--- a/ui/text/text_custom_emoji.h
+++ b/ui/text/text_custom_emoji.h
@@ -40,6 +40,7 @@ class CustomEmoji {
 public:
 	virtual ~CustomEmoji() = default;
 
+	[[nodiscard]] virtual int width() = 0;
 	[[nodiscard]] virtual QString entityData() = 0;
 
 	using Context = CustomEmojiPaintContext;
@@ -58,6 +59,7 @@ class ShiftedEmoji final : public CustomEmoji {
 public:
 	ShiftedEmoji(std::unique_ptr<CustomEmoji> wrapped, QPoint shift);
 
+	int width() override;
 	QString entityData() override;
 	void paint(QPainter &p, const Context &context) override;
 	void unload() override;
@@ -74,6 +76,7 @@ class FirstFrameEmoji final : public CustomEmoji {
 public:
 	explicit FirstFrameEmoji(std::unique_ptr<CustomEmoji> wrapped);
 
+	int width() override;
 	QString entityData() override;
 	void paint(QPainter &p, const Context &context) override;
 	void unload() override;
@@ -92,6 +95,7 @@ public:
 		int limit,
 		bool stopOnLast = false);
 
+	int width() override;
 	QString entityData() override;
 	void paint(QPainter &p, const Context &context) override;
 	void unload() override;
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 6aea539..42b28fb 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -949,14 +949,14 @@ bool Renderer::drawLine(uint16 _lineEnd, const String::TextBlocks::const_iterato
 						const auto color = (selected
 							? _currentPenSelected
 							: _currentPen)->color();
-						if (!_customEmojiSize) {
-							_customEmojiSize = AdjustCustomEmojiSize(st::emojiSize);
-							_customEmojiSkip = (st::emojiSize - _customEmojiSize) / 2;
+						if (!_customEmojiContext) {
 							_customEmojiContext = CustomEmoji::Context{
 								.textColor = color,
 								.now = now(),
 								.paused = _pausedEmoji,
 							};
+							_customEmojiSkip = (st::emojiSize
+								- AdjustCustomEmojiSize(st::emojiSize)) / 2;
 						} else {
 							_customEmojiContext->textColor = color;
 						}
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index 402caad..a248d4d 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -169,7 +169,6 @@ private:
 	QVarLengthArray<QRect, kSpoilersRectsSize> _highlightRects;
 
 	std::optional<CustomEmoji::Context> _customEmojiContext;
-	int _customEmojiSize = 0;
 	int _customEmojiSkip = 0;
 	int _indexOfElidedBlock = -1; // For spoilers.
 

From fa787b6b0dca9132ff96bc3f6473e1bf44341a44 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 3 Nov 2023 13:24:49 +0400
Subject: [PATCH 557/635] Fix crash in empty text geometry requests.

---
 ui/text/text.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index e83bd06..6e56f14 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -922,6 +922,9 @@ template <typename Callback>
 void String::enumerateLines(
 		GeometryDescriptor geometry,
 		Callback &&callback) const {
+	if (isEmpty()) {
+		return;
+	}
 	auto qindex = 0;
 	auto quote = (QuoteDetails*)nullptr;
 	auto qpadding = QMargins();

From 08235c5e06ac56564157f2856702804a2149d45e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 4 Nov 2023 21:14:50 +0400
Subject: [PATCH 558/635] Use internal custom emoji with paddings.

---
 ui/text/custom_emoji_instance.cpp | 15 ++++++++++++---
 ui/text/custom_emoji_instance.h   |  7 ++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index 29dec33..de94b85 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -862,14 +862,21 @@ void Object::repaint() {
 	_repaint();
 }
 
-Internal::Internal(QString entityData, QImage image, bool colored)
+Internal::Internal(
+	QString entityData,
+	QImage image,
+	QMargins padding,
+	bool colored)
 : _entityData(std::move(entityData))
 , _image(std::move(image))
+, _padding(padding)
 , _colored(colored) {
 }
 
 int Internal::width() {
-	return _image.width() / _image.devicePixelRatio();
+	return _padding.left()
+		+ (_image.width() / _image.devicePixelRatio())
+		+ _padding.right();
 }
 
 QString Internal::entityData() {
@@ -880,7 +887,9 @@ void Internal::paint(QPainter &p, const Context &context) {
 	context.internal.colorized = _colored;
 
 	const auto size = _image.size() / style::DevicePixelRatio();
-	const auto rect = QRect(context.position, size);
+	const auto rect = QRect(
+		context.position + QPoint(_padding.left(), _padding.top()),
+		size);
 	PaintScaledImage(p, rect, { &_image }, context);
 }
 
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
index 48ed3c3..597600f 100644
--- a/ui/text/custom_emoji_instance.h
+++ b/ui/text/custom_emoji_instance.h
@@ -276,7 +276,11 @@ private:
 
 class Internal final : public Text::CustomEmoji {
 public:
-	Internal(QString entityData, QImage image, bool colored);
+	Internal(
+		QString entityData,
+		QImage image,
+		QMargins padding,
+		bool colored);
 
 	int width() override;
 	QString entityData() override;
@@ -288,6 +292,7 @@ public:
 private:
 	const QString _entityData;
 	const QImage _image;
+	const QMargins _padding;
 	const bool _colored = false;
 
 };

From 65310f32dcc980aeca0b13253b1278a6f3ce722e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Nov 2023 11:28:27 +0400
Subject: [PATCH 559/635] Count correctly elided text dimensions.

---
 ui/text/text.cpp          | 116 ++++++++++++++++----------------------
 ui/text/text.h            |  10 ++--
 ui/text/text_renderer.cpp |  34 ++---------
 ui/text/text_renderer.h   |   2 +-
 4 files changed, 61 insertions(+), 101 deletions(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 6e56f14..f288572 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -142,47 +142,36 @@ not_null<SpoilerMessCache*> DefaultSpoilerCache() {
 
 GeometryDescriptor SimpleGeometry(
 		int availableWidth,
-		int fontHeight,
-		int elisionHeight,
+		int elisionLines,
 		int elisionRemoveFromEnd,
-		bool elisionOneLine,
 		bool elisionBreakEverywhere) {
 	constexpr auto wrap = [](
-			Fn<LineGeometry(LineGeometry)> layout,
+			Fn<LineGeometry(int line)> layout,
 			bool breakEverywhere = false) {
 		return GeometryDescriptor{ std::move(layout), breakEverywhere };
 	};
 
 	// Try to minimize captured values (to minimize Fn allocations).
-	if (!elisionOneLine && !elisionHeight) {
-		return wrap([=](LineGeometry line) {
-			line.width = availableWidth;
-			return line;
+	if (!elisionLines) {
+		return wrap([=](int line) {
+			return LineGeometry{ .width = availableWidth };
 		});
-	} else if (elisionOneLine) {
-		return wrap([=](LineGeometry line) {
-			line.elided = true;
-			line.width = availableWidth - elisionRemoveFromEnd;
-			return line;
-		}, elisionBreakEverywhere);
 	} else if (!elisionRemoveFromEnd) {
-		return wrap([=](LineGeometry line) {
-			if (line.top + fontHeight * 2 > elisionHeight) {
-				line.elided = true;
-			}
-			line.width = availableWidth;
-			return line;
-		});
+		return wrap([=](int line) {
+			return LineGeometry{
+				.width = availableWidth,
+				.elided = (line + 1 >= elisionLines),
+			};
+		}, elisionBreakEverywhere);
 	} else {
-		return wrap([=](LineGeometry line) {
-			if (line.top + fontHeight * 2 > elisionHeight) {
-				line.elided = true;
-				line.width = availableWidth - elisionRemoveFromEnd;
-			} else {
-				line.width = availableWidth;
-			}
-			return line;
-		});
+		return wrap([=](int line) {
+			const auto elided = (line + 1 >= elisionLines);
+			const auto removeFromEnd = (elided ? elisionRemoveFromEnd : 0);
+			return LineGeometry{
+				.width = availableWidth - removeFromEnd,
+				.elided = elided,
+			};
+		}, elisionBreakEverywhere);
 	}
 };
 
@@ -913,7 +902,7 @@ void String::enumerateLines(
 		return;
 	}
 	const auto width = std::max(w, _minResizeWidth);
-	auto g = SimpleGeometry(width, _st->font->height, 0, 0, false, false);
+	auto g = SimpleGeometry(width, 0, 0, false);
 	g.breakEverywhere = breakEverywhere;
 	enumerateLines(g, std::forward<Callback>(callback));
 }
@@ -925,6 +914,13 @@ void String::enumerateLines(
 	if (isEmpty()) {
 		return;
 	}
+
+	const auto withElided = [&](bool elided) {
+		if (geometry.outElided) {
+			*geometry.outElided = elided;
+		}
+	};
+
 	auto qindex = 0;
 	auto quote = (QuoteDetails*)nullptr;
 	auto qpadding = QMargins();
@@ -932,16 +928,14 @@ void String::enumerateLines(
 	auto top = 0;
 	auto lineLeft = 0;
 	auto lineWidth = 0;
+	auto lineElided = false;
 	auto widthLeft = QFixed(0);
-	auto paragraphWidthRemaining = QFixed();
+	auto lineIndex = 0;
 	const auto initNextLine = [&] {
-		const auto line = geometry.layout({
-			.left = 0,
-			.top = top,
-			.width = paragraphWidthRemaining.ceil().toInt(),
-		});
+		const auto line = geometry.layout(lineIndex++);
 		lineLeft = line.left;
 		lineWidth = line.width;
+		lineElided = line.elided;
 		if (quote && quote->maxWidth < lineWidth) {
 			const auto delta = lineWidth - quote->maxWidth;
 			lineWidth = quote->maxWidth;
@@ -951,7 +945,6 @@ void String::enumerateLines(
 	const auto initNextParagraph = [&](
 			TextBlocks::const_iterator i,
 			int16 paragraphIndex) {
-		paragraphWidthRemaining = 0;
 		if (qindex != paragraphIndex) {
 			top += qpadding.bottom();
 			qindex = paragraphIndex;
@@ -960,23 +953,6 @@ void String::enumerateLines(
 			top += qpadding.top();
 			qpadding.setTop(0);
 		}
-		const auto e = _blocks.cend();
-		if (i != e) {
-			auto last_rPadding = QFixed(0);
-			auto last_rBearing = QFixed(0);
-			for (; i != e; ++i) {
-				if ((*i)->type() == TextBlockType::Newline) {
-					break;
-				}
-				const auto rBearing = (*i)->f_rbearing();
-				paragraphWidthRemaining += last_rBearing
-					+ last_rPadding
-					+ (*i)->f_width()
-					- rBearing;
-				last_rBearing = rBearing;
-			}
-		}
-		paragraphWidthRemaining += qpadding.left() + qpadding.right();
 		initNextLine();
 	};
 
@@ -1004,6 +980,9 @@ void String::enumerateLines(
 			}
 
 			callback(lineLeft + lineWidth - widthLeft, top += lineHeight);
+			if (lineElided) {
+				return withElided(true);
+			}
 			lineHeight = 0;
 
 			initNextParagraph(i + 1, index);
@@ -1059,7 +1038,9 @@ void String::enumerateLines(
 					continue;
 				}
 
-				if (f != j && !geometry.breakEverywhere) {
+				if (lineElided) {
+					lineHeight = qMax(lineHeight, blockHeight);
+				} else if (f != j && !geometry.breakEverywhere) {
 					j = f;
 					widthLeft = f_wLeft;
 					lineHeight = f_lineHeight;
@@ -1067,10 +1048,12 @@ void String::enumerateLines(
 				}
 
 				callback(lineLeft + lineWidth - widthLeft, top += lineHeight);
+				if (lineElided) {
+					return withElided(true);
+				}
 
 				lineHeight = qMax(0, blockHeight);
 
-				paragraphWidthRemaining -= (lineWidth - widthLeft) - last_rPadding + last_rBearing;
 				initNextLine();
 
 				last_rBearing = j->f_rbearing();
@@ -1085,10 +1068,15 @@ void String::enumerateLines(
 			continue;
 		}
 
+		if (lineElided) {
+			lineHeight = qMax(lineHeight, blockHeight);
+		}
 		callback(lineLeft + lineWidth - widthLeft, top += lineHeight);
+		if (lineElided) {
+			return withElided(true);
+		}
 
 		lineHeight = qMax(0, blockHeight);
-		paragraphWidthRemaining -= (lineWidth - widthLeft) - last_rPadding + last_rBearing;
 		initNextLine();
 
 		last_rBearing = b__f_rbearing;
@@ -1103,6 +1091,7 @@ void String::enumerateLines(
 			lineLeft + lineWidth - widthLeft,
 			top + lineHeight + qpadding.bottom());
 	}
+	return withElided(false);
 }
 
 void String::draw(QPainter &p, const PaintContext &context) const {
@@ -1144,11 +1133,8 @@ void String::drawElided(Painter &p, int32 left, int32 top, int32 w, int32 lines,
 		.palette = &p.textPalette(),
 		.paused = p.inactive(),
 		.selection = selection,
-		.elisionHeight = ((!isEmpty() && lines > 1)
-			? (lines * _st->font->height)
-			: 0),
+		.elisionLines = lines,
 		.elisionRemoveFromEnd = removeFromEnd,
-		.elisionOneLine = (lines == 1),
 	});
 }
 
@@ -1185,7 +1171,7 @@ StateResult String::getState(QPoint point, int width, StateRequest request) cons
 	}
 	return Renderer(*this).getState(
 		point,
-		SimpleGeometry(width, _st->font->height, 0, 0, false, false),
+		SimpleGeometry(width, 0, 0, false),
 		request);
 }
 
@@ -1199,10 +1185,8 @@ StateResult String::getStateElided(QPoint point, int width, StateRequestElided r
 	}
 	return Renderer(*this).getState(point, SimpleGeometry(
 		width,
-		_st->font->height,
-		(request.lines > 1) ? (request.lines * _st->font->height) : 0,
+		request.lines,
 		request.removeFromEnd,
-		(request.lines == 1),
 		request.flags & StateRequest::Flag::BreakEverywhere
 	), static_cast<StateRequest>(request));
 }
diff --git a/ui/text/text.h b/ui/text/text.h
index fc174d7..e6f8f42 100644
--- a/ui/text/text.h
+++ b/ui/text/text.h
@@ -146,23 +146,21 @@ struct SpecialColor {
 
 struct LineGeometry {
 	int left = 0;
-	int top = 0;
 	int width = 0;
 	bool elided = false;
 };
 struct GeometryDescriptor {
-	Fn<LineGeometry(LineGeometry line)> layout;
+	Fn<LineGeometry(int line)> layout;
 	bool breakEverywhere = false;
+	bool *outElided = nullptr;
 };
 
 [[nodiscard]] not_null<SpoilerMessCache*> DefaultSpoilerCache();
 
 [[nodiscard]] GeometryDescriptor SimpleGeometry(
 	int availableWidth,
-	int fontHeight,
-	int elisionHeight,
+	int elisionLines,
 	int elisionRemoveFromEnd,
-	bool elisionOneLine,
 	bool elisionBreakEverywhere);
 
 constexpr auto kMaxQuoteOutlines = 3;
@@ -230,8 +228,8 @@ struct PaintContext {
 	HighlightInfoRequest *highlight = nullptr;
 
 	int elisionHeight = 0;
+	int elisionLines = 0;
 	int elisionRemoveFromEnd = 0;
-	bool elisionOneLine = false;
 	bool elisionBreakEverywhere = false;
 };
 
diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 42b28fb..2231fa0 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -189,10 +189,10 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 		? context.geometry
 		: SimpleGeometry(
 			context.availableWidth,
-			_t->_st->font->height,
-			context.elisionHeight,
+			(context.elisionLines
+				? context.elisionLines
+				: (context.elisionHeight / _t->_st->font->height)),
 			context.elisionRemoveFromEnd,
-			context.elisionOneLine,
 			context.elisionBreakEverywhere);
 	_breakEverywhere = _geometry.breakEverywhere;
 	_spoilerCache = context.spoiler;
@@ -213,6 +213,8 @@ void Renderer::draw(QPainter &p, const PaintContext &context) {
 }
 
 void Renderer::enumerate() {
+	Expects(!_geometry.outElided);
+
 	_blocksSize = _t->_blocks.size();
 	_str = _t->_text.unicode();
 
@@ -356,7 +358,6 @@ void Renderer::enumerate() {
 				_lineHeight = qMax(0, blockHeight);
 				_lineStart = j->position();
 				_lineStartBlock = blockIndex;
-				_paragraphWidthRemaining -= (_lineWidth - _wLeft) - _last_rPadding + last_rBearing;
 				initNextLine();
 
 				last_rBearing = j->f_rbearing();
@@ -385,7 +386,6 @@ void Renderer::enumerate() {
 		_lineHeight = qMax(0, blockHeight);
 		_lineStart = b->position();
 		_lineStartBlock = blockIndex;
-		_paragraphWidthRemaining -= (_lineWidth - _wLeft) - _last_rPadding + last_rBearing;
 		initNextLine();
 
 		last_rBearing = b__f_rbearing;
@@ -506,7 +506,6 @@ void Renderer::initNextParagraph(
 		? style::LayoutDirection()
 		: direction;
 	_paragraphStartBlock = i;
-	_paragraphWidthRemaining = 0;
 	if (_quoteIndex != paragraphIndex) {
 		_y += _quotePadding.bottom();
 		_quoteIndex = paragraphIndex;
@@ -525,39 +524,18 @@ void Renderer::initNextParagraph(
 	} else {
 		_lineStart = _paragraphStart = (*i)->position();
 		_lineStartBlock = i - _t->_blocks.cbegin();
-
-		auto last_rPadding = QFixed(0);
-		auto last_rBearing = QFixed(0);
-		for (; i != e; ++i) {
-			if ((*i)->type() == TextBlockType::Newline) {
-				break;
-			}
-			const auto rBearing = (*i)->f_rbearing();
-			_paragraphWidthRemaining += last_rBearing
-				+ last_rPadding
-				+ (*i)->f_width()
-				- rBearing;
-			last_rBearing = rBearing;
-		}
 		_paragraphLength = ((i == e)
 			? _t->_text.size()
 			: (*i)->position())
 			- _paragraphStart;
 	}
 	_paragraphAnalysis.resize(0);
-	_paragraphWidthRemaining += _quotePadding.left() + _quotePadding.right();
 	initNextLine();
 }
 
 void Renderer::initNextLine() {
-	const auto line = _geometry.layout({
-		.left = 0,
-		.top = (_y - _startTop),
-		.width = _paragraphWidthRemaining.ceil().toInt(),
-	});
-	_quoteLineTop += _startTop + line.top - _y;
+	const auto line = _geometry.layout(_lineIndex++);
 	_x = _startLeft + line.left + _quotePadding.left();
-	_y = _startTop + line.top;
 	_startLineWidth = line.width;
 	_quoteShift = 0;
 	if (_quote && _quote->maxWidth < _startLineWidth) {
diff --git a/ui/text/text_renderer.h b/ui/text/text_renderer.h
index a248d4d..ba9aab7 100644
--- a/ui/text/text_renderer.h
+++ b/ui/text/text_renderer.h
@@ -179,7 +179,6 @@ private:
 	int _paragraphLength = 0;
 	bool _paragraphHasBidi = false;
 	QVarLengthArray<QScriptAnalysis, 4096> _paragraphAnalysis;
-	QFixed _paragraphWidthRemaining = 0;
 
 	// current quote data
 	QuoteDetails *_quote = nullptr;
@@ -203,6 +202,7 @@ private:
 	QFixed _x, _wLeft, _last_rPadding;
 	int _y = 0;
 	int _yDelta = 0;
+	int _lineIndex = 0;
 	int _lineHeight = 0;
 	int _fontHeight = 0;
 	bool _breakEverywhere = false;

From 762a611f2009e623d6291ae5564bcd5fa4602e3d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Nov 2023 13:38:03 +0400
Subject: [PATCH 560/635] Fix possible std::clamp contract violation.

---
 ui/rp_widget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/rp_widget.h b/ui/rp_widget.h
index 347963a..0cb7e6f 100644
--- a/ui/rp_widget.h
+++ b/ui/rp_widget.h
@@ -226,7 +226,7 @@ public:
 
 	// Updates the area that is visible inside the scroll container.
 	void setVisibleTopBottom(int visibleTop, int visibleBottom) {
-		auto max = height();
+		const auto max = std::max(height(), 0);
 		visibleTopBottomUpdated(
 			std::clamp(visibleTop, 0, max),
 			std::clamp(visibleBottom, 0, max));

From b8998700c4a34890cf20b7cad0a9225877101d69 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Nov 2023 14:41:24 +0400
Subject: [PATCH 561/635] Make links in multiline tooltips clickable.

---
 ui/toast/toast_widget.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/toast/toast_widget.cpp b/ui/toast/toast_widget.cpp
index a1b8cd7..0907e1b 100644
--- a/ui/toast/toast_widget.cpp
+++ b/ui/toast/toast_widget.cpp
@@ -44,7 +44,7 @@ Widget::Widget(QWidget *parent, const Config &config)
 , _adaptive(config.adaptive)
 , _maxTextWidth(widthWithoutPadding(_st->maxWidth))
 , _maxTextHeight(
-	config.st->style.font->height * (_multiline ? config.maxLines : 1))
+	_st->style.font->height * (_multiline ? config.maxLines : 1))
 , _text(_multiline ? widthWithoutPadding(config.st->minWidth) : kQFixedMax)
 , _clickHandlerFilter(config.filter) {
 	const auto toastOptions = TextParseOptions{
@@ -200,7 +200,9 @@ void Widget::mouseMoveEvent(QMouseEvent *e) {
 	}
 	const auto point = e->pos()
 		- QPoint(_st->padding.left(), _textTop);
-	const auto state = _text.getStateElided(point, _textWidth + 1);
+	auto request = Ui::Text::StateRequestElided();
+	request.lines = (_maxTextHeight / _st->style.font->height);
+	const auto state = _text.getStateElided(point, _textWidth + 1, request);
 	const auto was = ClickHandler::getActive();
 	if (was != state.link) {
 		ClickHandler::setActive(state.link);

From f59c13455ce53933b9024fa32fd3a5f4e7ed0405 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Nov 2023 20:29:27 +0400
Subject: [PATCH 562/635] Fix bidi data init.

---
 ui/text/text_renderer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/text/text_renderer.cpp b/ui/text/text_renderer.cpp
index 2231fa0..58e72bd 100644
--- a/ui/text/text_renderer.cpp
+++ b/ui/text/text_renderer.cpp
@@ -524,6 +524,11 @@ void Renderer::initNextParagraph(
 	} else {
 		_lineStart = _paragraphStart = (*i)->position();
 		_lineStartBlock = i - _t->_blocks.cbegin();
+		for (; i != e; ++i) {
+			if ((*i)->type() == TextBlockType::Newline) {
+				break;
+			}
+		}
 		_paragraphLength = ((i == e)
 			? _t->_text.size()
 			: (*i)->position())

From 0837a6364d85fc2b057d14b3548d7d7b644adab3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 6 Nov 2023 20:30:20 +0400
Subject: [PATCH 563/635] Fix build with GCC.

---
 ui/text/text.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index f288572..95f10cb 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -937,7 +937,6 @@ void String::enumerateLines(
 		lineWidth = line.width;
 		lineElided = line.elided;
 		if (quote && quote->maxWidth < lineWidth) {
-			const auto delta = lineWidth - quote->maxWidth;
 			lineWidth = quote->maxWidth;
 		}
 		widthLeft = lineWidth - qpadding.left() - qpadding.right();

From d28afffcb9211228d6b5a4424da330637f12ca4a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 7 Nov 2023 12:39:17 +0400
Subject: [PATCH 564/635] Workaround menu click-through on macOS 14.1.

---
 ui/platform/linux/ui_utility_linux.h |  3 +++
 ui/platform/mac/ui_utility_mac.mm    | 17 +++++++++++++++++
 ui/platform/ui_platform_utility.h    |  1 +
 ui/platform/win/ui_utility_win.h     |  3 +++
 ui/widgets/popup_menu.cpp            |  1 +
 5 files changed, 25 insertions(+)

diff --git a/ui/platform/linux/ui_utility_linux.h b/ui/platform/linux/ui_utility_linux.h
index f2b58a7..bdde615 100644
--- a/ui/platform/linux/ui_utility_linux.h
+++ b/ui/platform/linux/ui_utility_linux.h
@@ -29,6 +29,9 @@ inline void UpdateOverlayed(not_null<QWidget*> widget) {
 inline void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 }
 
+inline void AcceptAllMouseInput(not_null<QWidget*> widget) {
+}
+
 inline void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio) {
 }
 
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 366b42f..9f30cec 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -77,6 +77,23 @@ void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 	}
 }
 
+void AcceptAllMouseInput(not_null<QWidget*> widget) {
+	// https://github.com/telegramdesktop/tdesktop/issues/27025
+	//
+	// By default system clicks through fully transparent pixels,
+	// and starting with macOS 14.1 it counts the transparency
+	// incorrectly (as if `y` is mirrored), so when clicking
+	// on a reactions strip outside of the menu column the click
+	// is ignored and made on the underlying window, because at the
+	// bottom of the menu in the same place there is nothing, empty.
+	//
+	// We explicitly request all the input to disable this behavior.
+	//
+	// See https://stackoverflow.com/a/29451199 and comments.
+	NSWindow *window = [reinterpret_cast<NSView*>(widget->winId()) window];
+	[window setIgnoresMouseEvents:NO];
+}
+
 void DrainMainQueue() {
 #ifndef OS_MAC_STORE
 	_dispatch_main_queue_callback_4CF(nullptr);
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 73d6c27..227c064 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -28,6 +28,7 @@ void UpdateOverlayed(not_null<QWidget*> widget);
 void ShowOverAll(not_null<QWidget*> widget, bool canFocus = true);
 void IgnoreAllActivation(not_null<QWidget*> widget);
 void ClearTransientParent(not_null<QWidget*> widget);
+void AcceptAllMouseInput(not_null<QWidget*> widget);
 
 void DisableSystemWindowResize(not_null<QWidget*> widget, QSize ratio);
 
diff --git a/ui/platform/win/ui_utility_win.h b/ui/platform/win/ui_utility_win.h
index 26def3f..a4f79be 100644
--- a/ui/platform/win/ui_utility_win.h
+++ b/ui/platform/win/ui_utility_win.h
@@ -32,6 +32,9 @@ inline void ReInitOnTopPanel(not_null<QWidget*> panel) {
 inline void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 }
 
+inline void AcceptAllMouseInput(not_null<QWidget*> widget) {
+}
+
 inline void ClearTransientParent(not_null<QWidget*> widget) {
 }
 
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index fba91a9..ad7f62d 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -490,6 +490,7 @@ void PopupMenu::paintEvent(QPaintEvent *e) {
 		PostponeCall(this, [=] {
 			showChildren();
 			_animatePhase = AnimatePhase::Shown;
+			Platform::AcceptAllMouseInput(this);
 		});
 	} else {
 		paintBg(p);

From 0bee95570e7d28afa5cee91b3d1c642051ba1da8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 9 Nov 2023 01:55:31 +0400
Subject: [PATCH 565/635] Prevent false positives in TWidgetPrivate::rhiConfig

QWidget::create could set the WA_WState_Created flag without creating actual window. Adding the check from the top of QWidgetPrivate::create should prevent such false positives.
---
 ui/rp_widget.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index 42d8e95..4fc7c3b 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -23,7 +23,9 @@ public:
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
 	QPlatformBackingStoreRhiConfig rhiConfig() const override {
 		const auto q = static_cast<TWidget*>(q_ptr);
-		if (!q->testAttribute(Qt::WA_WState_Created)) {
+		if (!q->testAttribute(Qt::WA_WState_Created)
+			|| (!q->testAttribute(Qt::WA_NativeWindow)
+				&& !q->isWindow())) {
 			return QWidgetPrivate::rhiConfig();
 		}
 		if (const auto config = q->rhiConfig()) {

From 85b25a109dc916356d75836bff73710c846a5a40 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 Nov 2023 11:18:46 +0400
Subject: [PATCH 566/635] Use Ctrl+Shift+Dot workaround on Windows only.

---
 ui/widgets/fields/input_field.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 1005389..ebfc977 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -2910,12 +2910,16 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
 		return sequence.matches(events) == QKeySequence::ExactMatch;
 	};
 	const auto matchesCtrlShiftDot = [&] {
+#ifdef Q_OS_WIN
 		// We can't match ctrl+shift+. with QKeySequence because
 		// shift+. gives us '>' and ctrl+shift+> is not the same.
 		// So we check by nativeVirtualKey instead.
 		return e->modifiers().testFlag(Qt::ControlModifier)
 			&& e->modifiers().testFlag(Qt::ShiftModifier)
-			&& (e->nativeVirtualKey() == 190);
+			&& (e->nativeVirtualKey() == 190); // VK_OEM_PERIOD
+#else // Q_OS_WIN
+		return false;
+#endif // Q_OS_WIN
 	};
 	if (e == QKeySequence::Bold) {
 		toggleSelectionMarkdown(kTagBold);

From 024f438ce539d627717e4793479c8b727e8df29b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 10 Nov 2023 16:46:06 +0400
Subject: [PATCH 567/635] Fix modifications tracking in Ui::Text::String.

---
 ui/text/text.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index 95f10cb..367134c 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -787,7 +787,8 @@ bool String::removeSkipBlock() {
 void String::insertModifications(int position, int delta) {
 	auto &modifications = ensureExtended()->modifications;
 	auto i = end(modifications);
-	while (i != begin(modifications) && (--i)->position >= position) {
+	while (i != begin(modifications) && (i - 1)->position >= position) {
+		--i;
 		if (i->position < position) {
 			break;
 		} else if (delta > 0) {

From f4b87f2322d7850f2d9c87bbd3cec0fabdbb2b2d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 10 Nov 2023 12:12:45 +0400
Subject: [PATCH 568/635] Compare nativeVirtualKey with enum value

---
 ui/widgets/fields/input_field.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index ebfc977..ae643c0 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -31,6 +31,10 @@
 #include <QtWidgets/QScrollBar>
 #include <QtWidgets/QTextEdit>
 
+#ifdef Q_OS_WIN
+#include <WinUser.h>
+#endif // Q_OS_WIN
+
 namespace Ui {
 namespace {
 
@@ -2910,16 +2914,16 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
 		return sequence.matches(events) == QKeySequence::ExactMatch;
 	};
 	const auto matchesCtrlShiftDot = [&] {
-#ifdef Q_OS_WIN
 		// We can't match ctrl+shift+. with QKeySequence because
 		// shift+. gives us '>' and ctrl+shift+> is not the same.
 		// So we check by nativeVirtualKey instead.
+#ifdef Q_OS_WIN
 		return e->modifiers().testFlag(Qt::ControlModifier)
 			&& e->modifiers().testFlag(Qt::ShiftModifier)
-			&& (e->nativeVirtualKey() == 190); // VK_OEM_PERIOD
+			&& (e->nativeVirtualKey() == VK_OEM_PERIOD);
 #else // Q_OS_WIN
 		return false;
-#endif // Q_OS_WIN
+#endif // !Q_OS_WIN
 	};
 	if (e == QKeySequence::Bold) {
 		toggleSelectionMarkdown(kTagBold);

From d047544584b378cd1445aa0ae982c49147ac6297 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 10 Nov 2023 12:13:42 +0400
Subject: [PATCH 569/635] Add X11 support for Ctrl+Shift+.

---
 ui/widgets/fields/input_field.cpp | 32 +++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index ae643c0..bd5a6e9 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -33,7 +33,12 @@
 
 #ifdef Q_OS_WIN
 #include <WinUser.h>
-#endif // Q_OS_WIN
+#elif !defined DESKTOP_APP_DISABLE_X11_INTEGRATION // Q_OS_WIN
+#include "base/platform/linux/base_linux_xcb_utilities.h"
+
+#include <xcb/xcb_keysyms.h>
+#include <xkbcommon/xkbcommon-keysyms.h>
+#endif // !Q_OS_WIN && !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 namespace Ui {
 namespace {
@@ -1008,6 +1013,14 @@ private:
 	}
 	friend class InputField;
 
+#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
+	base::Platform::XCB::ObjectWithConnection<
+		xcb_key_symbols_t,
+		xcb_key_symbols_alloc,
+		xcb_key_symbols_free
+	> _xcbKeySymbols;
+#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+
 };
 
 void InsertEmojiAtCursor(QTextCursor cursor, EmojiPtr emoji) {
@@ -2916,14 +2929,25 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
 	const auto matchesCtrlShiftDot = [&] {
 		// We can't match ctrl+shift+. with QKeySequence because
 		// shift+. gives us '>' and ctrl+shift+> is not the same.
-		// So we check by nativeVirtualKey instead.
+		// So we check with native code instead.
 #ifdef Q_OS_WIN
 		return e->modifiers().testFlag(Qt::ControlModifier)
 			&& e->modifiers().testFlag(Qt::ShiftModifier)
 			&& (e->nativeVirtualKey() == VK_OEM_PERIOD);
-#else // Q_OS_WIN
+#elif !defined DESKTOP_APP_DISABLE_X11_INTEGRATION // Q_OS_WIN
+		if (!_inner->_xcbKeySymbols) {
+			return false;
+		}
+		const auto keysym = xcb_key_symbols_get_keysym(
+			_inner->_xcbKeySymbols.get(),
+			e->nativeScanCode(),
+			0);
+		return e->modifiers().testFlag(Qt::ControlModifier)
+			&& e->modifiers().testFlag(Qt::ShiftModifier)
+			&& (keysym == XKB_KEY_period);
+#else // !Q_OS_WIN && !DESKTOP_APP_DISABLE_X11_INTEGRATION
 		return false;
-#endif // !Q_OS_WIN
+#endif // !Q_OS_WIN && DESKTOP_APP_DISABLE_X11_INTEGRATION
 	};
 	if (e == QKeySequence::Bold) {
 		toggleSelectionMarkdown(kTagBold);

From f9b24c75512bc5f73b9ec5e6612858394582a328 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 Nov 2023 10:52:39 +0400
Subject: [PATCH 570/635] Fix build on Windows.

---
 ui/gl/gl_window.h                      | 1 -
 ui/platform/win/ui_window_shadow_win.h | 5 ++++-
 ui/platform/win/ui_window_win.cpp      | 1 +
 ui/platform/win/ui_window_win.h        | 2 --
 ui/widgets/fields/input_field.cpp      | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ui/gl/gl_window.h b/ui/gl/gl_window.h
index 65bbc72..2e92448 100644
--- a/ui/gl/gl_window.h
+++ b/ui/gl/gl_window.h
@@ -6,7 +6,6 @@
 //
 #pragma once
 
-
 namespace Ui {
 class RpWindow;
 class RpWidget;
diff --git a/ui/platform/win/ui_window_shadow_win.h b/ui/platform/win/ui_window_shadow_win.h
index c157fa5..78b0a9f 100644
--- a/ui/platform/win/ui_window_shadow_win.h
+++ b/ui/platform/win/ui_window_shadow_win.h
@@ -6,9 +6,12 @@
 //
 #pragma once
 
+#include "base/platform/win/base_windows_h.h"
 #include "base/flags.h"
 
-#include <windows.h>
+#include <rpc.h>
+#include <rpcndr.h>
+#include <Unknwn.h>
 
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) < (b) ? (b) : (a))
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 5fe828b..e26cb62 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -28,6 +28,7 @@
 #include <qpa/qwindowsysteminterface.h>
 
 #include <dwmapi.h>
+#include <shellapi.h>
 #include <uxtheme.h>
 #include <windowsx.h>
 
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index 490d87d..74d03e6 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -9,8 +9,6 @@
 #include "ui/platform/ui_platform_window.h"
 #include "ui/platform/win/ui_window_shadow_win.h"
 
-#include <windef.h>
-
 namespace Ui {
 namespace Platform {
 
diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index bd5a6e9..85e56bd 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -32,6 +32,7 @@
 #include <QtWidgets/QTextEdit>
 
 #ifdef Q_OS_WIN
+#include "base/platform/win/base_windows_h.h"
 #include <WinUser.h>
 #elif !defined DESKTOP_APP_DISABLE_X11_INTEGRATION // Q_OS_WIN
 #include "base/platform/linux/base_linux_xcb_utilities.h"

From fee301f94197d3351f2f20671c329b81540e63e2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 13 Nov 2023 18:59:56 +0400
Subject: [PATCH 571/635] Use plain windows.h now it doesn't define small.

---
 ui/platform/win/ui_utility_win.cpp               |  2 +-
 ui/platform/win/ui_window_shadow_win.h           | 13 ++-----------
 ui/platform/win/ui_windows_direct_manipulation.h |  2 +-
 ui/widgets/fields/input_field.cpp                |  2 +-
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 23592ce..6c320a6 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -6,13 +6,13 @@
 //
 #include "ui/platform/win/ui_utility_win.h"
 
-#include "base/platform/win/base_windows_h.h"
 #include "ui/widgets/popup_menu.h"
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QWindow>
 #include <QtCore/QAbstractNativeEventFilter>
 
+#include <windows.h>
 #include <wrl/client.h>
 #include <Shobjidl.h>
 
diff --git a/ui/platform/win/ui_window_shadow_win.h b/ui/platform/win/ui_window_shadow_win.h
index 78b0a9f..948bf96 100644
--- a/ui/platform/win/ui_window_shadow_win.h
+++ b/ui/platform/win/ui_window_shadow_win.h
@@ -6,19 +6,10 @@
 //
 #pragma once
 
-#include "base/platform/win/base_windows_h.h"
+#include "base/platform/win/base_windows_rpcndr_h.h"
+#include "base/platform/win/base_windows_gdiplus_h.h"
 #include "base/flags.h"
 
-#include <rpc.h>
-#include <rpcndr.h>
-#include <Unknwn.h>
-
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) < (b) ? (b) : (a))
-#include <gdiplus.h>
-#undef min
-#undef max
-
 class QColor;
 
 namespace Ui {
diff --git a/ui/platform/win/ui_windows_direct_manipulation.h b/ui/platform/win/ui_windows_direct_manipulation.h
index 22c34a0..716b22f 100644
--- a/ui/platform/win/ui_windows_direct_manipulation.h
+++ b/ui/platform/win/ui_windows_direct_manipulation.h
@@ -7,11 +7,11 @@
 #pragma once
 
 #include "base/platform/win/base_windows_winrt.h"
-#include "base/platform/win/base_windows_h.h"
 #include "ui/effects/animations.h"
 
 #include <QtCore/QPoint>
 
+#include <windows.h>
 #include <directmanipulation.h>
 
 namespace Ui {
diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 85e56bd..99c87aa 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -32,7 +32,7 @@
 #include <QtWidgets/QTextEdit>
 
 #ifdef Q_OS_WIN
-#include "base/platform/win/base_windows_h.h"
+#include <windows.h>
 #include <WinUser.h>
 #elif !defined DESKTOP_APP_DISABLE_X11_INTEGRATION // Q_OS_WIN
 #include "base/platform/linux/base_linux_xcb_utilities.h"

From e3eabf8effb02c4c3b0f3b0fd150fb9e0f959a2f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 Nov 2023 12:17:00 +0400
Subject: [PATCH 572/635] Allow better InputField content restriction.

---
 ui/widgets/fields/input_field.cpp | 28 +++++++++++++++++-----------
 ui/widgets/fields/input_field.h   |  9 ++++++++-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 99c87aa..728a892 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -51,7 +51,6 @@ constexpr auto kReplaceTagId = QTextFormat::UserProperty + 3;
 constexpr auto kTagProperty = QTextFormat::UserProperty + 4;
 constexpr auto kCustomEmojiText = QTextFormat::UserProperty + 5;
 constexpr auto kCustomEmojiLink = QTextFormat::UserProperty + 6;
-constexpr auto kCustomEmojiId = QTextFormat::UserProperty + 7;
 const auto kObjectReplacementCh = QChar(QChar::ObjectReplacementCharacter);
 const auto kObjectReplacement = QString::fromRawData(
 	&kObjectReplacementCh,
@@ -65,6 +64,7 @@ const auto &kTagPre = InputField::kTagPre;
 const auto &kTagBlockquote = InputField::kTagBlockquote;
 const auto &kTagSpoiler = InputField::kTagSpoiler;
 const auto &kCustomEmojiFormat = InputField::kCustomEmojiFormat;
+const auto &kCustomEmojiId = InputField::kCustomEmojiId;
 const auto kTagCheckLinkMeta = u"^:/:/:^"_q;
 const auto kNewlineChars = QString("\r\n")
 	+ QChar(0xfdd0) // QTextBeginningOfFrame
@@ -711,14 +711,6 @@ QTextImageFormat PrepareEmojiFormat(EmojiPtr emoji, const QFont &font) {
 	return result;
 }
 
-// Optimization: with null page size document does not re-layout
-// on each insertText / mergeCharFormat.
-void PrepareFormattingOptimization(not_null<QTextDocument*> document) {
-	if (!document->pageSize().isNull()) {
-		document->setPageSize(QSizeF(0, 0));
-	}
-}
-
 void RemoveDocumentTags(
 		const style::InputField &st,
 		not_null<QTextDocument*> document,
@@ -954,8 +946,8 @@ const QString InputField::kTagPre = u"```"_q;
 const QString InputField::kTagSpoiler = u"||"_q;
 const QString InputField::kTagBlockquote = u">"_q;
 const QString InputField::kCustomEmojiTagStart = u"custom-emoji://"_q;
-const int InputField::kCustomEmojiFormat
-	= QTextFormat::UserObject + 1;
+const int InputField::kCustomEmojiFormat = QTextFormat::UserObject + 1;
+const int InputField::kCustomEmojiId = QTextFormat::UserProperty + 7;
 
 class InputField::Inner final : public QTextEdit {
 public:
@@ -2353,6 +2345,12 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
 	}
 }
 
+void InputField::forceProcessContentsChanges() {
+	PostponeCall(this, [=] {
+		handleContentsChanged();
+	});
+}
+
 void InputField::documentContentsChanged(
 		int position,
 		int charsRemoved,
@@ -3982,4 +3980,12 @@ rpl::producer<Qt::KeyboardModifiers> InputField::submits() const {
 
 InputField::~InputField() = default;
 
+// Optimization: with null page size document does not re-layout
+// on each insertText / mergeCharFormat.
+void PrepareFormattingOptimization(not_null<QTextDocument*> document) {
+	if (!document->pageSize().isNull()) {
+		document->setPageSize(QSizeF(0, 0));
+	}
+}
+
 } // namespace Ui
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index afb4f6f..12f0361 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -14,6 +14,9 @@
 #include "ui/text/text_custom_emoji.h"
 
 #include <QtGui/QTextObjectInterface>
+#include <QtGui/qtextlayout.h>
+#include <QtGui/qtextdocument.h>
+#include <QtGui/qtextcursor.h>
 
 #include <rpl/variable.h>
 
@@ -136,7 +139,8 @@ public:
 	static const QString kTagSpoiler;
 	static const QString kTagBlockquote;
 	static const QString kCustomEmojiTagStart;
-	static const int kCustomEmojiFormat;
+	static const int kCustomEmojiFormat; // QTextFormat::ObjectTypes
+	static const int kCustomEmojiId; // QTextFormat::Property
 
 	InputField(
 		QWidget *parent,
@@ -323,6 +327,7 @@ public:
 	[[nodiscard]] rpl::producer<> cancelled() const;
 	[[nodiscard]] rpl::producer<> changes() const;
 	[[nodiscard]] rpl::producer<Qt::KeyboardModifiers> submits() const;
+	void forceProcessContentsChanges();
 
 	~InputField();
 
@@ -565,4 +570,6 @@ private:
 
 };
 
+void PrepareFormattingOptimization(not_null<QTextDocument*> document);
+
 } // namespace Ui

From 4ea96ef32865eabbcd1542a935ec034ca2789e00 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 14 Nov 2023 14:43:18 +0400
Subject: [PATCH 573/635] Fix saving custom emoji id in property.

---
 ui/widgets/fields/input_field.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 728a892..b80d519 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -158,7 +158,7 @@ bool IsNewline(QChar ch) {
 	return base::StringViewMid(
 		link,
 		skip,
-		(index <= skip) ? -1 : (index - skip - 1)
+		(index <= skip) ? -1 : (index - skip)
 	).toULongLong();
 }
 

From 388fc709186f6a47d42efaa922876ea39a9950b6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 15 Nov 2023 03:16:08 +0300
Subject: [PATCH 574/635] Spread some style entries from basic style.

---
 ui/basic.style         | 38 --------------------------------------
 ui/layers/layers.style |  2 ++
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index e67a9d4..7bcdbed 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -102,53 +102,15 @@ noContactsColor: windowSubTextFg;
 activeFadeInDuration: 500;
 activeFadeOutDuration: 3000;
 
-searchedBarHeight: 32px;
-searchedBarFont: normalFont;
-searchedBarPosition: point(17px, 7px);
-
 smallCloseIcon: icon {{ "simple_close", smallCloseIconFg }};
 smallCloseIconOver: icon {{ "simple_close", smallCloseIconFgOver }};
 
-dragFont: font(27px semibold);
-dragSubfont: font(19px semibold);
-dragColor: windowSubTextFg;
-dragDropColor: windowActiveTextFg;
-
-dragMargin: margins(0px, 10px, 0px, 10px);
-dragPadding: margins(20px, 10px, 20px, 10px);
-
-dragHeight: 72px;
-
 radialSize: size(50px, 50px);
 radialLine: 3px;
 radialDuration: 350;
 radialPeriod: 3000;
 locationSize: size(320px, 240px);
 
-mediaPlayerSuppressDuration: 150;
-
-botDescSkip: 8px;
-
-inlineResultsLeft: 11px;
-inlineResultsSkip: 3px;
-inlineMediaHeight: 96px;
-inlineThumbSize: 64px;
-inlineThumbSkip: 10px;
-inlineTitleFg: windowFg;
-inlineDescriptionFg: windowSubTextFg;
-inlineRowMargin: 6px;
-inlineRowBorder: 1px;
-inlineRowBorderFg: shadowFg;
-inlineRowFileNameTop: 2px;
-inlineRowFileDescriptionTop: 23px;
-inlineResultsMinWidth: 48px;
-inlineDurationMargin: 3px;
-
-historyReplyCancelIcon: icon {{ "box_button_close", historyReplyCancelFg }};
-historyReplyCancelIconOver: icon {{ "box_button_close", historyReplyCancelFgOver }};
-boxTitleCloseIcon: icon {{ "box_button_close", boxTitleCloseFg }};
-boxTitleCloseIconOver: icon {{ "box_button_close", boxTitleCloseFgOver }};
-
 transparentPlaceholderSize: 4px;
 
 // floating badge colors
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index 5c44c53..ac4dee8 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -94,6 +94,8 @@ boxRowPadding: margins(24px, 0px, 24px, 0px);
 
 boxTopMargin: 8px;
 
+boxTitleCloseIcon: icon {{ "box_button_close", boxTitleCloseFg }};
+boxTitleCloseIconOver: icon {{ "box_button_close", boxTitleCloseFgOver }};
 boxTitleClose: IconButton(defaultIconButton) {
 	width: boxTitleHeight;
 	height: boxTitleHeight;

From 164877a0dcbfed41b7b496c807704b7efd693644 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 15 Nov 2023 03:27:59 +0300
Subject: [PATCH 575/635] Moved out common default style entries from settings.

---
 ui/basic.style         |  2 ++
 ui/layers/layers.style | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/ui/basic.style b/ui/basic.style
index 7bcdbed..a3e3dae 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -113,6 +113,8 @@ locationSize: size(320px, 240px);
 
 transparentPlaceholderSize: 4px;
 
+defaultVerticalListSkip: 6px;
+
 // floating badge colors
 roundedFg: radialFg;
 roundedBg: radialBg; // closest to #00000066
diff --git a/ui/layers/layers.style b/ui/layers/layers.style
index ac4dee8..567b3f3 100644
--- a/ui/layers/layers.style
+++ b/ui/layers/layers.style
@@ -148,6 +148,7 @@ boxDividerLabel: FlatLabel(boxLabel) {
 	textFg: windowSubTextFg;
 	style: defaultTextStyle;
 }
+defaultBoxDividerLabelPadding: margins(22px, 8px, 22px, 16px);
 
 boxLoadingAnimation: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) {
 	color: windowSubTextFg;
@@ -159,6 +160,15 @@ boxDividerTop: icon {{ "box_divider_top", boxDividerFg }};
 boxDividerBottom: icon {{ "box_divider_bottom", boxDividerFg }};
 boxDividerHeight: 8px;
 
+defaultSubsectionTitle: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(semiboldTextStyle) {
+		font: font(boxFontSize semibold);
+	}
+	textFg: windowActiveTextFg;
+	minWidth: 240px;
+}
+defaultSubsectionTitlePadding: margins(22px, 7px, 10px, 9px);
+
 separatePanelBorderCacheSize: 60px;
 separatePanelTitleHeight: 62px;
 separatePanelNoTitleHeight: 32px;

From e0c25001279119fb2469d0c2f136759a5e2dacd9 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 16 Nov 2023 00:29:58 +0400
Subject: [PATCH 576/635] Cache QWindow native interface check in
 WindowMarginsSupported()

It couldn't be changed at runtime anyway
---
 ui/platform/linux/ui_utility_linux.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 933902f..8c0b5ca 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -533,10 +533,14 @@ std::optional<bool> IsOverlapped(
 
 bool WindowMarginsSupported() {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
-	using namespace QNativeInterface::Private;
-	QWindow window;
-	window.create();
-	if (window.nativeInterface<QWaylandWindow>()) {
+	static const auto WaylandResult = [] {
+		using namespace QNativeInterface::Private;
+		QWindow window;
+		window.create();
+		return bool(window.nativeInterface<QWaylandWindow>());
+	}();
+
+	if (WaylandResult) {
 		return true;
 	}
 #endif // Qt >= 6.5.0

From d6133525dc1649745ac94698c02e533ecc6f0281 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 16 Nov 2023 14:29:12 +0400
Subject: [PATCH 577/635] Remove unnecessary includes in input_field.

---
 ui/widgets/fields/input_field.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index 12f0361..01a008e 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -14,9 +14,6 @@
 #include "ui/text/text_custom_emoji.h"
 
 #include <QtGui/QTextObjectInterface>
-#include <QtGui/qtextlayout.h>
-#include <QtGui/qtextdocument.h>
-#include <QtGui/qtextcursor.h>
 
 #include <rpl/variable.h>
 

From d86bd3f49306fefb3b09259dc25c460be632778d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 Nov 2023 01:20:52 +0400
Subject: [PATCH 578/635] Add QHighDpiScaling support on Wayland via QPA API

---
 ui/platform/linux/ui_utility_linux.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 8c0b5ca..45b0791 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -16,6 +16,7 @@
 #include <QtCore/QPoint>
 #include <QtGui/QWindow>
 #include <QtWidgets/QApplication>
+#include <qpa/qplatformwindow.h>
 #include <qpa/qplatformwindow_p.h>
 
 extern "C" {
@@ -561,9 +562,13 @@ bool WindowMarginsSupported() {
 void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
 	using namespace QNativeInterface::Private;
-	if (const auto native = not_null(widget->windowHandle())
-			->nativeInterface<QWaylandWindow>()) {
-		native->setCustomMargins(margins);
+	const auto window = not_null(widget->windowHandle());
+	const auto platformWindow = not_null(window->handle());
+	if (const auto native = window->nativeInterface<QWaylandWindow>()) {
+		native->setCustomMargins(
+			margins
+				* window->devicePixelRatio()
+				/ platformWindow->devicePixelRatio());
 		return;
 	}
 #endif // Qt >= 6.5.0

From 89d664b6f78b8de3c37bb3055ba13e1488746893 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 Nov 2023 01:26:20 +0400
Subject: [PATCH 579/635] Use setFixedSize instead of set{Minimum,Maximum}Size
 combo

---
 ui/widgets/popup_menu.cpp     |  3 +--
 ui/widgets/separate_panel.cpp | 12 +++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index ad7f62d..9417959 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -384,8 +384,7 @@ void PopupMenu::handleMenuResize() {
 			newWidth,
 			_padding.top() + scrollHeight + _padding.bottom());
 		if (::Platform::IsMac()) {
-			setMaximumSize(newSize);
-			setMinimumSize(newSize);
+			setFixedSize(newSize);
 		}
 		resize(newSize);
 	}
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index e912181..fc173c4 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -671,21 +671,15 @@ void SeparatePanel::initGeometry(QSize size) {
 		const QRect initRect(QPoint(), size);
 		return initRect.translated(center - initRect.center()).marginsAdded(_padding);
 	}();
-	setGeometry(rect);
-	setMinimumSize(rect.size());
-	setMaximumSize(rect.size());
+	move(rect.topLeft());
+	setFixedSize(rect.size());
 	updateControlsGeometry();
 }
 
 void SeparatePanel::updateGeometry(QSize size) {
-	const auto rect = QRect(
-		x(),
-		y(),
+	setFixedSize(
 		_padding.left() + size.width() + _padding.right(),
 		_padding.top() + size.height() + _padding.bottom());
-	setGeometry(rect);
-	setMinimumSize(rect.size());
-	setMaximumSize(rect.size());
 	updateControlsGeometry();
 	update();
 }

From 1d1c524b2caa6fad5db040f2735cfbd7766849ac Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 Nov 2023 01:23:55 +0400
Subject: [PATCH 580/635] Use setFixedSize for popup menu and tooltip

---
 ui/widgets/popup_menu.cpp | 5 +----
 ui/widgets/tooltip.cpp    | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 9417959..7e8ba2b 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -383,10 +383,7 @@ void PopupMenu::handleMenuResize() {
 		const auto newSize = QSize(
 			newWidth,
 			_padding.top() + scrollHeight + _padding.bottom());
-		if (::Platform::IsMac()) {
-			setFixedSize(newSize);
-		}
-		resize(newSize);
+		setFixedSize(newSize);
 	}
 	_inner = rect().marginsRemoved(_padding);
 }
diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index 317c6b3..f77f983 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -137,7 +137,8 @@ void Tooltip::popup(const QPoint &m, const QString &text, const style::Tooltip *
 		}
 	}
 
-	setGeometry(QRect(p, s));
+	move(p);
+	setFixedSize(s);
 
 	_hideByLeaveTimer.cancel();
 	show();
@@ -234,7 +235,7 @@ void ImportantTooltip::resizeToContent() {
 	if (size.width() < 2 * (_st.arrowSkipMin + _st.arrow)) {
 		size.setWidth(2 * (_st.arrowSkipMin + _st.arrow));
 	}
-	resize(size);
+	setFixedSize(size);
 	updateGeometry();
 }
 

From b1d5c7c116c589c2712f00167fcffe48ae2423f1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 Nov 2023 22:04:41 +0400
Subject: [PATCH 581/635] Allow Ui::GL::CheckCapapilities to work without
 QWidget

---
 ui/gl/gl_detection.cpp | 44 +++++++++++++++++++++++++++++++++---------
 ui/gl/gl_detection.h   |  4 +++-
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp
index 3d2a542..df38f90 100644
--- a/ui/gl/gl_detection.cpp
+++ b/ui/gl/gl_detection.cpp
@@ -14,9 +14,11 @@
 
 #include <QtCore/QSet>
 #include <QtCore/QFile>
+#include <QtGui/QtEvents>
 #include <QtGui/QWindow>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLFunctions>
+#include <QOpenGLWindow>
 #include <QOpenGLWidget>
 
 #ifdef Q_OS_WIN
@@ -56,7 +58,7 @@ void CrashCheckStart() {
 
 const char kOptionAllowLinuxNvidiaOpenGL[] = "allow-linux-nvidia-opengl";
 
-Capabilities CheckCapabilities(QWidget *widget) {
+Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) {
 	if (ForceDisabled) {
 		LOG_ONCE(("OpenGL: Force-disabled."));
 		return {};
@@ -88,19 +90,43 @@ Capabilities CheckCapabilities(QWidget *widget) {
 	}
 
 	CrashCheckStart();
-	auto tester = QOpenGLWidget(widget);
-	tester.setFormat(format);
-	tester.grabFramebuffer(); // Force initialize().
-	if (!tester.window()->windowHandle()) {
-		tester.window()->createWinId();
-	}
+	const auto tester = [&] {
+		std::unique_ptr<QObject> result;
+		if (avoidWidgetCreation) {
+			const auto w = new QOpenGLWindow();
+			auto e = QResizeEvent(QSize(), QSize());
+			w->setFormat(format);
+			w->create();
+			static_cast<QObject*>(w)->event(&e); // Force initialize().
+			w->grabFramebuffer(); // Force makeCurrent().
+			result.reset(w);
+		} else {
+			const auto w = new QOpenGLWidget(widget);
+			w->setFormat(format);
+			w->grabFramebuffer(); // Force initialize().
+			if (!w->window()->windowHandle()) {
+				w->window()->createWinId();
+			}
+			result.reset(w);
+		}
+		return result;
+	}();
+	const auto testerWidget = avoidWidgetCreation
+		? nullptr
+		: static_cast<QOpenGLWidget*>(tester.get());
+	const auto testerWindow = avoidWidgetCreation
+		? static_cast<QOpenGLWindow*>(tester.get())
+		: nullptr;
+	/*const auto testerQWindow = avoidWidgetCreation
+		? static_cast<QWindow*>(tester.get())
+		: testerWidget->window()->windowHandle();*/
 	CrashCheckFinish();
 
-	const auto context = tester.context();
+	const auto context = avoidWidgetCreation ? testerWindow->context() : testerWidget->context();
 	if (!context
 		|| !context->isValid()/*
 		// This check doesn't work for a widget with WA_NativeWindow.
-		|| !context->makeCurrent(tester.window()->windowHandle())*/) {
+		|| !context->makeCurrent(testerQWindow)*/) {
 		LOG_ONCE(("OpenGL: Could not create widget in a window."));
 		return {};
 	}
diff --git a/ui/gl/gl_detection.h b/ui/gl/gl_detection.h
index 8ea77be..97e6606 100644
--- a/ui/gl/gl_detection.h
+++ b/ui/gl/gl_detection.h
@@ -24,7 +24,9 @@ struct Capabilities {
 	bool transparency = false;
 };
 
-[[nodiscard]] Capabilities CheckCapabilities(QWidget *widget = nullptr);
+[[nodiscard]] Capabilities CheckCapabilities(
+	QWidget *widget = nullptr,
+	bool avoidWidgetCreation = false);
 [[nodiscard]] Backend ChooseBackendDefault(Capabilities capabilities);
 
 void ForceDisable(bool disable);

From 16772f440f6cf8c1a0e850ed8df82cf10c4b211a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 19 Nov 2023 01:39:24 +0400
Subject: [PATCH 582/635] Enable highdpi downscale when rhiConfig evaluates to
 GL

---
 ui/rp_widget.cpp | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/ui/rp_widget.cpp b/ui/rp_widget.cpp
index 4fc7c3b..41b24bc 100644
--- a/ui/rp_widget.cpp
+++ b/ui/rp_widget.cpp
@@ -21,6 +21,20 @@
 class TWidgetPrivate : public QWidgetPrivate {
 public:
 #if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
+	TWidgetPrivate(int version = QObjectPrivateVersion)
+	: QWidgetPrivate(version) {
+		[[maybe_unused]] static const auto Once = [] {
+			if (::Platform::IsWayland()
+				&& Ui::GL::ChooseBackendDefault(
+						Ui::GL::CheckCapabilities(nullptr, true))
+					== Ui::GL::Backend::OpenGL) {
+				qApp->setProperty("_q_widgets_highdpi_downscale", true);
+				WaylandGL = true;
+			}
+			return true;
+		}();
+	}
+
 	QPlatformBackingStoreRhiConfig rhiConfig() const override {
 		const auto q = static_cast<TWidget*>(q_ptr);
 		if (!q->testAttribute(Qt::WA_WState_Created)
@@ -31,20 +45,20 @@ public:
 		if (const auto config = q->rhiConfig()) {
 			return *config;
 		}
-		// We can't specify the widget here as q_evaluateRhiConfig is called
-		// in QWidgetWindow constructor, while windowHandle is set right after
-		// the constructor is completed
-		if (::Platform::IsWayland() // old versions of mutter produce flicker without OpenGL
-			&& Ui::GL::ChooseBackendDefault(
-					Ui::GL::CheckCapabilities(nullptr))
-				== Ui::GL::Backend::OpenGL) {
+		// fix flickering on GNOME
+		if (WaylandGL) {
 			return { QPlatformBackingStoreRhiConfig::OpenGL };
 		}
 		return QWidgetPrivate::rhiConfig();
 	}
 #endif // Qt >= 6.4.0
+
+private:
+	static bool WaylandGL;
 };
 
+bool TWidgetPrivate::WaylandGL = false;
+
 TWidget::TWidget(QWidget *parent)
 : TWidgetHelper<QWidget>(*(new TWidgetPrivate), parent, {}) {
 	[[maybe_unused]] static const auto Once = [] {

From 69c8353746dbb36808b8349eff0cac0f057fa2f4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 21 Nov 2023 17:04:50 +0400
Subject: [PATCH 583/635] Allow line height less than font height.

---
 ui/text/text_block.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/text/text_block.cpp b/ui/text/text_block.cpp
index e24723d..afe8fb7 100644
--- a/ui/text/text_block.cpp
+++ b/ui/text/text_block.cpp
@@ -847,7 +847,7 @@ int CountBlockHeight(
 		const style::TextStyle *st) {
 	return (block->type() == TextBlockType::Skip)
 		? static_cast<const SkipBlock*>(block)->height()
-		: (st->lineHeight > st->font->height)
+		: st->lineHeight
 		? st->lineHeight
 		: st->font->height;
 }

From cd4e9d378cc98f590f814332900ec33863ffb98c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 22 Nov 2023 12:17:32 +0400
Subject: [PATCH 584/635] Allow to use ForceFullRepaintSync on Linux.

---
 ui/platform/linux/ui_utility_linux.h |  3 ---
 ui/platform/mac/ui_utility_mac.h     |  3 ---
 ui/platform/ui_platform_utility.h    |  1 -
 ui/platform/win/ui_utility_win.cpp   | 12 ------------
 ui/ui_utility.cpp                    | 12 ++++++++++++
 ui/ui_utility.h                      |  1 +
 ui/widgets/popup_menu.cpp            |  4 +++-
 7 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/ui/platform/linux/ui_utility_linux.h b/ui/platform/linux/ui_utility_linux.h
index bdde615..605fecb 100644
--- a/ui/platform/linux/ui_utility_linux.h
+++ b/ui/platform/linux/ui_utility_linux.h
@@ -23,9 +23,6 @@ inline void DeInitOnTopPanel(not_null<QWidget*> panel) {
 inline void ReInitOnTopPanel(not_null<QWidget*> panel) {
 }
 
-inline void UpdateOverlayed(not_null<QWidget*> widget) {
-}
-
 inline void ShowOverAll(not_null<QWidget*> widget, bool canFocus) {
 }
 
diff --git a/ui/platform/mac/ui_utility_mac.h b/ui/platform/mac/ui_utility_mac.h
index 339cb0a..4d37327 100644
--- a/ui/platform/mac/ui_utility_mac.h
+++ b/ui/platform/mac/ui_utility_mac.h
@@ -17,9 +17,6 @@ inline bool TranslucentWindowsSupported() {
 	return true;
 }
 
-inline void UpdateOverlayed(not_null<QWidget*> widget) {
-}
-
 inline void ClearTransientParent(not_null<QWidget*> widget) {
 }
 
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index 227c064..a54076d 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -24,7 +24,6 @@ void InitOnTopPanel(not_null<QWidget*> panel);
 void DeInitOnTopPanel(not_null<QWidget*> panel);
 void ReInitOnTopPanel(not_null<QWidget*> panel);
 
-void UpdateOverlayed(not_null<QWidget*> widget);
 void ShowOverAll(not_null<QWidget*> widget, bool canFocus = true);
 void IgnoreAllActivation(not_null<QWidget*> widget);
 void ClearTransientParent(not_null<QWidget*> widget);
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 6c320a6..c1abcaf 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -24,18 +24,6 @@ bool IsApplicationActive() {
 	return QApplication::activeWindow() != nullptr;
 }
 
-void UpdateOverlayed(not_null<QWidget*> widget) {
-	const auto wm = widget->testAttribute(Qt::WA_Mapped);
-	const auto wv = widget->testAttribute(Qt::WA_WState_Visible);
-	if (!wm) widget->setAttribute(Qt::WA_Mapped, true);
-	if (!wv) widget->setAttribute(Qt::WA_WState_Visible, true);
-	widget->update();
-	QEvent e(QEvent::UpdateRequest);
-	QGuiApplication::sendEvent(widget, &e);
-	if (!wm) widget->setAttribute(Qt::WA_Mapped, false);
-	if (!wv) widget->setAttribute(Qt::WA_WState_Visible, false);
-}
-
 void IgnoreAllActivation(not_null<QWidget*> widget) {
 	widget->createWinId();
 
diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp
index 2a5de32..ded550d 100644
--- a/ui/ui_utility.cpp
+++ b/ui/ui_utility.cpp
@@ -154,6 +154,18 @@ void ForceFullRepaint(not_null<QWidget*> widget) {
 	refresher->show();
 }
 
+void ForceFullRepaintSync(not_null<QWidget*> widget) {
+	const auto wm = widget->testAttribute(Qt::WA_Mapped);
+	const auto wv = widget->testAttribute(Qt::WA_WState_Visible);
+	if (!wm) widget->setAttribute(Qt::WA_Mapped, true);
+	if (!wv) widget->setAttribute(Qt::WA_WState_Visible, true);
+	ForceFullRepaint(widget);
+	QEvent e(QEvent::UpdateRequest);
+	QGuiApplication::sendEvent(widget, &e);
+	if (!wm) widget->setAttribute(Qt::WA_Mapped, false);
+	if (!wv) widget->setAttribute(Qt::WA_WState_Visible, false);
+}
+
 void PostponeCall(FnMut<void()> &&callable) {
 	Integration::Instance().postponeCall(std::move(callable));
 }
diff --git a/ui/ui_utility.h b/ui/ui_utility.h
index 3242ed5..4913831 100644
--- a/ui/ui_utility.h
+++ b/ui/ui_utility.h
@@ -140,6 +140,7 @@ void RenderWidget(
 	= QWidget::DrawChildren | QWidget::IgnoreMask);
 
 void ForceFullRepaint(not_null<QWidget*> widget);
+void ForceFullRepaintSync(not_null<QWidget*> widget);
 
 void PostponeCall(FnMut<void()> &&callable);
 
diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 7e8ba2b..0bd4e4d 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -1065,7 +1065,9 @@ void PopupMenu::showPrepared(TriggeredSource source) {
 
 	startShowAnimation();
 
-	Platform::UpdateOverlayed(this);
+	if (::Platform::IsWindows()) {
+		ForceFullRepaintSync(this);
+	}
 	show();
 	Platform::ShowOverAll(this);
 	raise();

From 97a725c79161157af02f48dc1b5e8566040323d9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 Nov 2023 02:05:12 +0300
Subject: [PATCH 585/635] Fixed legal link in some files.

---
 ui/animated_icon.cpp                                | 13 ++++++-------
 ui/animated_icon.h                                  | 13 ++++++-------
 ui/dragging_scroll_manager.cpp                      | 13 ++++++-------
 ui/dragging_scroll_manager.h                        | 13 ++++++-------
 ui/text/custom_emoji_instance.cpp                   | 13 ++++++-------
 ui/text/custom_emoji_instance.h                     | 13 ++++++-------
 ui/widgets/icon_button_with_text.cpp                | 13 ++++++-------
 ui/widgets/icon_button_with_text.h                  | 13 ++++++-------
 ui/widgets/menu/menu_add_action_callback.cpp        | 13 ++++++-------
 ui/widgets/menu/menu_add_action_callback.h          | 13 ++++++-------
 .../menu/menu_add_action_callback_factory.cpp       | 13 ++++++-------
 ui/widgets/menu/menu_add_action_callback_factory.h  | 13 ++++++-------
 ui/widgets/separate_panel.cpp                       | 13 ++++++-------
 ui/widgets/separate_panel.h                         | 13 ++++++-------
 14 files changed, 84 insertions(+), 98 deletions(-)

diff --git a/ui/animated_icon.cpp b/ui/animated_icon.cpp
index 5e5be7d..d0e7699 100644
--- a/ui/animated_icon.cpp
+++ b/ui/animated_icon.cpp
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #include "ui/animated_icon.h"
 
 #include "ui/image/image_prepare.h"
diff --git a/ui/animated_icon.h b/ui/animated_icon.h
index b6c6b35..5c58f28 100644
--- a/ui/animated_icon.h
+++ b/ui/animated_icon.h
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #pragma once
 
 #include "ui/style/style_core_types.h"
diff --git a/ui/dragging_scroll_manager.cpp b/ui/dragging_scroll_manager.cpp
index e9f2f2d..011b291 100644
--- a/ui/dragging_scroll_manager.cpp
+++ b/ui/dragging_scroll_manager.cpp
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #include "ui/dragging_scroll_manager.h"
 
 #include "base/timer.h"
diff --git a/ui/dragging_scroll_manager.h b/ui/dragging_scroll_manager.h
index 5ae4f1b..8503c2c 100644
--- a/ui/dragging_scroll_manager.h
+++ b/ui/dragging_scroll_manager.h
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #pragma once
 
 namespace base {
diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index de94b85..279ac85 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #include "ui/text/custom_emoji_instance.h"
 
 #include "ui/effects/animation_value.h"
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
index 597600f..be56c2d 100644
--- a/ui/text/custom_emoji_instance.h
+++ b/ui/text/custom_emoji_instance.h
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #pragma once
 
 #include "ui/text/text_custom_emoji.h"
diff --git a/ui/widgets/icon_button_with_text.cpp b/ui/widgets/icon_button_with_text.cpp
index bdf0bf1..0ff2159 100644
--- a/ui/widgets/icon_button_with_text.cpp
+++ b/ui/widgets/icon_button_with_text.cpp
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #include "ui/widgets/icon_button_with_text.h"
 
 namespace Ui {
diff --git a/ui/widgets/icon_button_with_text.h b/ui/widgets/icon_button_with_text.h
index d4a31f8..ec20b30 100644
--- a/ui/widgets/icon_button_with_text.h
+++ b/ui/widgets/icon_button_with_text.h
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #pragma once
 
 #include "ui/widgets/buttons.h"
diff --git a/ui/widgets/menu/menu_add_action_callback.cpp b/ui/widgets/menu/menu_add_action_callback.cpp
index 81a9acb..feb6702 100644
--- a/ui/widgets/menu/menu_add_action_callback.cpp
+++ b/ui/widgets/menu/menu_add_action_callback.cpp
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #include "ui/widgets/menu/menu_add_action_callback.h"
 
 #include "ui/style/style_core.h"
diff --git a/ui/widgets/menu/menu_add_action_callback.h b/ui/widgets/menu/menu_add_action_callback.h
index 8f9eff8..e1cde37 100644
--- a/ui/widgets/menu/menu_add_action_callback.h
+++ b/ui/widgets/menu/menu_add_action_callback.h
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #pragma once
 
 #include "ui/style/style_core.h"
diff --git a/ui/widgets/menu/menu_add_action_callback_factory.cpp b/ui/widgets/menu/menu_add_action_callback_factory.cpp
index 6e1f231..5429d61 100644
--- a/ui/widgets/menu/menu_add_action_callback_factory.cpp
+++ b/ui/widgets/menu/menu_add_action_callback_factory.cpp
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 
 #include "ui/widgets/menu/menu_add_action_callback.h"
diff --git a/ui/widgets/menu/menu_add_action_callback_factory.h b/ui/widgets/menu/menu_add_action_callback_factory.h
index 5091845..b0b3ee1 100644
--- a/ui/widgets/menu/menu_add_action_callback_factory.h
+++ b/ui/widgets/menu/menu_add_action_callback_factory.h
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #pragma once
 
 #include "base/unique_qptr.h"
diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index fc173c4..92780ed 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #include "ui/widgets/separate_panel.h"
 
 #include "ui/widgets/shadow.h"
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 5160f2b..655fd3e 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -1,10 +1,9 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
 #pragma once
 
 #include "base/flat_map.h"

From 66ca90c1b2c111fe8ae45453c7bf180af2593d8d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 28 Nov 2023 01:57:03 +0300
Subject: [PATCH 586/635] Moved style values for shake animation.

---
 ui/basic.style           | 3 +++
 ui/widgets/widgets.style | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/basic.style b/ui/basic.style
index a3e3dae..8d55bac 100644
--- a/ui/basic.style
+++ b/ui/basic.style
@@ -115,6 +115,9 @@ transparentPlaceholderSize: 4px;
 
 defaultVerticalListSkip: 6px;
 
+shakeShift: 4px;
+shakeDuration: 300;
+
 // floating badge colors
 roundedFg: radialFg;
 roundedBg: radialBg; // closest to #00000066
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 0a9624b..36921c3 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1405,8 +1405,6 @@ defaultMultilineToast: Toast(defaultToast) {
 	minWidth: 160px;
 }
 
-shakeShift: 4px;
-
 // Windows specific title
 
 windowTitleButtonWidth: 36px;

From 44161f183c255dc0dac7ebe9558a1ca48f5e5258 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 28 Nov 2023 12:52:31 +0400
Subject: [PATCH 587/635] Allow producer<TextWithEntities>() | map(ToLink).

---
 ui/text/text_utilities.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/text/text_utilities.h b/ui/text/text_utilities.h
index 1391759..68d549b 100644
--- a/ui/text/text_utilities.h
+++ b/ui/text/text_utilities.h
@@ -69,7 +69,7 @@ inline constexpr auto Upper = details::ToUpperType{};
 }
 
 [[nodiscard]] inline auto ToLink(const QString &url = "internal:action") {
-	return rpl::map([=](const QString &text) {
+	return rpl::map([=](const auto &text) {
 		return Link(text, url);
 	});
 }

From 4f2a33ea70c79f50449decc679e81ec3154eaecc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Dec 2023 14:18:35 +0400
Subject: [PATCH 588/635] Allow disabling window title shadow on Windows.

---
 ui/platform/win/ui_window_title_win.cpp | 16 ++++++++++++++--
 ui/platform/win/ui_window_title_win.h   |  1 +
 ui/widgets/widgets.style                |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index 3433df0..7c66f78 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -104,9 +104,20 @@ void TitleWidget::setText(const QString &text) {
 
 void TitleWidget::setStyle(const style::WindowTitle &st) {
 	_controls.setStyle(st);
+	if (!st.shadow) {
+		_shadow.destroy();
+	} else if (!_shadow) {
+		_shadow.create(this, st::titleShadow);
+		updateShadowGeometry();
+	}
 	refreshGeometryWithWidth(window()->width());
 }
 
+void TitleWidget::updateShadowGeometry() {
+	const auto thickness = st::lineWidth;
+	_shadow->setGeometry(0, height() - thickness, width(), thickness);
+}
+
 void TitleWidget::refreshGeometryWithWidth(int width) {
 	const auto add = additionalPadding();
 	setGeometry(0, 0, width, _controls.st()->height + add);
@@ -136,8 +147,9 @@ void TitleWidget::paintEvent(QPaintEvent *e) {
 }
 
 void TitleWidget::resizeEvent(QResizeEvent *e) {
-	const auto thickness = st::lineWidth;
-	_shadow->setGeometry(0, height() - thickness, width(), thickness);
+	if (_shadow) {
+		updateShadowGeometry();
+	}
 }
 
 HitTestResult TitleWidget::hitTest(
diff --git a/ui/platform/win/ui_window_title_win.h b/ui/platform/win/ui_window_title_win.h
index 7cce4dc..b98272e 100644
--- a/ui/platform/win/ui_window_title_win.h
+++ b/ui/platform/win/ui_window_title_win.h
@@ -61,6 +61,7 @@ private:
 	[[nodiscard]] bool additionalPaddingRequired() const;
 	void refreshGeometryWithWidth(int width);
 	void setAdditionalPadding(int padding);
+	void updateShadowGeometry();
 
 	std::unique_ptr<PaddingHelper> _paddingHelper;
 	TitleControls _controls;
diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index 36921c3..d34d504 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -558,6 +558,7 @@ WindowTitle {
 	bgActive: color;
 	fg: color;
 	fgActive: color;
+	shadow: bool;
 	style: TextStyle;
 	minimize: IconButton;
 	minimizeIconActive: icon;
@@ -1428,6 +1429,7 @@ defaultWindowTitle: WindowTitle {
 	style: TextStyle(defaultTextStyle) {
 		font: font(semibold 12px);
 	}
+	shadow: true;
 	minimize: IconButton(windowTitleButton) {
 		icon: icon {
 			{ windowTitleButtonSize, titleButtonBg },

From 6b5524b63c58a0c29fc43b4be89aab17352a96a9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Dec 2023 14:18:49 +0400
Subject: [PATCH 589/635] Allow clearing system buttons state on Windows.

---
 ui/platform/ui_platform_window.cpp | 8 ++++++++
 ui/platform/ui_platform_window.h   | 2 ++
 ui/platform/win/ui_window_win.cpp  | 8 ++++++++
 ui/platform/win/ui_window_win.h    | 2 ++
 ui/widgets/rp_window.cpp           | 8 ++++++++
 ui/widgets/rp_window.h             | 2 ++
 6 files changed, 30 insertions(+)

diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
index 49d0c7a..926f51f 100644
--- a/ui/platform/ui_platform_window.cpp
+++ b/ui/platform/ui_platform_window.cpp
@@ -150,6 +150,14 @@ rpl::producer<HitTestResult> BasicWindowHelper::systemButtonDown() const {
 	return rpl::never<HitTestResult>();
 }
 
+void BasicWindowHelper::overrideSystemButtonOver(HitTestResult button) {
+	Expects(button == HitTestResult::None);
+}
+
+void BasicWindowHelper::overrideSystemButtonDown(HitTestResult button) {
+	Expects(button == HitTestResult::None);
+}
+
 void BasicWindowHelper::setTitle(const QString &title) {
 	_window->setWindowTitle(title);
 }
diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
index f0dc391..6926fa0 100644
--- a/ui/platform/ui_platform_window.h
+++ b/ui/platform/ui_platform_window.h
@@ -49,6 +49,8 @@ public:
 		-> rpl::producer<HitTestResult>;
 	[[nodiscard]] virtual auto systemButtonDown() const
 		-> rpl::producer<HitTestResult>;
+	virtual void overrideSystemButtonOver(HitTestResult button);
+	virtual void overrideSystemButtonDown(HitTestResult button);
 	virtual void setTitle(const QString &title);
 	virtual void setTitleStyle(const style::WindowTitle &st);
 	virtual void setNativeFrame(bool enabled);
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index e26cb62..3fe7d01 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -389,6 +389,14 @@ rpl::producer<HitTestResult> WindowHelper::systemButtonDown() const {
 	return _systemButtonDown.events();
 }
 
+void WindowHelper::overrideSystemButtonOver(HitTestResult button) {
+	_systemButtonOver.fire_copy(button);
+}
+
+void WindowHelper::overrideSystemButtonDown(HitTestResult button) {
+	_systemButtonDown.fire_copy(button);
+}
+
 void WindowHelper::init() {
 	_title->show();
 	GetNativeFilter()->registerWindow(_handle, this);
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index 74d03e6..58b723e 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -43,6 +43,8 @@ public:
 		-> rpl::producer<HitTestResult> override;
 	[[nodiscard]] auto systemButtonDown() const
 		-> rpl::producer<HitTestResult> override;
+	void overrideSystemButtonOver(HitTestResult button) override;
+	void overrideSystemButtonDown(HitTestResult button) override;
 
 private:
 	class NativeFilter;
diff --git a/ui/widgets/rp_window.cpp b/ui/widgets/rp_window.cpp
index 90a8d70..4d1eaa9 100644
--- a/ui/widgets/rp_window.cpp
+++ b/ui/widgets/rp_window.cpp
@@ -54,6 +54,14 @@ rpl::producer<Platform::HitTestResult> RpWindow::systemButtonDown() const {
 	return _helper->systemButtonDown();
 }
 
+void RpWindow::overrideSystemButtonOver(Platform::HitTestResult button) {
+	_helper->overrideSystemButtonOver(button);
+}
+
+void RpWindow::overrideSystemButtonDown(Platform::HitTestResult button) {
+	_helper->overrideSystemButtonDown(button);
+}
+
 void RpWindow::setTitle(const QString &title) {
 	_helper->setTitle(title);
 }
diff --git a/ui/widgets/rp_window.h b/ui/widgets/rp_window.h
index 96cac73..ec29b3e 100644
--- a/ui/widgets/rp_window.h
+++ b/ui/widgets/rp_window.h
@@ -55,6 +55,8 @@ public:
 		-> rpl::producer<Platform::HitTestResult>;
 	[[nodiscard]] auto systemButtonDown() const
 		-> rpl::producer<Platform::HitTestResult>;
+	void overrideSystemButtonOver(Platform::HitTestResult button);
+	void overrideSystemButtonDown(Platform::HitTestResult button);
 
 	void setTitle(const QString &title);
 	void setTitleStyle(const style::WindowTitle &st);

From a8b24e6f6fa3cd7016736572ce3ceaf1904bd179 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 5 Dec 2023 20:31:58 +0400
Subject: [PATCH 590/635] Fix a crash with QHighDpiScaling

---
 ui/widgets/popup_menu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/popup_menu.cpp b/ui/widgets/popup_menu.cpp
index 0bd4e4d..3a79351 100644
--- a/ui/widgets/popup_menu.cpp
+++ b/ui/widgets/popup_menu.cpp
@@ -384,6 +384,7 @@ void PopupMenu::handleMenuResize() {
 			newWidth,
 			_padding.top() + scrollHeight + _padding.bottom());
 		setFixedSize(newSize);
+		resize(newSize);
 	}
 	_inner = rect().marginsRemoved(_padding);
 }

From 367a64aa1f8fdb474580489345110c8ac394ae49 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 6 Dec 2023 02:48:50 +0400
Subject: [PATCH 591/635] Fix Qt's texture use-after-free with HiDPI

---
 ui/gl/gl_surface.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ui/gl/gl_surface.cpp b/ui/gl/gl_surface.cpp
index 3900b07..64f3bcb 100644
--- a/ui/gl/gl_surface.cpp
+++ b/ui/gl/gl_surface.cpp
@@ -38,7 +38,6 @@ private:
 	const std::unique_ptr<Renderer> _renderer;
 	QMetaObject::Connection _connection;
 	QSize _deviceSize;
-	bool _inPaintEvent = false;
 
 };
 
@@ -85,16 +84,10 @@ void SurfaceOpenGL::resizeGL(int w, int h) {
 }
 
 void SurfaceOpenGL::paintEvent(QPaintEvent *e) {
-	if (_inPaintEvent) {
-		return;
-	}
-	_inPaintEvent = true;
 	if (_deviceSize != size() * devicePixelRatio()) {
-		QResizeEvent event = { size(), size() };
-		resizeEvent(&event);
+		QCoreApplication::postEvent(this, new QResizeEvent(size(), size()));
 	}
 	QOpenGLWidget::paintEvent(e);
-	_inPaintEvent = false;
 }
 
 void SurfaceOpenGL::paintGL() {

From 06360dea67358b62e21c014c4b0d20461d752c98 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 6 Dec 2023 18:23:58 +0400
Subject: [PATCH 592/635] Fix missing include

---
 ui/gl/gl_surface.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/gl/gl_surface.cpp b/ui/gl/gl_surface.cpp
index 64f3bcb..bc25970 100644
--- a/ui/gl/gl_surface.cpp
+++ b/ui/gl/gl_surface.cpp
@@ -9,6 +9,7 @@
 #include "ui/rp_widget.h"
 #include "ui/painter.h"
 
+#include <QtCore/QCoreApplication>
 #include <QtGui/QtEvents>
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QWindow>

From afe99d1e06069f522daa3a2845e22b75d3b098aa Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Dec 2023 20:09:40 +0300
Subject: [PATCH 593/635] Moved out include directive for styles from header of
 RippleAnimation.

---
 ui/effects/ripple_animation.cpp | 1 +
 ui/effects/ripple_animation.h   | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/effects/ripple_animation.cpp b/ui/effects/ripple_animation.cpp
index 35cc5bc..3971cc7 100644
--- a/ui/effects/ripple_animation.cpp
+++ b/ui/effects/ripple_animation.cpp
@@ -10,6 +10,7 @@
 #include "ui/painter.h"
 #include "ui/ui_utility.h"
 #include "ui/image/image_prepare.h"
+#include "styles/style_widgets.h"
 
 namespace Ui {
 
diff --git a/ui/effects/ripple_animation.h b/ui/effects/ripple_animation.h
index 94a9ca1..47ceb0f 100644
--- a/ui/effects/ripple_animation.h
+++ b/ui/effects/ripple_animation.h
@@ -6,14 +6,16 @@
 //
 #pragma once
 
-#include "styles/style_widgets.h"
-
 #include <deque>
 
 namespace Images {
 struct CornersMaskRef;
 } // namespace Images
 
+namespace style {
+struct RippleAnimation;
+} // namespace style
+
 namespace Ui {
 
 class RippleAnimation {

From c5a616de350eafd780eceb853d149afe7d1951d0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Dec 2023 14:40:24 -0400
Subject: [PATCH 594/635] Fix possible crash in style::colorizeImage.

---
 ui/style/style_core.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/style/style_core.cpp b/ui/style/style_core.cpp
index 040313c..8015bf3 100644
--- a/ui/style/style_core.cpp
+++ b/ui/style/style_core.cpp
@@ -106,6 +106,7 @@ void colorizeImage(
 	auto width = srcRect.width();
 	auto height = srcRect.height();
 	Assert(outResult->rect().contains(QRect(dstPoint, srcRect.size())));
+	outResult->detach();
 
 	auto pattern = anim::shifted(color);
 

From d95f9e778b5c38ef98182d1749ae50e2ae822471 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 22 Dec 2023 03:42:31 +0400
Subject: [PATCH 595/635] Instantiate QRegularExpression instances statically

---
 ui/basic_click_handlers.cpp           |  6 ++++--
 ui/text/text_entity.cpp               | 19 ++++++++++---------
 ui/text/text_entity.h                 |  2 +-
 ui/widgets/fields/time_part_input.cpp |  3 ++-
 ui/widgets/time_input.cpp             |  5 +++--
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ui/basic_click_handlers.cpp b/ui/basic_click_handlers.cpp
index 91e52e7..32a23a7 100644
--- a/ui/basic_click_handlers.cpp
+++ b/ui/basic_click_handlers.cpp
@@ -64,9 +64,11 @@ QString UrlClickHandler::EncodeForOpening(const QString &originalUrl) {
 		? QString::fromUtf8(good.toEncoded())
 		: originalUrl;
 
+	static const auto RegExp = QRegularExpression(
+		QStringLiteral("^[a-zA-Z]+:"));
+
 	if (!result.isEmpty()
-		&& !QRegularExpression(
-			QStringLiteral("^[a-zA-Z]+:")).match(result).hasMatch()) {
+		&& !RegExp.match(result).hasMatch()) {
 		// No protocol.
 		return QStringLiteral("https://") + result;
 	}
diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 383b3d0..65c9dee 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -1236,8 +1236,9 @@ const QRegularExpression &RegExpBotCommand() {
 	return result;
 }
 
-QRegularExpression RegExpDigitsExclude() {
-	return QRegularExpression("[^\\d]");
+const QRegularExpression &RegExpDigitsExclude() {
+	static const auto result = QRegularExpression("[^\\d]");
+	return result;
 }
 
 QString MarkdownBoldGoodBefore() {
@@ -2225,9 +2226,10 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 		};
 		switch (entity.type()) {
 		case EntityType::MentionName: {
-			const auto match = QRegularExpression(
+			static const auto RegExp = QRegularExpression(
 				"^(\\d+\\.\\d+:\\d+)$"
-			).match(entity.data());
+			);
+			const auto match = RegExp.match(entity.data());
 			if (match.hasMatch()) {
 				push(kMentionTagStart + entity.data());
 			}
@@ -2240,9 +2242,8 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 			}
 		} break;
 		case EntityType::CustomEmoji: {
-			const auto match = QRegularExpression(
-				"^(\\d+)$"
-			).match(entity.data());
+			static const auto RegExp = QRegularExpression("^(\\d+)$");
+			const auto match = RegExp.match(entity.data());
 			if (match.hasMatch()) {
 				push(Ui::InputField::CustomEmojiLink(entity.data()));
 			}
@@ -2261,8 +2262,8 @@ TextWithTags::Tags ConvertEntitiesToTextTags(
 		case EntityType::Code: push(Ui::InputField::kTagCode); break;
 		case EntityType::Pre: {
 			if (!entity.data().isEmpty()) {
-				const auto language = QRegularExpression("^[a-z0-9\\-]+$");
-				if (language.match(entity.data()).hasMatch()) {
+				static const auto Language = QRegularExpression("^[a-z0-9\\-]+$");
+				if (Language.match(entity.data()).hasMatch()) {
 					push(Ui::InputField::kTagPre + entity.data());
 					break;
 				}
diff --git a/ui/text/text_entity.h b/ui/text/text_entity.h
index 2aa8385..10bddc2 100644
--- a/ui/text/text_entity.h
+++ b/ui/text/text_entity.h
@@ -293,7 +293,7 @@ const QRegularExpression &RegExpHashtag();
 const QRegularExpression &RegExpHashtagExclude();
 const QRegularExpression &RegExpMention();
 const QRegularExpression &RegExpBotCommand();
-QRegularExpression RegExpDigitsExclude();
+const QRegularExpression &RegExpDigitsExclude();
 QString MarkdownBoldGoodBefore();
 QString MarkdownBoldBadAfter();
 QString MarkdownItalicGoodBefore();
diff --git a/ui/widgets/fields/time_part_input.cpp b/ui/widgets/fields/time_part_input.cpp
index 3767574..5ca80a8 100644
--- a/ui/widgets/fields/time_part_input.cpp
+++ b/ui/widgets/fields/time_part_input.cpp
@@ -14,12 +14,13 @@
 namespace Ui {
 
 std::optional<int> TimePart::number() {
+	static const auto RegExp = QRegularExpression("^\\d+$");
 	const auto text = getLastText();
 	auto view = QStringView(text);
 	while (view.size() > 1 && view.at(0) == '0') {
 		view = base::StringViewMid(view, 1);
 	}
-	return QRegularExpression("^\\d+$").match(view).hasMatch()
+	return RegExp.match(view).hasMatch()
 		? std::make_optional(view.toInt())
 		: std::nullopt;
 }
diff --git a/ui/widgets/time_input.cpp b/ui/widgets/time_input.cpp
index 1317f3a..66041e6 100644
--- a/ui/widgets/time_input.cpp
+++ b/ui/widgets/time_input.cpp
@@ -17,8 +17,9 @@ namespace Ui {
 namespace {
 
 QTime ValidateTime(const QString &value) {
-	const auto match = QRegularExpression(
-		"^(\\d{1,2})\\:(\\d\\d)$").match(value);
+	static const auto RegExp = QRegularExpression(
+		"^(\\d{1,2})\\:(\\d\\d)$");
+	const auto match = RegExp.match(value);
 	if (!match.hasMatch()) {
 		return QTime();
 	}

From 83f12e2dd08340f1f7a98f5087dc4d75e4dadd42 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 22 Dec 2023 03:43:14 +0400
Subject: [PATCH 596/635] QString::arg usage optimization

---
 ui/gl/gl_shader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/gl/gl_shader.cpp b/ui/gl/gl_shader.cpp
index e28bfed..f306bbe 100644
--- a/ui/gl/gl_shader.cpp
+++ b/ui/gl/gl_shader.cpp
@@ -199,9 +199,9 @@ not_null<QOpenGLShader*> MakeShader(
 		const QString &source) {
 	const auto result = new QOpenGLShader(type, program);
 	if (!result->compileSourceCode(source)) {
-		LOG(("Shader Compilation Failed: %1, error %2."
-			).arg(source
-			).arg(result->log()));
+		LOG(("Shader Compilation Failed: %1, error %2.").arg(
+			source,
+			result->log()));
 	}
 	program->addShader(result);
 	return result;

From 955bf2dfa928f08e441518eaf88eaf4ce0bff56b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 22 Dec 2023 03:43:27 +0400
Subject: [PATCH 597/635] Normalize signal connections

---
 ui/widgets/fields/masked_input_field.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/fields/masked_input_field.cpp b/ui/widgets/fields/masked_input_field.cpp
index 4e1b8da..2a9112d 100644
--- a/ui/widgets/fields/masked_input_field.cpp
+++ b/ui/widgets/fields/masked_input_field.cpp
@@ -82,10 +82,10 @@ MaskedInputField::MaskedInputField(
 
 	setAttribute(Qt::WA_OpaquePaintEvent);
 
-	connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChange(const QString&)));
+	connect(this, SIGNAL(textChanged(QString)), this, SLOT(onTextChange(QString)));
 	connect(this, SIGNAL(cursorPositionChanged(int,int)), this, SLOT(onCursorPositionChanged(int,int)));
 
-	connect(this, SIGNAL(textEdited(const QString&)), this, SLOT(onTextEdited()));
+	connect(this, SIGNAL(textEdited(QString)), this, SLOT(onTextEdited()));
 	connect(this, &MaskedInputField::selectionChanged, [] {
 		Integration::Instance().textActionsUpdated();
 	});

From 4dd604e61e75788bb72d73a2c94b779703438228 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 22 Dec 2023 18:01:19 +0400
Subject: [PATCH 598/635] Ensure temporaries don't detach with range loop

---
 ui/gl/gl_detection.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/gl/gl_detection.cpp b/ui/gl/gl_detection.cpp
index df38f90..150eb8b 100644
--- a/ui/gl/gl_detection.cpp
+++ b/ui/gl/gl_detection.cpp
@@ -186,8 +186,9 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) {
 		const auto version = reinterpret_cast<const char*>(
 			functions->glGetString(GL_VERSION));
 		LOG(("OpenGL Version: %1").arg(version ? version : "[nullptr]"));
+		const auto extensions = context->extensions();
 		auto list = QStringList();
-		for (const auto &extension : context->extensions()) {
+		for (const auto &extension : extensions) {
 			list.append(QString::fromLatin1(extension));
 		}
 		LOG(("OpenGL Extensions: %1").arg(list.join(", ")));

From fb3d00bab073a49203965f8a8cdd228f94322091 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 23 Dec 2023 16:40:25 +0400
Subject: [PATCH 599/635] Do pixel<->angle delta conversion right

---
 ui/platform/win/ui_window_win.cpp | 3 ++-
 ui/widgets/elastic_scroll.cpp     | 2 +-
 ui/widgets/elastic_scroll.h       | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 3fe7d01..356e85b 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -11,6 +11,7 @@
 #include "ui/platform/win/ui_windows_direct_manipulation.h"
 #include "ui/platform/ui_platform_utility.h"
 #include "ui/widgets/rp_window.h"
+#include "ui/widgets/elastic_scroll.h"
 #include "base/platform/win/base_windows_safe_library.h"
 #include "base/platform/base_platform_info.h"
 #include "base/integration.h"
@@ -505,7 +506,7 @@ void WindowHelper::handleDirectManipulationEvent(
 				QPointF(local.x, local.y),
 				QPointF(global.x, global.y),
 				event.delta,
-				event.delta,
+				event.delta * kPixelToAngleDelta,
 				LookupModifiers(),
 				phase,
 				Qt::MouseEventSynthesizedBySystem);
diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 4406c43..5f15e12 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -1280,7 +1280,7 @@ QPoint ScrollDelta(not_null<QWheelEvent*> e) {
 		|| (Platform::IsWindows() && e->phase() != Qt::NoScrollPhase)) {
 		return convert(e->pixelDelta());
 	}
-	return convert(e->angleDelta() * style::DevicePixelRatio());
+	return convert(e->angleDelta() / kPixelToAngleDelta);
 }
 
 } // namespace Ui
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index fb6aec3..3113dc8 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -22,6 +22,8 @@ extern const style::ScrollArea &defaultScrollArea;
 
 namespace Ui {
 
+constexpr auto kPixelToAngleDelta = 10;
+
 struct ScrollState {
 	int visibleFrom = 0;
 	int visibleTill = 0;

From 8c01f3f0fa14e37532037537c2e15d868e4012b1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 31 Dec 2023 09:56:49 +0400
Subject: [PATCH 600/635] Unscale DirectManipulation values

---
 ui/platform/win/ui_window_win.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 356e85b..5327495 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -501,12 +501,14 @@ void WindowHelper::handleDirectManipulationEvent(
 			::GetCursorPos(&global);
 			auto local = global;
 			::ScreenToClient(_handle, &local);
+			const auto dpi = _dpi.current() ? double(_dpi.current()) : 96.;
+			const auto delta = QPointF(event.delta) / (dpi / 96.);
 			QWindowSystemInterface::handleWheelEvent(
 				windowHandle,
 				QPointF(local.x, local.y),
 				QPointF(global.x, global.y),
-				event.delta,
-				event.delta * kPixelToAngleDelta,
+				delta.toPoint(),
+				(delta * kPixelToAngleDelta).toPoint(),
 				LookupModifiers(),
 				phase,
 				Qt::MouseEventSynthesizedBySystem);

From 30ec6ea20dd71bbeebfc5a3cf3c7f8d44ba0b6ad Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 31 Dec 2023 10:15:05 +0400
Subject: [PATCH 601/635] Multiple pixel delta by 2.5 on Linux

---
 ui/widgets/elastic_scroll.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 5f15e12..b089172 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -24,6 +24,7 @@ constexpr auto kOverscrollReturnDuration = crl::time(250);
 constexpr auto kOverscrollFromThreshold = -(1 << 30);
 constexpr auto kOverscrollTillThreshold = (1 << 30);
 constexpr auto kTouchOverscrollMultiplier = 2;
+constexpr auto kMagicScrollMultiplier = Platform::IsLinux() ? 2.5 : 1.;
 
 constexpr auto kLogA = 16.;
 constexpr auto kLogB = 10.;
@@ -658,7 +659,7 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e, bool touch) {
 	const auto guard = gsl::finally([&] {
 		_lastScroll = now;
 	});
-	const auto pixels = ScrollDelta(e);
+	const auto pixels = ScrollDelta(e) / (touch ? kMagicScrollMultiplier : 1.);
 	auto delta = _vertical ? -pixels.y() : pixels.x();
 	if (std::abs(_vertical ? pixels.x() : pixels.y()) >= std::abs(delta)) {
 		delta = 0;
@@ -1274,7 +1275,7 @@ QPoint ScrollDelta(not_null<QWheelEvent*> e) {
 	const auto convert = [](QPoint point) {
 		return QPoint(
 			style::ConvertScale(point.x()),
-			style::ConvertScale(point.y()));
+			style::ConvertScale(point.y())) * kMagicScrollMultiplier;
 	};
 	if (Platform::IsMac()
 		|| (Platform::IsWindows() && e->phase() != Qt::NoScrollPhase)) {

From 88f53cf1d9e79b4896656e49292bd7b21d64ae0f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 23 Dec 2023 16:41:24 +0400
Subject: [PATCH 602/635] Use pixel delta whenever it's present

---
 ui/widgets/elastic_scroll.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index b089172..f20dc81 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -1277,8 +1277,7 @@ QPoint ScrollDelta(not_null<QWheelEvent*> e) {
 			style::ConvertScale(point.x()),
 			style::ConvertScale(point.y())) * kMagicScrollMultiplier;
 	};
-	if (Platform::IsMac()
-		|| (Platform::IsWindows() && e->phase() != Qt::NoScrollPhase)) {
+	if (!e->pixelDelta().isNull()) {
 		return convert(e->pixelDelta());
 	}
 	return convert(e->angleDelta() / kPixelToAngleDelta);

From 6ff9eb237b1f9ef1f516a53e5fa461eceb11dfd7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Dec 2023 18:58:42 +0400
Subject: [PATCH 603/635] Improve scrolling constants.

---
 ui/widgets/elastic_scroll.cpp | 6 +++---
 ui/widgets/elastic_scroll.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index f20dc81..3abbdf9 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -1275,12 +1275,12 @@ QPoint ScrollDelta(not_null<QWheelEvent*> e) {
 	const auto convert = [](QPoint point) {
 		return QPoint(
 			style::ConvertScale(point.x()),
-			style::ConvertScale(point.y())) * kMagicScrollMultiplier;
+			style::ConvertScale(point.y()));
 	};
 	if (!e->pixelDelta().isNull()) {
-		return convert(e->pixelDelta());
+		return convert(e->pixelDelta()) * kMagicScrollMultiplier;
 	}
-	return convert(e->angleDelta() / kPixelToAngleDelta);
+	return convert(e->angleDelta()) / kPixelToAngleDelta;
 }
 
 } // namespace Ui
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index 3113dc8..d8ca3b1 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -22,7 +22,7 @@ extern const style::ScrollArea &defaultScrollArea;
 
 namespace Ui {
 
-constexpr auto kPixelToAngleDelta = 10;
+inline constexpr auto kPixelToAngleDelta = 2;
 
 struct ScrollState {
 	int visibleFrom = 0;

From e9901b17192f35c8205751f889ef14e5859b946b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 31 Dec 2023 18:58:33 +0400
Subject: [PATCH 604/635] Adjust pixel delta conversion a bit

---
 ui/widgets/elastic_scroll.cpp | 7 ++++---
 ui/widgets/elastic_scroll.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 3abbdf9..c31791d 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -659,7 +659,7 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e, bool touch) {
 	const auto guard = gsl::finally([&] {
 		_lastScroll = now;
 	});
-	const auto pixels = ScrollDelta(e) / (touch ? kMagicScrollMultiplier : 1.);
+	const auto pixels = ScrollDelta(e, touch);
 	auto delta = _vertical ? -pixels.y() : pixels.x();
 	if (std::abs(_vertical ? pixels.x() : pixels.y()) >= std::abs(delta)) {
 		delta = 0;
@@ -1271,14 +1271,15 @@ rpl::producer<ElasticScrollMovement> ElasticScroll::movementValue() const {
 	return _movement.value();
 }
 
-QPoint ScrollDelta(not_null<QWheelEvent*> e) {
+QPoint ScrollDelta(not_null<QWheelEvent*> e, bool touch) {
 	const auto convert = [](QPoint point) {
 		return QPoint(
 			style::ConvertScale(point.x()),
 			style::ConvertScale(point.y()));
 	};
 	if (!e->pixelDelta().isNull()) {
-		return convert(e->pixelDelta()) * kMagicScrollMultiplier;
+		return convert(e->pixelDelta())
+			* (touch ? 1. : kMagicScrollMultiplier);
 	}
 	return convert(e->angleDelta()) / kPixelToAngleDelta;
 }
diff --git a/ui/widgets/elastic_scroll.h b/ui/widgets/elastic_scroll.h
index d8ca3b1..8404c98 100644
--- a/ui/widgets/elastic_scroll.h
+++ b/ui/widgets/elastic_scroll.h
@@ -275,6 +275,6 @@ private:
 
 };
 
-[[nodiscard]] QPoint ScrollDelta(not_null<QWheelEvent*> e);
+[[nodiscard]] QPoint ScrollDelta(not_null<QWheelEvent*> e, bool touch = false);
 
 } // namespace Ui

From 99e36f9ac64048a6b7fcb0e6ee2e8eaca48935e1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 1 Jan 2024 20:18:47 +0400
Subject: [PATCH 605/635] Multiple by the magic multiplier only on Wayland

---
 ui/widgets/elastic_scroll.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index c31791d..7167d2e 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -24,7 +24,7 @@ constexpr auto kOverscrollReturnDuration = crl::time(250);
 constexpr auto kOverscrollFromThreshold = -(1 << 30);
 constexpr auto kOverscrollTillThreshold = (1 << 30);
 constexpr auto kTouchOverscrollMultiplier = 2;
-constexpr auto kMagicScrollMultiplier = Platform::IsLinux() ? 2.5 : 1.;
+constexpr auto kMagicScrollMultiplier = 2.5;
 
 constexpr auto kLogA = 16.;
 constexpr auto kLogB = 10.;
@@ -1279,7 +1279,9 @@ QPoint ScrollDelta(not_null<QWheelEvent*> e, bool touch) {
 	};
 	if (!e->pixelDelta().isNull()) {
 		return convert(e->pixelDelta())
-			* (touch ? 1. : kMagicScrollMultiplier);
+			* ((Platform::IsWayland() && !touch)
+				? kMagicScrollMultiplier
+				: 1.);
 	}
 	return convert(e->angleDelta()) / kPixelToAngleDelta;
 }

From 7fef09421c2b71e5ab9cf481c0fcf2a0b6d2daf0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 3 Jan 2024 22:11:57 +0400
Subject: [PATCH 606/635] Allow requesting exact icon instances, ignoring dpr.

---
 ui/style/style_core_icon.cpp | 50 ++++++++++++++++++++++++------------
 ui/style/style_core_icon.h   | 17 +++++++++---
 2 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/ui/style/style_core_icon.cpp b/ui/style/style_core_icon.cpp
index e4330ff..3ddc9ee 100644
--- a/ui/style/style_core_icon.cpp
+++ b/ui/style/style_core_icon.cpp
@@ -29,16 +29,18 @@ base::flat_set<IconData*> iconData;
 
 [[nodiscard]] QImage CreateIconMask(
 		not_null<const IconMask*> mask,
-		int scale) {
+		int scale,
+		bool ignoreDpr = false) {
+	const auto ratio = ignoreDpr ? 1 : DevicePixelRatio();
+
 	auto maskImage = QImage::fromData(mask->data(), mask->size(), "PNG");
-	maskImage.setDevicePixelRatio(DevicePixelRatio());
+	maskImage.setDevicePixelRatio(ratio);
 	Assert(!maskImage.isNull());
 
-	// images are layouted like this:
+	// images are laid out like this:
 	// 100x 200x
 	// 300x
-	const auto factor = DevicePixelRatio();
-	const auto realscale = scale * factor;
+	const auto realscale = scale * ratio;
 	const auto width = maskImage.width() / 3;
 	const auto height = maskImage.height() / 5;
 	const auto one = QRect(0, 0, width, height);
@@ -54,8 +56,8 @@ base::flat_set<IconData*> iconData;
 	return maskImage.copy(
 		(realscale > 200) ? three : two
 	).scaled(
-		ConvertScale(width, scale) * factor,
-		ConvertScale(height, scale) * factor,
+		ConvertScale(width, scale) * ratio,
+		ConvertScale(height, scale) * ratio,
 		Qt::IgnoreAspectRatio,
 		Qt::SmoothTransformation);
 }
@@ -71,7 +73,10 @@ base::flat_set<IconData*> iconData;
 	).first->second;
 }
 
-QSize readGeneratedSize(const IconMask *mask, int scale) {
+[[nodiscard]] QSize readGeneratedSize(
+		const IconMask *mask,
+		int scale,
+		bool ignoreDpr = false) {
 	auto data = mask->data();
 	auto size = mask->size();
 
@@ -239,10 +244,15 @@ void MonoIcon::fill(
 	}
 }
 
-QImage MonoIcon::instance(QColor colorOverride, int scale) const {
+QImage MonoIcon::instance(
+		QColor colorOverride,
+		int scale,
+		bool ignoreDpr) const {
 	if (scale == kScaleAuto) {
 		ensureLoaded();
-		auto result = QImage(size() * DevicePixelRatio(), QImage::Format_ARGB32_Premultiplied);
+		auto result = QImage(
+			size() * DevicePixelRatio(),
+			QImage::Format_ARGB32_Premultiplied);
 		result.setDevicePixelRatio(DevicePixelRatio());
 		if (_pixmap.isNull()) {
 			result.fill(colorOverride);
@@ -251,16 +261,19 @@ QImage MonoIcon::instance(QColor colorOverride, int scale) const {
 		}
 		return result;
 	}
-	auto size = readGeneratedSize(_mask, scale);
+	const auto ratio = ignoreDpr ? 1 : DevicePixelRatio();
+	auto size = readGeneratedSize(_mask, scale, ignoreDpr);
 	if (!size.isEmpty()) {
-		auto result = QImage(size * DevicePixelRatio(), QImage::Format_ARGB32_Premultiplied);
-		result.setDevicePixelRatio(DevicePixelRatio());
+		auto result = QImage(
+			size * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		result.setDevicePixelRatio(ratio);
 		result.fill(colorOverride);
 		return result;
 	}
-	auto mask = CreateIconMask(_mask, scale);
+	auto mask = CreateIconMask(_mask, scale, ignoreDpr);
 	auto result = QImage(mask.size(), QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(DevicePixelRatio());
+	result.setDevicePixelRatio(ratio);
 	colorizeImage(mask, colorOverride, &result);
 	return result;
 }
@@ -340,12 +353,15 @@ void IconData::fill(QPainter &p, const QRect &rect, QColor colorOverride) const
 	}
 }
 
-QImage IconData::instance(QColor colorOverride, int scale) const {
+QImage IconData::instance(
+		QColor colorOverride,
+		int scale,
+		bool ignoreDpr) const {
 	Expects(_parts.size() == 1);
 
 	auto &part = _parts[0];
 	Assert(part.offset() == QPoint(0, 0));
-	return part.instance(colorOverride, scale);
+	return part.instance(colorOverride, scale, ignoreDpr);
 }
 
 int IconData::width() const {
diff --git a/ui/style/style_core_icon.h b/ui/style/style_core_icon.h
index 16b2837..9afd9ee 100644
--- a/ui/style/style_core_icon.h
+++ b/ui/style/style_core_icon.h
@@ -62,7 +62,10 @@ public:
 	void paint(QPainter &p, const QPoint &pos, int outerw, const style::palette &paletteOverride) const;
 	void fill(QPainter &p, const QRect &rect, const style::palette &paletteOverride) const;
 
-	QImage instance(QColor colorOverride, int scale) const;
+	[[nodiscard]] QImage instance(
+		QColor colorOverride,
+		int scale,
+		bool ignoreDpr) const;
 
 	~MonoIcon() {
 	}
@@ -123,7 +126,10 @@ public:
 	}
 	void fill(QPainter &p, const QRect &rect, const style::palette &paletteOverride) const;
 
-	QImage instance(QColor colorOverride, int scale) const;
+	[[nodiscard]] QImage instance(
+		QColor colorOverride,
+		int scale,
+		bool ignoreDpr) const;
 
 	int width() const;
 	int height() const;
@@ -218,8 +224,11 @@ public:
 		return _data->fill(p, rect, colorOverride);
 	}
 
-	QImage instance(QColor colorOverride, int scale = kScaleAuto) const {
-		return _data->instance(colorOverride, scale);
+	[[nodiscard]] QImage instance(
+			QColor colorOverride,
+			int scale = kScaleAuto,
+			bool ignoreDpr = false) const {
+		return _data->instance(colorOverride, scale, ignoreDpr);
 	}
 
 	class Proxy {

From 30c5dfe6f65babf234c889959061c97c4a2f391d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Jan 2024 18:17:12 +0400
Subject: [PATCH 607/635] Allow querying current SeparatePanel::inner widget.

---
 ui/widgets/separate_panel.cpp | 7 +++++++
 ui/widgets/separate_panel.h   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 92780ed..6a8b1d5 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -583,10 +583,17 @@ void SeparatePanel::destroyLayer() {
 	layer = nullptr;
 }
 
+RpWidget *SeparatePanel::inner() const {
+	return _inner.get();
+}
+
 void SeparatePanel::showInner(base::unique_qptr<RpWidget> inner) {
 	Expects(!size().isEmpty());
 
+	auto old = base::take(_inner);
 	_inner = std::move(inner);
+	old = nullptr; // Make sure in old destructor inner() != old.
+
 	_inner->setParent(_body);
 	_inner->move(0, 0);
 	_body->sizeValue(
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 655fd3e..563eead 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -60,6 +60,7 @@ public:
 	void showAndActivate();
 	int hideGetDuration();
 
+	[[nodiscard]] RpWidget *inner() const;
 	void showInner(base::unique_qptr<RpWidget> inner);
 	void showBox(
 		object_ptr<BoxContent> box,

From 30dc9667ec3513559af468f695ce4b384f451a79 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Jan 2024 11:25:16 +0400
Subject: [PATCH 608/635] Add anim::with_alpha helper.

---
 ui/effects/animation_value.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui/effects/animation_value.h b/ui/effects/animation_value.h
index dee83eb..593432e 100644
--- a/ui/effects/animation_value.h
+++ b/ui/effects/animation_value.h
@@ -322,6 +322,11 @@ TG_FORCE_INLINE QBrush brush(style::color a, style::color b, float64 b_ratio) {
 	return (b_ratio > 0) ? ((b_ratio < 1) ? brush(a->c, b->c, b_ratio) : b) : a;
 }
 
+TG_FORCE_INLINE QColor with_alpha(QColor color, float64 alpha) {
+	color.setAlphaF(color.alphaF() * alpha);
+	return color;
+}
+
 template <int N>
 QPainterPath interpolate(QPointF (&from)[N], QPointF (&to)[N], float64 k) {
 	static_assert(N > 1, "Wrong points count in path!");

From 00f5bdaccdff4f53e8ba347f09f2de161b7ca7da Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 10 Jan 2024 09:50:12 +0400
Subject: [PATCH 609/635] Add wheel scroll lines setting support for elastic
 scroll

---
 ui/widgets/elastic_scroll.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 7167d2e..506b200 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -25,6 +25,7 @@ constexpr auto kOverscrollFromThreshold = -(1 << 30);
 constexpr auto kOverscrollTillThreshold = (1 << 30);
 constexpr auto kTouchOverscrollMultiplier = 2;
 constexpr auto kMagicScrollMultiplier = 2.5;
+constexpr auto kDefaultWheelScrollLines = 3;
 
 constexpr auto kLogA = 16.;
 constexpr auto kLogB = 10.;
@@ -1283,7 +1284,8 @@ QPoint ScrollDelta(not_null<QWheelEvent*> e, bool touch) {
 				? kMagicScrollMultiplier
 				: 1.);
 	}
-	return convert(e->angleDelta()) / kPixelToAngleDelta;
+	return (convert(e->angleDelta()) * QApplication::wheelScrollLines())
+		/ (kPixelToAngleDelta * kDefaultWheelScrollLines);
 }
 
 } // namespace Ui

From aa39793a91f1186879c15c214a2671d78eab5085 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 12 Jan 2024 13:53:22 +0400
Subject: [PATCH 610/635] Attempt to fix window geometry restore on Windows.

---
 ui/platform/linux/ui_utility_linux.cpp |  6 ++++++
 ui/platform/mac/ui_utility_mac.mm      |  6 ++++++
 ui/platform/ui_platform_utility.h      |  4 ++++
 ui/platform/win/ui_utility_win.cpp     | 19 +++++++++++++++++++
 ui/platform/win/ui_window_win.cpp      |  4 +++-
 ui/ui_utility.cpp                      |  6 ++++++
 ui/ui_utility.h                        |  4 ++++
 7 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp
index 45b0791..eda2916 100644
--- a/ui/platform/linux/ui_utility_linux.cpp
+++ b/ui/platform/linux/ui_utility_linux.cpp
@@ -615,5 +615,11 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 }
 
+void SetGeometryWithPossibleScreenChange(
+		not_null<QWidget*> widget,
+		QRect geometry) {
+	widget->setGeometry(geometry);
+}
+
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/mac/ui_utility_mac.mm b/ui/platform/mac/ui_utility_mac.mm
index 9f30cec..02bc70b 100644
--- a/ui/platform/mac/ui_utility_mac.mm
+++ b/ui/platform/mac/ui_utility_mac.mm
@@ -164,5 +164,11 @@ std::optional<bool> IsOverlapped(
 	return false;
 }
 
+void SetGeometryWithPossibleScreenChange(
+		not_null<QWidget*> widget,
+		QRect geometry) {
+	widget->setGeometry(geometry);
+}
+
 } // namespace Platform
 } // namespace Ui
diff --git a/ui/platform/ui_platform_utility.h b/ui/platform/ui_platform_utility.h
index a54076d..c2d304e 100644
--- a/ui/platform/ui_platform_utility.h
+++ b/ui/platform/ui_platform_utility.h
@@ -45,6 +45,10 @@ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point);
 
 void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu);
 
+void SetGeometryWithPossibleScreenChange(
+    not_null<QWidget*> widget,
+    QRect geometry);
+
 } // namespace Ui::Platform
 
 // Platform dependent implementations.
diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index c1abcaf..9ac0e72 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -16,6 +16,10 @@
 #include <wrl/client.h>
 #include <Shobjidl.h>
 
+#include "base/event_filter.h"
+#include <QTimer>
+#include <QScreen>
+
 using namespace Microsoft::WRL;
 
 namespace Ui::Platform {
@@ -177,4 +181,19 @@ void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
 		menu->lifetime().make_state<Filter>(menu));
 }
 
+void SetGeometryWithPossibleScreenChange(
+		not_null<QWidget*> widget,
+		QRect geometry) {
+	const auto screen = QGuiApplication::screenAt(geometry.center());
+	const auto window = widget->window();
+	window->createWinId();
+	const auto handle = window->windowHandle();
+	if (handle->screen() != screen) {
+		handle->setScreen(screen);
+		window->move(screen->availableGeometry().topLeft());
+		window->show();
+	}
+	widget->setGeometry(geometry);
+}
+
 } // namespace Ui::Platform
diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 5327495..3de9191 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -356,7 +356,9 @@ void WindowHelper::setFixedSize(QSize size) {
 }
 
 void WindowHelper::setGeometry(QRect rect) {
-	window()->setGeometry(rect.marginsAdded({ 0, titleHeight(), 0, 0 }));
+	SetGeometryWithPossibleScreenChange(
+		window(),
+		rect.marginsAdded({ 0, titleHeight(), 0, 0 }));
 }
 
 void WindowHelper::showFullScreen() {
diff --git a/ui/ui_utility.cpp b/ui/ui_utility.cpp
index ded550d..26b284f 100644
--- a/ui/ui_utility.cpp
+++ b/ui/ui_utility.cpp
@@ -252,4 +252,10 @@ QPoint MapFrom(
 	return { MapFrom(to, from, rect.topLeft()), rect.size() };
 }
 
+void SetGeometryWithPossibleScreenChange(
+		not_null<QWidget*> widget,
+		QRect geometry) {
+	Platform::SetGeometryWithPossibleScreenChange(widget, geometry);
+}
+
 } // namespace Ui
diff --git a/ui/ui_utility.h b/ui/ui_utility.h
index 4913831..5e2dd81 100644
--- a/ui/ui_utility.h
+++ b/ui/ui_utility.h
@@ -207,4 +207,8 @@ int WheelDirection(not_null<QWheelEvent*> e);
 	not_null<QWidget*> from,
 	QRect rect);
 
+void SetGeomtryWithPossibleScreenChange(
+	not_null<QWidget*> widget,
+	QRect geometry);
+
 } // namespace Ui

From 08a19be802cef8ee801121906c5f0ce9d2fa65b0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 14 Jan 2024 17:21:43 +0300
Subject: [PATCH 611/635] Added initial support of right side arrow to tooltip.

---
 ui/widgets/tooltip.cpp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/ui/widgets/tooltip.cpp b/ui/widgets/tooltip.cpp
index f77f983..73af93a 100644
--- a/ui/widgets/tooltip.cpp
+++ b/ui/widgets/tooltip.cpp
@@ -235,6 +235,9 @@ void ImportantTooltip::resizeToContent() {
 	if (size.width() < 2 * (_st.arrowSkipMin + _st.arrow)) {
 		size.setWidth(2 * (_st.arrowSkipMin + _st.arrow));
 	}
+	if (_side & RectPart::Right) {
+		size.setWidth(size.width() + _st.arrow);
+	}
 	setFixedSize(size);
 	updateGeometry();
 }
@@ -250,9 +253,11 @@ void ImportantTooltip::countApproachSide(RectParts preferSide) {
 	auto allowedBelow = (availableBelow >= requiredSpace + _st.margin.bottom());
 	if ((allowedAbove && allowedBelow) || (!allowedAbove && !allowedBelow)) {
 		_side = preferSide;
+	} else if (preferSide & RectPart::Right) {
+		_side = preferSide;
 	} else {
 		_side = (allowedAbove ? RectPart::Top : RectPart::Bottom)
-			| (preferSide & (RectPart::Left | RectPart::Center | RectPart::Right));
+			| (preferSide & (RectPart::Left | RectPart::Center));
 	}
 	auto arrow = QImage(
 		QSize(_st.arrow * 2, _st.arrow) * style::DevicePixelRatio(),
@@ -272,6 +277,8 @@ void ImportantTooltip::countApproachSide(RectParts preferSide) {
 	}
 	if (_side & RectPart::Bottom) {
 		arrow = std::move(arrow).transformed(QTransform(1, 0, 0, -1, 0, 0));
+	} else if (_side & RectPart::Right) {
+		arrow = std::move(arrow).transformed(QTransform().rotate(-90));
 	}
 	_arrow = PixmapFromImage(std::move(arrow));
 }
@@ -366,11 +373,15 @@ void ImportantTooltip::updateGeometry() {
 	const auto position = _countPosition
 		? _countPosition(size())
 		: countPosition();
+	const auto isTop = (_side & RectPart::Top);
+	const auto isBottom = (_side & RectPart::Bottom);
 	const auto shift = anim::interpolate(
-		(_side & RectPart::Top) ? -_st.shift : _st.shift,
+		(isTop || (_side & RectPart::Left)) ? -_st.shift : _st.shift,
 		0,
 		_visibleAnimation.value(_visible ? 1. : 0.));
-	move(position.x(), position.y() + shift);
+	move(
+		position.x() + (isTop || isBottom ? 0 : shift),
+		position.y() + (isTop || isBottom ? shift : 0));
 }
 
 void ImportantTooltip::resizeEvent(QResizeEvent *e) {
@@ -407,8 +418,14 @@ void ImportantTooltip::paintEvent(QPaintEvent *e) {
 		auto arrowLeft = areaMiddle - _st.arrow;
 		if (_side & RectPart::Top) {
 			p.drawPixmapLeft(arrowLeft, inner.y() + inner.height(), width(), _arrow);
-		} else {
+		} else if (_side & RectPart::Bottom) {
 			p.drawPixmapLeft(arrowLeft, inner.y() - _st.arrow, width(), _arrow);
+		} else if (_side & RectPart::Right) {
+			p.drawPixmapLeft(
+				inner.x() + inner.width(),
+				inner.y() + (inner.height() - _st.arrow) / 2,
+				width(),
+				_arrow);
 		}
 	}
 }

From b429fdcf988cbadc7677f3ec8ee28981beb66af6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 14 Jan 2024 02:41:49 +0400
Subject: [PATCH 612/635] Use vertical metrics for vertical borders

---
 ui/platform/win/ui_window_win.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 3de9191..a59999f 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -580,12 +580,17 @@ bool WindowHelper::handleNativeEvent(
 					+ GetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi)
 				: GetSystemMetrics(SM_CXSIZEFRAME)
 					+ GetSystemMetrics(SM_CXPADDEDBORDER);
+			const auto borderHeight = (GetSystemMetricsForDpiSupported() && dpi)
+				? GetSystemMetricsForDpi(SM_CYSIZEFRAME, dpi)
+					+ GetSystemMetricsForDpi(SM_CYPADDEDBORDER, dpi)
+				: GetSystemMetrics(SM_CYSIZEFRAME)
+					+ GetSystemMetrics(SM_CYPADDEDBORDER);
 			r->left += borderWidth;
 			r->right -= borderWidth;
 			if (maximized) {
-				r->top += borderWidth;
+				r->top += borderHeight;
 			}
-			r->bottom -= borderWidth;
+			r->bottom -= borderHeight;
 		}
 		if (maximized) {
 			const auto hMonitor = MonitorFromWindow(

From 683e532d15898bddeba537ca4637ac89ca02991d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 12 Jan 2024 23:10:22 +0400
Subject: [PATCH 613/635] Show RpWindow on Windows after initial paint

To avoid white flash
---
 ui/platform/win/ui_window_win.cpp | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index a59999f..8cab2af 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -14,6 +14,7 @@
 #include "ui/widgets/elastic_scroll.h"
 #include "base/platform/win/base_windows_safe_library.h"
 #include "base/platform/base_platform_info.h"
+#include "base/event_filter.h"
 #include "base/integration.h"
 #include "base/invoke_queued.h"
 #include "base/debug_log.h"
@@ -492,6 +493,34 @@ void WindowHelper::init() {
 			handleDirectManipulationEvent(event);
 		}, window()->lifetime());
 	}
+
+	window()->shownValue() | rpl::filter([=](bool shown) {
+		return !shown;
+	}) | rpl::start_with_next([=] {
+		BOOL cloak = TRUE;
+		DwmSetWindowAttribute(_handle, DWMWA_CLOAK, &cloak, sizeof(cloak));
+
+		const auto firstPaintEventFilter = std::make_shared<QObject*>(nullptr);
+		*firstPaintEventFilter = base::install_event_filter(
+			window()->windowHandle(),
+			[=](not_null<QEvent*> e) {
+				if (!*firstPaintEventFilter
+						|| e->type() != QEvent::Expose
+						|| !window()->windowHandle()->isExposed()) {
+					return base::EventFilterResult::Continue;
+				}
+				InvokeQueued(*firstPaintEventFilter, [=] {
+					BOOL cloak = FALSE;
+					DwmSetWindowAttribute(
+						_handle,
+						DWMWA_CLOAK,
+						&cloak,
+						sizeof(cloak));
+					delete base::take(*firstPaintEventFilter);
+				});
+				return base::EventFilterResult::Continue;
+			});
+	}, window()->lifetime());
 }
 
 void WindowHelper::handleDirectManipulationEvent(

From 0db88bdec1db72a1ffa1b910f962c965fab16652 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Jan 2024 12:08:38 +0400
Subject: [PATCH 614/635] Fix build on Windows.

---
 ui/platform/win/ui_window_win.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 8cab2af..a6452d3 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -611,9 +611,9 @@ bool WindowHelper::handleNativeEvent(
 					+ GetSystemMetrics(SM_CXPADDEDBORDER);
 			const auto borderHeight = (GetSystemMetricsForDpiSupported() && dpi)
 				? GetSystemMetricsForDpi(SM_CYSIZEFRAME, dpi)
-					+ GetSystemMetricsForDpi(SM_CYPADDEDBORDER, dpi)
+					+ GetSystemMetricsForDpi(SM_CXPADDEDBORDER, dpi)
 				: GetSystemMetrics(SM_CYSIZEFRAME)
-					+ GetSystemMetrics(SM_CYPADDEDBORDER);
+					+ GetSystemMetrics(SM_CXPADDEDBORDER);
 			r->left += borderWidth;
 			r->right -= borderWidth;
 			if (maximized) {

From 564e354c1d4fabe906cb790babe6879e33faca54 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Jan 2024 12:51:24 +0400
Subject: [PATCH 615/635] Wait longer after first paint, then show window.

---
 ui/platform/win/ui_window_win.cpp | 32 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index a6452d3..5f76de4 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -497,27 +497,25 @@ void WindowHelper::init() {
 	window()->shownValue() | rpl::filter([=](bool shown) {
 		return !shown;
 	}) | rpl::start_with_next([=] {
-		BOOL cloak = TRUE;
-		DwmSetWindowAttribute(_handle, DWMWA_CLOAK, &cloak, sizeof(cloak));
+		const auto toggleCloak = [=](bool enabled) {
+			const auto flag = BOOL(enabled ? TRUE : FALSE);
+			DwmSetWindowAttribute(_handle, DWMWA_CLOAK, &flag, sizeof(flag));
+		};
+		toggleCloak(true);
 
-		const auto firstPaintEventFilter = std::make_shared<QObject*>(nullptr);
+		const auto qwindow = window()->windowHandle();
+		const auto firstPaintEventFilter = std::make_shared<QObject*>();
 		*firstPaintEventFilter = base::install_event_filter(
-			window()->windowHandle(),
+			qwindow,
 			[=](not_null<QEvent*> e) {
-				if (!*firstPaintEventFilter
-						|| e->type() != QEvent::Expose
-						|| !window()->windowHandle()->isExposed()) {
-					return base::EventFilterResult::Continue;
-				}
-				InvokeQueued(*firstPaintEventFilter, [=] {
-					BOOL cloak = FALSE;
-					DwmSetWindowAttribute(
-						_handle,
-						DWMWA_CLOAK,
-						&cloak,
-						sizeof(cloak));
+				if (e->type() == QEvent::Expose && qwindow->isExposed()) {
+					InvokeQueued(qwindow, [=] {
+						InvokeQueued(qwindow, [=] {
+							toggleCloak(false);
+						});
+					});
 					delete base::take(*firstPaintEventFilter);
-				});
+				}
 				return base::EventFilterResult::Continue;
 			});
 	}, window()->lifetime());

From cb1a041ca363e815cbb9f63804c02b2d02d9818d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 13 Jan 2024 04:15:42 +0400
Subject: [PATCH 616/635] Stop timer for infinite radial animation when
 animations are disabled

---
 ui/effects/radial_animation.cpp | 20 ++++++++++++++++----
 ui/effects/radial_animation.h   |  6 +++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ui/effects/radial_animation.cpp b/ui/effects/radial_animation.cpp
index ffea2ac..2ae1d53 100644
--- a/ui/effects/radial_animation.cpp
+++ b/ui/effects/radial_animation.cpp
@@ -112,13 +112,25 @@ RadialState RadialAnimation::computeState() const {
 	return { _opacity, from, length };
 }
 
+void InfiniteRadialAnimation::init() {
+	anim::Disables() | rpl::filter([=] {
+		return animating();
+	}) | rpl::start_with_next([=](bool disabled) {
+		if (!disabled && !_animation.animating()) {
+			_animation.start();
+		} else if (disabled && _animation.animating()) {
+			_animation.stop();
+		}
+	}, _lifetime);
+}
+
 void InfiniteRadialAnimation::start(crl::time skip) {
-	const auto now = crl::now();
-	if (_workFinished <= now && (_workFinished || !_workStarted)) {
+	if (!animating()) {
+		const auto now = crl::now();
 		_workStarted = std::max(now + _st.sineDuration - skip, crl::time(1));
 		_workFinished = 0;
 	}
-	if (!_animation.animating()) {
+	if (!anim::Disabled() && !_animation.animating()) {
 		_animation.start();
 	}
 }
@@ -213,7 +225,7 @@ RadialState InfiniteRadialAnimation::computeState() {
 	const auto now = crl::now();
 	const auto linear = kFullArcLength
 		- int(((now * kFullArcLength) / _st.linearPeriod) % kFullArcLength);
-	if (!_workStarted || (_workFinished && _workFinished <= now)) {
+	if (!animating()) {
 		const auto shown = 0.;
 		_animation.stop();
 		return {
diff --git a/ui/effects/radial_animation.h b/ui/effects/radial_animation.h
index 984e49a..1ed035d 100644
--- a/ui/effects/radial_animation.h
+++ b/ui/effects/radial_animation.h
@@ -73,7 +73,7 @@ public:
 		const style::InfiniteRadialAnimation &st);
 
 	[[nodiscard]] bool animating() const {
-		return _animation.animating();
+		return _workStarted && (!_workFinished || _workFinished > crl::now());
 	}
 
 	void start(crl::time skip = 0);
@@ -101,10 +101,13 @@ public:
 	[[nodiscard]] RadialState computeState();
 
 private:
+	void init();
+
 	const style::InfiniteRadialAnimation &_st;
 	crl::time _workStarted = 0;
 	crl::time _workFinished = 0;
 	Ui::Animations::Basic _animation;
+	rpl::lifetime _lifetime;
 
 };
 
@@ -114,6 +117,7 @@ inline InfiniteRadialAnimation::InfiniteRadialAnimation(
 	const style::InfiniteRadialAnimation &st)
 : _st(st)
 , _animation(std::forward<Callback>(callback)) {
+	init();
 }
 
 } // namespace Ui

From 30b22ace0b67f72e2ab913fccf56842b863effad Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 16 Jan 2024 21:11:05 +0400
Subject: [PATCH 617/635] Use new cloaking workaround for non-fullscreen only.

---
 ui/platform/win/ui_window_win.cpp | 16 ++++++++++------
 ui/platform/win/ui_window_win.h   |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ui/platform/win/ui_window_win.cpp b/ui/platform/win/ui_window_win.cpp
index 5f76de4..4ac4d77 100644
--- a/ui/platform/win/ui_window_win.cpp
+++ b/ui/platform/win/ui_window_win.cpp
@@ -367,6 +367,7 @@ void WindowHelper::showFullScreen() {
 		_isFullScreen = true;
 		updateMargins();
 		updateCornersRounding();
+		updateCloaking();
 	}
 	window()->showFullScreen();
 }
@@ -377,6 +378,7 @@ void WindowHelper::showNormal() {
 		_isFullScreen = false;
 		updateMargins();
 		updateCornersRounding();
+		updateCloaking();
 	}
 }
 
@@ -497,11 +499,7 @@ void WindowHelper::init() {
 	window()->shownValue() | rpl::filter([=](bool shown) {
 		return !shown;
 	}) | rpl::start_with_next([=] {
-		const auto toggleCloak = [=](bool enabled) {
-			const auto flag = BOOL(enabled ? TRUE : FALSE);
-			DwmSetWindowAttribute(_handle, DWMWA_CLOAK, &flag, sizeof(flag));
-		};
-		toggleCloak(true);
+		updateCloaking();
 
 		const auto qwindow = window()->windowHandle();
 		const auto firstPaintEventFilter = std::make_shared<QObject*>();
@@ -511,7 +509,7 @@ void WindowHelper::init() {
 				if (e->type() == QEvent::Expose && qwindow->isExposed()) {
 					InvokeQueued(qwindow, [=] {
 						InvokeQueued(qwindow, [=] {
-							toggleCloak(false);
+							updateCloaking();
 						});
 					});
 					delete base::take(*firstPaintEventFilter);
@@ -910,6 +908,12 @@ void WindowHelper::updateWindowFrameColors(bool active) {
 		sizeof(COLORREF));
 }
 
+void WindowHelper::updateCloaking() {
+	const auto enabled = window()->isHidden() && !_isFullScreen;
+	const auto flag = BOOL(enabled ? TRUE : FALSE);
+	DwmSetWindowAttribute(_handle, DWMWA_CLOAK, &flag, sizeof(flag));
+}
+
 void WindowHelper::updateMargins() {
 	if (_updatingMargins) return;
 
diff --git a/ui/platform/win/ui_window_win.h b/ui/platform/win/ui_window_win.h
index 58b723e..8b9fe15 100644
--- a/ui/platform/win/ui_window_win.h
+++ b/ui/platform/win/ui_window_win.h
@@ -52,6 +52,7 @@ private:
 
 	void init();
 	void updateMargins();
+	void updateCloaking();
 	void updateWindowFrameColors();
 	void updateWindowFrameColors(bool active);
 	void initialShadowUpdate();

From a2c2d92cda2cffdafeb671d1f292a2002fb54217 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 18 Jan 2024 22:21:44 +0400
Subject: [PATCH 618/635] Fix possible crash.

---
 ui/platform/win/ui_utility_win.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ui/platform/win/ui_utility_win.cpp b/ui/platform/win/ui_utility_win.cpp
index 9ac0e72..30e1e5c 100644
--- a/ui/platform/win/ui_utility_win.cpp
+++ b/ui/platform/win/ui_utility_win.cpp
@@ -184,14 +184,15 @@ void FixPopupMenuNativeEmojiPopup(not_null<PopupMenu*> menu) {
 void SetGeometryWithPossibleScreenChange(
 		not_null<QWidget*> widget,
 		QRect geometry) {
-	const auto screen = QGuiApplication::screenAt(geometry.center());
-	const auto window = widget->window();
-	window->createWinId();
-	const auto handle = window->windowHandle();
-	if (handle->screen() != screen) {
-		handle->setScreen(screen);
-		window->move(screen->availableGeometry().topLeft());
-		window->show();
+	if (const auto screen = QGuiApplication::screenAt(geometry.center())) {
+		const auto window = widget->window();
+		window->createWinId();
+		const auto handle = window->windowHandle();
+		if (handle->screen() != screen) {
+			handle->setScreen(screen);
+			window->move(screen->availableGeometry().topLeft());
+			window->show();
+		}
 	}
 	widget->setGeometry(geometry);
 }

From 7328e2786248c673e3599695a56989d9c1062303 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 2 Feb 2024 11:24:44 +0400
Subject: [PATCH 619/635] Add GenericClickHandler that allows right clicks.

---
 ui/click_handler.h | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/ui/click_handler.h b/ui/click_handler.h
index b22576e..08151b5 100644
--- a/ui/click_handler.h
+++ b/ui/click_handler.h
@@ -114,16 +114,16 @@ protected:
 
 };
 
-class LambdaClickHandler : public ClickHandler {
+class GenericClickHandler : public ClickHandler {
 public:
-	LambdaClickHandler(Fn<void()> handler)
+	GenericClickHandler(Fn<void()> handler)
 	: _handler([handler = std::move(handler)](ClickContext) { handler(); }) {
 	}
-	LambdaClickHandler(Fn<void(ClickContext)> handler)
+	GenericClickHandler(Fn<void(ClickContext)> handler)
 	: _handler(std::move(handler)) {
 	}
-	void onClick(ClickContext context) const override final {
-		if (context.button == Qt::LeftButton && _handler) {
+	void onClick(ClickContext context) const override {
+		if (_handler) {
 			_handler(context);
 		}
 	}
@@ -133,6 +133,18 @@ private:
 
 };
 
+class LambdaClickHandler : public GenericClickHandler {
+public:
+	using GenericClickHandler::GenericClickHandler;
+
+	void onClick(ClickContext context) const override final {
+		if (context.button == Qt::LeftButton) {
+			GenericClickHandler::onClick(std::move(context));
+		}
+	}
+
+};
+
 void ActivateClickHandler(
 	not_null<QWidget*> guard,
 	ClickHandlerPtr handler,

From d4247511355a666903e9a57d821b1eb58884aade Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 12 Feb 2024 14:50:04 +0400
Subject: [PATCH 620/635] Ui::DynamicImage /
 Ui::CustomEmoji::DynamicImageEmoji.

---
 CMakeLists.txt                    |  1 +
 ui/dynamic_image.h                | 19 ++++++++++++
 ui/text/custom_emoji_instance.cpp | 51 +++++++++++++++++++++++++++++++
 ui/text/custom_emoji_instance.h   | 27 ++++++++++++++++
 4 files changed, 98 insertions(+)
 create mode 100644 ui/dynamic_image.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 281dbb6..6646223 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -273,6 +273,7 @@ PRIVATE
     ui/delayed_activation.h
     ui/dragging_scroll_manager.cpp
     ui/dragging_scroll_manager.h
+    ui/dynamic_image.h
     ui/emoji_config.cpp
     ui/emoji_config.h
     ui/focus_persister.h
diff --git a/ui/dynamic_image.h b/ui/dynamic_image.h
new file mode 100644
index 0000000..6c62830
--- /dev/null
+++ b/ui/dynamic_image.h
@@ -0,0 +1,19 @@
+// This file is part of Desktop App Toolkit,
+// a set of libraries for developing nice desktop applications.
+//
+// For license and copyright information please follow this link:
+// https://github.com/desktop-app/legal/blob/master/LEGAL
+//
+#pragma once
+
+namespace Ui {
+
+class DynamicImage {
+public:
+	virtual ~DynamicImage() = default;
+
+	[[nodiscard]] virtual QImage image(int size) = 0;
+	virtual void subscribeToUpdates(Fn<void()> callback) = 0;
+};
+
+} // namespace Ui
diff --git a/ui/text/custom_emoji_instance.cpp b/ui/text/custom_emoji_instance.cpp
index 279ac85..1e1acac 100644
--- a/ui/text/custom_emoji_instance.cpp
+++ b/ui/text/custom_emoji_instance.cpp
@@ -8,6 +8,7 @@
 
 #include "ui/effects/animation_value.h"
 #include "ui/effects/frame_generator.h"
+#include "ui/dynamic_image.h"
 #include "ui/ui_utility.h"
 #include "ui/painter.h"
 
@@ -903,4 +904,54 @@ bool Internal::readyInDefaultState() {
 	return true;
 }
 
+DynamicImageEmoji::DynamicImageEmoji(
+	QString entityData,
+	std::shared_ptr<DynamicImage> image,
+	Fn<void()> repaint,
+	QMargins padding,
+	int size)
+: _entityData(entityData)
+, _image(std::move(image))
+, _repaint(std::move(repaint))
+, _padding(padding)
+, _size(size) {
+}
+
+int DynamicImageEmoji::width() {
+	return _padding.left() + _size + _padding.right();
+}
+
+QString DynamicImageEmoji::entityData() {
+	return _entityData;
+}
+
+void DynamicImageEmoji::paint(QPainter &p, const Context &context) {
+	if (!_subscribed) {
+		_subscribed = true;
+		_image->subscribeToUpdates(_repaint);
+	}
+
+	const auto rect = QRect(
+		context.position + QPoint(_padding.left(), _padding.top()),
+		QSize(_size, _size));
+	auto image = _image->image(_size);
+	context.internal.colorized = false;
+	PaintScaledImage(p, rect, { &image }, context);
+}
+
+void DynamicImageEmoji::unload() {
+	if (_subscribed) {
+		_subscribed = false;
+		_image->subscribeToUpdates(nullptr);
+	}
+}
+
+bool DynamicImageEmoji::ready() {
+	return true;
+}
+
+bool DynamicImageEmoji::readyInDefaultState() {
+	return true;
+}
+
 } // namespace Ui::CustomEmoji
diff --git a/ui/text/custom_emoji_instance.h b/ui/text/custom_emoji_instance.h
index be56c2d..337e8b6 100644
--- a/ui/text/custom_emoji_instance.h
+++ b/ui/text/custom_emoji_instance.h
@@ -17,6 +17,7 @@ class QColor;
 class QPainter;
 
 namespace Ui {
+class DynamicImage;
 class FrameGenerator;
 } // namespace Ui
 
@@ -296,4 +297,30 @@ private:
 
 };
 
+class DynamicImageEmoji final : public Ui::Text::CustomEmoji {
+public:
+	DynamicImageEmoji(
+		QString entityData,
+		std::shared_ptr<DynamicImage> image,
+		Fn<void()> repaint,
+		QMargins padding,
+		int size);
+
+	int width() override;
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	const QString _entityData;
+	const std::shared_ptr<DynamicImage> _image;
+	const Fn<void()> _repaint;
+	const QMargins _padding;
+	const int _size = 0;
+	bool _subscribed = false;
+
+};
+
 } // namespace Ui::CustomEmoji

From c6b7c57bb2459e09f65a928219bdf735315dedf4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 20 Feb 2024 14:33:09 +0400
Subject: [PATCH 621/635] Add producer<> GenericBox::showFinishes().

---
 ui/layers/generic_box.cpp | 19 +++++++++++++++++++
 ui/layers/generic_box.h   | 18 ++++++------------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index 8ce8c16..bbf7109 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -68,6 +68,25 @@ void GenericBox::addSkip(int height) {
 	addRow(object_ptr<Ui::FixedHeightWidget>(this, height));
 }
 
+void GenericBox::setInnerFocus() {
+	if (_focus) {
+		_focus();
+	} else {
+		BoxContent::setInnerFocus();
+	}
+}
+
+void GenericBox::showFinished() {
+	const auto guard = QPointer(this);
+	if (const auto onstack = _showFinished) {
+		onstack();
+		if (!guard) {
+			return;
+		}
+	}
+	_showFinishes.fire({});
+}
+
 not_null<Ui::RpWidget*> GenericBox::doSetPinnedToTopContent(
 		object_ptr<Ui::RpWidget> content) {
 	_pinnedToTopContent = std::move(content);
diff --git a/ui/layers/generic_box.h b/ui/layers/generic_box.h
index 3bfd724..4c3baae 100644
--- a/ui/layers/generic_box.h
+++ b/ui/layers/generic_box.h
@@ -41,6 +41,9 @@ public:
 	void setShowFinishedCallback(Fn<void()> callback) {
 		_showFinished = callback;
 	}
+	[[nodiscard]] rpl::producer<> showFinishes() const {
+		return _showFinishes.events();
+	}
 
 	[[nodiscard]] int rowsCount() const;
 	[[nodiscard]] int width() const;
@@ -81,18 +84,8 @@ public:
 		_scrollSt = &st;
 	}
 
-	void setInnerFocus() override {
-		if (_focus) {
-			_focus();
-		} else {
-			BoxContent::setInnerFocus();
-		}
-	}
-	void showFinished() override {
-		if (_showFinished) {
-			_showFinished();
-		}
-	}
+	void setInnerFocus() override;
+	void showFinished() override;
 
 	template <typename Widget>
 	not_null<Widget*> setPinnedToTopContent(object_ptr<Widget> content) {
@@ -144,6 +137,7 @@ private:
 	FnMut<void(not_null<GenericBox*>)> _init;
 	Fn<void()> _focus;
 	Fn<void()> _showFinished;
+	rpl::event_stream<> _showFinishes;
 	object_ptr<Ui::VerticalLayout> _owned;
 	not_null<Ui::VerticalLayout*> _content;
 	const style::ScrollArea *_scrollSt = nullptr;

From 1af6140fa3042aaad8aca5fd5b8beb0dcd10ad94 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 21 Feb 2024 22:25:24 +0400
Subject: [PATCH 622/635] Allow custom scroll init in GenericBox.

---
 ui/layers/generic_box.cpp | 4 ++++
 ui/layers/generic_box.h   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ui/layers/generic_box.cpp b/ui/layers/generic_box.cpp
index bbf7109..bfcc7aa 100644
--- a/ui/layers/generic_box.cpp
+++ b/ui/layers/generic_box.cpp
@@ -62,6 +62,10 @@ void GenericBox::prepare() {
 			pinnedToBottom->move(0, outer - height);
 		}, pinnedToBottom->lifetime());
 	}
+
+	if (const auto onstack = _initScroll) {
+		onstack();
+	}
 }
 
 void GenericBox::addSkip(int height) {
diff --git a/ui/layers/generic_box.h b/ui/layers/generic_box.h
index 4c3baae..53be668 100644
--- a/ui/layers/generic_box.h
+++ b/ui/layers/generic_box.h
@@ -38,6 +38,9 @@ public:
 	void setFocusCallback(Fn<void()> callback) {
 		_focus = callback;
 	}
+	void setInitScrollCallback(Fn<void()> callback) {
+		_initScroll = callback;
+	}
 	void setShowFinishedCallback(Fn<void()> callback) {
 		_showFinished = callback;
 	}
@@ -136,6 +139,7 @@ private:
 
 	FnMut<void(not_null<GenericBox*>)> _init;
 	Fn<void()> _focus;
+	Fn<void()> _initScroll;
 	Fn<void()> _showFinished;
 	rpl::event_stream<> _showFinishes;
 	object_ptr<Ui::VerticalLayout> _owned;

From 0c6b2c611dcf55fcc3b4fe053e0cb693b9e88703 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Feb 2024 13:24:20 +0400
Subject: [PATCH 623/635] Add rpl interface to RadiobuttonGroup.

---
 ui/widgets/checkbox.cpp | 22 +++++++++--
 ui/widgets/checkbox.h   | 85 +++++++++++++++++++++++------------------
 2 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/ui/widgets/checkbox.cpp b/ui/widgets/checkbox.cpp
index bc3c6c7..ff7615f 100644
--- a/ui/widgets/checkbox.cpp
+++ b/ui/widgets/checkbox.cpp
@@ -907,11 +907,25 @@ void RadiobuttonGroup::setValue(int value) {
 	for (const auto button : _buttons) {
 		button->handleNewGroupValue(_value);
 	}
-	if (const auto callback = _changedCallback) {
-		callback(_value);
+	const auto guard = weak_from_this();
+	_changes.fire_copy(value);
+	if (guard.lock()) {
+		if (const auto callback = _changedCallback) {
+			callback(_value);
+		}
 	}
 }
 
+void RadiobuttonGroup::registerButton(Radiobutton *button) {
+	if (!base::contains(_buttons, button)) {
+		_buttons.push_back(button);
+	}
+}
+
+void RadiobuttonGroup::unregisterButton(Radiobutton *button) {
+	_buttons.erase(ranges::remove(_buttons, button), _buttons.end());
+}
+
 Radiobutton::Radiobutton(
 	QWidget *parent,
 	const std::shared_ptr<RadiobuttonGroup> &group,
@@ -927,7 +941,7 @@ Radiobutton::Radiobutton(
 	st,
 	std::make_unique<RadioView>(
 		radioSt,
-		(group->hasValue() && group->value() == value))) {
+		(group->hasValue() && group->current() == value))) {
 }
 
 Radiobutton::Radiobutton(
@@ -946,7 +960,7 @@ Radiobutton::Radiobutton(
 , _value(value) {
 	using namespace rpl::mappers;
 
-	checkbox()->setChecked(group->hasValue() && group->value() == value);
+	checkbox()->setChecked(group->hasValue() && group->current() == value);
 	_group->registerButton(this);
 	checkbox()->checkedChanges(
 	) | rpl::filter(
diff --git a/ui/widgets/checkbox.h b/ui/widgets/checkbox.h
index 06da21b..593dc05 100644
--- a/ui/widgets/checkbox.h
+++ b/ui/widgets/checkbox.h
@@ -191,9 +191,9 @@ public:
 	using ClickHandlerFilter = Fn<bool(const ClickHandlerPtr&, Qt::MouseButton)>;
 	void setClickHandlerFilter(ClickHandlerFilter &&filter);
 
-	bool checked() const;
-	rpl::producer<bool> checkedChanges() const;
-	rpl::producer<bool> checkedValue() const;
+	[[nodiscard]] bool checked() const;
+	[[nodiscard]] rpl::producer<bool> checkedChanges() const;
+	[[nodiscard]] rpl::producer<bool> checkedValue() const;
 	enum class NotifyAboutChange {
 		Notify,
 		DontNotify,
@@ -204,17 +204,17 @@ public:
 
 	void finishAnimating();
 
-	QMargins getMargins() const override {
+	[[nodiscard]] QMargins getMargins() const override {
 		return _st.margin;
 	}
-	int naturalWidth() const override;
+	[[nodiscard]] int naturalWidth() const override;
 
 	void updateCheck() {
 		rtlupdate(checkRect());
 	}
-	QRect checkRect() const;
+	[[nodiscard]] QRect checkRect() const;
 
-	not_null<AbstractCheckView*> checkView() const {
+	[[nodiscard]] not_null<AbstractCheckView*> checkView() const {
 		return _check.get();
 	}
 
@@ -257,7 +257,8 @@ private:
 
 class Radiobutton;
 
-class RadiobuttonGroup {
+class RadiobuttonGroup
+	: public std::enable_shared_from_this<RadiobuttonGroup> {
 public:
 	RadiobuttonGroup() = default;
 	RadiobuttonGroup(int value) : _value(value), _hasValue(true) {
@@ -266,29 +267,32 @@ public:
 	void setChangedCallback(Fn<void(int value)> callback) {
 		_changedCallback = std::move(callback);
 	}
+	[[nodiscard]] rpl::producer<int> changes() const {
+		return _changes.events();
+	}
+	[[nodiscard]] rpl::producer<int> value() const {
+		return hasValue()
+			? _changes.events_starting_with_copy(_value)
+			: changes();
+	}
 
-	bool hasValue() const {
+	[[nodiscard]] bool hasValue() const {
 		return _hasValue;
 	}
-	int value() const {
+	[[nodiscard]] int current() const {
 		return _value;
 	}
 	void setValue(int value);
 
 private:
 	friend class Radiobutton;
-	void registerButton(Radiobutton *button) {
-		if (!base::contains(_buttons, button)) {
-			_buttons.push_back(button);
-		}
-	}
-	void unregisterButton(Radiobutton *button) {
-		_buttons.erase(std::remove(_buttons.begin(), _buttons.end(), button), _buttons.end());
-	}
+	void registerButton(Radiobutton *button);
+	void unregisterButton(Radiobutton *button);
 
 	int _value = 0;
 	bool _hasValue = false;
 	Fn<void(int value)> _changedCallback;
+	rpl::event_stream<int> _changes;
 	std::vector<Radiobutton*> _buttons;
 
 };
@@ -340,35 +344,42 @@ template <typename Enum>
 class Radioenum;
 
 template <typename Enum>
-class RadioenumGroup {
+class RadioenumGroup : public RadiobuttonGroup {
+	using Parent = RadiobuttonGroup;
+
+	[[nodiscard]] static Enum Cast(int value) {
+		return static_cast<Enum>(value);
+	}
+
 public:
 	RadioenumGroup() = default;
-	RadioenumGroup(Enum value) : _group(static_cast<int>(value)) {
+	RadioenumGroup(Enum value) : Parent(static_cast<int>(value)) {
 	}
 
 	template <typename Callback>
 	void setChangedCallback(Callback &&callback) {
-		_group.setChangedCallback([callback](int value) {
-			callback(static_cast<Enum>(value));
+		Parent::setChangedCallback([copy = std::move(callback)](int value) {
+			copy(Cast(value));
 		});
 	}
 
-	bool hasValue() const {
-		return _group.hasValue();
+	[[nodiscard]] rpl::producer<Enum> changes() const {
+		return Parent::changes() | rpl::map(Cast);
 	}
-	Enum value() const {
-		return static_cast<Enum>(_group.value());
+	[[nodiscard]] rpl::producer<Enum> value() const {
+		return Parent::value() | rpl::map(Cast);
+	}
+	[[nodiscard]] Enum current() const {
+		return Cast(Parent::current());
 	}
 	void setValue(Enum value) {
-		_group.setValue(static_cast<int>(value));
+		Parent::setValue(static_cast<int>(value));
 	}
 
 private:
 	template <typename OtherEnum>
 	friend class Radioenum;
 
-	RadiobuttonGroup _group;
-
 };
 
 template <typename Enum>
@@ -382,7 +393,7 @@ public:
 		const style::Checkbox &st = st::defaultCheckbox)
 	: Radiobutton(
 		parent,
-		std::shared_ptr<RadiobuttonGroup>(group, &group->_group),
+		group->shared_from_this(),
 		static_cast<int>(value),
 		text,
 		st) {
@@ -394,13 +405,13 @@ public:
 		const QString &text,
 		const style::Checkbox &st,
 		std::unique_ptr<AbstractCheckView> check)
-		: Radiobutton(
-			parent,
-			std::shared_ptr<RadiobuttonGroup>(group, &group->_group),
-			static_cast<int>(value),
-			text,
-			st,
-			std::move(check)) {
+	: Radiobutton(
+		parent,
+		group->shared_from_this(),
+		static_cast<int>(value),
+		text,
+		st,
+		std::move(check)) {
 	}
 
 };

From 333587d95edefcae1ebaf8838d3f499639fc2de8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 27 Feb 2024 04:11:54 +0300
Subject: [PATCH 624/635] Added function to count characters in input field
 with emoji.

---
 ui/widgets/fields/input_field.cpp | 5 +++++
 ui/widgets/fields/input_field.h   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index b80d519..3ce4ab0 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -3988,4 +3988,9 @@ void PrepareFormattingOptimization(not_null<QTextDocument*> document) {
 	}
 }
 
+int FieldCharacterCount(not_null<InputField*> field) {
+	// This method counts emoji properly.
+	return field->document()->characterCount() - 1;
+}
+
 } // namespace Ui
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index 01a008e..3b3d978 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -569,4 +569,6 @@ private:
 
 void PrepareFormattingOptimization(not_null<QTextDocument*> document);
 
+[[nodiscard]] int FieldCharacterCount(not_null<InputField*> field);
+
 } // namespace Ui

From 14794d22210cb21b82db20aa55b1f3c8733b5fbd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Mar 2024 12:26:46 +0400
Subject: [PATCH 625/635] Allow default toast to work with .adaptive flag.

---
 ui/widgets/widgets.style | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/widgets/widgets.style b/ui/widgets/widgets.style
index d34d504..436e852 100644
--- a/ui/widgets/widgets.style
+++ b/ui/widgets/widgets.style
@@ -1404,6 +1404,7 @@ defaultToast: Toast {
 
 defaultMultilineToast: Toast(defaultToast) {
 	minWidth: 160px;
+	maxWidth: 360px;
 }
 
 // Windows specific title

From 7eaf7f8aaa5c7aac9cbc6e5dc92dea7944003eba Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 3 Mar 2024 15:17:55 +0400
Subject: [PATCH 626/635] Fix bold formatting in the beginning of a quote.

---
 ui/text/text_entity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/text/text_entity.cpp b/ui/text/text_entity.cpp
index 65c9dee..7083ac9 100644
--- a/ui/text/text_entity.cpp
+++ b/ui/text/text_entity.cpp
@@ -2125,7 +2125,7 @@ EntitiesInText ConvertTextTagsToEntities(const TextWithTags::Tags &tags) {
 				openType(EntityType::CustomUrl, nextState.link);
 			}
 		}
-		for (const auto type : kInMaskTypes) {
+		for (const auto type : kInMaskTypes | ranges::views::reverse) {
 			if (nextState.has(type) && !state.has(type)) {
 				openType(type, nextState.language);
 			}

From 893dab0920d65636c9f6385a87000dd9f2b984f5 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 7 Mar 2024 23:10:33 +0400
Subject: [PATCH 627/635] Do exact match for Ctrl+Shift+.

---
 ui/widgets/fields/input_field.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index 3ce4ab0..e2527f9 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -2919,10 +2919,10 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
 	if (!_markdownEnabled) {
 		return false;
 	}
+	const auto modifiers = e->modifiers()
+		& ~(Qt::KeypadModifier | Qt::GroupSwitchModifier);
 	const auto matches = [&](const QKeySequence &sequence) {
-		const auto searchKey = (e->modifiers() | e->key())
-			& ~(Qt::KeypadModifier | Qt::GroupSwitchModifier);
-		const auto events = QKeySequence(searchKey);
+		const auto events = QKeySequence(modifiers | e->key());
 		return sequence.matches(events) == QKeySequence::ExactMatch;
 	};
 	const auto matchesCtrlShiftDot = [&] {
@@ -2930,8 +2930,7 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
 		// shift+. gives us '>' and ctrl+shift+> is not the same.
 		// So we check with native code instead.
 #ifdef Q_OS_WIN
-		return e->modifiers().testFlag(Qt::ControlModifier)
-			&& e->modifiers().testFlag(Qt::ShiftModifier)
+		return (modifiers == (Qt::ControlModifier | Qt::ShiftModifier))
 			&& (e->nativeVirtualKey() == VK_OEM_PERIOD);
 #elif !defined DESKTOP_APP_DISABLE_X11_INTEGRATION // Q_OS_WIN
 		if (!_inner->_xcbKeySymbols) {
@@ -2941,8 +2940,7 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
 			_inner->_xcbKeySymbols.get(),
 			e->nativeScanCode(),
 			0);
-		return e->modifiers().testFlag(Qt::ControlModifier)
-			&& e->modifiers().testFlag(Qt::ShiftModifier)
+		return (modifiers == (Qt::ControlModifier | Qt::ShiftModifier))
 			&& (keysym == XKB_KEY_period);
 #else // !Q_OS_WIN && !DESKTOP_APP_DISABLE_X11_INTEGRATION
 		return false;

From 5d7445ce7dd3d1c722c79f9addbe8be954e24955 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 5 Mar 2024 19:25:28 +0300
Subject: [PATCH 628/635] Fixed title elision in separate panels when back
 button is present.

---
 ui/widgets/separate_panel.cpp | 23 ++++++++++-------------
 ui/widgets/separate_panel.h   |  3 +--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/ui/widgets/separate_panel.cpp b/ui/widgets/separate_panel.cpp
index 6a8b1d5..1ee1437 100644
--- a/ui/widgets/separate_panel.cpp
+++ b/ui/widgets/separate_panel.cpp
@@ -21,6 +21,7 @@
 #include "ui/layers/show.h"
 #include "ui/style/style_core_palette.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "base/platform/base_platform_info.h"
 #include "base/debug_log.h"
 #include "styles/style_widgets.h"
@@ -170,15 +171,13 @@ void SeparatePanel::initControls() {
 	) | rpl::start_with_next([=](int width) {
 		_back->moveToLeft(_padding.left(), _padding.top());
 		_close->moveToRight(_padding.right(), _padding.top());
-		if (_title) {
-			updateTitleGeometry(width);
-		}
+		updateTitleGeometry(width);
 	}, lifetime());
 
 	_back->toggledValue(
 	) | rpl::start_with_next([=](bool toggled) {
 		_titleLeft.start(
-			[=] { updateTitlePosition(); },
+			[=] { updateTitleGeometry(width()); },
 			toggled ? 0. : 1.,
 			toggled ? 1. : 0.,
 			st::fadeWrapDuration);
@@ -238,15 +237,7 @@ void SeparatePanel::overrideTitleColor(std::optional<QColor> color) {
 	update();
 }
 
-void SeparatePanel::updateTitleGeometry(int newWidth) {
-	_title->resizeToWidth(newWidth
-		- _padding.left() - _back->width()
-		- _padding.right() - _close->width()
-		- (_menuToggle ? _menuToggle->width() : 0));
-	updateTitlePosition();
-}
-
-void SeparatePanel::updateTitlePosition() {
+void SeparatePanel::updateTitleGeometry(int newWidth) const {
 	if (!_title) {
 		return;
 	}
@@ -255,6 +246,11 @@ void SeparatePanel::updateTitlePosition() {
 		st::separatePanelTitleLeft,
 		_back->width() + st::separatePanelTitleSkip,
 		progress);
+	_title->resizeToWidth(newWidth
+		- rect::m::sum::h(_padding)
+		- left
+		- _close->width()
+		- (_menuToggle ? _menuToggle->width() : 0));
 	_title->moveToLeft(
 		_padding.left() + left,
 		_padding.top() + st::separatePanelTitleTop);
@@ -295,6 +291,7 @@ void SeparatePanel::setMenuAllowed(
 			_padding.right() + _close->width(),
 			_padding.top());
 	}, _menuToggle->lifetime());
+	updateTitleGeometry(width());
 }
 
 void SeparatePanel::showMenu(Fn<void(const Menu::MenuCallback&)> fill) {
diff --git a/ui/widgets/separate_panel.h b/ui/widgets/separate_panel.h
index 563eead..4c955e3 100644
--- a/ui/widgets/separate_panel.h
+++ b/ui/widgets/separate_panel.h
@@ -117,8 +117,7 @@ private:
 	void ensureLayerCreated();
 	void destroyLayer();
 
-	void updateTitleGeometry(int newWidth);
-	void updateTitlePosition();
+	void updateTitleGeometry(int newWidth) const;
 	void paintShadowBorder(QPainter &p) const;
 	void paintOpaqueBorder(QPainter &p) const;
 

From 3c8cf5f5dbc90fecb77bb87555b99fe964d03025 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 6 Mar 2024 17:35:19 +0300
Subject: [PATCH 629/635] Added storage of surrogate pairs count to every
 emoji.

---
 ui/emoji_config.cpp | 34 ++++++++++++++++++++++++++++++
 ui/emoji_config.h   | 50 ++++++++++++++++++++++++---------------------
 2 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/ui/emoji_config.cpp b/ui/emoji_config.cpp
index 49f29e9..349d939 100644
--- a/ui/emoji_config.cpp
+++ b/ui/emoji_config.cpp
@@ -373,6 +373,24 @@ void ClearUniversalChecked() {
 	}
 }
 
+[[nodiscard]] uint8 EmojiSurrogatePairs(const QString &e) {
+	if (e.size() > 1) {
+		auto count = uint8(0);
+		const auto begin = e.data();
+		auto ch = begin;
+		for (const auto end = begin + e.size(); ch != end; ++ch) {
+			if ((ch + 1 < end)
+				&& ch->isHighSurrogate()
+				&& (ch + 1)->isLowSurrogate()) {
+				count++;
+			}
+		}
+		return count;
+	} else {
+		return 0;
+	}
+}
+
 } // namespace
 
 namespace internal {
@@ -627,6 +645,22 @@ int GetSizeTouchbar() {
 }
 #endif
 
+One::One(
+	const QString &id,
+	EmojiPtr original,
+	uint32 index,
+	bool hasPostfix,
+	bool colorizable,
+	const CreationTag &)
+: _id(id)
+, _original(original)
+, _index(index)
+, _hasPostfix(hasPostfix)
+, _colorizable(colorizable)
+, _surrogatePairs(EmojiSurrogatePairs(text())) {
+	Expects(!_colorizable || !colored());
+}
+
 int One::variantsCount() const {
 	return hasVariants() ? 5 : 0;
 }
diff --git a/ui/emoji_config.h b/ui/emoji_config.h
index 95dd23b..30fbc77 100644
--- a/ui/emoji_config.h
+++ b/ui/emoji_config.h
@@ -51,66 +51,70 @@ class One {
 
 public:
 	One(One &&other) = default;
-	One(const QString &id, EmojiPtr original, uint32 index, bool hasPostfix, bool colorizable, const CreationTag &)
-	: _id(id)
-	, _original(original)
-	, _index(index)
-	, _hasPostfix(hasPostfix)
-	, _colorizable(colorizable) {
-		Expects(!_colorizable || !colored());
-	}
+	One(
+		const QString &id,
+		EmojiPtr original,
+		uint32 index,
+		bool hasPostfix,
+		bool colorizable,
+		const CreationTag &);
 
-	QString id() const {
+	[[nodiscard]] QString id() const {
 		return _id;
 	}
-	QString text() const {
+	[[nodiscard]] QString text() const {
 		return hasPostfix() ? (_id + QChar(kPostfix)) : _id;
 	}
 
-	bool colored() const {
+	[[nodiscard]] bool colored() const {
 		return (_original != nullptr);
 	}
-	EmojiPtr original() const {
+	[[nodiscard]] EmojiPtr original() const {
 		return _original ? _original : this;
 	}
-	QString nonColoredId() const {
+	[[nodiscard]] QString nonColoredId() const {
 		return original()->id();
 	}
 
-	bool hasPostfix() const {
+	[[nodiscard]] bool hasPostfix() const {
 		return _hasPostfix;
 	}
 
-	bool hasVariants() const {
+	[[nodiscard]] bool hasVariants() const {
 		return _colorizable || colored();
 	}
-	int variantsCount() const;
-	int variantIndex(EmojiPtr variant) const;
-	EmojiPtr variant(int index) const;
+	[[nodiscard]] int variantsCount() const;
+	[[nodiscard]] int variantIndex(EmojiPtr variant) const;
+	[[nodiscard]] EmojiPtr variant(int index) const;
 
-	int index() const {
+	[[nodiscard]] int index() const {
 		return _index;
 	}
-	int sprite() const {
+	[[nodiscard]] int sprite() const {
 		return int(_index >> 9);
 	}
-	int row() const {
+	[[nodiscard]] int row() const {
 		return int((_index >> 5) & 0x0FU);
 	}
-	int column() const {
+	[[nodiscard]] int column() const {
 		return int(_index & 0x1FU);
 	}
 
-	QString toUrl() const {
+	[[nodiscard]] QString toUrl() const {
 		return "emoji://e." + QString::number(index());
 	}
 
+	[[nodiscard]] uint8 surrogatePairs() const {
+		return _surrogatePairs;
+	}
+
 private:
 	const QString _id;
 	const EmojiPtr _original = nullptr;
 	const uint32 _index = 0;
 	const bool _hasPostfix = false;
 	const bool _colorizable = false;
+	const uint8 _surrogatePairs;
 
 	friend void internal::Init();
 

From 1587f9f1b901dbbf74cb7053d3a94d733fe59693 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 6 Mar 2024 17:32:20 +0300
Subject: [PATCH 630/635] Added storage of proper text size with emoji to input
 field.

---
 ui/widgets/fields/input_field.cpp | 34 ++++++++++++++++++++-----------
 ui/widgets/fields/input_field.h   | 10 ++++++++-
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/ui/widgets/fields/input_field.cpp b/ui/widgets/fields/input_field.cpp
index e2527f9..5a273c1 100644
--- a/ui/widgets/fields/input_field.cpp
+++ b/ui/widgets/fields/input_field.cpp
@@ -1927,7 +1927,7 @@ bool InputField::hasText() const {
 	return (from.next() != till);
 }
 
-QString InputField::getTextPart(
+InputField::TextPart InputField::getTextPart(
 		int start,
 		int end,
 		TagList &outTagsList,
@@ -1938,7 +1938,7 @@ QString InputField::getTextPart(
 	if (end >= 0 && end <= start) {
 		outTagsChanged = !outTagsList.isEmpty();
 		outTagsList.clear();
-		return QString();
+		return { QString(), 0 };
 	}
 
 	if (start < 0) {
@@ -1967,6 +1967,7 @@ QString InputField::getTextPart(
 	if (!full && end < 0) {
 		end = possibleLength;
 	}
+	auto textSizeWithoutSurrogatePairsCount = document->characterCount() - 1;
 
 	for (auto block = from; block != till;) {
 		for (auto item = block.begin(); !item.atEnd(); ++item) {
@@ -1993,14 +1994,19 @@ QString InputField::getTextPart(
 				}
 			}
 
-			const auto emojiText = [&] {
+			struct EmojiEntry final {
+				QString text;
+				uint8 surrogatePairs = 0;
+			};
+
+			const auto emojiEntry = [&]() -> EmojiEntry {
 				if (format.isImageFormat()) {
 					const auto imageName = format.toImageFormat().name();
 					if (const auto emoji = Emoji::FromUrl(imageName)) {
-						return emoji->text();
+						return { emoji->text(), emoji->surrogatePairs() };
 					}
 				}
-				return format.property(kCustomEmojiText).toString();
+				return { format.property(kCustomEmojiText).toString(), 0 };
 			}();
 			auto text = [&] {
 				const auto result = fragment.text();
@@ -2030,9 +2036,12 @@ QString InputField::getTextPart(
 					if (ch > begin) {
 						result.append(begin, ch - begin);
 					}
-					adjustedLength += (emojiText.size() - 1);
-					if (!emojiText.isEmpty()) {
-						result.append(emojiText);
+					const auto size = emojiEntry.text.size() - 1;
+					adjustedLength += size;
+					if (!emojiEntry.text.isEmpty()) {
+						result.append(emojiEntry.text);
+						textSizeWithoutSurrogatePairsCount += size
+							- emojiEntry.surrogatePairs;
 					}
 					begin = ch + 1;
 				} break;
@@ -2063,7 +2072,7 @@ QString InputField::getTextPart(
 	markdownTagAccumulator.finish();
 
 	outTagsChanged = tagAccumulator.changed();
-	return result;
+	return { result, textSizeWithoutSurrogatePairsCount };
 }
 
 bool InputField::isUndoAvailable() const {
@@ -2457,7 +2466,7 @@ void InputField::handleContentsChanged() {
 	setErrorShown(false);
 
 	auto tagsChanged = false;
-	const auto currentText = getTextPart(
+	const auto [currentText, currentTextSize] = getTextPart(
 		0,
 		-1,
 		_lastTextWithTags.tags,
@@ -2466,6 +2475,7 @@ void InputField::handleContentsChanged() {
 
 	//highlightMarkdown();
 
+	_lastTextSizeWithoutSurrogatePairsCount = currentTextSize;
 	if (tagsChanged || (_lastTextWithTags.text != currentText)) {
 		_lastTextWithTags.text = currentText;
 		const auto weak = MakeWeak(this);
@@ -2640,7 +2650,7 @@ void InputField::setTextWithTags(
 TextWithTags InputField::getTextWithTagsPart(int start, int end) const {
 	auto changed = false;
 	auto result = TextWithTags();
-	result.text = getTextPart(start, end, result.tags, changed);
+	result.text = getTextPart(start, end, result.tags, changed).text;
 	return result;
 }
 
@@ -3988,7 +3998,7 @@ void PrepareFormattingOptimization(not_null<QTextDocument*> document) {
 
 int FieldCharacterCount(not_null<InputField*> field) {
 	// This method counts emoji properly.
-	return field->document()->characterCount() - 1;
+	return field->lastTextSizeWithoutSurrogatePairsCount();
 }
 
 } // namespace Ui
diff --git a/ui/widgets/fields/input_field.h b/ui/widgets/fields/input_field.h
index 3b3d978..167f8a2 100644
--- a/ui/widgets/fields/input_field.h
+++ b/ui/widgets/fields/input_field.h
@@ -241,6 +241,9 @@ public:
 	const QString &getLastText() const {
 		return _lastTextWithTags.text;
 	}
+	[[nodiscard]] int lastTextSizeWithoutSurrogatePairsCount() const {
+		return _lastTextSizeWithoutSurrogatePairsCount;
+	}
 	void setPlaceholder(
 		rpl::producer<QString> placeholder,
 		int afterSymbols = 0);
@@ -380,7 +383,11 @@ private:
 
 	// "start" and "end" are in coordinates of text where emoji are replaced
 	// by ObjectReplacementCharacter. If "end" = -1 means get text till the end.
-	QString getTextPart(
+	struct TextPart final {
+		QString text;
+		int textSizeWithoutSurrogatePairsCount = 0;
+	};
+	TextPart getTextPart(
 		int start,
 		int end,
 		TagList &outTagsList,
@@ -484,6 +491,7 @@ private:
 	TextWithTags _lastTextWithTags;
 	std::vector<MarkdownTag> _lastMarkdownTags;
 	QString _lastPreEditText;
+	int _lastTextSizeWithoutSurrogatePairsCount = 0;
 	std::optional<QString> _inputMethodCommit;
 
 	QMargins _additionalMargins;

From edfcac751dbdd93fcabac4ebf0ff731ceab8af0f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Mar 2024 02:43:45 +0300
Subject: [PATCH 631/635] Added helpful function to convert padding into
 top-left point.

---
 ui/rect.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ui/rect.h b/ui/rect.h
index 3a104c6..6082880 100644
--- a/ui/rect.h
+++ b/ui/rect.h
@@ -39,6 +39,22 @@ namespace sum {
 }
 
 } // namespace sum
+
+namespace pos {
+
+/*
+	Top-left.
+	rect::m::pos::tl(mypadding);
+*/
+[[nodiscard]] inline QPoint tl(const QMargins &margins) {
+	return { margins.left(), margins.top() };
+}
+
+[[nodiscard]] inline QPointF tl(const QMarginsF &margins) {
+	return { margins.left(), margins.top() };
+}
+
+} // namespace pos
 } // namespace m
 
 /*

From fb1716c91f80baf482a51b86a9a92cb1df2819b0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Mar 2024 17:05:17 +0400
Subject: [PATCH 632/635] Add fast Ctrl/Shift scroll to ElasticScroll.

---
 ui/widgets/elastic_scroll.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/widgets/elastic_scroll.cpp b/ui/widgets/elastic_scroll.cpp
index 506b200..ec5c2a0 100644
--- a/ui/widgets/elastic_scroll.cpp
+++ b/ui/widgets/elastic_scroll.cpp
@@ -660,7 +660,14 @@ bool ElasticScroll::handleWheelEvent(not_null<QWheelEvent*> e, bool touch) {
 	const auto guard = gsl::finally([&] {
 		_lastScroll = now;
 	});
-	const auto pixels = ScrollDelta(e, touch);
+	const auto unmultiplied = ScrollDelta(e, touch);
+	const auto multiply = e->modifiers()
+		& (Qt::ControlModifier | Qt::ShiftModifier);
+	const auto pixels = multiply
+		? QPoint(
+			(unmultiplied.x() * std::max(width(), 120) / 120.),
+			(unmultiplied.y() * std::max(height(), 120) / 120.))
+		: unmultiplied;
 	auto delta = _vertical ? -pixels.y() : pixels.x();
 	if (std::abs(_vertical ? pixels.x() : pixels.y()) >= std::abs(delta)) {
 		delta = 0;
@@ -1030,7 +1037,7 @@ void ElasticScroll::sendWheelEvent(Qt::ScrollPhase phase, QPoint delta) {
 		delta,
 		delta,
 		Qt::NoButton,
-		QGuiApplication::keyboardModifiers(),
+		Qt::KeyboardModifiers(), // Ignore Ctrl/Shift fast scroll on touch.
 		phase,
 		false,
 		Qt::MouseEventSynthesizedByApplication);

From 6bce493029a08b460db88cbaf528e49450751d1f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 13 Mar 2024 03:57:29 +0400
Subject: [PATCH 633/635] Enter from event loop in the portal title controls
 layout watcher

---
 ui/platform/linux/ui_window_title_linux.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/platform/linux/ui_window_title_linux.cpp b/ui/platform/linux/ui_window_title_linux.cpp
index c89c0b4..f9ebe2a 100644
--- a/ui/platform/linux/ui_window_title_linux.cpp
+++ b/ui/platform/linux/ui_window_title_linux.cpp
@@ -8,6 +8,8 @@
 
 #include "base/platform/linux/base_linux_xdp_utilities.h"
 
+#include "base/integration.h"
+
 #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
 #include "base/platform/linux/base_linux_xsettings.h"
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -75,7 +77,11 @@ TitleControls::Layout TitleControlsLayout() {
 		static const XDP::SettingWatcher settingWatcher(
 			"org.gnome.desktop.wm.preferences",
 			"button-layout",
-			[] { NotifyTitleControlsLayoutChanged(); });
+			[] {
+				base::Integration::Instance().enterFromEventLoop([] {
+					NotifyTitleControlsLayoutChanged();
+				});
+			});
 
 		return true;
 	}();

From a1a6676eabebfc7f879a3edc9ddc4f59462fd415 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 13 Mar 2024 12:46:12 +0400
Subject: [PATCH 634/635] Get rid of glibmm

---
 ui/platform/linux/ui_window_title_linux.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ui/platform/linux/ui_window_title_linux.cpp b/ui/platform/linux/ui_window_title_linux.cpp
index f9ebe2a..ba1a331 100644
--- a/ui/platform/linux/ui_window_title_linux.cpp
+++ b/ui/platform/linux/ui_window_title_linux.cpp
@@ -14,8 +14,6 @@
 #include "base/platform/linux/base_linux_xsettings.h"
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
-#include <glibmm.h>
-
 namespace Ui {
 namespace Platform {
 namespace internal {
@@ -108,9 +106,7 @@ TitleControls::Layout TitleControlsLayout() {
 #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
 
 	const auto portalResult = []() -> std::optional<TitleControls::Layout> {
-		namespace XDP = base::Platform::XDP;
-
-		const auto decorationLayout = XDP::ReadSetting<Glib::ustring>(
+		auto decorationLayout = base::Platform::XDP::ReadSetting(
 			"org.gnome.desktop.wm.preferences",
 			"button-layout");
 
@@ -119,7 +115,7 @@ TitleControls::Layout TitleControlsLayout() {
 		}
 
 		return GtkKeywordsToTitleControlsLayout(
-			QString::fromStdString(*decorationLayout));
+			QString::fromStdString(decorationLayout->get_string(nullptr)));
 	}();
 
 	if (portalResult.has_value()) {

From 2687a19b1435276e5a998d04b7d47df92e0c8391 Mon Sep 17 00:00:00 2001
From: kukuruzka <60149954+kukuruzka165@users.noreply.github.com>
Date: Sun, 25 Feb 2024 18:44:26 +0200
Subject: [PATCH 635/635] Improve spoilers at low resolutions

---
 ui/effects/spoiler_mess.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/effects/spoiler_mess.cpp b/ui/effects/spoiler_mess.cpp
index a98bbc3..d4413de 100644
--- a/ui/effects/spoiler_mess.cpp
+++ b/ui/effects/spoiler_mess.cpp
@@ -25,7 +25,7 @@
 namespace Ui {
 namespace {
 
-constexpr auto kVersion = 1;
+constexpr auto kVersion = 2;
 constexpr auto kFramesPerRow = 10;
 constexpr auto kImageSpoilerDarkenAlpha = 32;
 constexpr auto kMaxCacheSize = 5 * 1024 * 1024;
@@ -186,7 +186,9 @@ struct Particle {
 	auto hq = PainterHighQualityEnabler(p);
 	p.setPen(Qt::NoPen);
 	p.setBrush(Qt::white);
-	p.drawRoundedRect(1., 1., width, height, radius, radius);
+	QPainterPath path;
+	path.addRoundedRect(1., 1., width, height, radius, radius);
+	p.drawPath(path);
 	p.end();
 	return result;
 }