[gnome-games/wip/exalm/views: 104/109] collection-view: Handle gamepad events
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/views: 104/109] collection-view: Handle gamepad events
- Date: Sun, 24 Feb 2019 18:40:28 +0000 (UTC)
commit bb35c3ac761185d561563c805be7ea01af4d1d16
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date: Thu Oct 4 21:40:02 2018 +0500
collection-view: Handle gamepad events
Make ApplicationWindow interact with CollectionView instead of its
internals.
src/ui/application-window.vala | 6 +++---
src/ui/collection-view.vala | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/ui/application-window.vala b/src/ui/application-window.vala
index f14c3bf7..eea9a3b1 100644
--- a/src/ui/application-window.vala
+++ b/src/ui/application-window.vala
@@ -246,7 +246,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
public bool gamepad_button_press_event (Manette.Event event) {
if (current_view == collection_view)
- return is_active && collection_view.box.gamepad_button_press_event (event);
+ return collection_view.gamepad_button_press_event (event);
else if (current_view == display_view) {
if (resume_dialog != null)
return resume_dialog.is_active && resume_dialog.gamepad_button_press_event
(event);
@@ -279,14 +279,14 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
public bool gamepad_button_release_event (Manette.Event event) {
if (current_view == collection_view)
- return is_active && collection_view.box.gamepad_button_release_event (event);
+ return collection_view.gamepad_button_release_event (event);
return false;
}
public bool gamepad_absolute_axis_event (Manette.Event event) {
if (current_view == collection_view)
- return is_active && collection_view.box.gamepad_absolute_axis_event (event);
+ return collection_view.gamepad_absolute_axis_event (event);
return false;
}
diff --git a/src/ui/collection-view.vala b/src/ui/collection-view.vala
index 42ce641d..340c2df2 100644
--- a/src/ui/collection-view.vala
+++ b/src/ui/collection-view.vala
@@ -99,15 +99,15 @@ private class Games.CollectionView: Gtk.Bin, ApplicationView {
}
public bool gamepad_button_press_event (Manette.Event event) {
- return false;
+ return window.is_active && box.gamepad_button_press_event (event);
}
public bool gamepad_button_release_event (Manette.Event event) {
- return false;
+ return window.is_active && box.gamepad_button_release_event (event);
}
public bool gamepad_absolute_axis_event (Manette.Event event) {
- return false;
+ return window.is_active && box.gamepad_absolute_axis_event (event);
}
[GtkCallback]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]