ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #644 from PikminGuts92/master 

Added flag to start Xenia in fullscreen.
This commit is contained in:
Justin Moore 2016-12-11 10:27:24 -06:00 committed by GitHub
parent af8e231ce6 9a8005e6fd
commit 2a2b7ae8f7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/app/emulator_window.h
View File

@ -36,6 +36,7 @@ class EmulatorWindow {
ui::Window* window() const { return window_.get(); } ui::Window* window() const { return window_.get(); }
void UpdateTitle(); void UpdateTitle();
void ToggleFullscreen();
private: private:
explicit EmulatorWindow(Emulator* emulator); explicit EmulatorWindow(Emulator* emulator);
@ -52,7 +53,6 @@ class EmulatorWindow {
void CpuBreakIntoDebugger(); void CpuBreakIntoDebugger();
void GpuTraceFrame(); void GpuTraceFrame();
void GpuClearCaches(); void GpuClearCaches();
void ToggleFullscreen();
void ShowHelpWebsite(); void ShowHelpWebsite();
Emulator* emulator_; Emulator* emulator_;

4
src/xenia/app/xenia_main.cc
View File

@ -42,6 +42,7 @@ DEFINE_string(gpu, "any", "Graphics system. Use: [any, gl4, vulkan, null]");
DEFINE_string(hid, "any", "Input system. Use: [any, nop, winkey, xinput]"); DEFINE_string(hid, "any", "Input system. Use: [any, nop, winkey, xinput]");
DEFINE_string(target, "", "Specifies the target .xex or .iso to execute."); DEFINE_string(target, "", "Specifies the target .xex or .iso to execute.");
DEFINE_bool(fullscreen, false, "Toggles fullscreen");
namespace xe { namespace xe {
namespace app { namespace app {
@ -191,6 +192,9 @@ int xenia_main(const std::vector<std::wstring>& args) {
} }
} }
// Toggles fullscreen
if (FLAGS_fullscreen) emulator_window->ToggleFullscreen();
if (!path.empty()) { if (!path.empty()) {
// Normalize the path and make absolute. // Normalize the path and make absolute.
std::wstring abs_path = xe::to_absolute_path(path); std::wstring abs_path = xe::to_absolute_path(path);