Commit 2c176f69 authored by Fabian's avatar Fabian

added patches for icontasks

parent 7d52d916
commit b56d1552e9a8f8efe8fb8fd641126e78627c61a9
Author: Eike Hein <hein@kde.org>
Date: Mon Sep 9 23:33:30 2013 +0200
Fix it for non-running items too.
BUG:324661
diff --git a/applets/icontasks/applauncheritem.cpp b/applets/icontasks/applauncheritem.cpp
index b5f646c..f721b5a 100644
--- a/applets/icontasks/applauncheritem.cpp
+++ b/applets/icontasks/applauncheritem.cpp
@@ -100,17 +100,18 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
actionList.append(configAction);
}
- TaskManager::BasicMenu menu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
- menu.adjustSize();
+ TaskManager::BasicMenu *menu = new TaskManager::BasicMenu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
+ menu->adjustSize();
if (m_applet->formFactor() != Plasma::Vertical) {
- menu.setMinimumWidth(size().width());
+ menu->setMinimumWidth(size().width());
}
Q_ASSERT(m_applet->containment());
Q_ASSERT(m_applet->containment()->corona());
stopWindowHoverEffect();
- menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size()));
+ menu->exec(m_applet->containment()->corona()->popupPosition(this, menu->size()));
+ menu->deleteLater();
}
commit 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6
Author: Eike Hein <hein@kde.org>
Date: Mon Sep 9 23:12:45 2013 +0200
Spin the event loop before destroying the menu.
This allows the menu implementation to complete toggling the
launcher before the instance is destroyed. It's extremely un-
fortunate that the library currently requires this careful
handling; see e944d7ae in kde-workspace for a note on what
needs to be cleaned up there.
BUG:324661
diff --git a/applets/icontasks/windowtaskitem.cpp b/applets/icontasks/windowtaskitem.cpp
index 970c19f..61b39ef 100644
--- a/applets/icontasks/windowtaskitem.cpp
+++ b/applets/icontasks/windowtaskitem.cpp
@@ -406,17 +406,18 @@ void WindowTaskItem::showContextMenu(const QPoint &pos, bool showAppMenu)
actionList.append(configAction);
}
- TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
- menu.adjustSize();
+ TaskManager::BasicMenu * menu = new TaskManager::BasicMenu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
+ menu->adjustSize();
if (m_applet->formFactor() != Plasma::Vertical) {
- menu.setMinimumWidth(size().width());
+ menu->setMinimumWidth(size().width());
}
Q_ASSERT(m_applet->containment());
Q_ASSERT(m_applet->containment()->corona());
stopWindowHoverEffect();
- menu.exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu.size()) : pos);
+ menu->exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu->size()) : pos);
+ menu->deleteLater();
delete a;
}
......@@ -84,7 +84,7 @@ pkgname=('kdeplasma-addons-applets-bball'
arch=('x86_64')
pkgver=${_kdever}
pkgrel=1
pkgrel=2
pkgdesc="KDE Plasma Addons"
url="http://www.kde.org/"
......@@ -94,16 +94,28 @@ depends=("kde-workspace>=${_kdever}" 'libqalculate' "kdeedu-marble>=${_kdever}"
makedepends=('pkg-config' 'cmake' 'automoc4' 'libqalculate' 'qoauth' 'fcitx'
"kdegraphics-libkexiv2>=${_kdever}" "kdeedu-marble>=${_kdever}" 'eigen' 'qwt')
source=("$_mirror/${pkgbase}-$_kdever.tar.xz")
sha1sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)
source=("$_mirror/${pkgbase}-$_kdever.tar.xz"
"${pkgver}-icontasks-spin-event-loop.patch"
"${pkgver}-icontasks-fix-for-non-running.patch")
sha256sums=(`grep ${pkgbase}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
'75531ddd3634bf1c987b9da225450c44328b14b9846aba3b892ea7058ad8f92f'
'96d93011f488d9b9024a43ac3c35cc794dcf266ea4ea8ac87bd61b6283fe6d4d')
build() {
cd $srcdir/$pkgbase-$pkgver
prepare() {
cd $srcdir/$pkgbase-$pkgver
patch -p1 < ${srcdir}/"${pkgver}-icontasks-spin-event-loop.patch"
patch -p1 < ${srcdir}/"${pkgver}-icontasks-fix-for-non-running.patch"
cd ..
rm -rf build
mkdir -p build && cd build
}
build() {
cd $srcdir/build
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment