Merge lp:~roti-al/synapse-project/scroll2list into lp:synapse-project

Proposed by Hrotkó Gábor
Status: Needs review
Proposed branch: lp:~roti-al/synapse-project/scroll2list
Merge into: lp:synapse-project
Diff against target: 58 lines (+18/-1)
3 files modified
src/ui/controller.vala (+7/-0)
src/ui/interfaces.vala (+3/-0)
src/ui/view-base.vala (+8/-1)
To merge this branch: bzr merge lp:~roti-al/synapse-project/scroll2list
Reviewer Review Type Date Requested Status
Synapse core team Pending
Review via email: mp+341776@code.launchpad.net

Description of the change

Enable to display the result list to be displayed by mouse scroll also, not only with the 'Down' key.
This way the category lists are browseable with mouse only.

To post a comment you must log in.

Unmerged revisions

666. By Hrotkó Gábor

Show list with mouse scroll

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/ui/controller.vala'
--- src/ui/controller.vala 2016-03-02 13:27:04 +0000
+++ src/ui/controller.vala 2018-03-20 21:29:33 +0000
@@ -101,6 +101,13 @@
101 this.fetch_command (command);101 this.fetch_command (command);
102 }102 }
103 }103 }
104
105 /* scroll_event should be fired on mouse scroll */
106 public void scroll_event (Gdk.EventScroll event)
107 {
108 if (event.direction == Gdk.ScrollDirection.DOWN) this.fetch_command (KeyComboConfig.Commands.NEXT_RESULT);
109 if (event.direction == Gdk.ScrollDirection.UP) this.fetch_command (KeyComboConfig.Commands.PREV_RESULT);
110 }
104111
105 /* category_changed_event should be fired ie when user clicks on a category */112 /* category_changed_event should be fired ie when user clicks on a category */
106 public void category_changed_event (int category_index)113 public void category_changed_event (int category_index)
107114
=== modified file 'src/ui/interfaces.vala'
--- src/ui/interfaces.vala 2017-06-16 18:56:25 +0000
+++ src/ui/interfaces.vala 2018-03-20 21:29:33 +0000
@@ -52,6 +52,9 @@
52 /* key_press_event should be fired on key press */52 /* key_press_event should be fired on key press */
53 public abstract void key_press_event (Gdk.EventKey event);53 public abstract void key_press_event (Gdk.EventKey event);
5454
55 /* scroll_event should be fired on mouse scroll */
56 public abstract void scroll_event (Gdk.EventScroll event);
57
55 /* category_changed_event should be fired ie when user clicks on a category */58 /* category_changed_event should be fired ie when user clicks on a category */
56 public abstract void category_changed_event (int category_index);59 public abstract void category_changed_event (int category_index);
5760
5861
=== modified file 'src/ui/view-base.vala'
--- src/ui/view-base.vala 2016-02-27 15:10:45 +0000
+++ src/ui/view-base.vala 2018-03-20 21:29:33 +0000
@@ -169,7 +169,8 @@
169169
170 /* Listen on click events */170 /* Listen on click events */
171 this.set_events (this.get_events () | Gdk.EventMask.BUTTON_PRESS_MASK171 this.set_events (this.get_events () | Gdk.EventMask.BUTTON_PRESS_MASK
172 | Gdk.EventMask.KEY_PRESS_MASK);172 | Gdk.EventMask.KEY_PRESS_MASK
173 | Gdk.EventMask.SCROLL_MASK);
173174
174 Gui.Utils.ensure_transparent_bg (this);175 Gui.Utils.ensure_transparent_bg (this);
175176
@@ -318,6 +319,12 @@
318 return false;319 return false;
319 }320 }
320321
322 public override bool scroll_event (Gdk.EventScroll event)
323 {
324 this.controller.scroll_event(event);
325 return false;
326 }
327
321 public override bool draw (Cairo.Context ctx)328 public override bool draw (Cairo.Context ctx)
322 {329 {
323 Gtk.Allocation allocation;330 Gtk.Allocation allocation;