Merge lp:~gandalfn/slingshot/fix-input-event into lp:~elementary-pantheon/slingshot/trunk

[Zisu Andrei]

[quequotion (quequotion)]

Are these supposed to be here?

<<<<<<< TREE
=======
>>>>>>> MERGE-SOURCE

[Adam Bieńkowski (donadigo)]

Conflicts with trunk.

review: Needs Fixing (code)

[quequotion (quequotion)]

> Are these supposed to be here?
>
> <<<<<<< TREE
> =======
> >>>>>>> MERGE-SOURCE

After fixing that part of the patch, gandalfn's merge proposal works.

This patch is very similar to the pantheon-debian patch:
https://gitlab.com/pantheon-debian/slingshot-launcher/commit/db8474f079a02ad005d662040ff6452c1e2f0b05

Except for this section:
@@ -402,8 +408,10 @@
                 case "9":
                     int page = int.parse (key);

- if (event.state != Gdk.ModifierType.MOD1_MASK)
- return false;
+ if (event.state != Gdk.ModifierType.MOD1_MASK) {
+ search_entry.key_press_event (event);
+ return true;
+ }

                     if (modality == Modality.NORMAL_VIEW) {
                         if (page < 0 || page == 9)

Is either preferrable for any reason?

[Zisu Andrei (matzipan)]

This seems to be an inactive branch. Perhaps we should create a new merge request based on this.

[quequotion (quequotion)]

>>matzipan
I've updated my branch, rebased upstream, and reimplemented gandalfn's method:
https://code.launchpad.net/~quequotion/slingshot/fix-1635776/+merge/310705

[Cody Garver (codygarver)]

I am rejecting this branch because we are accepting the simpler proposal (https://code.launchpad.net/~santileortiz/slingshot/fix-1635776/+merge/314255), which removes old hacky code that appears to be the source of the problem.

However, we've already reverted 1 commit that intended to fix this problem, so please stick around to make sure the problem is finally solved.

review: Disapprove

Unmerged revisions

651. By gandalfn on 2016-05-06

The scroll and key press/release event forwading from event box does not
work on debian testing.
Activate the default event mask for this events for event box.
Disconnect search entry key press/release event from event forwarding.
Send key press/release event forwarding from event box to search entry in all case.

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2016-11-21 04:43:16 +0000
+++ src/SlingshotView.vala	2016-12-01 00:54:11 +0000
@@ -204,6 +204,7 @@
             container.attach (stack, 0, 1, 1, 1);
 
             event_box = new Gtk.EventBox ();
+            event_box.add_events (Gdk.EventMask.SCROLL_MASK | Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK);
             event_box.add (container);
             // Add the container to the dialog's content area
 
@@ -233,7 +234,6 @@
             });
 
             event_box.key_press_event.connect (on_key_press);
-            search_entry.key_press_event.connect (on_key_press);
             // Showing a menu reverts the effect of the grab_device function.
             search_entry.search_changed.connect (() => {
                 if (modality != Modality.SEARCH_VIEW)
@@ -384,8 +384,14 @@
                 case "Enter": // "KP_Enter"
                 case "Return":
                 case "KP_Enter":
+<<<<<<< TREE
                     return false;
 
+=======
+                    search_entry.key_press_event (event);
+                    return true;
+                    
+>>>>>>> MERGE-SOURCE
                 case "Alt_L":
                 case "Alt_R":
                     break;
@@ -402,8 +408,10 @@
                 case "9":
                     int page = int.parse (key);
 
-                    if (event.state != Gdk.ModifierType.MOD1_MASK)
-                        return false;
+                    if (event.state != Gdk.ModifierType.MOD1_MASK) {
+                        search_entry.key_press_event (event);
+                        return true;
+                    }
 
                     if (modality == Modality.NORMAL_VIEW) {
                         if (page < 0 || page == 9)
@@ -416,7 +424,8 @@
                         else
                             category_view.app_view.go_to_number (page);
                     } else {
-                        return false;
+                        search_entry.key_press_event (event);
+                        return true;
                     }
                     search_entry.grab_focus ();
                     break;
@@ -515,17 +524,19 @@
                     if (event.state == Gdk.ModifierType.SHIFT_MASK) { // Shift + Delete
                         search_entry.text = "";
                     } else if (search_entry.has_focus) {
-                        return false;
+                        search_entry.key_press_event (event);
+                        return true;
                     } else {
                         search_entry.grab_focus ();
                         search_entry.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);
-                        return false;
+                        return true;
                     }
                     break;
 
                 case "Home":
                     if (search_entry.text.length > 0) {
-                        return false;
+                        search_entry.key_press_event (event);
+                        return true;
                     }
 
                     if (modality == Modality.NORMAL_VIEW) {
@@ -538,7 +549,8 @@
 
                 case "End":
                     if (search_entry.text.length > 0) {
-                        return false;
+                        search_entry.key_press_event (event);
+                        return true;
                     }
 
                     if (modality == Modality.NORMAL_VIEW) {
@@ -554,7 +566,8 @@
                     if ((event.state & (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)) != 0) {
                         search_entry.paste_clipboard ();
                     } else {
-                        return false;
+                        search_entry.key_press_event (event);
+                        return true;
                     }
                     break;
 
@@ -562,9 +575,9 @@
                     if (!search_entry.has_focus) {
                         search_entry.grab_focus ();
                         search_entry.move_cursor (Gtk.MovementStep.BUFFER_ENDS, 0, false);
-                        search_entry.key_press_event (event);
                     }
-                    return false;
+                    search_entry.key_press_event (event);
+                    return true;
 
             }