git.iko.soy/unity8
on xenial help sign in
review comments
commit4451c08849aacad354969112e36613bef44c46bf authorNick Dedekind <nicholas.dedekind@gmail.com> dateMon 7 Jul 2014, 17:33 (12 years ago) parentc02501d
5 files changed+17−8
compare with xenial
unifiedsplit
qml/Panel/ActiveCallHint.qml+1−1 qml/Panel/Panel.qml+11−4 tests/qmltests/CMakeLists.txt+2−2 tests/qmltests/Panel/tst_ActiveCallHint.qml+1−1 tests/qmltests/Panel/tst_Panel.qml+2
qml/Panel/ActiveCallHint.qml+1−1
@@ -50,7 +50,7 @@ Item {
5050 telepathyHelper.registerChannelObserver("unity8");
5151 }
5252
53− function activate() {
53+ function showLiveCall() {
5454 Qt.openUrlExternally("dialer:///?view=liveCall");
5555 }
5656
qml/Panel/Panel.qml+11−4
@@ -136,7 +136,7 @@ Item {
136136 }
137137 height: indicators.panelHeight
138138 enabled: callHint.visible
139− onClicked: callHint.activate()
139+ onClicked: callHint.showLiveCall()
140140 }
141141
142142 Indicators {
@@ -164,7 +164,7 @@ Item {
164164
165165 onShowTapped: {
166166 if (callHint.active) {
167− callHint.activate();
167+ callHint.showLiveCall();
168168 }
169169 }
170170 }
@@ -172,7 +172,7 @@ Item {
172172 SearchIndicator {
173173 id: search
174174 objectName: "search"
175− enabled: root.searchVisible && state == "visible"
175+ enabled: state == "visible"
176176
177177 state: {
178178 if (callHint.visible) {
@@ -227,11 +227,18 @@ Item {
227227 State {
228228 name: "onscreen" //fully opaque and visible at top edge of screen
229229 when: !fullscreenMode
230+ PropertyChanges {
231+ target: indicatorArea;
232+ anchors.topMargin: 0
233+ }
230234 },
231235 State {
232236 name: "offscreen" //pushed off screen
233237 when: fullscreenMode
234− PropertyChanges { target: indicatorArea; anchors.topMargin: indicators.state === "initial" ? -d.indicatorHeight : 0 }
238+ PropertyChanges {
239+ target: indicatorArea;
240+ anchors.topMargin: indicators.state === "initial" ? -d.indicatorHeight : 0
241+ }
235242 }
236243 ]
237244}
tests/qmltests/CMakeLists.txt+2−2
@@ -19,8 +19,8 @@ set(qmltest_DEFAULT_TARGETS qmluitests)
1919set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
2020set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
2121
22−#add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
23−# ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
22+add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
23+ ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
2424add_qml_test(Components Carousel)
2525add_qml_test(Components DraggingArea)
2626add_qml_test(Components EdgeDemoOverlay)
tests/qmltests/Panel/tst_ActiveCallHint.qml+1−1
@@ -150,7 +150,7 @@ Item {
150150 tryCompareFunction(function() { return timeLabel.text !== currentLabel }, true);
151151 }
152152
153− function test_tapToReturn() {
153+ function test_displayedLabelChangesOverTime() {
154154 callManager.backgroundCall = call3;
155155
156156 var labelPathView = findChild(callHint, "labelPathView");
tests/qmltests/Panel/tst_Panel.qml+2
@@ -312,6 +312,8 @@ Item {
312312 var searchIndicator = findChild(panel, "search");
313313 verify(searchIndicator !== null);
314314
315+ tryCompare(searchIndicator, "enabled", true);
316+
315317 tap(searchIndicator, 1, 1);
316318
317319 compare(searchClicked, true,