2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00

Merge remote-tracking branch 'tdesktop/dev' into dev

This commit is contained in:
RadRussianRus
2020-05-01 18:02:14 +03:00
112 changed files with 1405 additions and 507 deletions

View File

@@ -150,7 +150,8 @@ AdminLog::OwnedItem GenerateForwardedItem(
MTPint(), // channel_post
MTPstring(), // post_author
MTPPeer(), // saved_from_peer
MTPint()), // saved_from_msg_id
MTPint(), // saved_from_msg_id
MTPstring()), // psa_type
MTPint(), // via_bot_id
MTPint(), // reply_to_msg_id,
MTP_int(base::unixtime::now()), // date
@@ -829,7 +830,7 @@ void ForwardsPrivacyController::PaintForwardedTooltip(
}
Unexpected("Option value in ForwardsPrivacyController.");
}();
const auto &font = st::toastTextStyle.font;
const auto &font = st::defaultToast.style.font;
const auto textWidth = font->width(text);
const auto arrowSkip = st::settingsForwardPrivacyArrowSkip;
const auto arrowSize = st::settingsForwardPrivacyArrowSize;