diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2013-11-25 12:20:37 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@digia.com> | 2013-11-25 12:51:56 +0100 |
| commit | 5b92d43814eb01fd9fc0469e4a56269179f87b2a (patch) | |
| tree | c8057fec16795f527a26b0e3b94ab60011d504aa /share/qtcreator/welcomescreen/widgets | |
| parent | 73bbb59a8d71a0d162cef738950d89ad80dc758e (diff) | |
| download | qt-creator-5b92d43814eb01fd9fc0469e4a56269179f87b2a.tar.gz | |
WelcomeScreen: Pass height of develop mode to outer element
Previously the recent projects had an extra scrollview and the sessions
had a fixed height. In addition, as there will never be any scrollbars
around the recent projects anymore we don't need the borders around them
anymore, either.
Task-number: QTCREATORBUG-10731
Change-Id: I491265148a3ce777f15b8ba7d852248b583f2c83
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Diffstat (limited to 'share/qtcreator/welcomescreen/widgets')
| -rw-r--r-- | share/qtcreator/welcomescreen/widgets/RecentProjects.qml | 4 | ||||
| -rw-r--r-- | share/qtcreator/welcomescreen/widgets/Sessions.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml index f2d72d0af3..a1d73baffb 100644 --- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml +++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml @@ -30,10 +30,10 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 -ScrollView { +Rectangle { id: projectList + height: column.height + 200 - property bool scrollBarVisible: false//projectList.verticalScrollBar.visible property alias model: repeater.model // Behavior on verticalScrollBar.opacity { // PropertyAnimation { diff --git a/share/qtcreator/welcomescreen/widgets/Sessions.qml b/share/qtcreator/welcomescreen/widgets/Sessions.qml index d83243efd9..54e5362743 100644 --- a/share/qtcreator/welcomescreen/widgets/Sessions.qml +++ b/share/qtcreator/welcomescreen/widgets/Sessions.qml @@ -34,7 +34,7 @@ Item { id: root property var model property int topMargin: 6 - height: Math.min(content.contentHeight + topMargin, parent.height - 260) + height: content.contentHeight + 200 ListView { id: content |