[SCM] kwin packaging branch, master, updated. debian/5.4.1-1-6-g583fe03

Maximiliano Curia maxy at moszumanska.debian.org
Tue Oct 6 06:54:09 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwin.git;a=commitdiff;h=d1515dd

The following commit has been merged in the master branch:
commit d1515dd459dddb4901f4a7e3ecd7f4834a01e624
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Oct 2 12:33:12 2015 +0200

    Drop upstream patch: upstream_fake_a_leave_event_for_the_decoration_when_client_is_left.diff
---
 debian/changelog                                   |  3 ++
 debian/patches/series                              |  1 -
 ...ent_for_the_decoration_when_client_is_left.diff | 41 ----------------------
 3 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2937fe..1a98ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ kwin (4:5.4.2-1~) UNRELEASED; urgency=medium
   [ Maximiliano Curia ]
   * New upstream release (5.4.2).
   * Update symbols files from buildds logs (4:5.4.1-1).
+  * Drop upstream patch:
+    upstream_fake_a_leave_event_for_the_decoration_when_client_is_left.d
+    iff
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 01 Oct 2015 17:09:39 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 18f34fd..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-upstream_fake_a_leave_event_for_the_decoration_when_client_is_left.diff
diff --git a/debian/patches/upstream_fake_a_leave_event_for_the_decoration_when_client_is_left.diff b/debian/patches/upstream_fake_a_leave_event_for_the_decoration_when_client_is_left.diff
deleted file mode 100644
index 47e1c28..0000000
--- a/debian/patches/upstream_fake_a_leave_event_for_the_decoration_when_client_is_left.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 0b955611938716ae907a0972c23288c1e977ad25
-Author: Martin Gräßlin <mgraesslin at kde.org>
-Date:   Mon Aug 31 10:28:03 2015 +0200
-
-    Fake a leave event for the decoration when client is left
-    
-    We need to send a fake HoverMove event on minimized to remove all
-    hovered states of the decoration.
-    
-    At the same time we need to ensure that no further hover events are
-    sent to a minimized client.
-    
-    BUG: 351984
-    FIXED-IN: 5.4.1
-    REVIEW: 124997
-
-diff --git a/events.cpp b/events.cpp
-index 3ce3f91..5baab1f 100644
---- a/events.cpp
-+++ b/events.cpp
-@@ -1006,6 +1006,11 @@ void Client::leaveNotifyEvent(xcb_leave_notify_event_t *e)
-                 shadeHoverTimer->setSingleShot(true);
-                 shadeHoverTimer->start(options->shadeHoverInterval());
-             }
-+            if (m_decoration) {
-+                // sending a move instead of a leave. With leave we need to send proper coords, with move it's handled internally
-+                QHoverEvent leaveEvent(QEvent::HoverMove, QPointF(-1, -1), QPointF(-1, -1), Qt::NoModifier);
-+                QCoreApplication::sendEvent(m_decoration, &leaveEvent);
-+            }
-         }
-         if (options->focusPolicy() == Options::FocusStrictlyUnderMouse && isActive() && lostMouse) {
-             workspace()->requestDelayFocus(0);
-@@ -1343,7 +1348,7 @@ void Client::checkQuickTilingMaximizationZones(int xroot, int yroot)
- // return value matters only when filtering events before decoration gets them
- bool Client::motionNotifyEvent(xcb_window_t w, int state, int x, int y, int x_root, int y_root)
- {
--    if (w == frameId() && m_decoration) {
-+    if (w == frameId() && m_decoration && !isMinimized()) {
-         // TODO Mouse move event dependent on state
-         QHoverEvent event(QEvent::HoverMove, QPointF(x, y), QPointF(x, y));
-         QCoreApplication::instance()->sendEvent(m_decoration, &event);

-- 
kwin packaging



More information about the pkg-kde-commits mailing list