summaryrefslogtreecommitdiff
path: root/share/qtcreator
diff options
context:
space:
mode:
Diffstat (limited to 'share/qtcreator')
-rw-r--r--share/qtcreator/welcomescreen/develop.qml27
-rw-r--r--share/qtcreator/welcomescreen/widgets/RecentProjects.qml4
-rw-r--r--share/qtcreator/welcomescreen/widgets/Sessions.qml2
3 files changed, 4 insertions, 29 deletions
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
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