diff options
author | Nikita Krupenko <krnekit@gmail.com> | 2016-04-17 22:43:54 +0300 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-20 15:10:04 +0000 |
commit | ac152bfcd37f94453e9705b57ca6520ad30bade0 (patch) | |
tree | aded19991ee7e8bcc1311fa08015ef16780edc37 /tests | |
parent | 1cb0faf7886d9df99adfb61560e369387691f89c (diff) |
Material: update palette on primary/accent color change
Task-number: QTBUG-52631
Change-Id: Ib1649f44cdbc14770b1759ef7f4d7ea92f148cc1
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/material/data/tst_material.qml | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/tests/auto/material/data/tst_material.qml b/tests/auto/material/data/tst_material.qml index c686fef8..6e9d742e 100644 --- a/tests/auto/material/data/tst_material.qml +++ b/tests/auto/material/data/tst_material.qml @@ -111,6 +111,26 @@ TestCase { } Component { + id: popupComponent + ApplicationWindow { + Material.primary: Material.Blue + Material.accent: Material.Red + visible: true + property alias popup: popupInstance + property alias label: labelInstance + Popup { + id: popupInstance + Label { + id: labelInstance + text: "test" + color: popupInstance.Material.textSelectionColor + } + Component.onCompleted: open() + } + } + } + + Component { id: comboBox ApplicationWindow { width: 200 @@ -227,6 +247,33 @@ TestCase { parent.destroy() } + function test_inheritance_popup_data() { + return [ + { tag: "primary", value1: Material.color(Material.Amber), value2: Material.color(Material.Indigo) }, + { tag: "accent", value1: Material.color(Material.Amber), value2: Material.color(Material.Indigo) }, + { tag: "theme", value1: Material.Dark, value2: Material.Light }, + ] + } + + function test_inheritance_popup(data) { + var prop = data.tag + var popupObject = popupComponent.createObject(testCase) + compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString()) + compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString()) + + popupObject.Material[prop] = data.value1 + compare(popupObject.Material[prop], data.value1) + compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString()) + compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString()) + + popupObject.Material[prop] = data.value2 + compare(popupObject.Material[prop], data.value2) + compare(popupObject.popup.Material.textSelectionColor.toString(), popupObject.Material.textSelectionColor.toString()) + compare(popupObject.label.color.toString(), popupObject.Material.textSelectionColor.toString()) + + popupObject.destroy() + } + function test_window() { var parent = window.createObject() |