summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@theqtcompany.com>2014-11-11 17:30:31 +0100
committerDaniel Teske <daniel.teske@theqtcompany.com>2014-11-12 12:07:33 +0100
commit684a037a8ef362118970d718fb00a64fc4b5920f (patch)
treeea13e853640165491a605aee860a462f1b23be39 /share
parenta8918db5f724adc7867502ffa69706a85b44e373 (diff)
downloadqt-creator-684a037a8ef362118970d718fb00a64fc4b5920f.tar.gz
Welcome Screen: Fix scrollbar
The size of the project list should only depend on the size of the items, not on the size of the parent. Task-number: QTCREATORBUG-13387 Change-Id: Iad8a32999a277532c2b64a7a889ddaafa40f693b Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/welcomescreen/develop.qml4
-rw-r--r--share/qtcreator/welcomescreen/widgets/RecentProjects.qml1
2 files changed, 2 insertions, 3 deletions
diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index a8c6239f39..5f8a132077 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -40,7 +40,7 @@ Controls.ScrollView {
Item {
id: canvas
- implicitWidth: childrenRect.width + 200
+ implicitWidth: childrenRect.width
implicitHeight: childrenRect.height
Button {
@@ -97,8 +97,6 @@ Controls.ScrollView {
anchors.top: recentProjectsTitle.bottom
anchors.topMargin: 20
- anchors.right: parent.right
- anchors.rightMargin: 60
model: projectList
}
diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
index 442f2f9db0..1b6d40d94a 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
@@ -34,6 +34,7 @@ import QtQuick.Controls 1.0
Rectangle {
id: projectList
height: column.height + 200
+ width: column.width
color: creatorTheme.Welcome_BackgroundColorNormal
property alias model: repeater.model