Commit 5b92d438 authored by Ulf Hermann's avatar Ulf Hermann

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's avatarOrgad Shaneh <orgads@gmail.com>
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@digia.com>
parent 73bbb59a
......@@ -33,7 +33,7 @@ import widgets 1.0
Rectangle {
id: rectangle1
width: parent.width
height: 600
height: Math.max(sessions.height, recentProjects.height)
Item {
id: canvas
......@@ -45,21 +45,9 @@ Rectangle {
anchors.fill: parent
anchors.topMargin: 0
Rectangle {
width: 1
height: Math.max(Math.min(recentProjects.contentHeight + 120, recentProjects.height), sessions.height)
color: "#c4c4c4"
anchors.left: sessions.right
anchors.leftMargin: -1
anchors.top: sessions.top
visible: !sessions.scrollBarVisible
id: sessionLine
}
RecentProjects {
x: 428
height: 432
id: recentProjects
anchors.leftMargin: 12
......@@ -67,25 +55,12 @@ Rectangle {
anchors.top: recentProjectsTitle.bottom
anchors.topMargin: 20
anchors.bottom: parent.bottom
anchors.bottomMargin: 40
anchors.right: parent.right
anchors.rightMargin: 60
model: projectList
}
Rectangle {
id: line
width: 1
height: sessionLine.height
color: "#c4c4c4"
anchors.left: recentProjects.right
anchors.leftMargin: -1
anchors.top: recentProjects.top
visible: !recentProjects.scrollBarVisible
}
NativeText {
id: sessionsTitle
......
......@@ -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 {
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment