git.iko.soy/unity8
on xenial help sign in
search bar animation less obvious
commitffca0a3fa78e432153af6da12770737f2fc4cc63 authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 17 Jul 2013, 16:07 (13 years ago) parent3673b8a
3 files changed+11−16
compare with xenial
unifiedsplit
Panel/Panel.qml+2−2 Panel/SearchIndicator.qml+1−4 tests/qmltests/Panel/tst_SearchIndicator.qml+8−10
Panel/Panel.qml+2−2
@@ -117,14 +117,14 @@ Item {
117117 state: {
118118 if (parent.width < indicatorsMenu.width + width) {
119119 if (indicatorsMenu.state != "initial") {
120− return "hiddenUp";
120+ return "hidden";
121121 }
122122 }
123123 if (root.searchVisible) {
124124 return "visible";
125125 }
126126
127− return "hiddenUp";
127+ return "hidden";
128128 }
129129
130130 width: units.gu(13)
Panel/SearchIndicator.qml+1−4
@@ -42,7 +42,6 @@ Item {
4242 height: parent.height
4343
4444 Behavior on opacity { StandardAnimation {} }
45− Behavior on y {NumberAnimation {duration: 300; easing.type: Easing.OutCubic}}
4645
4746 Image {
4847 id: icon
@@ -68,15 +67,13 @@ Item {
6867 name: "visible"
6968 PropertyChanges {
7069 target: container
71− y: 0
7270 opacity: 1
7371 }
7472 },
7573 State {
76− name: "hiddenUp"
74+ name: "hidden"
7775 PropertyChanges {
7876 target: container
79− y: -height
8077 opacity: 0
8178 }
8279 }
tests/qmltests/Panel/tst_SearchIndicator.qml+8−10
@@ -41,24 +41,22 @@ Item {
4141 when: windowShown
4242
4343 function test_clickedSignal() {
44− clickedSpy.clear()
44+ clickedSpy.clear();
4545 mouseClick(searchIndicator,
4646 searchIndicator.width / 2, searchIndicator.height / 2);
47− compare(clickedSpy.count, 1)
47+ compare(clickedSpy.count, 1);
4848 }
4949
5050 function test_hideUp() {
51− var container = findChild(searchIndicator, "container")
52− searchIndicator.state = "hiddenUp"
53− tryCompare(container, "opacity", 0)
54− tryCompare(container, "y", -container.height)
51+ var container = findChild(searchIndicator, "container");
52+ searchIndicator.state = "hidden";
53+ tryCompare(container, "opacity", 0);
5554 }
5655
5756 function test_show() {
58− var container = findChild(searchIndicator, "container")
59− searchIndicator.state = "visible"
60− tryCompare(container, "opacity", 1)
61− tryCompare(container, "y", 0)
57+ var container = findChild(searchIndicator, "container");
58+ searchIndicator.state = "visible";
59+ tryCompare(container, "opacity", 1);
6260 }
6361 }
6462}