summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kwin/ChangeLog6
-rw-r--r--kde-base/kwin/files/kwin-4.11.10-hidewindow.patch31
2 files changed, 5 insertions, 32 deletions
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index f3a97d41b32b..96eef4d38ad2 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kwin
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.399 2015/02/17 11:06:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.400 2015/02/19 07:02:45 kensington Exp $
+
+ 19 Feb 2015; Michael Palimaka <kensington@gentoo.org>
+ -files/kwin-4.11.10-hidewindow.patch:
+ Remove unused patches.
17 Feb 2015; Agostino Sarubbo <ago@gentoo.org> kwin-4.11.14.ebuild:
Stable for ppc64 wrt bug #517344
diff --git a/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch b/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch
deleted file mode 100644
index e5db9a06335d..000000000000
--- a/kde-base/kwin/files/kwin-4.11.10-hidewindow.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4b4a7c752ae305c168b0a3e89ad2f49c54cadd5d Mon Sep 17 00:00:00 2001
-From: Hugo Pereira Da Costa <hugo.pereira@free.fr>
-Date: Thu, 12 Jun 2014 14:56:20 +0200
-Subject: [PATCH] Properly set titleHeight to zero when hideTitleBar is
- selected. CCBUG: 336128
-
----
- kwin/clients/oxygen/oxygenclient.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/kwin/clients/oxygen/oxygenclient.cpp b/kwin/clients/oxygen/oxygenclient.cpp
-index a7d8d7a..ebc0274 100644
---- a/kwin/clients/oxygen/oxygenclient.cpp
-+++ b/kwin/clients/oxygen/oxygenclient.cpp
-@@ -394,8 +394,11 @@ namespace Oxygen
-
- case LM_TitleHeight:
- {
-- const int titleHeight = QFontMetrics(options()->font(true)).height();
-- return qMax(buttonSize, titleHeight);
-+ if( hideTitleBar() ) return 0;
-+ else {
-+ const int titleHeight = QFontMetrics(options()->font(true)).height();
-+ return qMax(buttonSize, titleHeight);
-+ }
- }
-
- case LM_ButtonSpacing:
---
-1.8.5.5
-