Fix systray icon positioning on initial layouts and take svg margins

into account. When the size is too small to allow the svg and a single
icon, disable the svg.

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=818155
This commit is contained in:
Jason Stubbs 2008-06-07 22:51:51 +00:00
parent 210f9032ff
commit 21367769e7

View File

@ -388,12 +388,14 @@ QGraphicsView *Applet::view() const
QRectF Applet::mapFromView(const QGraphicsView *view, const QRect &rect) const QRectF Applet::mapFromView(const QGraphicsView *view, const QRect &rect) const
{ {
return mapFromScene(view->mapToScene(rect)).boundingRect(); // Why is this adjustment needed? Qt calculation error?
return mapFromScene(view->mapToScene(rect)).boundingRect().adjusted(0, 0, 1, 1);;
} }
QRect Applet::mapToView(const QGraphicsView *view, const QRectF &rect) const QRect Applet::mapToView(const QGraphicsView *view, const QRectF &rect) const
{ {
return view->mapFromScene(mapToScene(rect)).boundingRect(); // Why is this adjustment needed? Qt calculation error?
return view->mapFromScene(mapToScene(rect)).boundingRect().adjusted(0, 0, -1, -1);;
} }
QPoint Applet::popupPosition(const QSize &s) const QPoint Applet::popupPosition(const QSize &s) const