Create a new pull request by comparing changes across two branches

Telegram/Resources/langs/lang.strings

@@ -453,6 +453,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_username_app_not_found" = "Bot application not found.";
 "lng_username_link" = "This link opens a chat with you:";
 "lng_username_copied" = "Link copied to clipboard.";
+"lng_username_text_copied" = "Username copied to clipboard.";
 
 "lng_usernames_edit" = "click to edit";
 "lng_usernames_active" = "active";
@@ -487,6 +488,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_collectible_phone_info" = "This phone number was bought on **Fragment** on {date} for {price}";
 "lng_collectible_phone_copy" = "Copy Phone Number";
 "lng_collectible_learn_more" = "Learn More";
+"lng_collectible_phone_copied" = "Phone number copied to clipboard.";
 
 "lng_settings_section_info" = "Info";
 
@@ -5629,6 +5631,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_qr_box_quality1" = "Normal";
 "lng_qr_box_quality2" = "High";
 "lng_qr_box_quality3" = "Very High";
+"lng_qr_box_transparent_background" = "Transparent Background";
+"lng_qr_box_font_size" = "Font size";
 
 // Wnd specific
 

Telegram/Resources/winrc/Telegram.manifest

@@ -16,6 +16,8 @@
   </compatibility>
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitor</dpiAwareness>
       <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
     </windowsSettings>
   </application>

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -764,13 +764,14 @@ int PeerListRow::paintNameIconGetWidth(
 		int availableWidth,
 		int outerWidth,
 		bool selected) {
-	if (special()
+	if (_skipPeerBadge
+		|| special()
 		|| !_savedMessagesStatus.isEmpty()
 		|| _isRepliesMessagesChat
 		|| _isVerifyCodesChat) {
 		return 0;
 	}
-	return _bagde.drawGetWidth(
+	return _badge.drawGetWidth(
 		p,
 		QRect(
 			nameLeft,

Telegram/SourceFiles/boxes/peer_list_box.h

@@ -254,6 +254,10 @@ class PeerListRow {
 		return _nameFirstLetters;
 	}
 
+	void setSkipPeerBadge(bool skip) {
+		_skipPeerBadge = skip;
+	}
+
 	virtual void lazyInitialize(const style::PeerListItem &st);
 	virtual void paintStatusText(
 		Painter &p,
@@ -291,7 +295,7 @@ class PeerListRow {
 	std::unique_ptr<Ui::RoundImageCheckbox> _checkbox;
 	Ui::Text::String _name;
 	Ui::Text::String _status;
-	Ui::PeerBadge _bagde;
+	Ui::PeerBadge _badge;
 	StatusType _statusType = StatusType::Online;
 	crl::time _statusValidTill = 0;
 	base::flat_set<QChar> _nameFirstLetters;
@@ -303,6 +307,7 @@ class PeerListRow {
 	bool _isSearchResult : 1 = false;
 	bool _isRepliesMessagesChat : 1 = false;
 	bool _isVerifyCodesChat : 1 = false;
+	bool _skipPeerBadge : 1 = false;
 
 };
 

Telegram/SourceFiles/boxes/star_gift_box.cpp

@@ -1255,7 +1255,7 @@ void GiftBox(
 			stUser.photoSize * 2);
 		content->sizeValue(
 		) | rpl::start_with_next([=](const QSize &size) {
-			widget->moveToLeft(stUser.photoSize / 2, 0);
+			widget->moveToLeft((size.width() - widget->width()) / 2, 0);
 			const auto starsRect = Rect(widget->size());
 			stars->setPosition(starsRect.topLeft());
 			stars->setSize(starsRect.size());

Telegram/SourceFiles/core/application.cpp

@@ -1162,7 +1162,14 @@ bool Application::openCustomUrl(
 		|| passcodeLocked()) {
 		return false;
 	}
-	const auto command = base::StringViewMid(urlTrimmed, protocol.size(), 8192);
+	static const auto kTagExp = QRegularExpression(
+		u"^\\~[a-zA-Z0-9_\\-]+\\~:"_q);
+	auto skip = protocol.size();
+	const auto match = kTagExp.match(base::StringViewMid(urlTrimmed, skip));
+	if (match.hasMatch()) {
+		skip += match.capturedLength();
+	}
+	const auto command = base::StringViewMid(urlTrimmed, skip, 8192);
 	const auto my = context.value<ClickHandlerContext>();
 	const auto controller = my.sessionWindow.get()
 		? my.sessionWindow.get()

Telegram/SourceFiles/core/local_url_handlers.cpp

@@ -785,9 +785,9 @@ bool CopyPeerId(
 		Window::SessionController *controller,
 		const Match &match,
 		const QVariant &context) {
-	TextUtilities::SetClipboardText(TextForMimeData{ match->captured(1) });
+	TextUtilities::SetClipboardText({ match->captured(1) });
 	if (controller) {
-		controller->showToast(tr::lng_text_copied(tr::now));
+		controller->showToast(u"ID copied to clipboard."_q);
 	}
 	return true;
 }
@@ -926,6 +926,34 @@ bool ShowCollectibleUsername(
 	return true;
 }
 
+bool CopyUsernameLink(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto username = match->captured(1);
+	TextUtilities::SetClipboardText({
+		controller->session().createInternalLinkFull(username)
+	});
+	controller->showToast(tr::lng_username_copied(tr::now));
+	return true;
+}
+
+bool CopyUsername(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	const auto username = match->captured(1);
+	TextUtilities::SetClipboardText({ '@' + username });
+	controller->showToast(tr::lng_username_text_copied(tr::now));
+	return true;
+}
+
 bool ShowStarsExamples(
 		Window::SessionController *controller,
 		const Match &match,
@@ -1391,6 +1419,14 @@ const std::vector<LocalUrlHandler> &InternalUrlHandlers() {
 			u"^collectible_username/([a-zA-Z0-9\\-\\_\\.]+)@([0-9]+)$"_q,
 			ShowCollectibleUsername,
 		},
+		{
+			u"^username_link/([a-zA-Z0-9\\-\\_\\.]+)@([0-9]+)$"_q,
+			CopyUsernameLink,
+		},
+		{
+			u"^username_regular/([a-zA-Z0-9\\-\\_\\.]+)@([0-9]+)$"_q,
+			CopyUsername,
+		},
 		{
 			u"^stars_examples$"_q,
 			ShowStarsExamples,

Telegram/SourceFiles/history/view/history_view_chat_preview.cpp

@@ -480,6 +480,11 @@ void Item::setupHistory() {
 	using Type = Ui::ElasticScroll::OverscrollType;
 	_scroll->setOverscrollTypes(Type::Real, Type::Real);
 
+	_inner->scrollKeyEvents(
+	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+		_scroll->keyPressEvent(e);
+	}, lifetime());
+
 	_scroll->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonDblClick) {
 			const auto button = static_cast<QMouseEvent*>(e.get())->button();
@@ -504,6 +509,10 @@ void Item::setupHistory() {
 	_inner->refreshViewer();
 
 	_inner->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	crl::on_main(this, [=] {
+		_inner->setFocus();
+	});
 }
 
 void Item::paintEvent(QPaintEvent *e) {
@@ -532,6 +541,7 @@ bool Item::listScrollTo(int top, bool syntetic) {
 }
 
 void Item::listCancelRequest() {
+	_actions.fire({ .cancel = true });
 }
 
 void Item::listDeleteRequest() {

Telegram/SourceFiles/history/view/history_view_chat_preview.h

@@ -21,6 +21,7 @@ namespace HistoryView {
 
 struct ChatPreviewAction {
 	FullMsgId openItemId;
+	bool cancel = false;
 	bool openInfo = false;
 	bool markRead = false;
 	bool markUnread = false;

Telegram/SourceFiles/history/view/history_view_list_widget.cpp

@@ -2604,7 +2604,11 @@ auto ListWidget::countScrollState() const -> ScrollTopState {
 }
 
 void ListWidget::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Escape || e->key() == Qt::Key_Back) {
+	const auto key = e->key();
+	const auto hasModifiers = (Qt::NoModifier !=
+		(e->modifiers()
+			& ~(Qt::KeypadModifier | Qt::GroupSwitchModifier)));
+	if (key == Qt::Key_Escape || key == Qt::Key_Back) {
 		if (hasSelectedText() || hasSelectedItems()) {
 			cancelSelection();
 		} else {
@@ -2616,22 +2620,33 @@ void ListWidget::keyPressEvent(QKeyEvent *e) {
 		&& !hasCopyRestrictionForSelected()) {
 		TextUtilities::SetClipboardText(getSelectedText());
 #ifdef Q_OS_MAC
-	} else if (e->key() == Qt::Key_E
+	} else if (key == Qt::Key_E
 		&& e->modifiers().testFlag(Qt::ControlModifier)
 		&& !showCopyRestriction()
 		&& !hasCopyRestrictionForSelected()) {
 		TextUtilities::SetClipboardText(getSelectedText(), QClipboard::FindBuffer);
 #endif // Q_OS_MAC
-	} else if (e == QKeySequence::Delete || e->key() == Qt::Key_Backspace) {
+	} else if (e == QKeySequence::Delete || key == Qt::Key_Backspace) {
 		_delegate->listDeleteRequest();
+	} else if (!hasModifiers
+		&& ((key == Qt::Key_Up)
+			|| (key == Qt::Key_Down)
+			|| (key == Qt::Key_PageUp)
+			|| (key == Qt::Key_PageDown))) {
+		_scrollKeyEvents.fire(std::move(e));
 	} else if (!(e->modifiers() & ~Qt::ShiftModifier)
-		&& e->key() != Qt::Key_Shift) {
+		&& key != Qt::Key_Shift) {
 		_delegate->listTryProcessKeyInput(e);
 	} else {
 		e->ignore();
 	}
 }
 
+auto ListWidget::scrollKeyEvents() const
+-> rpl::producer<not_null<QKeyEvent*>> {
+	return _scrollKeyEvents.events();
+}
+
 void ListWidget::mouseDoubleClickEvent(QMouseEvent *e) {
 	mouseActionStart(e->globalPos(), e->button());
 	trySwitchToWordSelection();

Telegram/SourceFiles/history/view/history_view_list_widget.h

@@ -382,6 +382,10 @@ class ListWidget final
 		const TextState &reactionState) const;
 	void toggleFavoriteReaction(not_null<Element*> view) const;
 
+
+	[[nodiscard]] auto scrollKeyEvents() const
+		-> rpl::producer<not_null<QKeyEvent*>>;
+
 	// ElementDelegate interface.
 	Context elementContext() override;
 	bool elementUnderCursor(not_null<const Element*> view) override;
@@ -851,6 +855,7 @@ class ListWidget final
 	rpl::event_stream<ReplyToMessageRequest> _requestedToReplyToMessage;
 	rpl::event_stream<FullMsgId> _requestedToReadMessage;
 	rpl::event_stream<FullMsgId> _requestedToShowMessage;
+	rpl::event_stream<not_null<QKeyEvent*>> _scrollKeyEvents;
 
 	rpl::lifetime _viewerLifetime;
 

Telegram/SourceFiles/history/view/history_view_replies_section.cpp

@@ -797,7 +797,9 @@ void RepliesWidget::setupComposeControls() {
 		}
 	}, lifetime());
 
-	_composeControls->scrollKeyEvents(
+	rpl::merge(
+		_composeControls->scrollKeyEvents(),
+		_inner->scrollKeyEvents()
 	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());

Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp

@@ -378,7 +378,9 @@ void ScheduledWidget::setupComposeControls() {
 		}
 	}, lifetime());
 
-	_composeControls->scrollKeyEvents(
+	rpl::merge(
+		_composeControls->scrollKeyEvents(),
+		_inner->scrollKeyEvents()
 	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
 		_scroll->keyPressEvent(e);
 	}, lifetime());

Telegram/SourceFiles/history/view/media/history_view_media.cpp

@@ -156,17 +156,23 @@ TextWithEntities AddTimestampLinks(
 		}
 
 		auto &entities = text.entities;
-		const auto i = ranges::lower_bound(
+		auto i = ranges::lower_bound(
 			entities,
 			from,
 			std::less<>(),
 			&EntityInText::offset);
+		while (i != entities.end()
+			&& i->offset() < till
+			&& i->type() == EntityType::Spoiler) {
+			++i;
+		}
 		if (i != entities.end() && i->offset() < till) {
 			continue;
 		}
 
 		const auto intersects = [&](const EntityInText &entity) {
-			return entity.offset() + entity.length() > from;
+			return (entity.offset() + entity.length() > from)
+				&& (entity.type() != EntityType::Spoiler);
 		};
 		auto j = std::make_reverse_iterator(i);
 		const auto e = std::make_reverse_iterator(entities.begin());

Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp

@@ -517,7 +517,7 @@ TextWithEntities ThemeDocumentBox::subtitle() {
 }
 
 rpl::producer<QString> ThemeDocumentBox::button() {
-	if (_parent->data()->out()) {
+	if (_parent->data()->out() || _parent->history()->peer->isChannel()) {
 		return {};
 	}
 	return rpl::conditional(

Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.cpp

@@ -22,6 +22,7 @@ For license and copyright information please follow this link:
 #include "core/click_handler_types.h"
 #include "main/main_session.h"
 #include "base/event_filter.h"
+#include "base/options.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_menu_icons.h"
@@ -59,8 +60,15 @@ constexpr auto kRefreshListDelay = crl::time(100);
 	return CountMaxSizeWithMargins(st::reactionCornerShadow);
 }
 
+base::options::toggle OptionDisableFloatReactions({
+	.id = kOptionDisableFloatReactions,
+	.name = "Disable floating reactions strip",
+});
+
 } // namespace
 
+const char kOptionDisableFloatReactions[] = "disable-float-reactions";
+
 Button::Button(
 	Fn<void(QRect)> update,
 	ButtonParameters parameters,
@@ -445,6 +453,11 @@ void Manager::showButtonDelayed() {
 
 void Manager::applyList(const Data::PossibleItemReactionsRef &reactions) {
 	using Button = Strip::AddedButton;
+	if (OptionDisableFloatReactions.value()) {
+		_strip.applyList({}, Button::None);
+		_tagsStrip = {};
+		return;
+	}
 	_strip.applyList(
 		reactions.recent,
 		(/*reactions.customAllowed

Telegram/SourceFiles/history/view/reactions/history_view_reactions_button.h

@@ -38,6 +38,8 @@ class Session;
 
 namespace HistoryView::Reactions {
 
+extern const char kOptionDisableFloatReactions[];
+
 enum class ExpandDirection {
 	Up,
 	Down,

Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp

@@ -82,7 +82,7 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor) {
 	}, [&](const GiftTypeStars &data) {
 		_price.setMarkedText(
 			st::semiboldTextStyle,
-			_delegate->star().append(QString::number(data.stars)),
+			_delegate->star().append(' ' + QString::number(data.stars)),
 			kMarkupTextOptions,
 			_delegate->textContext());
 		_userpic = !data.userpic
@@ -284,6 +284,10 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 		const auto twidth = font->width(text);
 		const auto pos = position + QPoint(singlew - twidth, font->height);
 		p.save();
+		const auto rubberOut = _extend.top();
+		const auto inner = rect().marginsRemoved(_extend);
+		p.setClipRect(inner.marginsAdded(
+			{ rubberOut, rubberOut, rubberOut, rubberOut }));
 		p.translate(pos);
 		p.rotate(45.);
 		p.translate(-pos);