← Back to team overview

elementaryart team mailing list archive

[Merge] lp:~tristanc/granite/fix-918468 into lp:granite

 

Tristan Cormier has proposed merging lp:~tristanc/granite/fix-918468 into lp:granite.

Requested reviews:
  elementary Pantheon team (elementary-pantheon)
Related bugs:
  Bug #918468 in Granite: "pressing the clear button in an entry should clear the text after releasing the button"
  https://bugs.launchpad.net/granite/+bug/918468

For more details, see:
https://code.launchpad.net/~tristanc/granite/fix-918468/+merge/108365
-- 
https://code.launchpad.net/~tristanc/granite/fix-918468/+merge/108365
Your team elementaryart (old) is subscribed to branch lp:granite.
=== modified file 'lib/Widgets/Entries.vala'
--- lib/Widgets/Entries.vala	2012-03-25 02:45:04 +0000
+++ lib/Widgets/Entries.vala	2012-06-01 15:48:18 +0000
@@ -77,12 +77,12 @@
         public signal void text_changed_pause (string text);
         
         /**
-         * search_icon_pressed () signal is emitted after a short delay,
+         * search_icon_release () signal is emitted after releasing the mouse button,
          * which depends on the SearchBar's icon.
          * It can be useful to show something on the icon press,
          * we can show a PopOver, for example.
          **/
-        public signal void search_icon_pressed ();
+        public signal void search_icon_release ();
         
         public SearchBar (string hint_string) {
         
@@ -95,7 +95,7 @@
             changed.connect_after (on_changed);            
             focus_in_event.connect (on_focus_in);
             focus_out_event.connect (on_focus_out);
-            icon_press.connect (on_icon_press);
+            icon_release.connect (on_icon_release);
         }
 
         protected new void hint () {
@@ -133,7 +133,7 @@
                 set_icon_from_stock (EntryIconPosition.SECONDARY, null);
         }
 
-        private void on_icon_press (EntryIconPosition position) {
+        private void on_icon_release (EntryIconPosition position) {
         
             if (position == EntryIconPosition.SECONDARY) {
                 is_searching = false;
@@ -141,7 +141,7 @@
                 set_icon_from_stock (position, null);
                 is_searching = true;
             } else {
-                search_icon_pressed (); // emit signal
+                search_icon_release (); // emit signal
 
                 if (!is_focus) {
                     is_searching = false;


Follow ups