piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

WX: HiDPI: TASInputDlg

Browse Source
This commit is contained in:
EmptyChaos
2016-08-02 06:22:53 +00:00
parent ac404517a3
commit 2dfd04d7a5
2 changed files with 193 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

305
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <array>
#include <cstddef> #include <cstddef>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
@ -23,7 +25,9 @@
#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "Core/HW/WiimoteReal/WiimoteReal.h" #include "Core/HW/WiimoteReal/WiimoteReal.h"
#include "Core/Movie.h" #include "Core/Movie.h"
#include "DolphinWX/DolphinSlider.h"
#include "DolphinWX/TASInputDlg.h" #include "DolphinWX/TASInputDlg.h"
#include "DolphinWX/WxUtils.h"
#include "InputCommon/GCPadStatus.h" #include "InputCommon/GCPadStatus.h"
#include "InputCommon/InputConfig.h" #include "InputCommon/InputConfig.h"
@ -63,37 +67,38 @@ void TASInputDlg::CreateBaseLayout()
m_controls[0] = &m_main_stick.x_cont; m_controls[0] = &m_main_stick.x_cont;
m_controls[1] = &m_main_stick.y_cont; m_controls[1] = &m_main_stick.y_cont;
m_a = CreateButton("A"); m_a = CreateButton(_("A"));
m_a.checkbox->SetClientData(&m_a); m_a.checkbox->SetClientData(&m_a);
m_b = CreateButton("B"); m_b = CreateButton(_("B"));
m_b.checkbox->SetClientData(&m_b); m_b.checkbox->SetClientData(&m_b);
m_dpad_up = CreateButton("Up"); m_dpad_up = CreateButton(_("Up"));
m_dpad_up.checkbox->SetClientData(&m_dpad_up); m_dpad_up.checkbox->SetClientData(&m_dpad_up);
m_dpad_right = CreateButton("Right"); m_dpad_right = CreateButton(_("Right"));
m_dpad_right.checkbox->SetClientData(&m_dpad_right); m_dpad_right.checkbox->SetClientData(&m_dpad_right);
m_dpad_down = CreateButton("Down"); m_dpad_down = CreateButton(_("Down"));
m_dpad_down.checkbox->SetClientData(&m_dpad_down); m_dpad_down.checkbox->SetClientData(&m_dpad_down);
m_dpad_left = CreateButton("Left"); m_dpad_left = CreateButton(_("Left"));
m_dpad_left.checkbox->SetClientData(&m_dpad_left); m_dpad_left.checkbox->SetClientData(&m_dpad_left);
m_buttons_dpad = new wxGridSizer(3); m_buttons_dpad = new wxGridSizer(3);
m_buttons_dpad->AddSpacer(20); const int space20 = FromDIP(20);
m_buttons_dpad->Add(space20, space20);
m_buttons_dpad->Add(m_dpad_up.checkbox); m_buttons_dpad->Add(m_dpad_up.checkbox);
m_buttons_dpad->AddSpacer(20); m_buttons_dpad->Add(space20, space20);
m_buttons_dpad->Add(m_dpad_left.checkbox); m_buttons_dpad->Add(m_dpad_left.checkbox);
m_buttons_dpad->AddSpacer(20); m_buttons_dpad->Add(space20, space20);
m_buttons_dpad->Add(m_dpad_right.checkbox); m_buttons_dpad->Add(m_dpad_right.checkbox);
m_buttons_dpad->AddSpacer(20); m_buttons_dpad->Add(space20, space20);
m_buttons_dpad->Add(m_dpad_down.checkbox); m_buttons_dpad->Add(m_dpad_down.checkbox);
m_buttons_dpad->AddSpacer(20); m_buttons_dpad->Add(space20, space20);
} }
const int TASInputDlg::m_gc_pad_buttons_bitmask[12] = { static constexpr int s_gc_pad_buttons_bitmask[12] = {
PAD_BUTTON_DOWN, PAD_BUTTON_UP, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT, PAD_BUTTON_DOWN, PAD_BUTTON_UP, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT,
PAD_BUTTON_A, PAD_BUTTON_B, PAD_BUTTON_X, PAD_BUTTON_Y, PAD_BUTTON_A, PAD_BUTTON_B, PAD_BUTTON_X, PAD_BUTTON_Y,
PAD_TRIGGER_Z, PAD_TRIGGER_L, PAD_TRIGGER_R, PAD_BUTTON_START}; PAD_TRIGGER_Z, PAD_TRIGGER_L, PAD_TRIGGER_R, PAD_BUTTON_START};
const int TASInputDlg::m_wii_buttons_bitmask[11] = { static constexpr int s_wii_buttons_bitmask[11] = {
WiimoteEmu::Wiimote::PAD_DOWN, WiimoteEmu::Wiimote::PAD_UP, WiimoteEmu::Wiimote::PAD_DOWN, WiimoteEmu::Wiimote::PAD_UP,
WiimoteEmu::Wiimote::PAD_LEFT, WiimoteEmu::Wiimote::PAD_RIGHT, WiimoteEmu::Wiimote::PAD_LEFT, WiimoteEmu::Wiimote::PAD_RIGHT,
WiimoteEmu::Wiimote::BUTTON_A, WiimoteEmu::Wiimote::BUTTON_B, WiimoteEmu::Wiimote::BUTTON_A, WiimoteEmu::Wiimote::BUTTON_B,
@ -102,7 +107,7 @@ const int TASInputDlg::m_wii_buttons_bitmask[11] = {
WiimoteEmu::Wiimote::BUTTON_HOME, WiimoteEmu::Wiimote::BUTTON_HOME,
}; };
const int TASInputDlg::m_cc_buttons_bitmask[15] = { static constexpr int s_cc_buttons_bitmask[15] = {
WiimoteEmu::Classic::PAD_DOWN, WiimoteEmu::Classic::PAD_UP, WiimoteEmu::Classic::PAD_DOWN, WiimoteEmu::Classic::PAD_UP,
WiimoteEmu::Classic::PAD_LEFT, WiimoteEmu::Classic::PAD_RIGHT, WiimoteEmu::Classic::PAD_LEFT, WiimoteEmu::Classic::PAD_RIGHT,
WiimoteEmu::Classic::BUTTON_A, WiimoteEmu::Classic::BUTTON_B, WiimoteEmu::Classic::BUTTON_A, WiimoteEmu::Classic::BUTTON_B,
@ -113,13 +118,11 @@ const int TASInputDlg::m_cc_buttons_bitmask[15] = {
WiimoteEmu::Classic::BUTTON_HOME, WiimoteEmu::Classic::BUTTON_HOME,
}; };
const std::string TASInputDlg::m_cc_button_names[] = {
"Down", "Up", "Left", "Right", "A", "B", "X", "Y", "+", "-", "L", "R", "ZR", "ZL", "Home"};
void TASInputDlg::CreateWiiLayout(int num) void TASInputDlg::CreateWiiLayout(int num)
{ {
if (m_has_layout) if (m_has_layout)
return; return;
const int space5 = FromDIP(5);
CreateBaseLayout(); CreateBaseLayout();
@ -142,23 +145,17 @@ void TASInputDlg::CreateWiiLayout(int num)
wxStaticBoxSizer* const axisBox = wxStaticBoxSizer* const axisBox =
CreateAccelLayout(&m_x_cont, &m_y_cont, &m_z_cont, _("Orientation")); CreateAccelLayout(&m_x_cont, &m_y_cont, &m_z_cont, _("Orientation"));
wxStaticBoxSizer* const m_buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons")); m_plus = CreateButton(_("+"));
wxGridSizer* const m_buttons_grid = new wxGridSizer(4);
m_plus = CreateButton("+");
m_plus.checkbox->SetClientData(&m_plus); m_plus.checkbox->SetClientData(&m_plus);
m_minus = CreateButton("-"); m_minus = CreateButton(_("-"));
m_minus.checkbox->SetClientData(&m_minus); m_minus.checkbox->SetClientData(&m_minus);
m_one = CreateButton("1"); m_one = CreateButton(_("1"));
m_one.checkbox->SetClientData(&m_one); m_one.checkbox->SetClientData(&m_one);
m_two = CreateButton("2"); m_two = CreateButton(_("2"));
m_two.checkbox->SetClientData(&m_two); m_two.checkbox->SetClientData(&m_two);
m_home = CreateButton("Home"); m_home = CreateButton(_("Home"));
m_home.checkbox->SetClientData(&m_home); m_home.checkbox->SetClientData(&m_home);
m_main_szr = new wxBoxSizer(wxVERTICAL);
m_wiimote_szr = new wxBoxSizer(wxHORIZONTAL);
m_ext_szr = new wxBoxSizer(wxHORIZONTAL);
m_cc_szr = CreateCCLayout(); m_cc_szr = CreateCCLayout();
if (Core::IsRunning()) if (Core::IsRunning())
@ -196,12 +193,10 @@ void TASInputDlg::CreateWiiLayout(int num)
wxStaticBoxSizer* const nunchukaxisBox = wxStaticBoxSizer* const nunchukaxisBox =
CreateAccelLayout(&m_nx_cont, &m_ny_cont, &m_nz_cont, _("Nunchuk orientation")); CreateAccelLayout(&m_nx_cont, &m_ny_cont, &m_nz_cont, _("Nunchuk orientation"));
m_c = CreateButton("C"); m_c = CreateButton(_("C"));
m_c.checkbox->SetClientData(&m_c); m_c.checkbox->SetClientData(&m_c);
m_z = CreateButton("Z"); m_z = CreateButton(_("Z"));
m_z.checkbox->SetClientData(&m_z); m_z.checkbox->SetClientData(&m_z);
m_ext_szr->Add(m_c_stick_szr, 0, wxLEFT | wxBOTTOM | wxRIGHT, 5);
m_ext_szr->Add(nunchukaxisBox);
for (Control* const control : m_controls) for (Control* const control : m_controls)
{ {
@ -209,21 +204,35 @@ void TASInputDlg::CreateWiiLayout(int num)
control->slider->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnRightClickSlider, this); control->slider->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnRightClickSlider, this);
} }
m_ext_szr = new wxBoxSizer(wxHORIZONTAL);
m_ext_szr->Add(m_c_stick_szr, 0, wxBOTTOM, space5);
m_ext_szr->AddSpacer(space5);
m_ext_szr->Add(nunchukaxisBox, 0, wxBOTTOM, space5);
wxGridSizer* const buttons_grid = new wxGridSizer(4);
for (unsigned int i = 4; i < ArraySize(m_buttons); ++i) for (unsigned int i = 4; i < ArraySize(m_buttons); ++i)
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
m_buttons_grid->Add(m_buttons[i]->checkbox); buttons_grid->Add(m_buttons[i]->checkbox);
m_buttons_grid->AddSpacer(5); buttons_grid->Add(space5, space5);
m_buttons_box->Add(m_buttons_grid); wxStaticBoxSizer* const buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
m_buttons_box->Add(m_buttons_dpad); buttons_box->Add(buttons_grid);
buttons_box->Add(m_buttons_dpad, 0, wxTOP, space5);
m_wiimote_szr->Add(m_main_stick_szr, 0, wxALL, 5); m_wiimote_szr = new wxBoxSizer(wxHORIZONTAL);
m_wiimote_szr->Add(axisBox, 0, wxTOP | wxRIGHT, 5); m_wiimote_szr->AddSpacer(space5);
m_wiimote_szr->Add(m_buttons_box, 0, wxTOP | wxRIGHT, 5); m_wiimote_szr->Add(m_main_stick_szr);
m_main_szr->Add(m_wiimote_szr); m_wiimote_szr->Add(axisBox, 0, wxLEFT, space5);
m_main_szr->Add(m_ext_szr); m_wiimote_szr->Add(buttons_box, 0, wxLEFT, space5);
m_main_szr->Add(m_cc_szr); m_wiimote_szr->AddSpacer(space5);
// NOTE: Not all of these are visible at the same time.
m_main_szr = new wxBoxSizer(wxVERTICAL);
m_main_szr->Add(m_wiimote_szr, 0, wxTOP | wxBOTTOM, space5);
m_main_szr->Add(m_ext_szr, 0, wxLEFT | wxRIGHT, space5);
m_main_szr->Add(m_cc_szr, 0, wxLEFT | wxRIGHT, space5);
SetSizer(m_main_szr);
HandleExtensionChange(); HandleExtensionChange();
FinishLayout(); FinishLayout();
} }
@ -239,11 +248,12 @@ void TASInputDlg::FinishLayout()
wxBoxSizer* TASInputDlg::CreateCCLayout() wxBoxSizer* TASInputDlg::CreateCCLayout()
{ {
wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL); const std::array<wxString, 15> button_names{{_("Down"), _("Up"), _("Left"), _("Right"), _("A"),
_("B"), _("X"), _("Y"), _("+"), _("-"), _("L"),
for (size_t i = 0; i < ArraySize(m_cc_buttons); ++i) _("R"), _("ZR"), _("ZL"), _("Home")}};
for (size_t i = 0; i < button_names.size(); ++i)
{ {
m_cc_buttons[i] = CreateButton(m_cc_button_names[i]); m_cc_buttons[i] = CreateButton(button_names[i]);
m_cc_buttons[i].checkbox->SetClientData(&m_cc_buttons[i]); m_cc_buttons[i].checkbox->SetClientData(&m_cc_buttons[i]);
} }
@ -265,6 +275,9 @@ wxBoxSizer* TASInputDlg::CreateCCLayout()
m_cc_l = CreateControl(wxSL_VERTICAL, -1, 100, false, 31, 0); m_cc_l = CreateControl(wxSL_VERTICAL, -1, 100, false, 31, 0);
m_cc_r = CreateControl(wxSL_VERTICAL, -1, 100, false, 31, 0); m_cc_r = CreateControl(wxSL_VERTICAL, -1, 100, false, 31, 0);
const int space5 = FromDIP(5);
const int space20 = FromDIP(20);
wxStaticBoxSizer* const shoulder_box = wxStaticBoxSizer* const shoulder_box =
new wxStaticBoxSizer(wxHORIZONTAL, this, _("Shoulder Buttons")); new wxStaticBoxSizer(wxHORIZONTAL, this, _("Shoulder Buttons"));
shoulder_box->Add(m_cc_l.slider, 0, wxALIGN_CENTER_VERTICAL); shoulder_box->Add(m_cc_l.slider, 0, wxALIGN_CENTER_VERTICAL);
@ -272,32 +285,37 @@ wxBoxSizer* TASInputDlg::CreateCCLayout()
shoulder_box->Add(m_cc_r.slider, 0, wxALIGN_CENTER_VERTICAL); shoulder_box->Add(m_cc_r.slider, 0, wxALIGN_CENTER_VERTICAL);
shoulder_box->Add(m_cc_r.text, 0, wxALIGN_CENTER_VERTICAL); shoulder_box->Add(m_cc_r.text, 0, wxALIGN_CENTER_VERTICAL);
wxStaticBoxSizer* const cc_buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
wxGridSizer* const cc_buttons_grid = new wxGridSizer(4);
wxGridSizer* const cc_buttons_dpad = new wxGridSizer(3); wxGridSizer* const cc_buttons_dpad = new wxGridSizer(3);
cc_buttons_dpad->Add(space20, space20);
cc_buttons_dpad->AddSpacer(20);
cc_buttons_dpad->Add(m_cc_buttons[1].checkbox); cc_buttons_dpad->Add(m_cc_buttons[1].checkbox);
cc_buttons_dpad->AddSpacer(20); cc_buttons_dpad->Add(space20, space20);
cc_buttons_dpad->Add(m_cc_buttons[2].checkbox); cc_buttons_dpad->Add(m_cc_buttons[2].checkbox);
cc_buttons_dpad->AddSpacer(20); cc_buttons_dpad->Add(space20, space20);
cc_buttons_dpad->Add(m_cc_buttons[3].checkbox); cc_buttons_dpad->Add(m_cc_buttons[3].checkbox);
cc_buttons_dpad->AddSpacer(20); cc_buttons_dpad->Add(space20, space20);
cc_buttons_dpad->Add(m_cc_buttons[0].checkbox); cc_buttons_dpad->Add(m_cc_buttons[0].checkbox);
cc_buttons_dpad->AddSpacer(20); cc_buttons_dpad->Add(space20, space20);
for (auto button : m_cc_buttons) wxGridSizer* const cc_buttons_grid = new wxGridSizer(4);
for (auto& button : m_cc_buttons)
if (!button.checkbox->GetContainingSizer()) if (!button.checkbox->GetContainingSizer())
cc_buttons_grid->Add(button.checkbox); cc_buttons_grid->Add(button.checkbox);
cc_buttons_grid->AddSpacer(5); cc_buttons_grid->Add(space5, space5);
wxStaticBoxSizer* const cc_buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
cc_buttons_box->Add(cc_buttons_grid); cc_buttons_box->Add(cc_buttons_grid);
cc_buttons_box->Add(cc_buttons_dpad); cc_buttons_box->Add(cc_buttons_dpad, 0, wxTOP, space5);
szr->Add(m_cc_l_stick_szr, 0, wxALL, 5); wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
szr->Add(m_cc_r_stick_szr, 0, wxALL, 5); szr->AddSpacer(space5);
szr->Add(shoulder_box, 0, wxLEFT | wxRIGHT, 5); szr->Add(m_cc_l_stick_szr, 0, wxTOP | wxBOTTOM, space5);
szr->Add(cc_buttons_box, 0, wxTOP | wxRIGHT, 5); szr->AddSpacer(space5);
szr->Add(m_cc_r_stick_szr, 0, wxTOP | wxBOTTOM, space5);
szr->AddSpacer(space5);
szr->Add(shoulder_box, 0, wxTOP | wxBOTTOM, space5);
szr->AddSpacer(space5);
szr->Add(cc_buttons_box, 0, wxTOP | wxBOTTOM, space5);
szr->AddSpacer(space5);
for (Control* const control : m_cc_controls) for (Control* const control : m_cc_controls)
{ {
@ -327,8 +345,9 @@ void TASInputDlg::HandleExtensionChange()
m_main_szr->Hide(m_cc_szr); m_main_szr->Hide(m_cc_szr);
m_main_szr->Show(m_wiimote_szr); m_main_szr->Show(m_wiimote_szr);
} }
SetSizerAndFit(m_main_szr, true);
ResetValues(); ResetValues();
m_main_szr->SetSizeHints(this);
Layout();
} }
void TASInputDlg::CreateGCLayout() void TASInputDlg::CreateGCLayout()
@ -350,8 +369,6 @@ void TASInputDlg::CreateGCLayout()
m_controls[4] = &m_l_cont; m_controls[4] = &m_l_cont;
m_controls[5] = &m_r_cont; m_controls[5] = &m_r_cont;
wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL);
m_main_stick = CreateStick(ID_MAIN_STICK, 255, 255, 128, 128, false, true); m_main_stick = CreateStick(ID_MAIN_STICK, 255, 255, 128, 128, false, true);
wxStaticBoxSizer* const main_box = CreateStickLayout(&m_main_stick, _("Main Stick")); wxStaticBoxSizer* const main_box = CreateStickLayout(&m_main_stick, _("Main Stick"));
@ -373,38 +390,45 @@ void TASInputDlg::CreateGCLayout()
control->slider->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnRightClickSlider, this); control->slider->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnRightClickSlider, this);
} }
wxStaticBoxSizer* const m_buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons")); m_x = CreateButton(_("X"));
wxGridSizer* const m_buttons_grid = new wxGridSizer(4);
m_x = CreateButton("X");
m_x.checkbox->SetClientData(&m_x); m_x.checkbox->SetClientData(&m_x);
m_y = CreateButton("Y"); m_y = CreateButton(_("Y"));
m_y.checkbox->SetClientData(&m_y); m_y.checkbox->SetClientData(&m_y);
m_l = CreateButton("L"); m_l = CreateButton(_("L"));
m_l.checkbox->SetClientData(&m_l); m_l.checkbox->SetClientData(&m_l);
m_r = CreateButton("R"); m_r = CreateButton(_("R"));
m_r.checkbox->SetClientData(&m_r); m_r.checkbox->SetClientData(&m_r);
m_z = CreateButton("Z"); m_z = CreateButton(_("Z"));
m_z.checkbox->SetClientData(&m_z); m_z.checkbox->SetClientData(&m_z);
m_start = CreateButton("Start"); m_start = CreateButton(_("Start"));
m_start.checkbox->SetClientData(&m_start); m_start.checkbox->SetClientData(&m_start);
const int space5 = FromDIP(5);
wxGridSizer* const buttons_grid = new wxGridSizer(4);
for (unsigned int i = 4; i < ArraySize(m_buttons); ++i) for (unsigned int i = 4; i < ArraySize(m_buttons); ++i)
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
m_buttons_grid->Add(m_buttons[i]->checkbox, false); buttons_grid->Add(m_buttons[i]->checkbox, false);
m_buttons_grid->AddSpacer(5); buttons_grid->Add(space5, space5);
m_buttons_box->Add(m_buttons_grid); wxStaticBoxSizer* const buttons_box = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
m_buttons_box->Add(m_buttons_dpad); buttons_box->Add(buttons_grid);
buttons_box->Add(m_buttons_dpad);
wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL);
top_box->Add(main_box);
top_box->Add(c_box, 0, wxLEFT, space5);
wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL);
bottom_box->Add(shoulder_box);
bottom_box->Add(buttons_box, 0, wxLEFT, space5);
wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const main_szr = new wxBoxSizer(wxVERTICAL);
main_szr->AddSpacer(space5);
top_box->Add(main_box, 0, wxALL, 5); main_szr->Add(top_box, 0, wxLEFT | wxRIGHT, space5);
top_box->Add(c_box, 0, wxTOP | wxRIGHT, 5); main_szr->AddSpacer(space5);
bottom_box->Add(shoulder_box, 0, wxLEFT | wxRIGHT, 5); main_szr->Add(bottom_box, 0, wxLEFT | wxRIGHT, space5);
bottom_box->Add(m_buttons_box, 0, wxBOTTOM, 5); main_szr->AddSpacer(space5);
main_szr->Add(top_box);
main_szr->Add(bottom_box);
SetSizerAndFit(main_szr); SetSizerAndFit(main_szr);
ResetValues(); ResetValues();
@ -414,21 +438,20 @@ void TASInputDlg::CreateGCLayout()
TASInputDlg::Control TASInputDlg::CreateControl(long style, int width, int height, bool reverse, TASInputDlg::Control TASInputDlg::CreateControl(long style, int width, int height, bool reverse,
u32 range, u32 default_value) u32 range, u32 default_value)
{ {
Control tempCont; Control control;
tempCont.range = range; control.range = range;
tempCont.default_value = default_value; control.default_value = default_value;
tempCont.slider = new wxSlider(this, m_eleID++, default_value, 0, range, wxDefaultPosition, control.slider_id = m_eleID++;
wxDefaultSize, style); control.slider = new DolphinSlider(this, control.slider_id, default_value, 0, range,
tempCont.slider->SetMinSize(wxSize(width, height)); wxDefaultPosition, FromDIP(wxSize(width, height)), style);
tempCont.slider->Bind(wxEVT_SLIDER, &TASInputDlg::UpdateFromSliders, this); control.slider->Bind(wxEVT_SLIDER, &TASInputDlg::UpdateFromSliders, this);
tempCont.text = new wxTextCtrl(this, m_eleID++, std::to_string(default_value), wxDefaultPosition, control.text_id = m_eleID++;
wxSize(40, 20)); control.text = new wxTextCtrl(this, control.text_id, std::to_string(default_value));
tempCont.text->SetMaxLength(range > 999 ? 4 : 3); control.text->SetMaxLength(range > 999 ? 4 : 3);
tempCont.text_id = m_eleID - 1; control.text->SetMinSize(WxUtils::GetTextWidgetMinSize(control.text, range));
tempCont.text->Bind(wxEVT_TEXT, &TASInputDlg::UpdateFromText, this); control.text->Bind(wxEVT_TEXT, &TASInputDlg::UpdateFromText, this);
tempCont.slider_id = m_eleID - 2; control.reverse = reverse;
tempCont.reverse = reverse; return control;
return tempCont;
} }
TASInputDlg::Stick TASInputDlg::CreateStick(int id_stick, int xRange, int yRange, u32 defaultX, TASInputDlg::Stick TASInputDlg::CreateStick(int id_stick, int xRange, int yRange, u32 defaultX,
@ -446,18 +469,23 @@ TASInputDlg::Stick TASInputDlg::CreateStick(int id_stick, int xRange, int yRange
return tempStick; return tempStick;
} }
wxStaticBoxSizer* TASInputDlg::CreateStickLayout(Stick* tempStick, const wxString& title) wxStaticBoxSizer* TASInputDlg::CreateStickLayout(Stick* stick, const wxString& title)
{ {
wxStaticBoxSizer* const temp_box = new wxStaticBoxSizer(wxHORIZONTAL, this, title); const int space3 = FromDIP(3);
wxFlexGridSizer* grid = new wxFlexGridSizer(2, 3, 3);
grid->Add(tempStick->x_cont.slider, 0, wxALIGN_CENTER_HORIZONTAL | wxALIGN_BOTTOM); wxStaticBoxSizer* const temp_box = new wxStaticBoxSizer(wxVERTICAL, this, title);
grid->Add(tempStick->x_cont.text, 0, wxEXPAND); wxFlexGridSizer* const layout = new wxFlexGridSizer(2, space3, space3);
grid->Add(tempStick->bitmap, 0, wxALL | wxALIGN_CENTER, 3);
grid->Add(tempStick->y_cont.slider, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT); layout->Add(stick->x_cont.slider, 0, wxEXPAND);
grid->Add(1, 1); layout->Add(stick->x_cont.text, 0, wxALIGN_CENTER);
grid->Add(tempStick->y_cont.text, 0, wxEXPAND); layout->Add(stick->bitmap, 0, wxALIGN_RIGHT);
temp_box->Add(grid, 1, wxEXPAND | wxALL, 3); layout->Add(stick->y_cont.slider, 0, wxEXPAND);
layout->AddSpacer(1); // Placeholder for unused cell
layout->Add(stick->y_cont.text, 0, wxALIGN_CENTER);
temp_box->AddSpacer(space3);
temp_box->Add(layout, 0, wxLEFT | wxRIGHT, space3);
temp_box->AddSpacer(space3);
return temp_box; return temp_box;
} }
@ -468,6 +496,7 @@ wxStaticBoxSizer* TASInputDlg::CreateAccelLayout(Control* x, Control* y, Control
wxStaticBoxSizer* const xBox = new wxStaticBoxSizer(wxVERTICAL, this, _("X")); wxStaticBoxSizer* const xBox = new wxStaticBoxSizer(wxVERTICAL, this, _("X"));
wxStaticBoxSizer* const yBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Y")); wxStaticBoxSizer* const yBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Y"));
wxStaticBoxSizer* const zBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Z")); wxStaticBoxSizer* const zBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Z"));
const int space5 = FromDIP(5);
xBox->Add(x->slider, 0, wxALIGN_CENTER_HORIZONTAL); xBox->Add(x->slider, 0, wxALIGN_CENTER_HORIZONTAL);
xBox->Add(x->text, 0, wxALIGN_CENTER_HORIZONTAL); xBox->Add(x->text, 0, wxALIGN_CENTER_HORIZONTAL);
@ -475,21 +504,25 @@ wxStaticBoxSizer* TASInputDlg::CreateAccelLayout(Control* x, Control* y, Control
yBox->Add(y->text, 0, wxALIGN_CENTER_HORIZONTAL); yBox->Add(y->text, 0, wxALIGN_CENTER_HORIZONTAL);
zBox->Add(z->slider, 0, wxALIGN_CENTER_HORIZONTAL); zBox->Add(z->slider, 0, wxALIGN_CENTER_HORIZONTAL);
zBox->Add(z->text, 0, wxALIGN_CENTER_HORIZONTAL); zBox->Add(z->text, 0, wxALIGN_CENTER_HORIZONTAL);
temp_box->Add(xBox, 0, wxLEFT | wxBOTTOM | wxRIGHT, 5); temp_box->AddSpacer(space5);
temp_box->Add(yBox, 0, wxRIGHT, 5); temp_box->Add(xBox, 0, wxBOTTOM, space5);
temp_box->Add(zBox, 0, wxRIGHT, 5); temp_box->AddSpacer(space5);
temp_box->Add(yBox, 0, wxBOTTOM, space5);
temp_box->AddSpacer(space5);
temp_box->Add(zBox, 0, wxBOTTOM, space5);
temp_box->AddSpacer(space5);
return temp_box; return temp_box;
} }
TASInputDlg::Button TASInputDlg::CreateButton(const std::string& name) TASInputDlg::Button TASInputDlg::CreateButton(const wxString& name)
{ {
Button temp; Button temp;
wxCheckBox* checkbox = new wxCheckBox(this, m_eleID++, name); temp.id = m_eleID++;
wxCheckBox* checkbox = new wxCheckBox(this, temp.id, name);
checkbox->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this); checkbox->Bind(wxEVT_RIGHT_DOWN, &TASInputDlg::SetTurbo, this);
checkbox->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurbo, this); checkbox->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::SetTurbo, this);
checkbox->Bind(wxEVT_CHECKBOX, &TASInputDlg::OnCheckboxToggle, this); checkbox->Bind(wxEVT_CHECKBOX, &TASInputDlg::OnCheckboxToggle, this);
temp.checkbox = checkbox; temp.checkbox = checkbox;
temp.id = m_eleID - 1;
return temp; return temp;
} }
@ -606,7 +639,7 @@ void TASInputDlg::SetWiiButtons(u16* butt)
for (unsigned int i = 0; i < 11; ++i) for (unsigned int i = 0; i < 11; ++i)
{ {
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
*butt |= (m_buttons[i]->is_checked) ? m_wii_buttons_bitmask[i] : 0; *butt |= (m_buttons[i]->is_checked) ? s_wii_buttons_bitmask[i] : 0;
} }
ButtonTurbo(); ButtonTurbo();
} }
@ -625,7 +658,7 @@ void TASInputDlg::GetKeyBoardInput(GCPadStatus* PadStatus)
for (unsigned int i = 0; i < ArraySize(m_buttons); ++i) for (unsigned int i = 0; i < ArraySize(m_buttons); ++i)
{ {
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
SetButtonValue(m_buttons[i], ((PadStatus->button & m_gc_pad_buttons_bitmask[i]) != 0)); SetButtonValue(m_buttons[i], ((PadStatus->button & s_gc_pad_buttons_bitmask[i]) != 0));
} }
SetButtonValue(&m_l, SetButtonValue(&m_l,
((PadStatus->triggerLeft) == 255) || ((PadStatus->button & PAD_TRIGGER_L) != 0)); ((PadStatus->triggerLeft) == 255) || ((PadStatus->button & PAD_TRIGGER_L) != 0));
@ -648,7 +681,7 @@ void TASInputDlg::GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, in
{ {
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
SetButtonValue(m_buttons[i], SetButtonValue(m_buttons[i],
(((wm_buttons*)coreData)->hex & m_wii_buttons_bitmask[i]) != 0); (((wm_buttons*)coreData)->hex & s_wii_buttons_bitmask[i]) != 0);
} }
} }
if (accelData) if (accelData)
@ -688,7 +721,7 @@ void TASInputDlg::GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, in
cc.bt.hex = cc.bt.hex ^ 0xFFFF; cc.bt.hex = cc.bt.hex ^ 0xFFFF;
for (unsigned int i = 0; i < 15; ++i) for (unsigned int i = 0; i < 15; ++i)
{ {
SetButtonValue(&m_cc_buttons[i], ((cc.bt.hex & m_cc_buttons_bitmask[i]) != 0)); SetButtonValue(&m_cc_buttons[i], ((cc.bt.hex & s_cc_buttons_bitmask[i]) != 0));
} }
if (m_cc_l.value == 31) if (m_cc_l.value == 31)
@ -835,7 +868,7 @@ void TASInputDlg::GetValues(u8* data, WiimoteEmu::ReportFeatures rptf, int ext,
for (unsigned int i = 0; i < ArraySize(m_cc_buttons); ++i) for (unsigned int i = 0; i < ArraySize(m_cc_buttons); ++i)
{ {
cc.bt.hex |= (m_cc_buttons[i].is_checked) ? m_cc_buttons_bitmask[i] : 0; cc.bt.hex |= (m_cc_buttons[i].is_checked) ? s_cc_buttons_bitmask[i] : 0;
} }
cc.bt.hex ^= 0xFFFF; cc.bt.hex ^= 0xFFFF;
@ -877,9 +910,9 @@ void TASInputDlg::GetValues(GCPadStatus* PadStatus)
if (m_buttons[i] != nullptr) if (m_buttons[i] != nullptr)
{ {
if (m_buttons[i]->is_checked) if (m_buttons[i]->is_checked)
PadStatus->button |= m_gc_pad_buttons_bitmask[i]; PadStatus->button |= s_gc_pad_buttons_bitmask[i];
else else
PadStatus->button &= ~m_gc_pad_buttons_bitmask[i]; PadStatus->button &= ~s_gc_pad_buttons_bitmask[i];
} }
} }
@ -1042,8 +1075,9 @@ void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
return; return;
wxPoint ptM(event.GetPosition()); wxPoint ptM(event.GetPosition());
stick->x_cont.value = ptM.x * stick->x_cont.range / 127; wxSize bitmap_size = FromDIP(wxSize(127, 127));
stick->y_cont.value = ptM.y * stick->y_cont.range / 127; stick->x_cont.value = ptM.x * stick->x_cont.range / bitmap_size.GetWidth();
stick->y_cont.value = ptM.y * stick->y_cont.range / bitmap_size.GetHeight();
if ((unsigned)stick->y_cont.value > stick->y_cont.range) if ((unsigned)stick->y_cont.value > stick->y_cont.range)
stick->y_cont.value = stick->y_cont.range; stick->y_cont.value = stick->y_cont.range;
@ -1055,12 +1089,8 @@ void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
if (stick->x_cont.reverse) if (stick->x_cont.reverse)
stick->x_cont.value = stick->x_cont.range - (u16)stick->x_cont.value; stick->x_cont.value = stick->x_cont.range - (u16)stick->x_cont.value;
stick->x_cont.value = (unsigned int)stick->x_cont.value > stick->x_cont.range ? stick->x_cont.value = std::min<u32>(stick->x_cont.value, stick->x_cont.range);
stick->x_cont.range : stick->y_cont.value = std::min<u32>(stick->y_cont.value, stick->y_cont.range);
stick->x_cont.value;
stick->y_cont.value = (unsigned int)stick->y_cont.value > stick->y_cont.range ?
stick->y_cont.range :
stick->y_cont.value;
// This updates sliders and the bitmap too. // This updates sliders and the bitmap too.
stick->x_cont.text->SetValue(std::to_string(stick->x_cont.value)); stick->x_cont.text->SetValue(std::to_string(stick->x_cont.value));
@ -1188,9 +1218,19 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y)
x = x / 2; x = x / 2;
y = y / 2; y = y / 2;
// Scale for screen DPI
static constexpr int WIDTH = 129;
static constexpr int HEIGHT = 129;
wxSize bitmap_size = FromDIP(wxSize(WIDTH, HEIGHT));
double scale_x = bitmap_size.GetWidth() / static_cast<double>(WIDTH);
double scale_y = bitmap_size.GetHeight() / static_cast<double>(HEIGHT);
wxMemoryDC memDC; wxMemoryDC memDC;
wxBitmap bitmap(129, 129); wxBitmap bitmap;
bitmap.CreateScaled(bitmap_size.GetWidth(), bitmap_size.GetHeight(), wxBITMAP_SCREEN_DEPTH,
GetContentScaleFactor());
memDC.SelectObject(bitmap); memDC.SelectObject(bitmap);
memDC.SetUserScale(scale_x, scale_y);
memDC.SetBackground(*wxLIGHT_GREY_BRUSH); memDC.SetBackground(*wxLIGHT_GREY_BRUSH);
memDC.Clear(); memDC.Clear();
memDC.SetBrush(*wxWHITE_BRUSH); memDC.SetBrush(*wxWHITE_BRUSH);
@ -1198,7 +1238,8 @@ wxBitmap TASInputDlg::CreateStickBitmap(int x, int y)
memDC.SetPen(wxPen(*wxBLACK, 3, wxPENSTYLE_SOLID)); memDC.SetPen(wxPen(*wxBLACK, 3, wxPENSTYLE_SOLID));
memDC.DrawLine(64, 64, x, y); memDC.DrawLine(64, 64, x, y);
memDC.SetPen(*wxBLACK_PEN); memDC.SetPen(*wxBLACK_PEN);
memDC.CrossHair(64, 64); memDC.DrawLine(64, 0, 64, HEIGHT); // CrossHair doesn't work @96DPI on Windows for some reason
memDC.DrawLine(0, 64, WIDTH, 64);
memDC.SetBrush(*wxBLUE_BRUSH); memDC.SetBrush(*wxBLUE_BRUSH);
memDC.DrawCircle(x, y, 5); memDC.DrawCircle(x, y, 5);
memDC.SelectObject(wxNullBitmap); memDC.SelectObject(wxNullBitmap);

