Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4960 from lioncash/type

Browse Source 
ControlGroup: Convert group type enum into an enum class
This commit is contained in:
Anthony
2017-02-26 15:56:34 -08:00
committed by GitHub
parent 0dde642b7d 26f17a1723
commit 832e0501db
14 changed files with 61 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
+15 -15
View File
@@ -942,10 +942,10 @@ ControlGroupBox::~ControlGroupBox()
bool ControlGroupBox::HasBitmapHeading() const
{
return control_group->type == ControllerEmu::GROUP_TYPE_STICK ||
control_group->type == ControllerEmu::GROUP_TYPE_TILT ||
control_group->type == ControllerEmu::GROUP_TYPE_CURSOR ||
control_group->type == ControllerEmu::GROUP_TYPE_FORCE;
return control_group->type == ControllerEmu::GroupType::Stick ||
control_group->type == ControllerEmu::GroupType::Tilt ||
control_group->type == ControllerEmu::GroupType::Cursor ||
control_group->type == ControllerEmu::GroupType::Force;
}
ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent,
@@ -1000,10 +1000,10 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
switch (group->type)
{
case ControllerEmu::GROUP_TYPE_STICK:
case ControllerEmu::GROUP_TYPE_TILT:
case ControllerEmu::GROUP_TYPE_CURSOR:
case ControllerEmu::GROUP_TYPE_FORCE:
case ControllerEmu::GroupType::Stick:
case ControllerEmu::GroupType::Tilt:
case ControllerEmu::GroupType::Cursor:
case ControllerEmu::GroupType::Force:
{
wxSize bitmap_size = parent->FromDIP(wxSize(64, 64));
m_scale = bitmap_size.GetWidth() / 64.0;
@@ -1045,7 +1045,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
Add(h_szr, 0, wxEXPAND | wxLEFT | wxRIGHT, space3);
}
break;
case ControllerEmu::GROUP_TYPE_BUTTONS:
case ControllerEmu::GroupType::Buttons:
{
// Draw buttons in rows of 8
unsigned int button_cols = group->controls.size() > 8 ? 8 : group->controls.size();
@@ -1083,17 +1083,17 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
Add(static_bitmap, 0, wxALIGN_CENTER_HORIZONTAL | wxLEFT | wxRIGHT, space3);
}
break;
case ControllerEmu::GROUP_TYPE_MIXED_TRIGGERS:
case ControllerEmu::GROUP_TYPE_TRIGGERS:
case ControllerEmu::GROUP_TYPE_SLIDER:
case ControllerEmu::GroupType::MixedTriggers:
case ControllerEmu::GroupType::Triggers:
case ControllerEmu::GroupType::Slider:
{
int height = (int)(12 * group->controls.size());
int width = 64;
if (ControllerEmu::GROUP_TYPE_MIXED_TRIGGERS == group->type)
if (group->type == ControllerEmu::GroupType::MixedTriggers)
width = 64 + 12 + 1;
if (ControllerEmu::GROUP_TYPE_TRIGGERS != group->type)
if (group->type != ControllerEmu::GroupType::Triggers)
height /= 2;
height += 1;
@@ -1127,7 +1127,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
Add(static_bitmap, 0, wxALIGN_CENTER_HORIZONTAL | wxLEFT | wxRIGHT, space3);
}
break;
case ControllerEmu::GROUP_TYPE_EXTENSION:
case ControllerEmu::GroupType::Extension:
{
PadSettingExtension* const attachments =
new PadSettingExtension(parent, (ControllerEmu::Extension*)group);
Source/Core/DolphinWX/Input/InputConfigDiagBitmaps.cpp
+15 -15
View File
@@ -159,9 +159,9 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
switch (g->control_group->type)
{
case ControllerEmu::GROUP_TYPE_TILT:
case ControllerEmu::GROUP_TYPE_STICK:
case ControllerEmu::GROUP_TYPE_CURSOR:
case ControllerEmu::GroupType::Tilt:
case ControllerEmu::GroupType::Stick:
case ControllerEmu::GroupType::Cursor:
{
// this is starting to be a mess combining all these in one case
@@ -169,19 +169,19 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
switch (g->control_group->type)
{
case ControllerEmu::GROUP_TYPE_STICK:
case ControllerEmu::GroupType::Stick:
((ControllerEmu::AnalogStick*)g->control_group)->GetState(&x, &y);
break;
case ControllerEmu::GROUP_TYPE_TILT:
case ControllerEmu::GroupType::Tilt:
((ControllerEmu::Tilt*)g->control_group)->GetState(&x, &y);
break;
case ControllerEmu::GROUP_TYPE_CURSOR:
case ControllerEmu::GroupType::Cursor:
((ControllerEmu::Cursor*)g->control_group)->GetState(&x, &y, &z);
break;
}
// ir cursor forward movement
if (ControllerEmu::GROUP_TYPE_CURSOR == g->control_group->type)
if (g->control_group->type == ControllerEmu::GroupType::Cursor)
{
gc->SetBrush(z ? *wxRED_BRUSH : *wxGREY_BRUSH);
wxGraphicsPath path = gc->CreatePath();
@@ -191,7 +191,7 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
// input zone
gc->SetPen(*wxLIGHT_GREY_PEN);
if (ControllerEmu::GROUP_TYPE_STICK == g->control_group->type)
if (g->control_group->type == ControllerEmu::GroupType::Stick)
{
gc->SetBrush(wxColour(0xDDDDDD)); // Light Gray
@@ -231,9 +231,9 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
gc->DrawRectangle(16, 16, 32, 32);
}
if (ControllerEmu::GROUP_TYPE_CURSOR != g->control_group->type)
if (g->control_group->type != ControllerEmu::GroupType::Cursor)
{
const int deadzone_idx = g->control_group->type == ControllerEmu::GROUP_TYPE_STICK ?
const int deadzone_idx = g->control_group->type == ControllerEmu::GroupType::Stick ?
ControllerEmu::AnalogStick::SETTING_DEADZONE :
0;
@@ -267,7 +267,7 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
}
break;
case ControllerEmu::GROUP_TYPE_FORCE:
case ControllerEmu::GroupType::Force:
{
ControlState raw_dot[3];
ControlState adj_dot[3];
@@ -332,7 +332,7 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
}
break;
case ControllerEmu::GROUP_TYPE_BUTTONS:
case ControllerEmu::GroupType::Buttons:
{
const unsigned int button_count = static_cast<unsigned int>(g->control_group->controls.size());
std::vector<unsigned int> bitmasks(button_count);
@@ -361,7 +361,7 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
}
break;
case ControllerEmu::GROUP_TYPE_TRIGGERS:
case ControllerEmu::GroupType::Triggers:
{
const unsigned int trigger_count = static_cast<unsigned int>(g->control_group->controls.size());
std::vector<ControlState> trigs(trigger_count);
@@ -403,7 +403,7 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
}
break;
case ControllerEmu::GROUP_TYPE_MIXED_TRIGGERS:
case ControllerEmu::GroupType::MixedTriggers:
{
const unsigned int trigger_count = ((unsigned int)(g->control_group->controls.size() / 2));
@@ -443,7 +443,7 @@ static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g)
}
break;
case ControllerEmu::GROUP_TYPE_SLIDER:
case ControllerEmu::GroupType::Slider:
{
const ControlState deadzone = g->control_group->numeric_settings[0]->GetValue();