[gnome-games] ui: Use Gdk.ModifierType for key state instead of uint
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games] ui: Use Gdk.ModifierType for key state instead of uint
- Date: Mon, 19 Aug 2019 16:34:05 +0000 (UTC)
commit 79b52b9ee71384966e92744d16ea6601804a2af1
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date: Mon Aug 19 17:37:13 2019 +0500
ui: Use Gdk.ModifierType for key state instead of uint
This is more correct in general, and we also match GTK4.
plugins/nintendo-ds/src/nintendo-ds-runner.vala | 2 +-
src/command/command-runner.vala | 2 +-
src/core/runner.vala | 2 +-
src/dummy/dummy-runner.vala | 2 +-
src/retro/retro-runner.vala | 2 +-
src/ui/display-box.vala | 2 +-
src/ui/savestates-list.vala | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/plugins/nintendo-ds/src/nintendo-ds-runner.vala b/plugins/nintendo-ds/src/nintendo-ds-runner.vala
index 88e61ada..7ca20c47 100644
--- a/plugins/nintendo-ds/src/nintendo-ds-runner.vala
+++ b/plugins/nintendo-ds/src/nintendo-ds-runner.vala
@@ -76,7 +76,7 @@ private class Games.NintendoDsRunner : RetroRunner {
return new NintendoDsLayoutSwitcher (this);
}
- public override bool key_press_event (uint keyval, uint state) {
+ public override bool key_press_event (uint keyval, Gdk.ModifierType state) {
if (state == Gdk.ModifierType.MOD1_MASK) {
// Alt + 1|2|3|4
var shortcut_layout = layouts[keyval];
diff --git a/src/command/command-runner.vala b/src/command/command-runner.vala
index f0f0ad16..a472c2f8 100644
--- a/src/command/command-runner.vala
+++ b/src/command/command-runner.vala
@@ -110,7 +110,7 @@ public class Games.CommandRunner : Object, Runner {
return { };
}
- public bool key_press_event (uint keyval, uint state) {
+ public bool key_press_event (uint keyval, Gdk.ModifierType state) {
return false;
}
diff --git a/src/core/runner.vala b/src/core/runner.vala
index 50de8b5d..7a10160b 100644
--- a/src/core/runner.vala
+++ b/src/core/runner.vala
@@ -28,6 +28,6 @@ public interface Games.Runner : Object {
public abstract Savestate[] get_savestates ();
public abstract InputMode[] get_available_input_modes ();
- public abstract bool key_press_event (uint keyval, uint state);
+ public abstract bool key_press_event (uint keyval, Gdk.ModifierType state);
public abstract bool gamepad_button_press_event (uint16 button);
}
diff --git a/src/dummy/dummy-runner.vala b/src/dummy/dummy-runner.vala
index 6ae99161..7df9c50f 100644
--- a/src/dummy/dummy-runner.vala
+++ b/src/dummy/dummy-runner.vala
@@ -76,7 +76,7 @@ private class Games.DummyRunner : Object, Runner {
return { };
}
- public bool key_press_event (uint keyval, uint state) {
+ public bool key_press_event (uint keyval, Gdk.ModifierType state) {
return false;
}
diff --git a/src/retro/retro-runner.vala b/src/retro/retro-runner.vala
index f5e36d33..087799cf 100644
--- a/src/retro/retro-runner.vala
+++ b/src/retro/retro-runner.vala
@@ -387,7 +387,7 @@ public class Games.RetroRunner : Object, Runner {
return { InputMode.GAMEPAD };
}
- public virtual bool key_press_event (uint keyval, uint state) {
+ public virtual bool key_press_event (uint keyval, Gdk.ModifierType state) {
return false;
}
diff --git a/src/ui/display-box.vala b/src/ui/display-box.vala
index 54627242..441541fd 100644
--- a/src/ui/display-box.vala
+++ b/src/ui/display-box.vala
@@ -111,7 +111,7 @@ private class Games.DisplayBox : Gtk.Bin {
display_bin.remove (child);
}
- public bool on_key_press_event (uint keyval, uint state) {
+ public bool on_key_press_event (uint keyval, Gdk.ModifierType state) {
if (!get_mapped ())
return false;
diff --git a/src/ui/savestates-list.vala b/src/ui/savestates-list.vala
index 34532dc7..0248fc4c 100644
--- a/src/ui/savestates-list.vala
+++ b/src/ui/savestates-list.vala
@@ -303,7 +303,7 @@ private class Games.SavestatesList : Gtk.Box {
rename_btn.sensitive = (state.selected_savestate != null &&
!state.selected_savestate.is_automatic ());
}
- public bool on_key_press_event (uint keyval, uint state) {
+ public bool on_key_press_event (uint keyval, Gdk.ModifierType state) {
// FIXME: Move the other list shortcuts here
if (keyval == Gdk.Key.Delete || keyval == Gdk.Key.KP_Delete) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]