1 files changed, 7 insertions, 15 deletions
diff --git a/tools/designer/src/lib/shared/zoomwidget.cpp b/tools/designer/src/lib/shared/zoomwidget.cpp
index f4ab48e6e3..a404dcbfa2 100644
--- a/tools/designer/src/lib/shared/zoomwidget.cpp
+++ b/tools/designer/src/lib/shared/zoomwidget.cpp
@@ -143,9 +143,10 @@ ZoomView::ZoomView(QWidget *parent) :
     m_zoom(100),
     m_zoomFactor(1.0),
     m_zoomContextMenuEnabled(false),
-    m_autoScrollSuppressed(true),
     m_zoomMenu(0)
 {
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setFrameShape(QFrame::NoFrame);
     setScene(m_scene);
     if (debugZoomWidget)
@@ -187,8 +188,6 @@ void ZoomView::setZoom(int percent)
 
     resetTransform();
     scale(m_zoomFactor, m_zoomFactor);
-    if (m_autoScrollSuppressed)
-        scrollToOrigin();
 }
 
 void ZoomView::applyZoom()
@@ -210,16 +209,6 @@ void ZoomView::setZoomContextMenuEnabled(bool e)
     m_zoomContextMenuEnabled = e;
 }
 
-bool ZoomView::isAutoScrollSuppressed() const
-{
-    return m_autoScrollSuppressed;
-}
-
-void ZoomView::setAutoScrollSuppressed(bool s)
-{
-    m_autoScrollSuppressed = s;
-}
-
 ZoomMenu *ZoomView::zoomMenu()
 {
     if (!m_zoomMenu) {
@@ -469,13 +458,16 @@ void ZoomWidget::resizeEvent(QResizeEvent *event)
      * and the use the size ZoomView::resizeEvent(event); */
     if (m_proxy && !m_viewResizeBlocked) {
         if (debugZoomWidget > 1)
-            qDebug() << ">ZoomWidget (" << size() << ")::resizeEvent from " << event->oldSize() << " to " << event->size();
+            qDebug() << '>' << Q_FUNC_INFO << size() << ")::resizeEvent from " << event->oldSize() << " to " << event->size();
         const QSizeF newViewPortSize = size() - viewPortMargin();
         const QSizeF widgetSizeF = newViewPortSize / zoomFactor() - widgetDecorationSizeF();
         m_widgetResizeBlocked = true;
         m_proxy->widget()->resize(widgetSizeF.toSize());
+        setSceneRect(QRectF(QPointF(0, 0), widgetSizeF));
         scrollToOrigin();
         m_widgetResizeBlocked = false;
+        if (debugZoomWidget > 1)
+            qDebug() << '<' << Q_FUNC_INFO << widgetSizeF << m_proxy->widget()->size() << m_proxy->size();
     }
 }
 
@@ -559,7 +551,7 @@ QGraphicsProxyWidget *ZoomWidget::createProxyWidget(QGraphicsItem *parent, Qt::W
 void ZoomWidget::dump() const
 {
 
-    qDebug() << "ZoomWidget " << geometry() << " Viewport " << viewport()->geometry()
+    qDebug() << "ZoomWidget::dump " << geometry() << " Viewport " << viewport()->geometry()
         << "Scroll: " << scrollPosition() << "Matrix: " << matrix() << " SceneRect: " << sceneRect();
     if (m_proxy) {
         qDebug() << "Proxy Pos: " << m_proxy->pos() << "Proxy " << m_proxy->size()