SVN commit 883080 by aseigo: don't move the tools more than they need to move; makes it possible to hit the buttons agian! i see several issues with this method, however, that already existed and will fix that along with implementing save/hide and available space respect later tonight. M +3 -3 desktoptoolbox.cpp M +6 -6 toolbox.cpp --- trunk/KDE/kdelibs/plasma/private/desktoptoolbox.cpp #883079:883080 @@ -289,7 +289,7 @@ int y; switch (corner()) { case TopRight: - x = (int)boundingRect().left() - maxwidth - iconWidth - 5; + x = (int)boundingRect().right() - maxwidth - iconWidth - 5; y = (int)boundingRect().top() + 5; break; case Top: @@ -305,7 +305,7 @@ y = (int)boundingRect().center().y() - iconWidth; break; case Right: - x = (int)boundingRect().left() - maxwidth - iconWidth - 5; + x = (int)boundingRect().right() - maxwidth - iconWidth - 5; y = (int)boundingRect().center().y() - iconWidth; break; case BottomLeft: @@ -318,7 +318,7 @@ break; case BottomRight: default: - x = (int)boundingRect().left() - maxwidth - iconWidth - 5; + x = (int)boundingRect().right() - maxwidth - iconWidth - 5; y = (int)boundingRect().bottom() - iconWidth - 5; break; } --- trunk/KDE/kdelibs/plasma/private/toolbox.cpp #883079:883080 @@ -73,22 +73,22 @@ { switch (d->corner) { case TopRight: - return QPoint(d->size * 2, -toolHeight); + return QPoint(d->size, -toolHeight); case Top: return QPoint((int)boundingRect().center().x() - d->iconSize.width(), -toolHeight); case TopLeft: - return QPoint(-d->size * 2, -toolHeight); + return QPoint(-d->size, -toolHeight); case Left: - return QPoint(-d->size * 2, (int)boundingRect().center().y() - d->iconSize.height()); + return QPoint(-d->size, (int)boundingRect().center().y() - d->iconSize.height()); case Right: - return QPoint(d->size * 2, (int)boundingRect().center().y() - d->iconSize.height()); + return QPoint(d->size, (int)boundingRect().center().y() - d->iconSize.height()); case BottomLeft: - return QPoint(-d->size * 2, toolHeight); + return QPoint(-d->size, toolHeight); case Bottom: return QPoint((int)boundingRect().center().x() - d->iconSize.width(), toolHeight); case BottomRight: default: - return QPoint(d->size * 2, toolHeight); + return QPoint(d->size, toolHeight); } }