Merge lp:~tristanc/granite/fix-918468 into lp:~elementary-pantheon/granite/granite

Proposed by Tristan Cormier
Status: Merged
Merged at revision: 251
Proposed branch: lp:~tristanc/granite/fix-918468
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 45 lines (+5/-5)
1 file modified
lib/Widgets/Entries.vala (+5/-5)
To merge this branch: bzr merge lp:~tristanc/granite/fix-918468
Reviewer Review Type Date Requested Status
Tom Beckmann (community) Approve
Review via email: mp+108365@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tom Beckmann (tombeckmann) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/Widgets/Entries.vala'
2--- lib/Widgets/Entries.vala 2012-03-25 02:45:04 +0000
3+++ lib/Widgets/Entries.vala 2012-06-01 15:48:18 +0000
4@@ -77,12 +77,12 @@
5 public signal void text_changed_pause (string text);
6
7 /**
8- * search_icon_pressed () signal is emitted after a short delay,
9+ * search_icon_release () signal is emitted after releasing the mouse button,
10 * which depends on the SearchBar's icon.
11 * It can be useful to show something on the icon press,
12 * we can show a PopOver, for example.
13 **/
14- public signal void search_icon_pressed ();
15+ public signal void search_icon_release ();
16
17 public SearchBar (string hint_string) {
18
19@@ -95,7 +95,7 @@
20 changed.connect_after (on_changed);
21 focus_in_event.connect (on_focus_in);
22 focus_out_event.connect (on_focus_out);
23- icon_press.connect (on_icon_press);
24+ icon_release.connect (on_icon_release);
25 }
26
27 protected new void hint () {
28@@ -133,7 +133,7 @@
29 set_icon_from_stock (EntryIconPosition.SECONDARY, null);
30 }
31
32- private void on_icon_press (EntryIconPosition position) {
33+ private void on_icon_release (EntryIconPosition position) {
34
35 if (position == EntryIconPosition.SECONDARY) {
36 is_searching = false;
37@@ -141,7 +141,7 @@
38 set_icon_from_stock (position, null);
39 is_searching = true;
40 } else {
41- search_icon_pressed (); // emit signal
42+ search_icon_release (); // emit signal
43
44 if (!is_focus) {
45 is_searching = false;

Subscribers

People subscribed via source and target branches