43
Source/Core/DolphinWX/TASInputDlg.h
View File

@ -13,8 +13,8 @@
#include "Core/HW/WiimoteEmu/WiimoteEmu.h" #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
#include "InputCommon/GCPadStatus.h" #include "InputCommon/GCPadStatus.h"
class DolphinSlider;
class wxCheckBox; class wxCheckBox;
class wxSlider;
class wxStaticBitmap; class wxStaticBitmap;
class wxTextCtrl; class wxTextCtrl;
@ -25,36 +25,24 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP); long style = wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP);
void OnCloseWindow(wxCloseEvent& event);
void UpdateFromSliders(wxCommandEvent& event);
void UpdateFromText(wxCommandEvent& event);
void OnMouseDownL(wxMouseEvent& event);
void OnMouseUpR(wxMouseEvent& event);
void OnRightClickSlider(wxMouseEvent& event);
void ResetValues();
void GetValues(GCPadStatus* PadStatus); void GetValues(GCPadStatus* PadStatus);
void GetValues(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key); void GetValues(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key);
void SetTurbo(wxMouseEvent& event);
void ButtonTurbo();
void GetKeyBoardInput(GCPadStatus* PadStatus); void GetKeyBoardInput(GCPadStatus* PadStatus);
void GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key); void GetKeyBoardInput(u8* data, WiimoteEmu::ReportFeatures rptf, int ext, const wiimote_key key);
void CreateGCLayout(); void CreateGCLayout();
void CreateWiiLayout(int num); void CreateWiiLayout(int num);
wxBitmap CreateStickBitmap(int x, int y);
void SetWiiButtons(u16* butt);
void HandleExtensionChange();
private: private:
const int ID_C_STICK = 1001; static constexpr int ID_C_STICK = 1001;
const int ID_MAIN_STICK = 1002; static constexpr int ID_MAIN_STICK = 1002;
const int ID_CC_L_STICK = 1003; static constexpr int ID_CC_L_STICK = 1003;
const int ID_CC_R_STICK = 1004; static constexpr int ID_CC_R_STICK = 1004;
int m_eleID = 1005; int m_eleID = 1005;
struct Control struct Control
{ {
wxTextCtrl* text; wxTextCtrl* text;
wxSlider* slider; DolphinSlider* slider;
int value = -1; int value = -1;
int text_id; int text_id;
int slider_id; int slider_id;
@ -100,9 +88,22 @@ private:
bool reverseY); bool reverseY);
wxStaticBoxSizer* CreateStickLayout(Stick* tempStick, const wxString& title); wxStaticBoxSizer* CreateStickLayout(Stick* tempStick, const wxString& title);
wxStaticBoxSizer* CreateAccelLayout(Control* x, Control* y, Control* z, const wxString& title); wxStaticBoxSizer* CreateAccelLayout(Control* x, Control* y, Control* z, const wxString& title);
Button CreateButton(const std::string& name); Button CreateButton(const wxString& name);
Control CreateControl(long style, int width, int height, bool reverse = false, u32 range = 255, Control CreateControl(long style, int width, int height, bool reverse = false, u32 range = 255,
u32 default_value = 128); u32 default_value = 128);
wxBitmap CreateStickBitmap(int x, int y);
void OnCloseWindow(wxCloseEvent& event);
void UpdateFromSliders(wxCommandEvent& event);
void UpdateFromText(wxCommandEvent& event);
void OnMouseDownL(wxMouseEvent& event);
void OnMouseUpR(wxMouseEvent& event);
void OnRightClickSlider(wxMouseEvent& event);
void SetTurbo(wxMouseEvent& event);
void ButtonTurbo();
void HandleExtensionChange();
void ResetValues();
void SetWiiButtons(u16* butt);
enum enum
{ {
@ -127,10 +128,6 @@ private:
Button m_cc_buttons[15]; Button m_cc_buttons[15];
Control* m_controls[10]; Control* m_controls[10];
Control* m_cc_controls[6]; Control* m_cc_controls[6];
static const int m_gc_pad_buttons_bitmask[12];
static const int m_wii_buttons_bitmask[11];
static const int m_cc_buttons_bitmask[15];
static const std::string m_cc_button_names[15];
u8 m_ext = 0; u8 m_ext = 0;
wxBoxSizer* m_main_szr; wxBoxSizer* m_main_szr;
wxBoxSizer* m_wiimote_szr; wxBoxSizer* m_wiimote_szr;