From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF712139682 for ; Sat, 29 Oct 2016 13:58:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55C31E0C14; Sat, 29 Oct 2016 13:58:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B591E0C14 for ; Sat, 29 Oct 2016 13:58:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB043341293 for ; Sat, 29 Oct 2016 13:58:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C9AD249B for ; Sat, 29 Oct 2016 13:58:41 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1477749510.a68e3c8d70ecaa38a20831d71a0514b2e622a1d3.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/sddm/files/sddm-0.13.0-password-focus.patch X-VCS-Directories: x11-misc/sddm/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: a68e3c8d70ecaa38a20831d71a0514b2e622a1d3 X-VCS-Branch: master Date: Sat, 29 Oct 2016 13:58:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1671185d-05bd-4b17-9b0f-b614a1d7d012 X-Archives-Hash: 65db3520039cc6c74307480d664d8d1f commit: a68e3c8d70ecaa38a20831d71a0514b2e622a1d3 Author: Michael Palimaka gentoo org> AuthorDate: Sat Oct 29 13:57:47 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Oct 29 13:58:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68e3c8d x11-misc/sddm: remove unused patch Package-Manager: portage-2.3.2 .../sddm/files/sddm-0.13.0-password-focus.patch | 109 --------------------- 1 file changed, 109 deletions(-) diff --git a/x11-misc/sddm/files/sddm-0.13.0-password-focus.patch b/x11-misc/sddm/files/sddm-0.13.0-password-focus.patch deleted file mode 100644 index cc27669..00000000 --- a/x11-misc/sddm/files/sddm-0.13.0-password-focus.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 6d5b36b28907b16280ff78995fef764bb0c573db Mon Sep 17 00:00:00 2001 -From: Pier Luigi Fiorini -Date: Sat, 16 Jan 2016 19:52:09 +0100 -Subject: [PATCH] Activate window for the primary screen - -Request activation for the view on the primary screen -otherwise text fields won't get focus. - -Closes #501 - -[ChangeLog][Greeter] Fix text field focus (issue #501) ---- - src/greeter/GreeterApp.cpp | 31 ++++++++++++++++++++++++++++++- - src/greeter/GreeterApp.h | 4 +++- - 2 files changed, 33 insertions(+), 2 deletions(-) - -diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp -index 06d13c5..8201a4e 100644 ---- a/src/greeter/GreeterApp.cpp -+++ b/src/greeter/GreeterApp.cpp -@@ -1,5 +1,5 @@ - /*************************************************************************** --* Copyright (c) 2015 Pier Luigi Fiorini -+* Copyright (c) 2015-2016 Pier Luigi Fiorini - * Copyright (c) 2013 Abdurrahman AVCI - * - * This program is free software; you can redistribute it and/or modify -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -135,6 +136,11 @@ namespace SDDM { - - // handle screens - connect(this, &GreeterApp::screenAdded, this, &GreeterApp::addViewForScreen); -+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) -+ connect(this, &GreeterApp::primaryScreenChanged, this, [this](QScreen *) { -+ activatePrimary(); -+ }); -+#endif - } - - void GreeterApp::addViewForScreen(QScreen *screen) { -@@ -144,6 +150,7 @@ namespace SDDM { - view->setResizeMode(QQuickView::SizeRootObjectToView); - //view->setGeometry(QRect(QPoint(0, 0), screen->geometry().size())); - view->setGeometry(screen->geometry()); -+ m_views.append(view); - - // remove the view when the screen is removed, but we - // need to be careful here since Qt will move the view to -@@ -201,11 +208,33 @@ namespace SDDM { - // show - qDebug() << "Adding view for" << screen->name() << screen->geometry(); - view->show(); -+ -+ // activate windows for the primary screen to give focus to text fields -+ if (QGuiApplication::primaryScreen() == screen) -+ view->requestActivate(); - } - - void GreeterApp::removeViewForScreen(QQuickView *view) { -+ // screen is gone, remove the window - m_views.removeOne(view); - view->deleteLater(); -+ -+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0) -+ // starting from Qt 5.6 we are notified when the primary screen is changed -+ // and we request activation for the view when we get the signal, with -+ // older version we iterate the views and request activation -+ activatePrimary(); -+#endif -+ } -+ -+ void GreeterApp::activatePrimary() { -+ // activate and give focus to the window assigned to the primary screen -+ Q_FOREACH (QQuickView *view, m_views) { -+ if (view->screen() == QGuiApplication::primaryScreen()) { -+ view->requestActivate(); -+ break; -+ } -+ } - } - } - -diff --git a/src/greeter/GreeterApp.h b/src/greeter/GreeterApp.h -index 91fc1a9..1ebd981 100644 ---- a/src/greeter/GreeterApp.h -+++ b/src/greeter/GreeterApp.h -@@ -1,5 +1,5 @@ - /*************************************************************************** --* Copyright (c) 2015 Pier Luigi Fiorini -+* Copyright (c) 2015-2016 Pier Luigi Fiorini - * Copyright (c) 2013 Nikita Mikhaylov - * - * This program is free software; you can redistribute it and/or modify -@@ -65,6 +65,8 @@ namespace SDDM { - UserModel *m_userModel { nullptr }; - GreeterProxy *m_proxy { nullptr }; - KeyboardModel *m_keyboard { nullptr }; -+ -+ void activatePrimary(); - }; - } -