diff options
| author | 2021-07-28 11:36:42 -0700 | |
|---|---|---|
| committer | 2021-07-28 11:36:42 -0700 | |
| commit | d05e6003f049d7d478b763c6ec0e474f0f05a713 (patch) | |
| tree | 977d98b8d4ac985d6f578615b574e7e6a929ca88 /src/common | |
| parent | Merge pull request #6671 from jls47/master (diff) | |
| parent | Merge branch 'master' into fullscreen-enum (diff) | |
| download | yuzu-d05e6003f049d7d478b763c6ec0e474f0f05a713.tar.gz yuzu-d05e6003f049d7d478b763c6ec0e474f0f05a713.tar.xz yuzu-d05e6003f049d7d478b763c6ec0e474f0f05a713.zip | |
Merge pull request #6700 from lat9nq/fullscreen-enum
general: Implement FullscreenMode enumeration
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/settings.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/common/settings.h b/src/common/settings.h index d8730f515..cfc1ab46f 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -42,6 +42,11 @@ enum class CPUAccuracy : u32 { | |||
| 42 | Unsafe = 2, | 42 | Unsafe = 2, |
| 43 | }; | 43 | }; |
| 44 | 44 | ||
| 45 | enum class FullscreenMode : u32 { | ||
| 46 | Borderless = 0, | ||
| 47 | Exclusive = 1, | ||
| 48 | }; | ||
| 49 | |||
| 45 | /** The BasicSetting class is a simple resource manager. It defines a label and default value | 50 | /** The BasicSetting class is a simple resource manager. It defines a label and default value |
| 46 | * alongside the actual value of the setting for simpler and less-error prone use with frontend | 51 | * alongside the actual value of the setting for simpler and less-error prone use with frontend |
| 47 | * configurations. Setting a default value and label is required, though subclasses may deviate from | 52 | * configurations. Setting a default value and label is required, though subclasses may deviate from |
| @@ -322,11 +327,11 @@ struct Values { | |||
| 322 | Setting<u16> resolution_factor{1, "resolution_factor"}; | 327 | Setting<u16> resolution_factor{1, "resolution_factor"}; |
| 323 | // *nix platforms may have issues with the borderless windowed fullscreen mode. | 328 | // *nix platforms may have issues with the borderless windowed fullscreen mode. |
| 324 | // Default to exclusive fullscreen on these platforms for now. | 329 | // Default to exclusive fullscreen on these platforms for now. |
| 325 | Setting<int> fullscreen_mode{ | 330 | Setting<FullscreenMode> fullscreen_mode{ |
| 326 | #ifdef _WIN32 | 331 | #ifdef _WIN32 |
| 327 | 0, | 332 | FullscreenMode::Borderless, |
| 328 | #else | 333 | #else |
| 329 | 1, | 334 | FullscreenMode::Exclusive, |
| 330 | #endif | 335 | #endif |
| 331 | "fullscreen_mode"}; | 336 | "fullscreen_mode"}; |
| 332 | Setting<int> aspect_ratio{0, "aspect_ratio"}; | 337 | Setting<int> aspect_ratio{0, "aspect_ratio"}; |