diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-11 02:48:27 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-11 02:48:27 +0200 |
| commit | ef510a4f73eea16ead622afcba20b6182d21026b (patch) | |
| tree | 47aebc02f379ada0399a0ce0b7f152cd9a77f23a /Source/Core | |
| parent | 59a7939f181561c0a0499d1214773d39bff0ab73 (diff) | |
| parent | dbdefd074b517b108cd82ff9f3114c9270d581d5 (diff) | |
Merge pull request #594 from lioncash/another-clamp-removal
DolphinWX: Remove yet another clamp method
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/FrameAui.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp index 283bead945..34b0a72b28 100644 --- a/Source/Core/DolphinWX/FrameAui.cpp +++ b/Source/Core/DolphinWX/FrameAui.cpp @@ -33,6 +33,7 @@ #include "Common/Common.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" +#include "Common/MathUtil.h" #include "Common/StringUtil.h" #include "Common/Logging/ConsoleListener.h" #include "Core/ConfigManager.h" @@ -733,13 +734,6 @@ void CFrame::OnSelectPerspective(wxCommandEvent& event) DoLoadPerspective(); } -static int Limit(int i, int Low, int High) -{ - if (i < Low) return Low; - if (i > High) return High; - return i; -} - void CFrame::SetPaneSize() { if (Perspectives.size() <= ActivePerspective) @@ -764,8 +758,8 @@ void CFrame::SetPaneSize() H = Perspectives[ActivePerspective].Height[j]; // Check limits - W = Limit(W, 5, 95); - H = Limit(H, 5, 95); + MathUtil::Clamp<u32>(&W, 5, 95); + MathUtil::Clamp<u32>(&H, 5, 95); // Convert percentages to pixel lengths W = (W * iClientX) / 100; |