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

…o dev

Telegram/Resources/uwp/AppX/AppxManifest.xml

@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="1.5.10.0" />
+    Version="1.5.11.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,10,0
- PRODUCTVERSION 1,5,10,0
+ FILEVERSION 1,5,11,0
+ PRODUCTVERSION 1,5,11,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "1.5.10.0"
+            VALUE "FileVersion", "1.5.11.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2019"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.5.10.0"
+            VALUE "ProductVersion", "1.5.11.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,10,0
- PRODUCTVERSION 1,5,10,0
+ FILEVERSION 1,5,11,0
+ PRODUCTVERSION 1,5,11,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "1.5.10.0"
+            VALUE "FileVersion", "1.5.11.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2019"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.5.10.0"
+            VALUE "ProductVersion", "1.5.11.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp

@@ -212,7 +212,9 @@ void EditAdminBox::prepare() {
 	const auto chat = peer()->asChat();
 	const auto channel = peer()->asChannel();
 	const auto prepareRights = hadRights ? _oldRights : Defaults(peer());
-	const auto disabledByDefaults = DisabledByDefaultRestrictions(peer());
+	const auto disabledByDefaults = (channel && !channel->isMegagroup())
+		? MTPDchatAdminRights::Flags(0)
+		: DisabledByDefaultRestrictions(peer());
 	const auto filterByMyRights = canSave()
 		&& !hadRights
 		&& channel

Telegram/SourceFiles/core/version.h

@@ -15,7 +15,7 @@ For license and copyright information please follow this link:
 #define TDESKTOP_ALPHA_VERSION (0ULL)
 #endif // TDESKTOP_OFFICIAL_TARGET
 
-constexpr auto AppVersion = 1005010;
-constexpr auto AppVersionStr = "1.5.10 mod";
+constexpr auto AppVersion = 1005011;
+constexpr auto AppVersionStr = "1.5.11 mod";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

Telegram/SourceFiles/data/data_peer.cpp

@@ -350,16 +350,12 @@ bool PeerData::canPinMessages() const {
 	if (const auto user = asUser()) {
 		return user->fullFlags() & MTPDuserFull::Flag::f_can_pin_message;
 	} else if (const auto chat = asChat()) {
-		return chat->amIn()
-			&& ((chat->adminRights() & ChatAdminRight::f_pin_messages)
-				|| chat->amCreator());
+		return chat->amIn() && !chat->amRestricted(ChatRestriction::f_pin_messages);
 	} else if (const auto channel = asChannel()) {
-		if (channel->isMegagroup()) {
-			return (channel->adminRights() & ChatAdminRight::f_pin_messages)
-				|| channel->amCreator();
-		}
-		return (channel->adminRights() & ChatAdminRight::f_edit_messages)
-			|| channel->amCreator();
+		return channel->isMegagroup()
+			? !channel->amRestricted(ChatRestriction::f_pin_messages)
+			: ((channel->adminRights() & ChatAdminRight::f_edit_messages)
+				|| channel->amCreator());
 	}
 	Unexpected("Peer type in PeerData::canPinMessages.");
 }
@@ -613,9 +609,13 @@ Data::RestrictionCheckResult PeerData::amRestricted(
 		}
 	};
 	if (const auto channel = asChannel()) {
+		const auto defaultRestrictions = channel->defaultRestrictions()
+			| (channel->isPublic()
+				? (ChatRestriction::f_pin_messages | ChatRestriction::f_change_info)
+				: ChatRestrictions(0));
 		return (channel->amCreator() || allowByAdminRights(right, channel))
 			? Result::Allowed()
-			: (channel->defaultRestrictions() & right)
+			: (defaultRestrictions & right)
 			? Result::WithEveryone()
 			: (channel->restrictions() & right)
 			? Result::Explicit()

Telegram/SourceFiles/history/media/history_media_wall_paper.cpp

@@ -214,8 +214,8 @@ void HistoryWallPaper::prepareThumbnailFrom(
 	}
 	original = Images::prepare(
 		std::move(original),
-		_pixw,
-		(_pixw * th) / tw,
+		_pixw * cIntRetinaFactor(),
+		((_pixw * th) / tw) * cIntRetinaFactor(),
 		options,
 		_pixw,
 		_pixh);

Telegram/SourceFiles/mediaview.cpp

@@ -137,11 +137,11 @@ MediaView::MediaView()
 	});
 	handleAuthSessionChange();
 
-#ifdef OS_MAC_OLD
-	setWindowFlags(Qt::FramelessWindowHint);
-#else // OS_MAC_OLD
+#ifdef Q_OS_LINUX
 	setWindowFlags(Qt::FramelessWindowHint | Qt::MaximizeUsingFullscreenGeometryHint);
-#endif // OS_MAC_OLD
+#else // Q_OS_LINUX
+	setWindowFlags(Qt::FramelessWindowHint);
+#endif // Q_OS_LINUX
 	moveToScreen();
 	setAttribute(Qt::WA_NoSystemBackground, true);
 	setAttribute(Qt::WA_TranslucentBackground, true);
@@ -1781,7 +1781,11 @@ void MediaView::displayFinished() {
 	updateControls();
 	if (isHidden()) {
 		psUpdateOverlayed(this);
+#ifdef Q_OS_LINUX
 		showFullScreen();
+#else // Q_OS_LINUX
+		show();
+#endif // Q_OS_LINUX
 		psShowOverAll(this);
 		activateWindow();
 		QApplication::setActiveWindow(this);

Telegram/build/version

@@ -1,6 +1,6 @@
-AppVersion         1005010
+AppVersion         1005011
 AppVersionStrMajor 1.5
-AppVersionStrSmall 1.5.10
-AppVersionStr      1.5.10
+AppVersionStrSmall 1.5.11
+AppVersionStr      1.5.11
 BetaChannel        0
 AlphaVersion       0

changelog.txt

@@ -1,3 +1,7 @@
+1.5.11 (01.02.19)
+
+- Bug fixes and other minor improvements.
+
 1.5.10 (01.02.19)
 
 - Bug fixes and other minor improvements.