diff options
| author |  James Rowe | 2016-11-05 02:58:11 -0600 |
|---|---|---|
| committer | James Rowe | 2016-11-05 03:46:43 -0600 |
| commit | d9305b0a074a255eb484911db70a126a6fe347b1 (patch) | |
| tree | fcd629c513d4c8d217bf89069b288a39debb594f /src/common/math_util.h | |
| parent | Rework frame layouts to use a max rectangle instead of hardcoded calculations (diff) | |
| download | yuzu-d9305b0a074a255eb484911db70a126a6fe347b1.tar.gz yuzu-d9305b0a074a255eb484911db70a126a6fe347b1.tar.xz yuzu-d9305b0a074a255eb484911db70a126a6fe347b1.zip | |
Add default hotkey to swap primary screens.
Also minor style changes
Diffstat (limited to 'src/common/math_util.h')
| -rw-r--r-- | src/common/math_util.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/common/math_util.h b/src/common/math_util.h index 570ec8e56..9e630d93d 100644 --- a/src/common/math_util.h +++ b/src/common/math_util.h | |||
| @@ -45,10 +45,8 @@ struct Rectangle { | |||
| 45 | return Rectangle{left, top + y, right, bottom + y}; | 45 | return Rectangle{left, top + y, right, bottom + y}; |
| 46 | } | 46 | } |
| 47 | Rectangle<T> Scale(const float s) const { | 47 | Rectangle<T> Scale(const float s) const { |
| 48 | ASSERT(s > 0); | 48 | return Rectangle{left, top, static_cast<T>((right + left) * s), |
| 49 | return Rectangle { | 49 | static_cast<T>((top + bottom) * s)}; |
| 50 | left, top, static_cast<T>((right + left) * s), static_cast<T>((top + bottom) * s) | ||
| 51 | }; | ||
| 52 | } | 50 | } |
| 53 | }; | 51 | }; |
| 54 | 52 | ||