[Improvement] Allow to copy from bot response and poll solution modals

Telegram/CMakeLists.txt

@@ -1023,6 +1023,8 @@ PRIVATE
     iv/iv_delegate_impl.h
     iv/iv_instance.cpp
     iv/iv_instance.h
+    kotato/boxes/kotato_confirm_box.cpp
+    kotato/boxes/kotato_confirm_box.h
     kotato/boxes/kotato_fonts_box.cpp
     kotato/boxes/kotato_fonts_box.h
     kotato/boxes/kotato_radio_box.cpp

Telegram/SourceFiles/api/api_bot.cpp

@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/choose_peer_box.h"
 #include "lang/lang_keys.h"
 #include "core/core_cloud_password.h"
+#include "kotato/boxes/kotato_confirm_box.h"
 #include "core/click_handler_types.h"
 #include "data/data_changes.h"
 #include "data/data_peer.h"
@@ -115,7 +116,7 @@ void SendBotCallbackData(
 			if (!show->valid()) {
 				return;
 			} else if (showAlert) {
-				show->showBox(Ui::MakeInformBox(message));
+				show->showBox(Box<Kotato::InformBox>(message));
 			} else {
 				if (withPassword) {
 					show->hideLayer();

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

@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/fireworks_animation.h"
 #include "ui/toast/toast.h"
+#include "kotato/boxes/kotato_confirm_box.h"
 #include "ui/painter.h"
 #include "data/data_media_types.h"
 #include "data/data_poll.h"
@@ -454,8 +455,12 @@ void Poll::checkQuizAnswered() {
 	}
 }
 
-void Poll::showSolution() const {
+void Poll::showSolution(bool inBox) const {
 	if (!_poll->solution.text.isEmpty()) {
+		if (inBox) {
+			Ui::show(Box<Kotato::InformBox>(_poll->solution));
+			return;
+		}
 		solutionToggled(true);
 		_parent->delegate()->elementShowTooltip(
 			_poll->solution,
@@ -1021,7 +1026,7 @@ void Poll::paintShowSolution(
 	}
 	if (!_showSolutionLink) {
 		_showSolutionLink = std::make_shared<LambdaClickHandler>(
-			crl::guard(this, [=] { showSolution(); }));
+			crl::guard(this, [=] { showSolution(true); }));
 	}
 	const auto stm = context.messageStyle();
 	const auto &icon = stm->historyQuizExplain;
@@ -1176,7 +1181,11 @@ void Poll::paintRadio(
 			auto pen = regular->p;
 			pen.setWidth(radio.thickness);
 			p.setPen(pen);
-			p.drawEllipse(rect);
+			if (_flags & PollData::Flag::MultiChoice) {
+				p.drawRoundedRect(rect,	st::buttonRadius, st::buttonRadius);
+			} else {
+				p.drawEllipse(rect);
+			}
 		}
 		if (checkmark > 0.) {
 			const auto removeFull = (radio.diameter / 2 - radio.thickness);
@@ -1186,7 +1195,13 @@ void Poll::paintRadio(
 			pen.setWidth(radio.thickness);
 			p.setPen(pen);
 			p.setBrush(color);
-			p.drawEllipse(rect.marginsRemoved({ removeNow, removeNow, removeNow, removeNow }));
+			if (_flags & PollData::Flag::MultiChoice) {
+				p.drawRoundedRect(
+					rect.marginsRemoved({ removeNow, removeNow, removeNow, removeNow }),
+					st::buttonRadius, st::buttonRadius);
+			} else {
+				p.drawEllipse(rect.marginsRemoved({ removeNow, removeNow, removeNow, removeNow }));
+			}
 			const auto &icon = stm->historyPollChosen;
 			icon.paint(p, left + (radio.diameter - icon.width()) / 2, top + (radio.diameter - icon.height()) / 2, width());
 		}
@@ -1272,8 +1287,13 @@ void Poll::paintFilling(
 			: stm->historyPollChoiceRight;
 		const auto cleft = aleft - st::historyPollPercentSkip - icon.width();
 		const auto ctop = ftop - (icon.height() - thickness) / 2;
-		p.drawEllipse(cleft, ctop, icon.width(), icon.height());
-
+		if (_flags & PollData::Flag::MultiChoice) {
+			p.drawRoundedRect(
+				QRect{ cleft, ctop, icon.width(), icon.height() },
+				st::buttonRadius, st::buttonRadius);
+		} else {
+			p.drawEllipse(cleft, ctop, icon.width(), icon.height());
+		}
 		const auto paintContent = [&](QPainter &p) {
 			icon.paint(p, cleft, ctop, width);
 		};

Telegram/SourceFiles/history/view/media/history_view_poll.h

@@ -177,7 +177,7 @@ private:
 	void sendMultiOptions();
 	void showResults();
 	void checkQuizAnswered();
-	void showSolution() const;
+	void showSolution(bool inBox = false) const;
 	void solutionToggled(
 		bool solutionShown,
 		anim::type animated = anim::type::normal) const;

Telegram/SourceFiles/kotato/boxes/kotato_confirm_box.cpp

@@ -0,0 +1,215 @@
+/*
+This file is part of Kotatogram Desktop,
+the unofficial app based on Telegram Desktop.
+
+For license and copyright information please follow this link:
+https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL
+*/
+#include "kotato/boxes/kotato_confirm_box.h"
+
+#include "lang/lang_keys.h"
+#include "ui/widgets/labels.h"
+#include "styles/style_layers.h"
+#include "styles/style_boxes.h"
+
+namespace Kotato {
+
+ConfirmBox::ConfirmBox(
+	QWidget*,
+	const QString &text,
+	FnMut<void()> confirmedCallback,
+	FnMut<void()> cancelledCallback)
+: _confirmText(tr::lng_box_ok(tr::now))
+, _cancelText(tr::lng_cancel(tr::now))
+, _confirmStyle(st::defaultBoxButton)
+, _text(this, st::boxLabel)
+, _confirmedCallback(std::move(confirmedCallback))
+, _cancelledCallback(std::move(cancelledCallback)) {
+	init(text);
+}
+
+ConfirmBox::ConfirmBox(
+	QWidget*,
+	const QString &text,
+	const QString &confirmText,
+	FnMut<void()> confirmedCallback,
+	FnMut<void()> cancelledCallback)
+: _confirmText(confirmText)
+, _cancelText(tr::lng_cancel(tr::now))
+, _confirmStyle(st::defaultBoxButton)
+, _text(this, st::boxLabel)
+, _confirmedCallback(std::move(confirmedCallback))
+, _cancelledCallback(std::move(cancelledCallback)) {
+	init(text);
+}
+
+ConfirmBox::ConfirmBox(
+	QWidget*,
+	const TextWithEntities &text,
+	const QString &confirmText,
+	FnMut<void()> confirmedCallback,
+	FnMut<void()> cancelledCallback)
+: _confirmText(confirmText)
+, _cancelText(tr::lng_cancel(tr::now))
+, _confirmStyle(st::defaultBoxButton)
+, _text(this, st::boxLabel)
+, _confirmedCallback(std::move(confirmedCallback))
+, _cancelledCallback(std::move(cancelledCallback)) {
+	init(text);
+}
+
+ConfirmBox::ConfirmBox(
+	QWidget*,
+	const QString &text,
+	const QString &confirmText,
+	const style::RoundButton &confirmStyle,
+	FnMut<void()> confirmedCallback,
+	FnMut<void()> cancelledCallback)
+: _confirmText(confirmText)
+, _cancelText(tr::lng_cancel(tr::now))
+, _confirmStyle(confirmStyle)
+, _text(this, st::boxLabel)
+, _confirmedCallback(std::move(confirmedCallback))
+, _cancelledCallback(std::move(cancelledCallback)) {
+	init(text);
+}
+
+ConfirmBox::ConfirmBox(
+	QWidget*,
+	const QString &text,
+	const QString &confirmText,
+	const QString &cancelText,
+	FnMut<void()> confirmedCallback,
+	FnMut<void()> cancelledCallback)
+: _confirmText(confirmText)
+, _cancelText(cancelText)
+, _confirmStyle(st::defaultBoxButton)
+, _text(this, st::boxLabel)
+, _confirmedCallback(std::move(confirmedCallback))
+, _cancelledCallback(std::move(cancelledCallback)) {
+	init(text);
+}
+
+ConfirmBox::ConfirmBox(
+	QWidget*,
+	const QString &text,
+	const QString &confirmText,
+	const style::RoundButton &confirmStyle,
+	const QString &cancelText,
+	FnMut<void()> confirmedCallback,
+	FnMut<void()> cancelledCallback)
+: _confirmText(confirmText)
+, _cancelText(cancelText)
+, _confirmStyle(st::defaultBoxButton)
+, _text(this, st::boxLabel)
+, _confirmedCallback(std::move(confirmedCallback))
+, _cancelledCallback(std::move(cancelledCallback)) {
+	init(text);
+}
+
+ConfirmBox::ConfirmBox(
+	const InformBoxTag &,
+	const QString &text,
+	const QString &doneText,
+	Fn<void()> closedCallback)
+: _confirmText(doneText)
+, _confirmStyle(st::defaultBoxButton)
+, _informative(true)
+, _text(this, st::boxLabel)
+, _confirmedCallback(generateInformCallback(closedCallback))
+, _cancelledCallback(generateInformCallback(closedCallback)) {
+	init(text);
+}
+
+ConfirmBox::ConfirmBox(
+	const InformBoxTag &,
+	const TextWithEntities &text,
+	const QString &doneText,
+	Fn<void()> closedCallback)
+: _confirmText(doneText)
+, _confirmStyle(st::defaultBoxButton)
+, _informative(true)
+, _text(this, st::boxLabel)
+, _confirmedCallback(generateInformCallback(closedCallback))
+, _cancelledCallback(generateInformCallback(closedCallback)) {
+	init(text);
+}
+
+FnMut<void()> ConfirmBox::generateInformCallback(
+		Fn<void()> closedCallback) {
+	return crl::guard(this, [=] {
+		closeBox();
+		if (closedCallback) {
+			closedCallback();
+		}
+	});
+}
+
+void ConfirmBox::init(const QString &text) {
+	_text->setText(text);
+}
+
+void ConfirmBox::init(const TextWithEntities &text) {
+	_text->setMarkedText(text);
+}
+
+void ConfirmBox::prepare() {
+	addButton(
+		rpl::single(_confirmText),
+		[=] { confirmed(); },
+		_confirmStyle);
+	if (!_informative) {
+		addButton(
+			rpl::single(_cancelText),
+			[=] { _cancelled = true; closeBox(); });
+	}
+
+	boxClosing() | rpl::start_with_next([=] {
+		if (!_confirmed && (!_strictCancel || _cancelled)) {
+			if (auto callback = std::move(_cancelledCallback)) {
+				callback();
+			}
+		}
+	}, lifetime());
+
+	_text->setSelectable(true);
+	_text->setLinksTrusted();
+
+	setDimensions(st::boxWidth, st::boxPadding.top() + _text->height() + st::boxPadding.bottom());
+}
+
+void ConfirmBox::resizeEvent(QResizeEvent *e) {
+	BoxContent::resizeEvent(e);
+	_text->moveToLeft(st::boxPadding.left(), st::boxPadding.top());
+}
+
+void ConfirmBox::confirmed() {
+	if (!_confirmed) {
+		_confirmed = true;
+		if (auto callback = std::move(_confirmedCallback)) {
+			callback();
+		}
+	}
+}
+
+void ConfirmBox::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
+		confirmed();
+	} else {
+		BoxContent::keyPressEvent(e);
+	}
+}
+
+InformBox::InformBox(QWidget*, const QString &text, Fn<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, tr::lng_box_ok(tr::now), std::move(closedCallback)) {
+}
+
+InformBox::InformBox(QWidget*, const QString &text, const QString &doneText, Fn<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) {
+}
+
+InformBox::InformBox(QWidget*, const TextWithEntities &text, Fn<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, tr::lng_box_ok(tr::now), std::move(closedCallback)) {
+}
+
+InformBox::InformBox(QWidget*, const TextWithEntities &text, const QString &doneText, Fn<void()> closedCallback) : ConfirmBox(ConfirmBox::InformBoxTag(), text, doneText, std::move(closedCallback)) {
+}
+
+} // namespace Kotato

Telegram/SourceFiles/kotato/boxes/kotato_confirm_box.h

@@ -0,0 +1,73 @@
+/*
+This file is part of Kotatogram Desktop,
+the unofficial app based on Telegram Desktop.
+
+For license and copyright information please follow this link:
+https://github.com/kotatogram/kotatogram-desktop/blob/dev/LEGAL
+*/
+#pragma once
+
+#include "boxes/abstract_box.h"
+
+namespace Ui {
+class FlatLabel;
+} // namespace Ui
+
+namespace Kotato {
+class InformBox;
+class ConfirmBox : public Ui::BoxContent {
+public:
+	ConfirmBox(QWidget*, const QString &text, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const QString &cancelText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const QString &text, const QString &confirmText, const style::RoundButton &confirmStyle, const QString &cancelText, FnMut<void()> confirmedCallback = FnMut<void()>(), FnMut<void()> cancelledCallback = FnMut<void()>());
+	ConfirmBox(QWidget*, const TextWithEntities &text, const QString &confirmText, FnMut<void()> confirmedCallback = nullptr, FnMut<void()> cancelledCallback = nullptr);
+
+	// If strict cancel is set the cancelledCallback is only called if the cancel button was pressed.
+	void setStrictCancel(bool strictCancel) {
+		_strictCancel = strictCancel;
+	}
+
+protected:
+	void prepare() override;
+
+	void resizeEvent(QResizeEvent *e) override;
+	void keyPressEvent(QKeyEvent *e) override;
+
+private:
+	struct InformBoxTag {
+	};
+	ConfirmBox(const InformBoxTag &, const QString &text, const QString &doneText, Fn<void()> closedCallback);
+	ConfirmBox(const InformBoxTag &, const TextWithEntities &text, const QString &doneText, Fn<void()> closedCallback);
+	FnMut<void()> generateInformCallback(Fn<void()> closedCallback);
+	friend class InformBox;
+
+	void confirmed();
+	void init(const QString &text);
+	void init(const TextWithEntities &text);
+
+	QString _confirmText;
+	QString _cancelText;
+	const style::RoundButton &_confirmStyle;
+	bool _informative = false;
+
+	object_ptr<Ui::FlatLabel> _text;
+
+	bool _confirmed = false;
+	bool _cancelled = false;
+	bool _strictCancel = false;
+	FnMut<void()> _confirmedCallback;
+	FnMut<void()> _cancelledCallback;
+
+};
+
+class InformBox : public ConfirmBox {
+public:
+	InformBox(QWidget*, const QString &text, Fn<void()> closedCallback = nullptr);
+	InformBox(QWidget*, const QString &text, const QString &doneText, Fn<void()> closedCallback = nullptr);
+	InformBox(QWidget*, const TextWithEntities &text, Fn<void()> closedCallback = nullptr);
+	InformBox(QWidget*, const TextWithEntities &text, const QString &doneText, Fn<void()> closedCallback = nullptr);
+
+};
+} // namespace Kotato