Fix previous commit

3 files changed, 11 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec2f1861ced8..77d98cdc9fef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop9
 	pkgdesc = Official Telegram Desktop client (personal build)
 	pkgver = 2.6.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -45,7 +45,7 @@ pkgbase = telegram-desktop9
 	sha512sums = 8ec6b1739a1391b75a2653fff704a7d22e830c526acffe138936bbd20047bd24831e42558fa22069d7e914e762bbcfa2e1b14a8fd3911fd8bbbd0662d8baac14
 	sha512sums = 9c74c88eff1402d1334ec66b6233e85497666ee28eca1a804b8f5006c691bdd3718db2a238a736e30b1c8249d2c20ccc320650e97f67c4a9a67b689eb572cc2b
 	sha512sums = e6a10c1304e01676373c77d27629d93c085fa4e34e80ce1e4bd10af9cfb0a24c1fe2077cc0fdda83162e865cfab6811c9bc27aa13661c6d300c54749ffaef796
-	sha512sums = ba9adaa91d8d16a5d8dcbe55591a26f90eeda635b3973b2051ce6ed3e244394bc5e93e5c56febca5331803e7c728eebed77ef920ded1cb6e1ed6330c57d41905
+	sha512sums = e74c9c4cef3c6ac17c1cac19ecc4fc788b20a06776344a32f5ebdeeab9064c61a5ee302eca1f3d25af63f1e4c11b5ee615f3afdfefa30c1b1626fb093bf26866
 
 pkgname = telegram-desktop9
 
diff --git a/PKGBUILD b/PKGBUILD
index ae51bb6094af..8698eb376d21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: hexchain <i@hexchain.org>
 pkgname=telegram-desktop9
 pkgver=2.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Official Telegram Desktop client (personal build)'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -33,7 +33,7 @@ sha512sums=('92506477ee1778f7528d8b914406cbf04abf1941d4f1a5d61b75dbf393df2184da1
             '8ec6b1739a1391b75a2653fff704a7d22e830c526acffe138936bbd20047bd24831e42558fa22069d7e914e762bbcfa2e1b14a8fd3911fd8bbbd0662d8baac14'
             '9c74c88eff1402d1334ec66b6233e85497666ee28eca1a804b8f5006c691bdd3718db2a238a736e30b1c8249d2c20ccc320650e97f67c4a9a67b689eb572cc2b'
             'e6a10c1304e01676373c77d27629d93c085fa4e34e80ce1e4bd10af9cfb0a24c1fe2077cc0fdda83162e865cfab6811c9bc27aa13661c6d300c54749ffaef796'
-            'ba9adaa91d8d16a5d8dcbe55591a26f90eeda635b3973b2051ce6ed3e244394bc5e93e5c56febca5331803e7c728eebed77ef920ded1cb6e1ed6330c57d41905')
+            'e74c9c4cef3c6ac17c1cac19ecc4fc788b20a06776344a32f5ebdeeab9064c61a5ee302eca1f3d25af63f1e4c11b5ee615f3afdfefa30c1b1626fb093bf26866')
 
 prepare() {
     cd "$srcdir/tdesktop-$pkgver-full"
diff --git a/mediaviewer_nofullscreen.patch b/mediaviewer_nofullscreen.patch
index f644d6b5153f..a2517e86f4f2 100644
--- a/mediaviewer_nofullscreen.patch
+++ b/mediaviewer_nofullscreen.patch
@@ -1,37 +1,18 @@
 Description: Fix un-fullscreened media viewer sizing
-Reverts 3251b8bf6e740e55777e85d63065a61e43df54fe
+See 3251b8bf6e740e55777e85d63065a61e43df54fe
 Credits: novie
 
 diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
-index 604449dd3..021b74030 100644
+index 604449dd3..799e1de14 100644
 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
 +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
-@@ -457,13 +457,15 @@ void OverlayWidget::moveToScreen() {
- 			.arg(screenList.indexOf(activeWindowScreen)));
- 		windowHandle()->setScreen(activeWindowScreen);
- 		DEBUG_LOG(("Viewer Pos: New actual screen: %1")
--			.arg(screenList.indexOf(windowHandle()->screen())));
-+			.arg(windowHandle()
-+				? screenList.indexOf(windowHandle()->screen())
-+				: -2));
- 	}
- 	updateGeometry();
+@@ -463,9 +463,6 @@ void OverlayWidget::moveToScreen() {
  }
  
  void OverlayWidget::updateGeometry() {
 -	if (Platform::IsWayland()) {
-+	if (Platform::IsLinux()) {
- 		return;
- 	}
+-		return;
+-	}
  	const auto screen = windowHandle() && windowHandle()->screen()
-@@ -1341,7 +1343,9 @@ void OverlayWidget::handleVisibleChanged(bool visible) {
- 	if (visible) {
- 		const auto screenList = QGuiApplication::screens();
- 		DEBUG_LOG(("Viewer Pos: Shown, screen number: %1")
--			.arg(screenList.indexOf(windowHandle()->screen())));
-+			.arg(windowHandle()
-+				? screenList.indexOf(windowHandle()->screen())
-+				: -2));
- 
- 		moveToScreen();
- 	}
+ 		? windowHandle()->screen()
+ 		: QApplication::primaryScreen();