[iagno/arnaudb/wip/gtk4: 5/54] Update to GestureClick.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [iagno/arnaudb/wip/gtk4: 5/54] Update to GestureClick.
- Date: Thu, 30 Apr 2020 13:17:50 +0000 (UTC)
commit af02ee65f3a3dd0222fc79c975e96281540ff0c7
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Wed Feb 12 18:14:24 2020 +0100
Update to GestureClick.
And other EventController things.
src/base-window.vala | 5 +++--
src/reversi-view.vala | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/base-window.vala b/src/base-window.vala
index ed8e891..c1ce2a7 100644
--- a/src/base-window.vala
+++ b/src/base-window.vala
@@ -315,7 +315,7 @@ private class BaseWindow : AdaptativeWindow, AdaptativeWidget
private void init_keyboard () // called on construct
{
- key_controller = new Gtk.EventControllerKey (this);
+ key_controller = new Gtk.EventControllerKey ();
key_controller.key_pressed.connect (on_key_pressed);
}
@@ -441,8 +441,9 @@ private class BaseWindow : AdaptativeWindow, AdaptativeWidget
{
create_about_dialog ();
about_dialog.response.connect ((_about_dialog, response) => _about_dialog.hide ());
- about_dialog_key_controller = new Gtk.EventControllerKey (about_dialog);
+ about_dialog_key_controller = new Gtk.EventControllerKey ();
about_dialog_key_controller.key_pressed.connect (on_about_dialog_key_pressed);
+ about_dialog.add_controller (about_dialog_key_controller);
about_dialog.set_transient_for (this);
should_init_about_dialog = false;
}
diff --git a/src/reversi-view.vala b/src/reversi-view.vala
index 670be7d..6e5d901 100644
--- a/src/reversi-view.vala
+++ b/src/reversi-view.vala
@@ -1065,17 +1065,17 @@ private class ReversiView : Gtk.DrawingArea
\*/
private Gtk.EventControllerMotion motion_controller; // for keeping in memory
- private Gtk.GestureMultiPress click_controller; // for keeping in memory
+ private Gtk.GestureClick click_controller; // for keeping in memory
private bool mouse_is_in = false;
private void init_mouse () // called on construct
{
- motion_controller = new Gtk.EventControllerMotion (this);
+ motion_controller = new Gtk.EventControllerMotion ();
motion_controller.motion.connect (on_motion);
motion_controller.enter.connect (on_mouse_in);
motion_controller.leave.connect (on_mouse_out);
- click_controller = new Gtk.GestureMultiPress (this);
+ click_controller = new Gtk.GestureClick ();
click_controller.set_button (/* all buttons */ 0);
click_controller.pressed.connect (on_click);
}
@@ -1211,7 +1211,7 @@ private class ReversiView : Gtk.DrawingArea
}
}
- private inline void on_click (Gtk.GestureMultiPress _click_controller, int n_press, double event_x,
double event_y)
+ private inline void on_click (Gtk.GestureClick _click_controller, int n_press, double event_x, double
event_y)
{
if (!game_is_set)
return;
@@ -1244,7 +1244,7 @@ private class ReversiView : Gtk.DrawingArea
private void init_keyboard () // called on construct
{
- key_controller = new Gtk.EventControllerKey (this);
+ key_controller = new Gtk.EventControllerKey ();
key_controller.key_pressed.connect (on_key_pressed);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]