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

Merge pull request #594 from lioncash/another-clamp-removal 

DolphinWX: Remove yet another clamp method
This commit is contained in:
Pierre Bourdon 2014-07-11 02:48:27 +02:00
parent 59a7939f18 dbdefd074b
commit ef510a4f73
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/FrameAui.cpp
View File

@ -33,6 +33,7 @@
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/IniFile.h" #include "Common/IniFile.h"
#include "Common/MathUtil.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/Logging/ConsoleListener.h" #include "Common/Logging/ConsoleListener.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
@ -733,13 +734,6 @@ void CFrame::OnSelectPerspective(wxCommandEvent& event)
DoLoadPerspective(); 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() void CFrame::SetPaneSize()
{ {
if (Perspectives.size() <= ActivePerspective) if (Perspectives.size() <= ActivePerspective)
@ -764,8 +758,8 @@ void CFrame::SetPaneSize()
H = Perspectives[ActivePerspective].Height[j]; H = Perspectives[ActivePerspective].Height[j];
// Check limits // Check limits
W = Limit(W, 5, 95); MathUtil::Clamp<u32>(&W, 5, 95);
H = Limit(H, 5, 95); MathUtil::Clamp<u32>(&H, 5, 95);
// Convert percentages to pixel lengths // Convert percentages to pixel lengths
W = (W * iClientX) / 100; W = (W * iClientX) / 100;