1
=== modified file 'src/Ubuntu/Components/plugin/ucbottomedgehint.cpp'
2
--- src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-11-19 10:04:40 +0000
3
+++ src/Ubuntu/Components/plugin/ucbottomedgehint.cpp	2015-11-19 10:04:40 +0000
4
@@ -160,15 +160,20 @@
5
160
{
160
{
6
161
    if (contains(event->localPos()) && (m_status >= Active)) {
161
    if (contains(event->localPos()) && (m_status >= Active)) {
7
162
        m_pressed = true;
162
        m_pressed = true;
8
163
        event->accept();
9
164
        // also call requestFocus
10
165
        requestFocus(Qt::MouseFocusReason);
11
163
    } else {
166
    } else {
12
164
        UCActionItem::mousePressEvent(event);
167
        UCActionItem::mousePressEvent(event);
13
165
    }
168
    }
14
166
}
169
}
15
167
void UCBottomEdgeHint::mouseReleaseEvent(QMouseEvent *event)
170
void UCBottomEdgeHint::mouseReleaseEvent(QMouseEvent *event)
16
168
{
171
{
17
169
    UCActionItem::mouseReleaseEvent(event);
18
170
    if (m_pressed && (m_status >= Active)) {
172
    if (m_pressed && (m_status >= Active)) {
19
171
        Q_EMIT clicked();
173
        Q_EMIT clicked();
20
174
        event->accept();
21
175
    } else {
22
176
        UCActionItem::mouseReleaseEvent(event);
23
172
    }
177
    }
24
173
}
178
}
25
174
179
26
175
180
27
=== modified file 'tests/unit_x11/tst_components/tst_bottomedgehint.qml'
28
--- tests/unit_x11/tst_components/tst_bottomedgehint.qml	2015-11-19 10:04:40 +0000
29
+++ tests/unit_x11/tst_components/tst_bottomedgehint.qml	2015-11-19 10:04:40 +0000
30
@@ -105,6 +105,7 @@
31
105
        }
105
        }
32
106
106
33
107
        function cleanup() {
107
        function cleanup() {
34
108
            mainView.forceActiveFocus();
35
108
            listView.positionViewAtBeginning();
109
            listView.positionViewAtBeginning();
36
109
            bottomEdgeHint.visible = true;
110
            bottomEdgeHint.visible = true;
37
110
            bottomEdgeHint.iconName = "";
111
            bottomEdgeHint.iconName = "";
38
@@ -223,5 +224,18 @@
39
223
            clickSpy.wait(500);
224
            clickSpy.wait(500);
40
224
            compare(bottomEdgeHint.triggerCount, prevCount + 1, "Overloaded trigger not called");
225
            compare(bottomEdgeHint.triggerCount, prevCount + 1, "Overloaded trigger not called");
41
225
        }
226
        }
42
227
43
228
        function test_active_focus_on_press_bug1517777() {
44
229
            var testItem = bottomEdgeHint;
45
230
            testItem.status = BottomEdgeHint.Active;
46
231
            testItem.activeFocusOnPress = true;
47
232
            // make sure the test item is not active focus
48
233
            floatingHint.forceActiveFocus();
49
234
            verify(testItem.status >= BottomEdgeHint.Active);
50
235
            compare(testItem.activeFocus, false, "BottomEdgeHint is focus before the test!");
51
236
52
237
            mouseClick(testItem, centerOf(testItem).x, centerOf(testItem).y);
53
238
            compare(testItem.activeFocus, true, "BottomEdgeHint is not focus");
54
239
        }
55
226
    }
240
    }
56
227
}
241
}
Reviewer	Review Type	Date Requested	Status
Cris Dywan		2015-11-19	Approve on 2015-11-20
PS Jenkins bot	continuous-integration		Approve on 2015-11-19
Review via email: mp+277957@code.launchpad.net