[gnome-games/wip/exalm/views: 61/68] application-window: Replace 'ui-state' with 'current-view'
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/views: 61/68] application-window: Replace 'ui-state' with 'current-view'
- Date: Wed, 14 Nov 2018 18:45:20 +0000 (UTC)
commit 8d77b6ba69bf04607b5a4952351355ccdce80575
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date: Thu Oct 4 20:44:10 2018 +0500
application-window: Replace 'ui-state' with 'current-view'
Since UI states are now represented by *View objects, use them directly
instead of having an enum.
src/ui/application-window.vala | 88 ++++++++++++++++--------------------------
src/ui/display-view.vala | 8 +++-
2 files changed, 41 insertions(+), 55 deletions(-)
---
diff --git a/src/ui/application-window.vala b/src/ui/application-window.vala
index ff9b82d6..f96e9f3c 100644
--- a/src/ui/application-window.vala
+++ b/src/ui/application-window.vala
@@ -7,38 +7,23 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
private const string CONTRIBUTE_URI = "https://wiki.gnome.org/Apps/Games/Contribute";
- private UiState _ui_state;
- public UiState ui_state {
- get { return _ui_state; }
+ private ApplicationView _current_view;
+ public ApplicationView current_view {
+ get { return _current_view; }
set {
- if (value == ui_state)
+ if (value == current_view)
return;
- _ui_state = value;
+ if (current_view != null)
+ current_view.is_view_active = false;
- switch (ui_state) {
- case UiState.COLLECTION:
- content_box.visible_child = collection_view;
- header_bar.visible_child = collection_view.titlebar;
+ _current_view = value;
- display_view.is_view_active = false;
- collection_view.is_view_active = true;
+ content_box.visible_child = current_view;
+ header_bar.visible_child = current_view.titlebar;
- if (display_view.box.runner != null) {
- display_view.box.runner.stop ();
- display_view.box.runner = null;
- }
-
- break;
- case UiState.DISPLAY:
- content_box.visible_child = display_view;
- header_bar.visible_child = display_view.titlebar;
-
- collection_view.is_view_active = false;
- display_view.is_view_active = true;
-
- break;
- }
+ if (current_view != null)
+ current_view.is_view_active = true;
konami_code.reset ();
}
@@ -48,7 +33,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
public bool is_fullscreen {
get { return _is_fullscreen; }
set {
- _is_fullscreen = value && (ui_state == UiState.DISPLAY);
+ _is_fullscreen = value && (current_view == display_view);
if (_is_fullscreen)
fullscreen ();
@@ -98,7 +83,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
construct {
header_bar.add (collection_view.titlebar);
header_bar.add (display_view.titlebar);
- ui_state = UiState.COLLECTION;
+ current_view = collection_view;
settings = new Settings ("org.gnome.Games");
@@ -207,8 +192,8 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
return true;
}
- if (ui_state == UiState.COLLECTION)
- return collection_view.on_key_pressed (event);
+ if (current_view == collection_view)
+ return current_view.on_key_pressed (event);
return handle_display_key_event (event);
}
@@ -217,7 +202,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
public bool on_button_pressed (Gdk.EventButton event) {
// Mouse button 8 is the navigation previous button
if (event.button == 8) {
- if (ui_state != UiState.DISPLAY)
+ if (current_view != display_view)
return false;
on_display_back ();
@@ -239,7 +224,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
return false;
var focused = (bool) (event.new_window_state & Gdk.WindowState.FOCUSED);
- var playing = (ui_state == UiState.DISPLAY);
+ var playing = (current_view == display_view);
if (focused && playing)
inhibit (Gtk.ApplicationInhibitFlags.IDLE);
@@ -251,10 +236,9 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
}
public bool gamepad_button_press_event (Manette.Event event) {
- switch (ui_state) {
- case UiState.COLLECTION:
+ if (current_view == collection_view)
return is_active && collection_view.box.gamepad_button_press_event (event);
- case UiState.DISPLAY:
+ else if (current_view == display_view) {
if (resume_dialog != null)
return resume_dialog.is_active && resume_dialog.gamepad_button_press_event
(event);
@@ -273,33 +257,29 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
switch (button) {
case EventCode.BTN_MODE:
- ui_state = UiState.COLLECTION;
+ current_view = collection_view;
return true;
default:
return false;
}
- default:
- return false;
}
+
+ return false;
}
public bool gamepad_button_release_event (Manette.Event event) {
- switch (ui_state) {
- case UiState.COLLECTION:
+ if (current_view == collection_view)
return is_active && collection_view.box.gamepad_button_release_event (event);
- default:
- return false;
- }
+
+ return false;
}
public bool gamepad_absolute_axis_event (Manette.Event event) {
- switch (ui_state) {
- case UiState.COLLECTION:
+ if (current_view == collection_view)
return is_active && collection_view.box.gamepad_absolute_axis_event (event);
- default:
- return false;
- }
+
+ return false;
}
[GtkCallback]
@@ -310,7 +290,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
[GtkCallback]
private void on_display_back () {
if (quit_game ())
- ui_state = UiState.COLLECTION;
+ current_view = collection_view;
uninhibit (Gtk.ApplicationInhibitFlags.IDLE | Gtk.ApplicationInhibitFlags.LOGOUT);
}
@@ -318,7 +298,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
private void run_game_with_cancellable (Game game, Cancellable cancellable) {
display_view.header_bar.game_title = game.name;
display_view.box.header_bar.game_title = game.name;
- ui_state = UiState.DISPLAY;
+ current_view = display_view;
// Reset the UI parts depending on the runner to avoid an
// inconsistent state is case we couldn't retrieve it.
@@ -427,7 +407,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
if (response == Gtk.ResponseType.CANCEL) {
display_view.box.runner = null;
- ui_state = UiState.COLLECTION;
+ current_view = collection_view;
return;
}
@@ -562,7 +542,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
}
private bool can_update_pause () {
- if (ui_state != UiState.DISPLAY)
+ if (current_view != display_view)
return false;
if (display_view.box.runner == null)
@@ -578,7 +558,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
}
private bool handle_display_key_event (Gdk.EventKey event) {
- if (ui_state != UiState.DISPLAY)
+ if (current_view != display_view)
return false;
var default_modifiers = Gtk.accelerator_get_default_mod_mask ();
@@ -657,7 +637,7 @@ private class Games.ApplicationWindow : Gtk.ApplicationWindow {
}
private void on_konami_code_performed () {
- if (ui_state != UiState.COLLECTION)
+ if (current_view != collection_view)
return;
try {
diff --git a/src/ui/display-view.vala b/src/ui/display-view.vala
index 6534ef1c..6c62fcd5 100644
--- a/src/ui/display-view.vala
+++ b/src/ui/display-view.vala
@@ -22,8 +22,14 @@ private class Games.DisplayView: Gtk.Bin, ApplicationView {
_is_view_active = value;
- if (!is_view_active)
+ if (!is_view_active) {
is_fullscreen = false;
+
+ if (box.runner != null) {
+ box.runner.stop ();
+ box.runner = null;
+ }
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]