[arch-commits] Commit in deepin-control-center/trunk (PKGBUILD fix-focus.patch)
Felix Yan
felixonmars at archlinux.org
Mon Feb 6 15:41:28 UTC 2017
Date: Monday, February 6, 2017 @ 15:41:27
Author: felixonmars
Revision: 210489
upgpkg: deepin-control-center 4.0.2-3
add a patch to fix focus problem (FS#52670)
Added:
deepin-control-center/trunk/fix-focus.patch
Modified:
deepin-control-center/trunk/PKGBUILD
-----------------+
PKGBUILD | 10 ++++++----
fix-focus.patch | 28 ++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-06 15:21:26 UTC (rev 210488)
+++ PKGBUILD 2017-02-06 15:41:27 UTC (rev 210489)
@@ -5,7 +5,7 @@
pkgname=deepin-control-center
pkgver=4.0.2
-pkgrel=2
+pkgrel=3
pkgdesc='New control center for linux deepin'
arch=('i686' 'x86_64')
url="http://github.com/linuxdeepin/dde-control-center"
@@ -12,19 +12,21 @@
license=('GPL3')
depends=('desktop-file-utils' 'deepin-tool-kit' 'deepin-account-faces' 'deepin-api' 'geoip'
'geoip-database' 'geoip-database-extra' 'deepin-daemon' 'startdde'
- 'deepin-qt-dbus-factory')
+ 'deepin-qt-dbus-factory' 'deepin-qt5integration')
makedepends=('deepin-dock' 'qt5-tools' 'git')
conflicts=('dde-control-center' 'dde-dock-applets')
replaces=('dde-control-center' 'dde-dock-applets')
groups=('deepin')
source=("git+https://cr.deepin.io/dde/dde-control-center.git#tag=$pkgver"
- disable-update.patch)
+ disable-update.patch fix-focus.patch)
sha256sums=('SKIP'
- '5e96faac28348a783d744955d0d3bd8b29a549ee5f4dbdad2a4671d531dbcce6')
+ '5e96faac28348a783d744955d0d3bd8b29a549ee5f4dbdad2a4671d531dbcce6'
+ '08801253ba5171c9eb83e6ecd25a25f567ab0c119487f964ed3b35e634c6e935')
prepare() {
cd dde-control-center
patch -p1 -i ../disable-update.patch
+ patch -p1 -i ../fix-focus.patch
}
build() {
Added: fix-focus.patch
===================================================================
--- fix-focus.patch (rev 0)
+++ fix-focus.patch 2017-02-06 15:41:27 UTC (rev 210489)
@@ -0,0 +1,28 @@
+commit c199fff7402f6872bf2f34c7a5648bd6e0e26d0f
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Mon Feb 6 23:09:48 2017 +0800
+
+ Fix focus problem in Arch
+
+ According to Qt docs [1], Qt::X11BypassWindowManagerHint leads to "no
+ keyboard input unless you call QWidget::activateWindow() manually".
+
+ Calling activateWindow() here fixes the focus problem [2] in Arch.
+
+ [1] http://doc.qt.io/qt-5/qt.html
+ [2] https://github.com/linuxdeepin/developer-center/issues/156
+
+ Change-Id: Ifc80b50d008a025ef68f760cfa2741f37a230989
+
+diff --git a/frame/frame.cpp b/frame/frame.cpp
+index acb2c351..ceef7fe6 100644
+--- a/frame/frame.cpp
++++ b/frame/frame.cpp
+@@ -220,6 +220,7 @@ void Frame::show()
+
+ // show frame
+ QFrame::show();
++ QFrame::activateWindow();
+
+ // notify top widget appear
+ if (m_frameWidgetStack.last() && m_frameWidgetStack.last()->content())
More information about the arch-commits
mailing list