commit: a68e3c8d70ecaa38a20831d71a0514b2e622a1d3
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 13:57:47 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> 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 <pierluigi.fior...@gmail.com>
-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 <pierluigi.fior...@gmail.com>
-+* Copyright (c) 2015-2016 Pier Luigi Fiorini <pierluigi.fior...@gmail.com>
- * Copyright (c) 2013 Abdurrahman AVCI <abdurrahmana...@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
-@@ -36,6 +36,7 @@
- #include <QQmlContext>
- #include <QQmlEngine>
- #include <QDebug>
-+#include <QTimer>
- #include <QTranslator>
-
- #include <iostream>
-@@ -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 <pierluigi.fior...@gmail.com>
-+* Copyright (c) 2015-2016 Pier Luigi Fiorini <pierluigi.fior...@gmail.com>
- * Copyright (c) 2013 Nikita Mikhaylov <nsl...@gmail.com>
- *
- * 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();
- };
- }
-
