aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-11 13:01:14 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-04-11 11:20:05 +0000
commit7124ac6371ad192f27fa172a98f7096884f9f600 (patch)
tree000f3c7a20118840f37f25ec1ec8a21bce335e94
parent3408d28e3c058c620f4dfb167a1e25c3618fc90f (diff)
Buttons: remove superfluous alignment for the internal labels
In QQuickIconLabel::layout(), the label is resized to: min(availableSize, implicitSize) In other words, the label is never larger than its content. Specifying an alignment has therefore zero effect. This saves a few unnecessary QML expression evaluations and gives a few frames' boost in qmlbench. Change-Id: Ifa942d99a026fd2dca6e680bde2b538f9e526604 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
-rw-r--r--src/imports/controls/Button.qml2
-rw-r--r--src/imports/controls/ToolButton.qml2
-rw-r--r--src/imports/controls/material/Button.qml2
-rw-r--r--src/imports/controls/material/ToolButton.qml2
-rw-r--r--src/imports/controls/universal/Button.qml2
-rw-r--r--src/imports/controls/universal/ToolButton.qml2
6 files changed, 0 insertions, 12 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 7e2eecd0..8a98bbad 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -76,8 +76,6 @@ T.Button {
color: control.checked || control.highlighted ?
Default.textLightColor :
(control.visualFocus ? Default.focusColor : (control.down ? Default.textDarkColor : Default.textColor))
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
}
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 13825fb0..e31f45a0 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -72,8 +72,6 @@ T.ToolButton {
font: control.font
color: control.enabled ? (control.visualFocus ? Default.focusColor : Default.textDarkColor) : Default.textDisabledLightColor
elide: Text.ElideRight
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
}
}
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index ebe5ff09..0142dacf 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -82,8 +82,6 @@ T.Button {
color: !control.enabled ? control.Material.hintTextColor :
control.flat && control.highlighted ? control.Material.accentColor :
control.highlighted ? control.Material.primaryHighlightedTextColor : control.Material.foreground
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
}
}
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index 78e9d651..4f0fdc9b 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/ToolButton.qml
@@ -75,8 +75,6 @@ T.ToolButton {
color: !control.enabled ? control.Material.hintTextColor :
control.checked || control.highlighted ? control.Material.accent : control.Material.foreground
elide: Text.ElideRight
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
}
}
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index f8fa21b7..d2f4f10d 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -76,8 +76,6 @@ T.Button {
text: control.text
font: control.font
elide: Text.ElideRight
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
opacity: enabled ? 1.0 : 0.2
color: control.Universal.foreground
}
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml
index 613feb9f..5a2e98fd 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/imports/controls/universal/ToolButton.qml
@@ -74,8 +74,6 @@ T.ToolButton {
text: control.text
font: control.font
elide: Text.ElideRight
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
opacity: enabled ? 1.0 : 0.2
color: control.Universal.foreground
}