From 4e5bf941f1b3089c22392bb5416d44cb8defe47d Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Mon, 3 Jun 2013 15:53:50 +0200
Subject: [PATCH] Improve default size for several controls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
src/controls/ScrollView.qml | 5 +++--
src/controls/TabView.qml | 3 ++-
src/controls/TableView.qml | 4 ++--
src/controls/TextArea.qml | 3 ---
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 0af69a0de..aa980ddd0 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 e0d3ca3bb..6319d72cd 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 f6a8ed4bf..a71264da0 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 43cc347ce..cbef6e310 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
--
GitLab