diff options
| -rw-r--r-- | share/qtcreator/welcomescreen/develop.qml | 8 | ||||
| -rw-r--r-- | share/qtcreator/welcomescreen/widgets/RecentProjects.qml | 3 | ||||
| -rw-r--r-- | share/qtcreator/welcomescreen/widgets/Sessions.qml | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml index c106084ca76..0dac47a8833 100644 --- a/share/qtcreator/welcomescreen/develop.qml +++ b/share/qtcreator/welcomescreen/develop.qml @@ -66,12 +66,13 @@ Rectangle { Rectangle { width: 1 - height: line.height + 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 { @@ -96,11 +97,12 @@ Rectangle { Rectangle { id: line width: 1 - height: Math.min(recentProjects.contentHeight + 120, recentProjects.height) + height: sessionLine.height color: "#c4c4c4" anchors.left: recentProjects.right anchors.leftMargin: -1 anchors.top: recentProjects.top + visible: !recentProjects.scrollBarVisible } Text { diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml index e3b6c853389..74c01bb2c0f 100644 --- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml +++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml @@ -34,7 +34,8 @@ import QtQuick 1.0 import qtcomponents 1.0 ScrollArea { - //id: projectList + property bool scrollBarVisible: projectList.verticalScrollBar.visible + id: projectList property alias model: repeater.model Behavior on verticalScrollBar.opacity { diff --git a/share/qtcreator/welcomescreen/widgets/Sessions.qml b/share/qtcreator/welcomescreen/widgets/Sessions.qml index db970a2a144..ac8970c7666 100644 --- a/share/qtcreator/welcomescreen/widgets/Sessions.qml +++ b/share/qtcreator/welcomescreen/widgets/Sessions.qml @@ -38,6 +38,8 @@ Item { property int topMargin: 6 height: Math.min(root.contentHeight + topMargin, parent.height - 260) + property alias scrollBarVisible: vscrollbar.visible + ListView { id: root |