Package: yakuake
Version: 2.9.9-1
Severity: normal
Tags: patch
Forwarded: https://bugs.kde.org/show_bug.cgi?id=310155

Yakuake does not always covers the whole screen if instructed to do so in dual
head setups.

This is upstream bug 310555 (as forwarded in this mail) and the upstream patch
is available in

https://projects.kde.org/projects/extragear/utils/yakuake/repository/revisions/5e31ccfdbc3a46e6bffd79fc6bcafc3a2bde0ed3

I backported the patch to the current version and I'm attaching it.

Thanks a lot, Lisandro.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=es_AR.UTF-8, LC_CTYPE=es_AR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages yakuake depends on:
ii  kde-runtime        4:4.14.2-1
ii  konsole            4:4.14.2-1
ii  libc6              2.19-13
ii  libgcc1            1:4.9.2-2
ii  libkdecore5        4:4.14.2-3
ii  libkdeui5          4:4.14.2-3
ii  libkio5            4:4.14.2-3
ii  libknewstuff3-4    4:4.14.2-3
ii  libknotifyconfig4  4:4.14.2-3
ii  libkparts4         4:4.14.2-3
ii  libnepomuk4        4:4.14.2-3
ii  libnepomukutils4   4:4.14.2-3
ii  libqt4-dbus        4:4.8.6+git64-g5dc8b2b+dfsg-2+b1
ii  libqt4-network     4:4.8.6+git64-g5dc8b2b+dfsg-2+b1
ii  libqt4-svg         4:4.8.6+git64-g5dc8b2b+dfsg-2+b1
ii  libqt4-xml         4:4.8.6+git64-g5dc8b2b+dfsg-2+b1
ii  libqtcore4         4:4.8.6+git64-g5dc8b2b+dfsg-2+b1
ii  libqtgui4          4:4.8.6+git64-g5dc8b2b+dfsg-2+b1
ii  libsoprano4        2.9.4+dfsg-1.1
ii  libstdc++6         4.9.2-2
ii  libx11-6           2:1.6.2-3

yakuake recommends no packages.

yakuake suggests no packages.

-- no debconf information
commit 5e31ccfdbc3a46e6bffd79fc6bcafc3a2bde0ed3
Author: Vangelis Tasoulas <[email protected]>
Date:   Sun Nov 23 00:16:11 2014 +0100

    Fixes incorrect Yakuake height handling on dualhead setups.

    BUG:310155

Backported by Lisandro.

---
 app/mainwindow.cpp |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -1265,8 +1265,6 @@ QRect MainWindow::getDesktopGeometry()
     if (action->isChecked())
         return screenGeometry;
 
-    int currentDesktop = KWindowSystem::windowInfo(winId(), NET::WMDesktop).desktop();
-
     if (KApplication::desktop()->numScreens() > 1)
     {
         const QList<WId> allWindows = KWindowSystem::windows();
@@ -1282,7 +1280,9 @@ QRect MainWindow::getDesktopGeometry()
             {
                 KWindowInfo windowInfo = KWindowSystem::windowInfo(windowId, NET::WMDesktop, NET::WM2ExtendedStrut);
 
-                if (windowInfo.valid() && windowInfo.desktop() == currentDesktop)
+                // If windowInfo is valid and the window is located at the same (current)
+                // desktop with the yakuake window...
+                if (windowInfo.valid() && windowInfo.isOnCurrentDesktop())
                 {
                     NETExtendedStrut strut = windowInfo.extendedStrut();
 
@@ -1312,10 +1312,10 @@ QRect MainWindow::getDesktopGeometry()
             }
         }
 
-        return KWindowSystem::workArea(offScreenWindows, currentDesktop).intersect(screenGeometry);
+        return KWindowSystem::workArea(offScreenWindows).intersect(screenGeometry);
     }
 
-    return KWindowSystem::workArea(currentDesktop);
+    return KWindowSystem::workArea();
 }
 
 void MainWindow::whatsThis()

Reply via email to