rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.2-panel-autohide.patch, 1.1, 1.2
Kevin Kofler
kkofler at fedoraproject.org
Thu Oct 9 21:49:17 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15313/F-9
Modified Files:
kdebase-workspace-4.1.2-panel-autohide.patch
Log Message:
Remove unrelated panelappletoverlay.cpp changes from http://websvn.kde.org/?view=rev&revision=857606 (which need library changes) from kdebase-workspace-4.1.2-panel-autohide.patch.
Remove kdebase-workspace-4.1.2-panel-autohide-867559.patch, actually a followup for the above, not related to autohide.
kdebase-workspace-4.1.2-panel-autohide.patch:
Index: kdebase-workspace-4.1.2-panel-autohide.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace-4.1.2-panel-autohide.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.1.2-panel-autohide.patch 9 Oct 2008 17:49:37 -0000 1.1
+++ kdebase-workspace-4.1.2-panel-autohide.patch 9 Oct 2008 21:48:47 -0000 1.2
@@ -913,75 +913,6 @@
}
#include "panelcontroller.moc"
-Index: plasma/plasma/panelappletoverlay.cpp
-===================================================================
---- plasma/plasma/panelappletoverlay.cpp (revision 864492)
-+++ plasma/plasma/panelappletoverlay.cpp (revision 864493)
-@@ -19,6 +19,7 @@
-
- #include "panelappletoverlay.h"
-
-+#include <QApplication>
- #include <QGraphicsLinearLayout>
- #include <QPainter>
- #include <QTimer>
-@@ -30,6 +31,7 @@
- #include <plasma/containment.h>
- #include <plasma/paintutils.h>
- #include <plasma/theme.h>
-+#include <plasma/view.h>
-
- class AppletMoveSpacer : public QGraphicsWidget
- {
-@@ -141,6 +143,17 @@
- return;
- }
-
-+ if (event->button() != Qt::LeftButton) {
-+ kDebug() << "sending even to" << (QWidget*)parent();
-+ Plasma::View *view = dynamic_cast<Plasma::View*>(parent());
-+
-+ if (view && view->containment()) {
-+ view->containment()->showContextMenu(mapToParent(event->pos()), event->globalPos());
-+ }
-+
-+ return;
-+ }
-+
- m_clickDrag = false;
- if (!m_spacer) {
- m_spacer = new AppletMoveSpacer(m_applet);
-@@ -167,6 +180,10 @@
- {
- Q_UNUSED(event)
-
-+ if (!m_spacer) {
-+ return;
-+ }
-+
- QPoint p = mapToParent(event->pos());
- QRect g = geometry();
-
-@@ -199,6 +216,11 @@
- {
- Q_UNUSED(event)
-
-+ releaseMouse();
-+ if (!m_spacer) {
-+ return;
-+ }
-+
- if (!m_origin.isNull()) {
- //kDebug() << m_clickDrag << m_origin << mapToParent(event->pos());
- if (m_orientation == Qt::Horizontal) {
-@@ -221,7 +243,6 @@
- m_spacer = 0;
- m_layout->insertItem(m_index, m_applet);
- m_applet->setZValue(m_applet->zValue() - 1);
-- releaseMouse();
- }
-
- void PanelAppletOverlay::enterEvent(QEvent *event)
Index: plasma/plasma/panelcontroller.h
===================================================================
--- plasma/plasma/panelcontroller.h (revision 864492)
More information about the fedora-extras-commits
mailing list