Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Author: c0re100

.github/workflows/user_agent_updater.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   User-agent:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     steps:
       - uses: desktop-app/action_code_updater@master
         with:

Telegram/Resources/langs/lang.strings

@@ -2686,7 +2686,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_forwarded_story" = "Story from {user}";
 "lng_forwarded_story_expired" = "This story has expired.";
 "lng_forwarded_date" = "Original: {date}";
-"lng_forwarded_saved_date" = "Saved date: {date}";
+"lng_forwarded_forwarded_date" = "Forwarded date: {date}";
 "lng_forwarded_channel" = "Forwarded from {channel}";
 "lng_forwarded_psa_default" = "Forwarded from {channel}";
 "lng_forwarded_via" = "Forwarded from {user} via {inline_bot}";

Telegram/SourceFiles/boxes/choose_filter_box.cpp

@@ -99,8 +99,7 @@ class FilterAction : public Ui::Menu::Action {
 			p.drawImage(
 				width()
 					- size.width()
-					- st::menuWithIcons.itemPadding.right()
-					- st::popupMenuWithIcons.shadow.extend.right(),
+					- st::menuWithIcons.itemPadding.right(),
 				(height() - size.height()) / 2,
 				_icon);
 		}
@@ -286,7 +285,7 @@ void FillChooseFilterMenu(
 		const auto contains = filter.contains(history);
 		const auto title = filter.title();
 		auto item = base::make_unique_q<FilterAction>(
-			menu.get(),
+			menu->menu(),
 			menu->st().menu,
 			Ui::Menu::CreateAction(
 				menu.get(),

Telegram/SourceFiles/boxes/star_gift_resale_box.cpp

@@ -152,7 +152,7 @@ struct ResaleTabs {
 				not_null<const style::icon*> icon,
 				bool checked = false) {
 			auto action = base::make_unique_q<Ui::GiftResaleFilterAction>(
-				menu,
+				menu->menu(),
 				menu->st().menu,
 				TextWithEntities{ text },
 				Ui::Text::MarkedContext(),
@@ -176,7 +176,7 @@ struct ResaleTabs {
 				QString data,
 				bool checked) {
 			auto action = base::make_unique_q<Ui::GiftResaleFilterAction>(
-				menu,
+				menu->menu(),
 				menu->st().menu,
 				std::move(text),
 				context,

Telegram/SourceFiles/calls/group/calls_cover_item.cpp

@@ -14,7 +14,7 @@ For license and copyright information please follow this link:
 namespace Calls {
 
 CoverItem::CoverItem(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &stMenu,
 	const style::ShortInfoCover &st,
 	rpl::producer<QString> name,
@@ -32,7 +32,7 @@ CoverItem::CoverItem(
 , _st(st) {
 	setPointerCursor(false);
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	enableMouseSelecting();
 	enableMouseSelecting(_cover.widget());
 
@@ -54,7 +54,7 @@ int CoverItem::contentHeight() const {
 }
 
 AboutItem::AboutItem(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	TextWithEntities &&about)
 : Ui::Menu::ItemBase(parent, st)
@@ -66,7 +66,7 @@ AboutItem::AboutItem(
 , _dummyAction(new QAction(parent)) {
 	setPointerCursor(false);
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	enableMouseSelecting();
 	enableMouseSelecting(_text.get());
 

Telegram/SourceFiles/calls/group/calls_cover_item.h

@@ -28,7 +28,7 @@ struct ParticipantState;
 class CoverItem final : public Ui::Menu::ItemBase {
 public:
 	CoverItem(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &stMenu,
 		const style::ShortInfoCover &st,
 		rpl::producer<QString> name,
@@ -50,7 +50,7 @@ class CoverItem final : public Ui::Menu::ItemBase {
 class AboutItem final : public Ui::Menu::ItemBase {
 public:
 	AboutItem(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		TextWithEntities &&about);
 

Telegram/SourceFiles/calls/group/calls_group_menu.cpp

@@ -38,7 +38,7 @@ namespace {
 class JoinAsAction final : public Ui::Menu::ItemBase {
 public:
 	JoinAsAction(
-		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		not_null<PeerData*> peer,
 		Fn<void()> callback);
@@ -74,7 +74,7 @@ class JoinAsAction final : public Ui::Menu::ItemBase {
 class RecordingAction final : public Ui::Menu::ItemBase {
 public:
 	RecordingAction(
-		not_null<Ui::RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		rpl::producer<QString> text,
 		rpl::producer<TimeId> startAtValues,
@@ -118,7 +118,7 @@ TextParseOptions MenuTextOptions = {
 };
 
 JoinAsAction::JoinAsAction(
-	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	not_null<PeerData*> peer,
 	Fn<void()> callback)
@@ -130,7 +130,7 @@ JoinAsAction::JoinAsAction(
 	+ st::groupCallJoinAsPhotoSize
 	+ st::groupCallJoinAsPadding.bottom()) {
 	setAcceptBoth(true);
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	setClickedCallback(std::move(callback));
 
 	paintRequest(
@@ -237,7 +237,7 @@ void JoinAsAction::handleKeyPress(not_null<QKeyEvent*> e) {
 }
 
 RecordingAction::RecordingAction(
-	not_null<Ui::RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	rpl::producer<QString> text,
 	rpl::producer<TimeId> startAtValues,
@@ -264,7 +264,7 @@ RecordingAction::RecordingAction(
 	}, lifetime());
 
 	setAcceptBoth(true);
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	setClickedCallback(std::move(callback));
 
 	paintRequest(

Telegram/SourceFiles/calls/group/calls_group_settings.cpp

@@ -787,19 +787,21 @@ void SettingsBox(
 		Ui::AddSkip(layout);
 	}
 	if (rtmp) {
-		const auto volumeItem = layout->add(
-			object_ptr<MenuVolumeItem>(
-				layout,
-				st::groupCallVolumeSettings,
-				st::groupCallVolumeSettingsSlider,
-				call->otherParticipantStateValue(
-				) | rpl::filter([=](const Group::ParticipantState &data) {
-					return data.peer == peer;
-				}),
-				call->rtmpVolume(),
-				Group::kMaxVolume,
-				false,
-				st::groupCallVolumeSettingsPadding));
+		const auto fakeMenu = layout->add(object_ptr<Ui::Menu::Menu>(
+			layout,
+			st::groupCallVolumeSettings));
+		auto volumeItem = base::make_unique_q<MenuVolumeItem>(
+			fakeMenu,
+			st::groupCallVolumeSettings,
+			st::groupCallVolumeSettingsSlider,
+			call->otherParticipantStateValue(
+			) | rpl::filter([=](const Group::ParticipantState &data) {
+				return data.peer == peer;
+			}),
+			call->rtmpVolume(),
+			Group::kMaxVolume,
+			false,
+			st::groupCallVolumeSettingsPadding);
 
 		const auto toggleMute = crl::guard(layout, [=](bool m, bool local) {
 			if (call) {
@@ -829,6 +831,8 @@ void SettingsBox(
 		) | rpl::on_next([=](int volume) {
 			changeVolume(volume, true);
 		}, volumeItem->lifetime());
+
+		fakeMenu->addAction(std::move(volumeItem));
 	}
 
 	if (call->canManage()) {

Telegram/SourceFiles/calls/group/calls_volume_item.cpp

@@ -41,7 +41,7 @@ constexpr auto kVolumeStickedValues
 } // namespace
 
 MenuVolumeItem::MenuVolumeItem(
-	not_null<RpWidget*> parent,
+	not_null<Ui::Menu::Menu*> parent,
 	const style::Menu &st,
 	const style::MediaSlider &stSlider,
 	rpl::producer<Group::ParticipantState> participantState,
@@ -65,7 +65,7 @@ MenuVolumeItem::MenuVolumeItem(
 	_localMuted ? 0. : (startVolume / float(maxVolume)),
 	Ui::Paint::ArcsAnimation::Direction::Right)) {
 
-	initResizeHook(parent->sizeValue());
+	fitToMenuWidth();
 	enableMouseSelecting();
 	enableMouseSelecting(_slider.get());
 

Telegram/SourceFiles/calls/group/calls_volume_item.h

@@ -29,7 +29,7 @@ struct ParticipantState;
 class MenuVolumeItem final : public Ui::Menu::ItemBase {
 public:
 	MenuVolumeItem(
-		not_null<RpWidget*> parent,
+		not_null<Ui::Menu::Menu*> parent,
 		const style::Menu &st,
 		const style::MediaSlider &stSlider,
 		rpl::producer<Group::ParticipantState> participantState,