s4504kr pushed to yakuake (f22). "Fix height-handling issue (#810312)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 18 15:10:54 UTC 2015
>From 1372aedd9aae26b13e33706aad8bb22c2b81426b Mon Sep 17 00:00:00 2001
From: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Sat, 18 Apr 2015 16:28:01 +0200
Subject: Fix height-handling issue (#810312)
diff --git a/yakuake-height.patch b/yakuake-height.patch
new file mode 100644
index 0000000..13ea1ed
--- /dev/null
+++ b/yakuake-height.patch
@@ -0,0 +1,45 @@
+commit 5e31ccfdbc3a46e6bffd79fc6bcafc3a2bde0ed3
+Author: Vangelis Tasoulas <vangelis at tasoulas.net>
+Date: Sun Nov 23 00:16:11 2014 +0100
+
+ Fixes incorrect Yakuake height handling on dualhead setups.
+
+ BUG:310155
+
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index ca5df80..c11de41 100644
+--- a/app/mainwindow.cpp
++++ b/app/mainwindow.cpp
+@@ -1269,8 +1269,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();
+@@ -1286,7 +1284,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();
+
+@@ -1316,10 +1316,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()
diff --git a/yakuake.spec b/yakuake.spec
index b317c41..9748775 100644
--- a/yakuake.spec
+++ b/yakuake.spec
@@ -1,7 +1,7 @@
Name: yakuake
Version: 2.9.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A drop-down terminal emulator
# KDE e.V. may determine that future GPL versions are accepted
@@ -9,6 +9,7 @@ License: GPLv2 or GPLv3
#URL: https://projects.kde.org/projects/extragear/utils/yakuake
URL: http://yakuake.kde.org/
Source0: http://download.kde.org/stable/yakuake/%{version}/src/yakuake-%{version}.tar.xz
+Patch1: yakuake-height.patch
# konsolepart
Requires: konsole4-part
@@ -23,7 +24,7 @@ Yakuake is a drop-down terminal emulator.
%prep
%setup -q
-
+%patch1 -p 1
%build
mkdir %{_target_platform}
@@ -67,6 +68,9 @@ fi
%changelog
+* Sat Apr 18 2015 Jochen Schmitt <Jochen herr-schmitt de> - 2.9.9-8
+- Fix height-handling issue (#810312)
+
* Sat Jan 31 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9.9-7
- kde-apps cleanup
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/yakuake.git/commit/?h=f22&id=1372aedd9aae26b13e33706aad8bb22c2b81426b
More information about the scm-commits
mailing list