added margin for scrollbars for almost all flickable elements
This commit is contained in:
parent
804a790392
commit
fd905ef308
15 changed files with 27 additions and 21 deletions
|
@ -4,7 +4,7 @@ import Qt.labs.platform 1.0
|
||||||
|
|
||||||
import "../Config"
|
import "../Config"
|
||||||
|
|
||||||
Flickable
|
FlickableType
|
||||||
{
|
{
|
||||||
property alias textArea: root
|
property alias textArea: root
|
||||||
id: flickable
|
id: flickable
|
||||||
|
|
|
@ -174,10 +174,6 @@ PageBase {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
FlickableType {
|
FlickableType {
|
||||||
visible: container_selector.selectedIndex <= 0
|
visible: container_selector.selectedIndex <= 0
|
||||||
clip: true
|
clip: true
|
||||||
|
|
|
@ -29,7 +29,7 @@ PageBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -40,6 +40,7 @@ PageBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
RadioButtonType {
|
RadioButtonType {
|
||||||
id: radioButton_setup_wizard_high
|
id: radioButton_setup_wizard_high
|
||||||
|
|
|
@ -29,7 +29,7 @@ PageBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -40,6 +40,7 @@ PageBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
@ -29,7 +29,7 @@ PageBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -40,6 +40,7 @@ PageBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
@ -29,7 +29,7 @@ PageBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -40,6 +40,7 @@ PageBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
@ -29,7 +29,7 @@ PageBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -40,6 +40,7 @@ PageBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
|
@ -30,7 +30,7 @@ PageBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -41,6 +41,7 @@ PageBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
TextAreaType {
|
TextAreaType {
|
||||||
id: ta_config
|
id: ta_config
|
||||||
|
|
|
@ -29,7 +29,7 @@ PageProtocolBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -40,7 +40,7 @@ PageProtocolBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
id: lb_subnet
|
id: lb_subnet
|
||||||
|
|
|
@ -28,7 +28,7 @@ PageShareProtocolBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height + 20
|
contentHeight: content.height + 20
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -46,6 +46,7 @@ PageShareProtocolBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
id: lb_desc
|
id: lb_desc
|
||||||
|
|
|
@ -28,7 +28,7 @@ PageShareProtocolBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -39,7 +39,7 @@ PageShareProtocolBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
id: lb_desc
|
id: lb_desc
|
||||||
|
|
|
@ -52,7 +52,7 @@ PageShareProtocolBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -63,6 +63,7 @@ PageShareProtocolBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
// LabelType {
|
// LabelType {
|
||||||
// id: lb_desc
|
// id: lb_desc
|
||||||
|
|
|
@ -28,7 +28,7 @@ PageShareProtocolBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -39,7 +39,7 @@ PageShareProtocolBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
id: lb_desc
|
id: lb_desc
|
||||||
|
|
|
@ -28,7 +28,7 @@ PageShareProtocolBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -39,6 +39,7 @@ PageShareProtocolBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
id: lb_desc
|
id: lb_desc
|
||||||
|
|
|
@ -28,7 +28,7 @@ PageShareProtocolBase {
|
||||||
anchors.left: root.left
|
anchors.left: root.left
|
||||||
anchors.leftMargin: 30
|
anchors.leftMargin: 30
|
||||||
anchors.right: root.right
|
anchors.right: root.right
|
||||||
anchors.rightMargin: 30
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
contentHeight: content.height
|
contentHeight: content.height
|
||||||
clip: true
|
clip: true
|
||||||
|
@ -39,6 +39,7 @@ PageShareProtocolBase {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 15
|
||||||
|
|
||||||
LabelType {
|
LabelType {
|
||||||
id: lb_desc
|
id: lb_desc
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue