rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.2-panel-autohide-866998.patch, NONE, 1.1 kdebase-workspace-4.1.2-panel-autohide-871058.patch, NONE, 1.1 kdebase-workspace-4.1.2-panel-autohide-coords.patch, NONE, 1.1 kdebase-workspace.spec, 1.109, 1.110
Kevin Kofler
kkofler at fedoraproject.org
Sat Oct 18 22:14:47 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2554/F-9
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.1.2-panel-autohide-866998.patch
kdebase-workspace-4.1.2-panel-autohide-871058.patch
kdebase-workspace-4.1.2-panel-autohide-coords.patch
Log Message:
Sync from F-10:
* Sat Oct 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-6
- reenable panel-autohide-fix-flicker patch
- backport revision 866998 to fix the CPU consumption problem (kde#172549)
- backport panelview.cpp coordinate fixes (revisions 869882, 869925, 870041)
- backport revision 871058 (request config sync when panel controller goes away)
kdebase-workspace-4.1.2-panel-autohide-866998.patch:
--- NEW FILE kdebase-workspace-4.1.2-panel-autohide-866998.patch ---
Index: plasma/containments/panel/panel.cpp
===================================================================
--- plasma/containments/panel/panel.cpp (revision 866997)
+++ plasma/containments/panel/panel.cpp (revision 866998)
@@ -443,6 +443,9 @@
if (viewGeom != m_lastViewGeom) {
m_lastViewGeom = viewGeom;
updateBorders(viewGeom);
+ if (containmentOpt && containmentOpt->view) {
+ containmentOpt->view->setMask(m_background->mask());
+ }
}
// blit the background (saves all the per-pixel-products that blending does)
@@ -451,10 +454,6 @@
m_background->paintPanel(painter, option->exposedRect);
- if (containmentOpt && containmentOpt->view) {
- containmentOpt->view->setMask(m_background->mask());
- }
-
// restore transformation and composition mode
painter->restore();
}
kdebase-workspace-4.1.2-panel-autohide-871058.patch:
--- NEW FILE kdebase-workspace-4.1.2-panel-autohide-871058.patch ---
Index: plasma/plasma/panelview.cpp
===================================================================
--- plasma/plasma/panelview.cpp (revision 871057)
+++ plasma/plasma/panelview.cpp (revision 871058)
@@ -626,6 +626,10 @@
containment()->closeToolBox();
updateStruts();
m_firstPaint = true; // triggers autohide
+
+ // not overly efficient since we may not have changed any settings,
+ // but ensures that if we have, a config sync will occur
+ PlasmaApp::self()->corona()->requestConfigSync();
}
Qt::Alignment PanelView::alignmentFilter(Qt::Alignment align) const
kdebase-workspace-4.1.2-panel-autohide-coords.patch:
--- NEW FILE kdebase-workspace-4.1.2-panel-autohide-coords.patch ---
Index: plasma/plasma/panelview.cpp
===================================================================
--- plasma/plasma/panelview.cpp (revision 869881)
+++ plasma/plasma/panelview.cpp (revision 870041)
@@ -324,7 +324,7 @@
} else if (m_alignment == Qt::AlignRight) {
geom.moveTopRight(QPoint(screenGeom.right() - m_offset, screenGeom.top()));
} else if (m_alignment == Qt::AlignCenter) {
- geom.moveCenter(QPoint(screenGeom.center().x() + m_offset, screenGeom.top() + geom.height()/2 - 1));
+ geom.moveTopLeft(QPoint(screenGeom.center().x() - geom.width()/2 + 1 - geom.width()%2 + m_offset, screenGeom.top()));
}
//enable borders if needed
@@ -337,7 +337,7 @@
} else if (m_alignment == Qt::AlignRight) {
geom.moveBottomLeft(QPoint(screenGeom.left(), screenGeom.bottom() - m_offset));
} else if (m_alignment == Qt::AlignCenter) {
- geom.moveCenter(QPoint(screenGeom.left()+size.width()/2 - 1, screenGeom.center().y() + m_offset -1));
+ geom.moveTopLeft(QPoint(screenGeom.left(), screenGeom.center().y() - geom.height()/2 + 1 - geom.height()%2 + m_offset));
}
//enable borders if needed
@@ -346,11 +346,11 @@
case Plasma::RightEdge:
if (m_alignment == Qt::AlignLeft) {
- geom.moveTopLeft(QPoint(screenGeom.right() - size.width() + 1, m_offset));
+ geom.moveTopRight(QPoint(screenGeom.right(), m_offset));
} else if (m_alignment == Qt::AlignRight) {
- geom.moveBottomLeft(QPoint(screenGeom.right() - size.width() + 1, screenGeom.bottom() - m_offset));
+ geom.moveBottomRight(QPoint(screenGeom.right(), screenGeom.bottom() - m_offset));
} else if (m_alignment == Qt::AlignCenter) {
- geom.moveCenter(QPoint(screenGeom.right() - size.width()/2, screenGeom.center().y() + m_offset));
+ geom.moveTopRight(QPoint(screenGeom.right(), screenGeom.center().y() - geom.height()/2 + 1 - geom.height()%2 + m_offset));
}
//enable borders if needed
@@ -360,11 +360,11 @@
case Plasma::BottomEdge:
default:
if (m_alignment == Qt::AlignLeft) {
- geom.moveTopLeft(QPoint(m_offset, screenGeom.bottom() - size.height() + 1));
+ geom.moveBottomLeft(QPoint(m_offset, screenGeom.bottom()));
} else if (m_alignment == Qt::AlignRight) {
- geom.moveTopRight(QPoint(screenGeom.right() - m_offset, screenGeom.bottom() - size.height() + 1));
+ geom.moveBottomRight(QPoint(screenGeom.right() - m_offset, screenGeom.bottom()));
} else if (m_alignment == Qt::AlignCenter) {
- geom.moveCenter(QPoint(screenGeom.center().x() + m_offset, screenGeom.bottom() - size.height()/2));
+ geom.moveBottomLeft(QPoint(screenGeom.center().x() - geom.width()/2 + 1 - geom.width()%2 + m_offset, screenGeom.bottom()));
}
//enable borders if needed
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- kdebase-workspace.spec 10 Oct 2008 19:20:06 -0000 1.109
+++ kdebase-workspace.spec 18 Oct 2008 22:14:17 -0000 1.110
@@ -4,7 +4,7 @@
Name: kdebase-workspace
Version: 4.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -52,11 +52,19 @@
# (use sed -i -e 's!plasma/shells/desktop!plasma/plasma!g' to backport):
# http://websvn.kde.org/?view=rev&revision=866710
# http://websvn.kde.org/?view=rev&revision=866715
-#Patch105: kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch
+Patch105: kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch
+# http://websvn.kde.org/?view=rev&revision=866998
+Patch106: kdebase-workspace-4.1.2-panel-autohide-866998.patch
# http://websvn.kde.org/?view=rev&revision=868231
-Patch106: kdebase-workspace-4.1.2-panel-autohide-868231.patch
+Patch107: kdebase-workspace-4.1.2-panel-autohide-868231.patch
# http://websvn.kde.org/?view=rev&revision=869277
-Patch107: kdebase-workspace-4.1.2-panel-autohide-869277.patch
+Patch108: kdebase-workspace-4.1.2-panel-autohide-869277.patch
+# http://websvn.kde.org/?view=rev&revision=869882
+# http://websvn.kde.org/?view=rev&revision=869925
+# http://websvn.kde.org/?view=rev&revision=870041
+Patch109: kdebase-workspace-4.1.2-panel-autohide-coords.patch
+# http://websvn.kde.org/?view=rev&revision=871058
+Patch110: kdebase-workspace-4.1.2-panel-autohide-871058.patch
# end panel autohide bugfixes
# FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
@@ -192,9 +200,12 @@
%patch102 -p0 -b .kwin-taskbarthumbnail
%patch103 -p0 -b .klipper-crash
%patch104 -p0 -b .panel-autohide
-#patch105 -p0 -b .panel-autohide2
+%patch105 -p0 -b .panel-autohide2
%patch106 -p0 -b .panel-autohide3
%patch107 -p0 -b .panel-autohide4
+%patch108 -p0 -b .panel-autohide5
+%patch109 -p0 -b .panel-autohide6
+%patch110 -p0 -b .panel-autohide7
%build
@@ -332,6 +343,12 @@
%changelog
+* Sat Oct 18 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-6
+- reenable panel-autohide-fix-flicker patch
+- backport revision 866998 to fix the CPU consumption problem (kde#172549)
+- backport panelview.cpp coordinate fixes (revisions 869882, 869925, 870041)
+- backport revision 871058 (request config sync when panel controller goes away)
+
* Fri Oct 10 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-5
- disable panel-autohide-fix-flicker patch for now, eats CPU
More information about the scm-commits
mailing list