From 3e135d9603332d4d5956b5da74fc8d4b49153f4e Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 21 Dec 2018 17:04:34 +0100 Subject: [PATCH] QmlDesigner: Prevent timeline from claiming too much space Cherry-picked from 6ba08f2336ff3d1d802e47defe85cd8dfbca468b Task-number: QDS-287 Change-Id: I9da352bc6195e86aa3e6db01b5d96cfe5c994b1e Reviewed-by: Thomas Hartmann --- .../qmldesignerextension/timelineeditor/timelinewidget.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp index c3436ea695c..b694a66b2b8 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp @@ -123,7 +123,7 @@ TimelineWidget::TimelineWidget(TimelineView *view) m_scrollbar->setStyleSheet(css); m_scrollbar->setOrientation(Qt::Horizontal); - QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding); + QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Preferred); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); sizePolicy1.setHeightForWidth(m_graphicsView->sizePolicy().hasHeightForWidth()); @@ -163,6 +163,7 @@ TimelineWidget::TimelineWidget(TimelineView *view) contentLayout->addLayout(scrollBarLayout); contentLayout->addWidget(m_statusBar); m_statusBar->setIndent(2); + m_statusBar->setFixedHeight(TimelineConstants::rulerHeight); auto *widgetLayout = new QVBoxLayout; widgetLayout->setContentsMargins(0, 0, 0, 0);