From 5b92d43814eb01fd9fc0469e4a56269179f87b2a Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Mon, 25 Nov 2013 12:20:37 +0100
Subject: 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>
---
 share/qtcreator/welcomescreen/develop.qml | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'share/qtcreator/welcomescreen/develop.qml')

diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index 731bcdc494..d57432cfc8 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -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
 
-- 
cgit v1.2.1