diff --git a/dialog.cpp b/dialog.cpp index 1693057cb..4d6a12f9e 100644 --- a/dialog.cpp +++ b/dialog.cpp @@ -349,6 +349,8 @@ void Dialog::setGraphicsWidget(QGraphicsWidget *widget) if (!d->view) { d->view = new QGraphicsView(this); + d->view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + d->view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); d->view->setFrameShape(QFrame::NoFrame); d->view->viewport()->setAutoFillBackground(false); layout()->addWidget(d->view); diff --git a/popupapplet.cpp b/popupapplet.cpp index 89c0188d9..55e908bb9 100644 --- a/popupapplet.cpp +++ b/popupapplet.cpp @@ -207,6 +207,14 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints) prefSize = qWidget->sizeHint(); } + //we could be on a big panel, but in that case we will be able to resize + //more than the natural minimum size, because we'll transform into an icon + if (f == Plasma::Horizontal) { + minimum.setHeight(0); + } else if (f == Plasma::Vertical) { + minimum.setWidth(0); + } + qreal left, top, right, bottom; q->getContentsMargins(&left, &top, &right, &bottom); QSizeF oldSize(q->size());