[arch-commits] Commit in lxqt-panel/trunk (FS70386.patch PKGBUILD)

[Chih-Hsuan Yen]

    Date: Saturday, April 10, 2021 @ 15:55:13
  Author: yan12125
Revision: 915577

upgpkg: lxqt-panel 0.16.1-2; backport upstream fix for https://bugs.archlinux.org/task/70386

Added:
  lxqt-panel/trunk/FS70386.patch
Modified:
  lxqt-panel/trunk/PKGBUILD

---------------+
 FS70386.patch |   28 ++++++++++++++++++++++++++++
 PKGBUILD      |   12 ++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

Added: FS70386.patch
===================================================================
--- FS70386.patch	                        (rev 0)
+++ FS70386.patch	2021-04-10 15:55:13 UTC (rev 915577)
@@ -0,0 +1,28 @@
+From 4c674608aaaac73d9333f869941a56b28fc47d22 Mon Sep 17 00:00:00 2001
+From: tsujan <tsujan2000 at gmail.com>
+Date: Sat, 10 Apr 2021 17:39:47 +0430
+Subject: [PATCH] Check pressed mouse buttons before closing grouped task popup
+ (#1601)
+
+The lack of checking didn't have an effect with the official Qt releases but it causes a bug with the latest official patches. Logically, the pressed mouse buttons should have always been checked.
+
+Closes https://github.com/lxqt/lxqt-panel/issues/1600
+---
+ CHANGELOG                        | 1 +
+ plugin-taskbar/lxqttaskgroup.cpp | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plugin-taskbar/lxqttaskgroup.cpp b/plugin-taskbar/lxqttaskgroup.cpp
+index 7f2367ce1..f1db0f179 100644
+--- a/plugin-taskbar/lxqttaskgroup.cpp
++++ b/plugin-taskbar/lxqttaskgroup.cpp
+@@ -576,7 +576,8 @@ void LXQtTaskGroup::dragLeaveEvent(QDragLeaveEvent *event)
+ void LXQtTaskGroup::mouseMoveEvent(QMouseEvent* event)
+ {
+     // if dragging the taskgroup, do not show the popup
+-    setPopupVisible(false, true);
++    if (event->buttons() & Qt::LeftButton)
++        setPopupVisible(false, true);
+     LXQtTaskButton::mouseMoveEvent(event);
+ }
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-10 15:29:11 UTC (rev 915576)
+++ PKGBUILD	2021-04-10 15:55:13 UTC (rev 915577)
@@ -1,8 +1,9 @@
 # Maintainer: Jerome Leclanche <jerome at leclan.ch>
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
 
 pkgname=lxqt-panel
 pkgver=0.16.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The LXQt desktop panel"
 arch=("x86_64")
 groups=("lxqt")
@@ -25,9 +26,11 @@
 )
 source=(
 	"https://github.com/lxqt/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"{,.asc}
+	"FS70386.patch"
 )
 sha256sums=('841a205ee80cb9a68aac1bb635789b883a14074448efec09c773b96cfe71ed4c'
-            'SKIP')
+            'SKIP'
+            '9dcef7e79f05da8a1192d469aa9ff8a310b7382e3b5e253e956fa4f2f9435447')
 validpgpkeys=(
 	"169704C6FB490C6892C7F23C37E0AF1FDA48F373"  # Jerome Leclanche <jerome at leclan.ch>
 	"7C733BA5F585AAD669E4D23A42C9C8D3AF5EA5E3"  # Alf Gaida <agaida at siduction.org>
@@ -34,6 +37,11 @@
 	"19DFDF3A579BD509DBB572D8BE793007AD22DF7E"  # Pedram Pourang <tsujan2000 at gmail.com>
 )
 
+prepare() {
+	cd "$pkgname-$pkgver"
+	# Backport of https://github.com/lxqt/lxqt-panel/pull/1601
+	patch -Np1 -i ../FS70386.patch
+}
 
 build() {
 	cmake -B build -S "$srcdir/$pkgname-$pkgver" \