summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-06-03 15:53:50 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-03 22:25:51 +0200
commit4e5bf941f1b3089c22392bb5416d44cb8defe47d (patch)
treee459ec6d62245341e531be599121d0a0e1b8ae76
parent207366038543adf5ee6384ff2577410f48df7a13 (diff)
downloadqtquickcontrols-4e5bf941f1b3089c22392bb5416d44cb8defe47d.tar.gz
qtquickcontrols-4e5bf941f1b3089c22392bb5416d44cb8defe47d.tar.bz2
qtquickcontrols-4e5bf941f1b3089c22392bb5416d44cb8defe47d.zip
Improve default size for several controls
We should set this to some decent default value that doesn't look wrong. Note that the width and height definition in TextArea could cause conflicts when used in layouts. Change-Id: I815ff96c02f9a9a76c07d57181f3a24291c83c52 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/controls/ScrollView.qml5
-rw-r--r--src/controls/TabView.qml3
-rw-r--r--src/controls/TableView.qml4
-rw-r--r--src/controls/TextArea.qml3
4 files changed, 7 insertions, 8 deletions
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 0af69a0d..aa980ddd 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -86,8 +86,9 @@ import QtQuick.Controls.Styles 1.0
FocusScope {
id: root
- implicitWidth: 200
- implicitHeight: 100
+
+ implicitWidth: 240
+ implicitHeight: 150
/*!
This property tells the ScrollView if it should render
diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index e0d3ca3b..6319d72c 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -55,7 +55,8 @@ import QtQuick.Controls.Private 1.0
FocusScope {
id: root
- implicitWidth: 150
+
+ implicitWidth: 240
implicitHeight: 150
/*! The current tab index */
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index f6a8ed4b..a71264da 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -359,8 +359,8 @@ ScrollView {
Accessible.role: Accessible.Table
- width: 200
- height: 200
+ implicitWidth: 200
+ implicitHeight: 150
frameVisible: true
__scrollBarTopMargin: Qt.platform.os === "mac" ? headerrow.height : 0
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index 43cc347c..cbef6e31 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -611,9 +611,6 @@ ScrollView {
/*! \internal */
property int __documentMargin: 4
- width: 280
- height: 120
-
frameVisible: true
activeFocusOnTab: true