[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: KDE/kdebase/workspace/plasma/desktop/containments/desktop
From: Ambroz Bizjak <ambrop7 () gmail ! com>
Date: 2010-06-14 14:05:08
Message-ID: 20100614140508.146EAAC8D4 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1137860 by abizjak:
Don't try to use animations to move applets, it doesn't work anymore for some reason. \
Remove previously added hack. BUG:241276
CCMAIL:plasma-devel@kde.org
M +0 -7 desktop.cpp
M +0 -1 desktop.h
M +5 -0 desktoplayout.cpp
--- trunk/KDE/kdebase/workspace/plasma/desktop/containments/desktop/desktop.cpp \
#1137859:1137860 @@ -102,22 +102,15 @@
}
}
-void DefaultDesktop::delayedPositionsAdjust()
-{
- m_layout->adjustPhysicalPositions();
-}
-
void DefaultDesktop::onAppletTransformedByUser()
{
m_layout->itemTransformed((Applet *)sender(), DesktopLayout::ItemTransformUser);
- QTimer::singleShot(1000, this, SLOT(delayedPositionsAdjust()));
m_layout->adjustPhysicalPositions();
}
void DefaultDesktop::onAppletTransformedItself()
{
m_layout->itemTransformed((Applet *)sender(), DesktopLayout::ItemTransformSelf);
- QTimer::singleShot(1000, this, SLOT(delayedPositionsAdjust()));
m_layout->adjustPhysicalPositions();
}
--- trunk/KDE/kdebase/workspace/plasma/desktop/containments/desktop/desktop.h \
#1137859:1137860 @@ -69,7 +69,6 @@
void onAppletTransformedByUser();
void onAppletTransformedItself();
void refreshWorkingArea();
- void delayedPositionsAdjust();
private:
DesktopLayout *m_layout;
--- trunk/KDE/kdebase/workspace/plasma/desktop/containments/desktop/desktoplayout.cpp \
#1137859:1137860 @@ -309,6 +309,8 @@
QRectF absoluteGeom = geometryRelativeToAbsolute(spaceItem.user.toInt(), \
effectiveGeom);
if (desktopItem.item->geometry() != absoluteGeom) {
+#if 0
+// FIXME
if (spaceItem.animateMovement) {
if (m_animatingItems.contains(desktopItem.item)) {
Plasma::Animation *anim = \
m_animatingItems.value(desktopItem.item).data(); @@ -329,8 +331,11 @@
spaceItem.animateMovement = false;
} else {
+#endif
desktopItem.item->setGeometry(absoluteGeom);
+#if 0
}
+#endif
}
}
}
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic