[gnome-games/wip/exalm/views: 12/14] collection-view: Handle gamepad
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/views: 12/14] collection-view: Handle gamepad
- Date: Thu, 4 Oct 2018 16:45:12 +0000 (UTC)
commit 6e213101a3f5774932610abd66acb36bd12e7661
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date: Thu Oct 4 21:40:02 2018 +0500
collection-view: Handle gamepad
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 d6b22d82..95413990 100644
--- a/src/ui/application-window.vala
+++ b/src/ui/application-window.vala
@@ -234,7 +234,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.collection_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);
@@ -267,14 +267,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.collection_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.collection_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 33dcdf18..ab54b4d1 100644
--- a/src/ui/collection-view.vala
+++ b/src/ui/collection-view.vala
@@ -104,15 +104,15 @@ private class Games.CollectionView: Gtk.Bin, ApplicationView {
}
public bool gamepad_button_press_event (Manette.Event event) {
- return false;
+ return window.is_active && collection_box.gamepad_button_press_event (event);
}
public bool gamepad_button_release_event (Manette.Event event) {
- return false;
+ return window.is_active && collection_box.gamepad_button_release_event (event);
}
public bool gamepad_absolute_axis_event (Manette.Event event) {
- return false;
+ return window.is_active && collection_box.gamepad_absolute_axis_event (event);
}
[GtkCallback]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]