From ac404517a392d6eaf0e9c6d45ee8609e14897025 Mon Sep 17 00:00:00 2001 From: EmptyChaos Date: Tue, 2 Aug 2016 06:22:48 +0000 Subject: [PATCH] WX: HiDPI: InputConfigDiag Slight redesign of Control Configuration sub-window since SL_LABELS can't be used with DolphinSlider. --- Source/Core/DolphinWX/InputConfigDiag.cpp | 385 +++++++++++------ Source/Core/DolphinWX/InputConfigDiag.h | 32 +- .../Core/DolphinWX/InputConfigDiagBitmaps.cpp | 393 ++++++++++-------- 3 files changed, 486 insertions(+), 324 deletions(-) diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 1be1a2436c..7978226711 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include +#include #include #include #include @@ -16,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -25,9 +27,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -41,6 +43,7 @@ #include "Core/HW/GCPad.h" #include "Core/HW/Wiimote.h" #include "Core/HotkeyManager.h" +#include "DolphinWX/DolphinSlider.h" #include "DolphinWX/InputConfigDiag.h" #include "DolphinWX/WxUtils.h" #include "InputCommon/ControllerEmu.h" @@ -66,8 +69,10 @@ void GamepadPage::ConfigExtension(wxCommandEvent& event) ControlGroupsSizer* const szr = new ControlGroupsSizer( ex->attachments[ex->switch_extension].get(), &dlg, this, &control_groups); - main_szr->Add(szr, 0, wxLEFT, 5); - main_szr->Add(dlg.CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); + const int space5 = FromDIP(5); + main_szr->Add(szr, 0, wxLEFT, space5); + main_szr->Add(dlg.CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_szr->AddSpacer(space5); dlg.SetSizerAndFit(main_szr); dlg.Center(); @@ -122,6 +127,19 @@ void PadSettingCheckBox::UpdateValue() setting->SetValue(((wxCheckBox*)wxcontrol)->GetValue()); } +PadSettingSpin::PadSettingSpin(wxWindow* const parent, + ControllerEmu::ControlGroup::NumericSetting* const settings) + : PadSetting(new wxSpinCtrl(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, + wxSP_ARROW_KEYS, settings->m_low, settings->m_high, + (int)(settings->m_value * 100))), + setting(settings) +{ + // Compute how wide the control needs to be to fit the maximum value in it. + // This accounts for borders, margins and the spinner buttons. + wxcontrol->SetMinSize(WxUtils::GetTextWidgetMinSize(static_cast(wxcontrol))); + wxcontrol->SetLabelText(setting->m_name); +} + void PadSettingSpin::UpdateGUI() { ((wxSpinCtrl*)wxcontrol)->SetValue((int)(setting->GetValue() * 100)); @@ -139,13 +157,12 @@ ControlDialog::ControlDialog(GamepadPage* const parent, InputConfig& config, control_reference(ref), m_config(config), m_parent(parent) { m_devq = m_parent->controller->default_device; + const int space5 = FromDIP(5); // GetStrings() sounds slow :/ - // device_cbox = new wxComboBox(this, wxID_ANY, StrToWxStr(ref->device_qualifier.ToString()), - // wxDefaultPosition, wxSize(256,-1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER); - device_cbox = - new wxComboBox(this, wxID_ANY, StrToWxStr(m_devq.ToString()), wxDefaultPosition, - wxSize(256, -1), parent->device_cbox->GetStrings(), wxTE_PROCESS_ENTER); + device_cbox = new wxComboBox(this, wxID_ANY, StrToWxStr(m_devq.ToString()), wxDefaultPosition, + wxDLG_UNIT(this, wxSize(180, -1)), parent->device_cbox->GetStrings(), + wxTE_PROCESS_ENTER); device_cbox->Bind(wxEVT_COMBOBOX, &ControlDialog::SetDevice, this); device_cbox->Bind(wxEVT_TEXT_ENTER, &ControlDialog::SetDevice, this); @@ -153,12 +170,19 @@ ControlDialog::ControlDialog(GamepadPage* const parent, InputConfig& config, wxStaticBoxSizer* const control_chooser = CreateControlChooser(parent); wxStaticBoxSizer* const d_szr = new wxStaticBoxSizer(wxVERTICAL, this, _("Device")); - d_szr->Add(device_cbox, 0, wxEXPAND | wxALL, 5); + d_szr->AddSpacer(space5); + d_szr->Add(device_cbox, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + d_szr->AddSpacer(space5); wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL); - szr->Add(d_szr, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, 5); - szr->Add(control_chooser, 1, wxEXPAND | wxALL, 5); + szr->AddSpacer(space5); + szr->Add(d_szr, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + szr->AddSpacer(space5); + szr->Add(control_chooser, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); + szr->AddSpacer(space5); + SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED); + SetLayoutAdaptationLevel(wxDIALOG_ADAPTATION_STANDARD_SIZER); SetSizerAndFit(szr); // needed UpdateGUI(); @@ -169,15 +193,26 @@ ControlButton::ControlButton(wxWindow* const parent, ControllerInterface::ControlReference* const _ref, const std::string& name, const unsigned int width, const std::string& label) - : wxButton(parent, wxID_ANY, "", wxDefaultPosition, wxSize(width, 20)), control_reference(_ref), - m_name(name) + : wxButton(parent, wxID_ANY), control_reference(_ref), m_name(name), + m_configured_width(FromDIP(width)) { if (label.empty()) - SetLabel(StrToWxStr(_ref->expression)); + SetLabelText(StrToWxStr(_ref->expression)); else SetLabel(StrToWxStr(label)); } +wxSize ControlButton::DoGetBestSize() const +{ + if (m_configured_width == wxDefaultCoord) + return wxButton::DoGetBestSize(); + + static constexpr int PADDING_HEIGHT = 4; + wxClientDC dc(const_cast(this)); + wxFontMetrics metrics = dc.GetFontMetrics(); + return {m_configured_width, metrics.height + FromDIP(PADDING_HEIGHT * 2)}; +} + void InputConfigDialog::UpdateProfileComboBox() { std::string pname(File::GetUserPath(D_CONFIG_IDX)); @@ -222,7 +257,7 @@ void InputConfigDialog::OnCloseButton(wxCommandEvent& event) int ControlDialog::GetRangeSliderValue() const { - return range_slider->GetValue(); + return m_range_slider->GetValue(); } void ControlDialog::UpdateListContents() @@ -288,9 +323,7 @@ void GamepadPage::UpdateGUI() { for (ControlButton* button : cgBox->control_buttons) { - wxString expr = StrToWxStr(button->control_reference->expression); - expr.Replace("&", "&&"); - button->SetLabel(expr); + button->SetLabelText(StrToWxStr(button->control_reference->expression)); } for (PadSetting* padSetting : cgBox->options) @@ -503,6 +536,23 @@ void GamepadPage::EnableControlButton(const std::string& group_name, const std:: (*it)->Enable(enabled); } +void ControlDialog::OnRangeSlide(wxScrollEvent& event) +{ + m_range_spinner->SetValue(event.GetPosition()); + control_reference->range = static_cast(event.GetPosition()) / SLIDER_TICK_COUNT; +} + +void ControlDialog::OnRangeSpin(wxSpinEvent& event) +{ + m_range_slider->SetValue(event.GetValue()); + control_reference->range = static_cast(event.GetValue()) / SLIDER_TICK_COUNT; +} + +void ControlDialog::OnRangeThumbtrack(wxScrollEvent& event) +{ + m_range_spinner->SetValue(event.GetPosition()); +} + void GamepadPage::AdjustSetting(wxCommandEvent& event) { const auto* const control = static_cast(event.GetEventObject()); @@ -528,12 +578,6 @@ void GamepadPage::AdjustBooleanSetting(wxCommandEvent& event) } } -void GamepadPage::AdjustControlOption(wxCommandEvent&) -{ - m_control_dialog->control_reference->range = - (ControlState)(m_control_dialog->GetRangeSliderValue()) / SLIDER_TICK_COUNT; -} - void GamepadPage::ConfigControl(wxEvent& event) { m_control_dialog = new ControlDialog(this, m_config, @@ -647,9 +691,10 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) { wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer( wxVERTICAL, this, control_reference->is_input ? _("Input") : _("Output")); + const int space5 = FromDIP(5); - textctrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), - wxTE_MULTILINE | wxTE_RICH2); + textctrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, + wxDLG_UNIT(this, wxSize(-1, 32)), wxTE_MULTILINE | wxTE_RICH2); wxFont font = textctrl->GetFont(); font.SetFamily(wxFONTFAMILY_MODERN); textctrl->SetFont(font); @@ -665,12 +710,12 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) wxButton* const or_button = new wxButton(this, wxID_ANY, _("| OR")); or_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); - control_lbox = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 64)); + control_lbox = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1, 48))); wxBoxSizer* const button_sizer = new wxBoxSizer(wxVERTICAL); - button_sizer->Add(detect_button, 1, 0, 5); - button_sizer->Add(select_button, 1, 0, 5); - button_sizer->Add(or_button, 1, 0, 5); + button_sizer->Add(detect_button, 1); + button_sizer->Add(select_button, 1); + button_sizer->Add(or_button, 1); if (control_reference->is_input) { @@ -683,43 +728,57 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) not_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); add_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); - button_sizer->Add(and_button, 1, 0, 5); - button_sizer->Add(not_button, 1, 0, 5); - button_sizer->Add(add_button, 1, 0, 5); + button_sizer->Add(and_button, 1); + button_sizer->Add(not_button, 1); + button_sizer->Add(add_button, 1); } - range_slider = - new wxSlider(this, wxID_ANY, SLIDER_TICK_COUNT, -SLIDER_TICK_COUNT * 5, SLIDER_TICK_COUNT * 5, - wxDefaultPosition, wxDefaultSize, wxSL_TOP | wxSL_LABELS /*| wxSL_AUTOTICKS*/); - - range_slider->SetValue((int)(control_reference->range * SLIDER_TICK_COUNT)); + m_range_slider = new DolphinSlider( + this, wxID_ANY, static_cast(control_reference->range * SLIDER_TICK_COUNT), + -SLIDER_TICK_COUNT * 5, SLIDER_TICK_COUNT * 5, wxDefaultPosition, wxDefaultSize, wxSL_TOP); + m_range_spinner = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, + wxDLG_UNIT(this, wxSize(32, -1)), + wxSP_ARROW_KEYS | wxALIGN_RIGHT, m_range_slider->GetMin(), + m_range_slider->GetMax(), m_range_slider->GetValue()); detect_button->Bind(wxEVT_BUTTON, &ControlDialog::DetectControl, this); clear_button->Bind(wxEVT_BUTTON, &ControlDialog::ClearControl, this); - range_slider->Bind(wxEVT_SCROLL_CHANGED, &GamepadPage::AdjustControlOption, parent); - wxStaticText* const range_label = new wxStaticText(this, wxID_ANY, _("Range")); + m_range_slider->Bind(wxEVT_SCROLL_CHANGED, &ControlDialog::OnRangeSlide, this); + m_range_slider->Bind(wxEVT_SCROLL_THUMBTRACK, &ControlDialog::OnRangeThumbtrack, this); + m_range_spinner->Bind(wxEVT_SPINCTRL, &ControlDialog::OnRangeSpin, this); m_bound_label = new wxStaticText(this, wxID_ANY, ""); m_error_label = new wxStaticText(this, wxID_ANY, ""); wxBoxSizer* const range_sizer = new wxBoxSizer(wxHORIZONTAL); - range_sizer->Add(range_label, 0, wxCENTER | wxLEFT, 5); - range_sizer->Add(range_slider, 1, wxEXPAND | wxLEFT, 5); + range_sizer->Add(new wxStaticText(this, wxID_ANY, _("Range")), 0, wxALIGN_CENTER_VERTICAL); + range_sizer->Add( + new wxStaticText(this, wxID_ANY, wxString::Format("%d", m_range_slider->GetMin())), 0, + wxALIGN_CENTER_VERTICAL | wxLEFT, space5); + range_sizer->Add(m_range_slider, 1, wxEXPAND); + range_sizer->Add( + new wxStaticText(this, wxID_ANY, wxString::Format("%d", m_range_slider->GetMax())), 0, + wxALIGN_CENTER_VERTICAL); + range_sizer->Add(m_range_spinner, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, space5); wxBoxSizer* const ctrls_sizer = new wxBoxSizer(wxHORIZONTAL); - ctrls_sizer->Add(control_lbox, 1, wxEXPAND, 0); - ctrls_sizer->Add(button_sizer, 0, wxEXPAND, 0); + ctrls_sizer->Add(control_lbox, 1, wxEXPAND); + ctrls_sizer->Add(button_sizer, 0, wxEXPAND); wxSizer* const bottom_btns_sizer = CreateButtonSizer(wxOK | wxAPPLY); - bottom_btns_sizer->Prepend(clear_button, 0, wxLEFT, 5); + bottom_btns_sizer->Prepend(clear_button, 0, wxLEFT, space5); - main_szr->Add(range_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, 5); - main_szr->Add(ctrls_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); - main_szr->Add(textctrl, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); - main_szr->Add(bottom_btns_sizer, 0, wxEXPAND | wxBOTTOM | wxRIGHT, 5); - main_szr->Add(m_bound_label, 0, wxCENTER, 0); - main_szr->Add(m_error_label, 0, wxCENTER, 0); + main_szr->Add(range_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_szr->AddSpacer(space5); + main_szr->Add(ctrls_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_szr->AddSpacer(space5); + main_szr->Add(textctrl, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_szr->AddSpacer(space5); + main_szr->Add(bottom_btns_sizer, 0, wxEXPAND | wxRIGHT, space5); + main_szr->AddSpacer(space5); + main_szr->Add(m_bound_label, 0, wxALIGN_CENTER_HORIZONTAL); + main_szr->Add(m_error_label, 0, wxALIGN_CENTER_HORIZONTAL); UpdateListContents(); @@ -839,22 +898,25 @@ ControlGroupBox::~ControlGroupBox() ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWindow* const parent, GamepadPage* const eventsink) - : wxBoxSizer(wxVERTICAL), control_group(group) + : wxBoxSizer(wxVERTICAL), control_group(group), static_bitmap(nullptr), m_scale(1) { - static_bitmap = nullptr; - const std::vector exclude_buttons = {"Mic", "Modifier"}; - const std::vector exclude_groups = {"IR", "Swing", "Tilt", "Shake", - "UDP Wiimote", "Extension", "Rumble"}; + static constexpr std::array exclude_buttons{{"Mic", "Modifier"}}; + static constexpr std::array exclude_groups{ + {"IR", "Swing", "Tilt", "Shake", "UDP Wiimote", "Extension", "Rumble"}}; - wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); - for (auto& control : group->controls) + wxFont small_font(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + const int space3 = parent->FromDIP(3); + + wxFlexGridSizer* control_grid = new wxFlexGridSizer(2, 0, space3); + control_grid->AddGrowableCol(0); + for (const auto& control : group->controls) { wxStaticText* const label = new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(control->name))); ControlButton* const control_button = new ControlButton(parent, control->control_ref.get(), control->name, 80); - control_button->SetFont(m_SmallFont); + control_button->SetFont(small_font); control_buttons.push_back(control_button); if (std::find(exclude_groups.begin(), exclude_groups.end(), control_group->name) == @@ -878,15 +940,10 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin control_button->Bind(wxEVT_MIDDLE_DOWN, &GamepadPage::ClearControl, eventsink); control_button->Bind(wxEVT_RIGHT_UP, &GamepadPage::ConfigControl, eventsink); - wxBoxSizer* const control_sizer = new wxBoxSizer(wxHORIZONTAL); - control_sizer->AddStretchSpacer(1); - control_sizer->Add(label, 0, wxCENTER | wxRIGHT, 3); - control_sizer->Add(control_button, 0, 0, 0); - - Add(control_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, 3); + control_grid->Add(label, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT); + control_grid->Add(control_button, 0, wxALIGN_CENTER_VERTICAL); } - - wxMemoryDC dc; + Add(control_grid, 0, wxEXPAND | wxLEFT | wxRIGHT, space3); switch (group->type) { @@ -895,9 +952,15 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin case GROUP_TYPE_CURSOR: case GROUP_TYPE_FORCE: { - wxBitmap bitmap(64, 64); - dc.SelectObject(bitmap); + wxSize bitmap_size = parent->FromDIP(wxSize(64, 64)); + m_scale = bitmap_size.GetWidth() / 64.0; + + wxBitmap bitmap; + bitmap.CreateScaled(bitmap_size.GetWidth(), bitmap_size.GetHeight(), wxBITMAP_SCREEN_DEPTH, + parent->GetContentScaleFactor()); + wxMemoryDC dc(bitmap); dc.Clear(); + dc.SelectObject(wxNullBitmap); static_bitmap = new wxStaticBitmap(parent, wxID_ANY, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP); @@ -909,21 +972,23 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin options.push_back(setting); szr->Add( new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->m_name)))); - szr->Add(setting->wxcontrol, 0, wxLEFT, 0); + szr->Add(setting->wxcontrol); } for (auto& groupSetting : group->boolean_settings) { auto* checkbox = new PadSettingCheckBox(parent, groupSetting.get()); checkbox->wxcontrol->Bind(wxEVT_CHECKBOX, &GamepadPage::AdjustBooleanSetting, eventsink); options.push_back(checkbox); - Add(checkbox->wxcontrol, 0, wxALL | wxLEFT, 5); + Add(checkbox->wxcontrol, 0, wxALL | wxLEFT, space3); } wxBoxSizer* const h_szr = new wxBoxSizer(wxHORIZONTAL); - h_szr->Add(szr, 1, 0, 5); - h_szr->Add(static_bitmap, 0, wxALL | wxCENTER, 3); + h_szr->Add(szr, 1, wxEXPAND | wxTOP | wxBOTTOM, space3); + h_szr->AddSpacer(space3); + h_szr->Add(static_bitmap, 0, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, space3); - Add(h_szr, 0, wxEXPAND | wxLEFT | wxCENTER | wxTOP, 3); + AddSpacer(space3); + Add(h_szr, 0, wxEXPAND | wxLEFT | wxRIGHT, space3); } break; case GROUP_TYPE_BUTTONS: @@ -931,10 +996,16 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin // Draw buttons in rows of 8 unsigned int button_cols = group->controls.size() > 8 ? 8 : group->controls.size(); unsigned int button_rows = ceil((float)group->controls.size() / 8.0f); - wxBitmap bitmap(int(12 * button_cols + 1), (11 * button_rows) + 1); + wxSize bitmap_size(12 * button_cols + 1, 11 * button_rows + 1); + wxSize bitmap_scaled_size = parent->FromDIP(bitmap_size); + m_scale = static_cast(bitmap_scaled_size.GetWidth()) / bitmap_size.GetWidth(); - dc.SelectObject(bitmap); + wxBitmap bitmap; + bitmap.CreateScaled(bitmap_scaled_size.GetWidth(), bitmap_scaled_size.GetHeight(), + wxBITMAP_SCREEN_DEPTH, parent->GetContentScaleFactor()); + wxMemoryDC dc(bitmap); dc.Clear(); + dc.SelectObject(wxNullBitmap); static_bitmap = new wxStaticBitmap(parent, wxID_ANY, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP); @@ -949,11 +1020,13 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL); szr->Add(new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(group->numeric_settings[0]->m_name))), - 0, wxCENTER | wxRIGHT, 3); - szr->Add(threshold_cbox->wxcontrol, 0, wxRIGHT, 3); + 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, space3); + szr->Add(threshold_cbox->wxcontrol, 0, wxRIGHT, space3); - Add(szr, 0, wxALL | wxCENTER, 3); - Add(static_bitmap, 0, wxALL | wxCENTER, 3); + AddSpacer(space3); + Add(szr, 0, wxALIGN_CENTER_HORIZONTAL | wxLEFT | wxRIGHT, space3); + AddSpacer(space3); + Add(static_bitmap, 0, wxALIGN_CENTER_HORIZONTAL | wxLEFT | wxRIGHT, space3); } break; case GROUP_TYPE_MIXED_TRIGGERS: @@ -968,10 +1041,16 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin if (GROUP_TYPE_TRIGGERS != group->type) height /= 2; + height += 1; - wxBitmap bitmap(width, height + 1); - dc.SelectObject(bitmap); + wxSize bitmap_size = parent->FromDIP(wxSize(width, height)); + m_scale = static_cast(bitmap_size.GetWidth()) / width; + wxBitmap bitmap; + bitmap.CreateScaled(bitmap_size.GetWidth(), bitmap_size.GetHeight(), wxBITMAP_SCREEN_DEPTH, + parent->GetContentScaleFactor()); + wxMemoryDC dc(bitmap); dc.Clear(); + dc.SelectObject(wxNullBitmap); static_bitmap = new wxStaticBitmap(parent, wxID_ANY, bitmap, wxDefaultPosition, wxDefaultSize, wxBITMAP_TYPE_BMP); @@ -983,12 +1062,15 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL); szr->Add( new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->m_name))), 0, - wxCENTER | wxRIGHT, 3); - szr->Add(setting->wxcontrol, 0, wxRIGHT, 3); - Add(szr, 0, wxALL | wxCENTER, 3); + wxALIGN_CENTER_VERTICAL); + szr->Add(setting->wxcontrol, 0, wxLEFT, space3); + + AddSpacer(space3); + Add(szr, 0, wxALIGN_CENTER_HORIZONTAL | wxLEFT | wxRIGHT, space3); } - Add(static_bitmap, 0, wxALL | wxCENTER, 3); + AddSpacer(space3); + Add(static_bitmap, 0, wxALIGN_CENTER_HORIZONTAL | wxLEFT | wxRIGHT, space3); } break; case GROUP_TYPE_EXTENSION: @@ -1002,8 +1084,10 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin attachments->wxcontrol->Bind(wxEVT_CHOICE, &GamepadPage::AdjustSetting, eventsink); configure_btn->Bind(wxEVT_BUTTON, &GamepadPage::ConfigExtension, eventsink); - Add(attachments->wxcontrol, 0, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, 3); - Add(configure_btn, 0, wxALL | wxEXPAND, 3); + AddSpacer(space3); + Add(attachments->wxcontrol, 0, wxEXPAND | wxLEFT | wxRIGHT, space3); + AddSpacer(space3); + Add(configure_btn, 0, wxEXPAND | wxLEFT | wxRIGHT, space3); } break; default: @@ -1016,7 +1100,8 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin if (groupSetting->m_name == "Iterative Input") groupSetting->SetValue(false); options.push_back(setting_cbox); - Add(setting_cbox->wxcontrol, 0, wxALL | wxLEFT, 5); + AddSpacer(space3); + Add(setting_cbox->wxcontrol, 0, wxLEFT | wxRIGHT, space3); } for (auto& groupSetting : group->numeric_settings) { @@ -1026,17 +1111,15 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL); szr->Add( new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->m_name))), 0, - wxCENTER | wxRIGHT, 3); - szr->Add(setting->wxcontrol, 0, wxRIGHT, 3); - Add(szr, 0, wxALL | wxCENTER, 3); + wxALIGN_CENTER_VERTICAL, space3); + szr->Add(setting->wxcontrol, 0, wxLEFT, space3); + AddSpacer(space3); + Add(szr, 0, wxLEFT | wxRIGHT, space3); } + break; } - break; } - - dc.SelectObject(wxNullBitmap); - - // AddStretchSpacer(0); + AddSpacer(space3); } ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow* const parent, @@ -1044,15 +1127,17 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow std::vector* groups) : wxBoxSizer(wxHORIZONTAL) { + const int space5 = parent->FromDIP(5); size_t col_size = 0; wxBoxSizer* stacked_groups = nullptr; for (auto& group : controller->groups) { - ControlGroupBox* control_group_box = new ControlGroupBox(group.get(), parent, eventsink); wxStaticBoxSizer* control_group = new wxStaticBoxSizer(wxVERTICAL, parent, wxGetTranslation(StrToWxStr(group->ui_name))); - control_group->Add(control_group_box); + ControlGroupBox* control_group_box = + new ControlGroupBox(group.get(), control_group->GetStaticBox(), eventsink); + control_group->Add(control_group_box, 0, wxEXPAND); const size_t grp_size = group->controls.size() + group->numeric_settings.size() + group->boolean_settings.size(); @@ -1060,7 +1145,10 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow if (col_size > 8 || nullptr == stacked_groups) { if (stacked_groups) - Add(stacked_groups, 0, /*wxEXPAND|*/ wxBOTTOM | wxRIGHT, 5); + { + Add(stacked_groups, 0, wxBOTTOM, space5); + AddSpacer(space5); + } stacked_groups = new wxBoxSizer(wxVERTICAL); stacked_groups->Add(control_group, 0, wxEXPAND); @@ -1077,7 +1165,7 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow } if (stacked_groups) - Add(stacked_groups, 0, /*wxEXPAND|*/ wxBOTTOM | wxRIGHT, 5); + Add(stacked_groups, 0, wxBOTTOM, space5); } GamepadPage::GamepadPage(wxWindow* parent, InputConfig& config, const int pad_num, @@ -1086,65 +1174,81 @@ GamepadPage::GamepadPage(wxWindow* parent, InputConfig& config, const int pad_nu m_config_dialog(config_dialog), m_config(config) { wxBoxSizer* control_group_sizer = new ControlGroupsSizer(controller, this, this, &control_groups); - - wxStaticBoxSizer* profile_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Profile")); + const int space3 = FromDIP(3); + const int space5 = FromDIP(5); // device chooser + wxStaticBoxSizer* const device_sbox = new wxStaticBoxSizer(wxVERTICAL, this, _("Device")); - wxStaticBoxSizer* const device_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Device")); - - device_cbox = new wxComboBox(this, wxID_ANY, "", wxDefaultPosition, wxSize(64, -1)); + device_cbox = new wxComboBox(device_sbox->GetStaticBox(), wxID_ANY, ""); device_cbox->ToggleWindowStyle(wxTE_PROCESS_ENTER); - wxButton* refresh_button = - new wxButton(this, wxID_ANY, _("Refresh"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + wxButton* refresh_button = new wxButton(device_sbox->GetStaticBox(), wxID_ANY, _("Refresh"), + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); device_cbox->Bind(wxEVT_COMBOBOX, &GamepadPage::SetDevice, this); device_cbox->Bind(wxEVT_TEXT_ENTER, &GamepadPage::SetDevice, this); refresh_button->Bind(wxEVT_BUTTON, &GamepadPage::RefreshDevices, this); - device_sbox->Add(device_cbox, 1, wxLEFT | wxRIGHT, 3); - device_sbox->Add(refresh_button, 0, wxRIGHT | wxBOTTOM, 3); + wxBoxSizer* const device_sbox_in = new wxBoxSizer(wxHORIZONTAL); + device_sbox_in->Add(WxUtils::GiveMinSizeDIP(device_cbox, wxSize(64, -1)), 1, + wxALIGN_CENTER_VERTICAL); + device_sbox_in->Add(refresh_button, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, space3); + device_sbox->Add(device_sbox_in, 1, wxEXPAND | wxLEFT | wxRIGHT, space3); + device_sbox->AddSpacer(space3); - wxButton* const default_button = - new wxButton(this, wxID_ANY, _("Default"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); - wxButton* const clearall_button = - new wxButton(this, wxID_ANY, _("Clear"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + // Clear / Reset buttons + wxStaticBoxSizer* const clear_sbox = new wxStaticBoxSizer(wxVERTICAL, this, _("Reset")); - wxStaticBoxSizer* const clear_sbox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Reset")); - clear_sbox->Add(default_button, 1, wxLEFT, 3); - clear_sbox->Add(clearall_button, 1, wxRIGHT, 3); + wxButton* const default_button = new wxButton(clear_sbox->GetStaticBox(), wxID_ANY, _("Default"), + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + wxButton* const clearall_button = new wxButton(clear_sbox->GetStaticBox(), wxID_ANY, _("Clear"), + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + + wxBoxSizer* clear_sbox_in = new wxBoxSizer(wxHORIZONTAL); + clear_sbox_in->Add(default_button, 1, wxALIGN_CENTER_VERTICAL); + clear_sbox_in->Add(clearall_button, 1, wxALIGN_CENTER_VERTICAL); + clear_sbox->Add(clear_sbox_in, 1, wxEXPAND | wxLEFT | wxRIGHT, space3); + clear_sbox->AddSpacer(space3); clearall_button->Bind(wxEVT_BUTTON, &GamepadPage::ClearAll, this); default_button->Bind(wxEVT_BUTTON, &GamepadPage::LoadDefaults, this); - profile_cbox = new wxComboBox(this, wxID_ANY, "", wxDefaultPosition, wxSize(64, -1)); + // Profile selector + wxStaticBoxSizer* profile_sbox = new wxStaticBoxSizer(wxVERTICAL, this, _("Profile")); + profile_cbox = new wxComboBox(profile_sbox->GetStaticBox(), wxID_ANY, ""); - wxButton* const pload_btn = - new wxButton(this, wxID_ANY, _("Load"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); - wxButton* const psave_btn = - new wxButton(this, wxID_ANY, _("Save"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); - wxButton* const pdelete_btn = - new wxButton(this, wxID_ANY, _("Delete"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + wxButton* const pload_btn = new wxButton(profile_sbox->GetStaticBox(), wxID_ANY, _("Load"), + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + wxButton* const psave_btn = new wxButton(profile_sbox->GetStaticBox(), wxID_ANY, _("Save"), + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); + wxButton* const pdelete_btn = new wxButton(profile_sbox->GetStaticBox(), wxID_ANY, _("Delete"), + wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); pload_btn->Bind(wxEVT_BUTTON, &GamepadPage::LoadProfile, this); psave_btn->Bind(wxEVT_BUTTON, &GamepadPage::SaveProfile, this); pdelete_btn->Bind(wxEVT_BUTTON, &GamepadPage::DeleteProfile, this); - profile_sbox->Add(profile_cbox, 1, wxLEFT, 3); - profile_sbox->Add(pload_btn, 0, wxLEFT, 3); - profile_sbox->Add(psave_btn, 0, 0, 3); - profile_sbox->Add(pdelete_btn, 0, wxRIGHT | wxBOTTOM, 3); + wxBoxSizer* profile_sbox_in = new wxBoxSizer(wxHORIZONTAL); + profile_sbox_in->Add(WxUtils::GiveMinSizeDIP(profile_cbox, wxSize(64, -1)), 1, + wxALIGN_CENTER_VERTICAL); + profile_sbox_in->AddSpacer(space3); + profile_sbox_in->Add(pload_btn, 0, wxALIGN_CENTER_VERTICAL); + profile_sbox_in->Add(psave_btn, 0, wxALIGN_CENTER_VERTICAL); + profile_sbox_in->Add(pdelete_btn, 0, wxALIGN_CENTER_VERTICAL); + profile_sbox->Add(profile_sbox_in, 1, wxEXPAND | wxLEFT | wxRIGHT, space3); + profile_sbox->AddSpacer(space3); wxBoxSizer* const dio = new wxBoxSizer(wxHORIZONTAL); - dio->Add(device_sbox, 1, wxEXPAND | wxRIGHT, 5); - dio->Add(clear_sbox, 0, wxEXPAND | wxRIGHT, 5); - dio->Add(profile_sbox, 1, wxEXPAND | wxRIGHT, 5); + dio->Add(device_sbox, 1, wxEXPAND); + dio->Add(clear_sbox, 0, wxEXPAND | wxLEFT, space5); + dio->Add(profile_sbox, 1, wxEXPAND | wxLEFT, space5); wxBoxSizer* const mapping = new wxBoxSizer(wxVERTICAL); - - mapping->Add(dio, 1, wxEXPAND | wxLEFT | wxTOP | wxBOTTOM, 5); - mapping->Add(control_group_sizer, 0, wxLEFT | wxEXPAND, 5); + mapping->AddSpacer(space5); + mapping->Add(dio, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); + mapping->AddSpacer(space5); + mapping->Add(control_group_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); UpdateGUI(); @@ -1154,9 +1258,9 @@ GamepadPage::GamepadPage(wxWindow* parent, InputConfig& config, const int pad_nu InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name, const int tab_num) - : wxDialog(parent, wxID_ANY, name, wxPoint(128, -1)), m_config(config) + : wxDialog(parent, wxID_ANY, name), m_config(config) { - m_pad_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT); + m_pad_notebook = new wxNotebook(this, wxID_ANY); GamepadPage* gp = new GamepadPage(m_pad_notebook, m_config, tab_num, this); m_padpages.push_back(gp); m_pad_notebook->AddPage(gp, wxString::Format("%s [%u]", @@ -1172,10 +1276,15 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config Bind(wxEVT_BUTTON, &InputConfigDialog::OnCloseButton, this, wxID_CLOSE); wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL); - szr->Add(m_pad_notebook, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5); - szr->Add(CreateButtonSizer(wxCLOSE), 0, wxEXPAND | wxALL, 5); + const int space5 = FromDIP(5); + szr->AddSpacer(space5); + szr->Add(m_pad_notebook, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); + szr->AddSpacer(space5); + szr->Add(CreateButtonSizer(wxCLOSE | wxNO_DEFAULT), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + szr->AddSpacer(space5); SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED); + SetLayoutAdaptationLevel(wxDIALOG_ADAPTATION_STANDARD_SIZER); SetSizerAndFit(szr); Center(); diff --git a/Source/Core/DolphinWX/InputConfigDiag.h b/Source/Core/DolphinWX/InputConfigDiag.h index 41390d8d60..210a01d312 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.h +++ b/Source/Core/DolphinWX/InputConfigDiag.h @@ -27,11 +27,11 @@ #include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/Device.h" +class DolphinSlider; class InputConfig; class wxComboBox; class wxListBox; class wxNotebook; -class wxSlider; class wxStaticBitmap; class wxStaticText; class wxTextCtrl; @@ -62,15 +62,7 @@ class PadSettingSpin : public PadSetting { public: PadSettingSpin(wxWindow* const parent, - ControllerEmu::ControlGroup::NumericSetting* const _setting) - : PadSetting(new wxSpinCtrl(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, - wxSize(54, -1), 0, _setting->m_low, _setting->m_high, - (int)(_setting->GetValue() * 100))), - setting(_setting) - { - wxcontrol->SetLabel(setting->m_name); - } - + ControllerEmu::ControlGroup::NumericSetting* const setting); void UpdateGUI() override; void UpdateValue() override; @@ -136,6 +128,9 @@ private: void SetSelectedControl(wxCommandEvent& event); void AppendControl(wxCommandEvent& event); + void OnRangeSlide(wxScrollEvent&); + void OnRangeSpin(wxSpinEvent&); + void OnRangeThumbtrack(wxScrollEvent&); bool GetExpressionForSelectedControl(wxString& expr); @@ -143,7 +138,8 @@ private: wxComboBox* device_cbox; wxTextCtrl* textctrl; wxListBox* control_lbox; - wxSlider* range_slider; + DolphinSlider* m_range_slider; + wxSpinCtrl* m_range_spinner; wxStaticText* m_bound_label; wxStaticText* m_error_label; InputEventFilter m_event_filter; @@ -165,10 +161,15 @@ class ControlButton : public wxButton { public: ControlButton(wxWindow* const parent, ControllerInterface::ControlReference* const _ref, - const std::string& name, const unsigned int width, const std::string& label = ""); + const std::string& name, const unsigned int width, const std::string& label = {}); ControllerInterface::ControlReference* const control_reference; const std::string m_name; + +protected: + wxSize DoGetBestSize() const override; + + int m_configured_width = wxDefaultCoord; }; class ControlGroupBox : public wxBoxSizer @@ -178,11 +179,18 @@ public: GamepadPage* const eventsink); ~ControlGroupBox(); + bool HasBitmapHeading() const + { + return control_group->type == GROUP_TYPE_STICK || control_group->type == GROUP_TYPE_TILT || + control_group->type == GROUP_TYPE_CURSOR || control_group->type == GROUP_TYPE_FORCE; + } + std::vector options; ControllerEmu::ControlGroup* const control_group; wxStaticBitmap* static_bitmap; std::vector control_buttons; + double m_scale; }; class ControlGroupsSizer : public wxBoxSizer diff --git a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp index 8f972c9091..fa4f10ff13 100644 --- a/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp +++ b/Source/Core/DolphinWX/InputConfigDiagBitmaps.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include +#include #include #include #include @@ -11,8 +13,10 @@ #include #include #include +#include #include #include +#include #include #include "DolphinWX/InputConfigDiag.h" @@ -36,69 +40,64 @@ struct ShapePosition }; // regular octagon -static void DrawOctagon(wxDC* dc, ShapePosition p) +static void DrawOctagon(wxGraphicsContext* gc, ShapePosition p) { - const int vertices = 8; + static constexpr int vertices = 8; double radius = p.max; - wxPoint point[vertices]; + wxGraphicsPath path = gc->CreatePath(); double angle = 2.0 * M_PI / vertices; for (int i = 0; i < vertices; i++) { - double a = (angle * i); + double a = angle * i; double x = radius * cos(a); double y = radius * sin(a); - point[i].x = x; - point[i].y = y; + if (i == 0) + path.MoveToPoint(x, y); + else + path.AddLineToPoint(x, y); } + path.CloseSubpath(); - dc->DrawPolygon(vertices, point, p.offset, p.offset); + wxGraphicsMatrix matrix = gc->CreateMatrix(); + matrix.Translate(p.offset, p.offset); + path.Transform(matrix); + + gc->DrawPath(path); } // irregular dodecagon -static void DrawDodecagon(wxDC* dc, ShapePosition p) +static void DrawDodecagon(wxGraphicsContext* gc, ShapePosition p) { - const int vertices = 12; + wxGraphicsPath path = gc->CreatePath(); + path.MoveToPoint(p.dz, p.max); + path.AddLineToPoint(p.diag, p.diag); + path.AddLineToPoint(p.max, p.dz); + path.AddLineToPoint(p.max, -p.dz); + path.AddLineToPoint(p.diag, -p.diag); + path.AddLineToPoint(p.dz, -p.max); + path.AddLineToPoint(-p.dz, -p.max); + path.AddLineToPoint(-p.diag, -p.diag); + path.AddLineToPoint(-p.max, -p.dz); + path.AddLineToPoint(-p.max, p.dz); + path.AddLineToPoint(-p.diag, p.diag); + path.AddLineToPoint(-p.dz, p.max); + path.CloseSubpath(); - wxPoint point[vertices]; - point[0].x = p.dz; - point[0].y = p.max; - point[1].x = p.diag; - point[1].y = p.diag; - point[2].x = p.max; - point[2].y = p.dz; + wxGraphicsMatrix matrix = gc->CreateMatrix(); + matrix.Translate(p.offset, p.offset); + path.Transform(matrix); - point[3].x = p.max; - point[3].y = -p.dz; - point[4].x = p.diag; - point[4].y = -p.diag; - point[5].x = p.dz; - point[5].y = -p.max; - - point[6].x = -p.dz; - point[6].y = -p.max; - point[7].x = -p.diag; - point[7].y = -p.diag; - point[8].x = -p.max; - point[8].y = -p.dz; - - point[9].x = -p.max; - point[9].y = p.dz; - point[10].x = -p.diag; - point[10].y = p.diag; - point[11].x = -p.dz; - point[11].y = p.max; - - dc->DrawPolygon(vertices, point, p.offset, p.offset); + gc->DrawPath(path); } -static void DrawCenteredRectangle(wxDC& dc, int x, int y, int w, int h) +static void DrawCenteredRectangle(wxGraphicsContext* gc, double x, double y, double w, double h) { x -= w / 2; y -= h / 2; - dc.DrawRectangle(x, y, w, h); + gc->DrawRectangle(x, y, w, h); } #define VIS_BITMAP_SIZE 64 @@ -108,37 +107,47 @@ static void DrawCenteredRectangle(wxDC& dc, int x, int y, int w, int h) #define COORD_VIS_SIZE 4 -static void DrawCoordinate(wxDC& dc, ControlState x, ControlState y) +static void DrawCoordinate(wxGraphicsContext* gc, ControlState x, ControlState y) { - int xc = VIS_COORD(x); - int yc = VIS_COORD(y); - DrawCenteredRectangle(dc, xc, yc, COORD_VIS_SIZE, COORD_VIS_SIZE); + double xc = VIS_COORD(x); + double yc = VIS_COORD(y); + DrawCenteredRectangle(gc, xc, yc, COORD_VIS_SIZE, COORD_VIS_SIZE); } -static void DrawButton(unsigned int* const bitmasks, unsigned int buttons, unsigned int n, wxDC& dc, - ControlGroupBox* g, unsigned int row) +static void DrawButton(const std::vector& bitmasks, unsigned int buttons, + unsigned int n, wxGraphicsContext* gc, ControlGroupBox* g, unsigned int row, + const wxGraphicsMatrix& null_matrix) { if (buttons & bitmasks[(row * 8) + n]) { - dc.SetBrush(*wxRED_BRUSH); + gc->SetBrush(*wxRED_BRUSH); } else { - auto lock = ControllerEmu::GetStateLock(); unsigned char amt = 255 - g->control_group->controls[(row * 8) + n]->control_ref->State() * 128; - dc.SetBrush(wxBrush(wxColour(amt, amt, amt))); + gc->SetBrush(wxBrush(wxColour(amt, amt, amt))); } - dc.DrawRectangle(n * 12, (row == 0) ? 0 : (row * 11), 14, 12); + gc->DrawRectangle(n * 12, (row == 0) ? 0 : (row * 11), 14, 12); // text const std::string name = g->control_group->controls[(row * 8) + n]->name; + // Matrix transformation needs to be disabled so we don't draw scaled/zoomed text. + wxGraphicsMatrix old_matrix = gc->GetTransform(); + gc->SetTransform(null_matrix); // bit of hax so ZL, ZR show up as L, R - dc.DrawText(StrToWxStr(std::string(1, (name[1] && name[1] < 'a') ? name[1] : name[0])), - n * 12 + 2, 1 + ((row == 0) ? 0 : (row * 11))); + gc->DrawText(wxUniChar((name[1] && name[1] < 'a') ? name[1] : name[0]), (n * 12 + 2) * g->m_scale, + (1 + (row == 0 ? 0 : row * 11)) * g->m_scale); + gc->SetTransform(old_matrix); } -static void DrawControlGroupBox(wxDC& dc, ControlGroupBox* g) +static void DrawControlGroupBox(wxGraphicsContext* gc, ControlGroupBox* g) { + wxGraphicsMatrix null_matrix = gc->GetTransform(); + wxGraphicsMatrix scale_matrix = null_matrix; + scale_matrix.Scale(g->m_scale, g->m_scale); + + gc->SetTransform(scale_matrix); + switch (g->control_group->type) { case GROUP_TYPE_TILT: @@ -165,29 +174,17 @@ static void DrawControlGroupBox(wxDC& dc, ControlGroupBox* g) // ir cursor forward movement if (GROUP_TYPE_CURSOR == g->control_group->type) { - if (z) - { - dc.SetPen(*wxRED_PEN); - dc.SetBrush(*wxRED_BRUSH); - } - else - { - dc.SetPen(*wxGREY_PEN); - dc.SetBrush(*wxGREY_BRUSH); - } - dc.DrawRectangle(0, 31 - z * 31, 64, 2); + gc->SetBrush(z ? *wxRED_BRUSH : *wxGREY_BRUSH); + wxGraphicsPath path = gc->CreatePath(); + path.AddRectangle(0, 31 - z * 31, 64, 2); + gc->FillPath(path); } // input zone - dc.SetPen(*wxLIGHT_GREY_PEN); - dc.SetBrush(*wxWHITE_BRUSH); + gc->SetPen(*wxLIGHT_GREY_PEN); if (GROUP_TYPE_STICK == g->control_group->type) { - // outline and fill colors - wxBrush LightGrayBrush("#dddddd"); - wxPen LightGrayPen("#bfbfbf"); - dc.SetBrush(LightGrayBrush); - dc.SetPen(LightGrayPen); + gc->SetBrush(wxColour(0xDDDDDD)); // Light Gray ShapePosition p; p.box = 64; @@ -215,20 +212,25 @@ static void DrawControlGroupBox(wxDC& dc, ControlGroupBox* g) } if (octagon) - DrawOctagon(&dc, p); + DrawOctagon(gc, p); else - DrawDodecagon(&dc, p); + DrawDodecagon(gc, p); } else { - dc.DrawRectangle(16, 16, 32, 32); + gc->SetBrush(*wxWHITE_BRUSH); + gc->DrawRectangle(16, 16, 32, 32); } if (GROUP_TYPE_CURSOR != g->control_group->type) { - // deadzone circle - dc.SetBrush(*wxLIGHT_GREY_BRUSH); - dc.DrawCircle(32, 32, g->control_group->numeric_settings[SETTING_DEADZONE]->GetValue() * 32); + int deadzone_idx = g->control_group->type == GROUP_TYPE_STICK ? SETTING_DEADZONE : 0; + wxGraphicsPath path = gc->CreatePath(); + path.AddCircle(VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE / 2, + g->control_group->numeric_settings[deadzone_idx]->GetValue() * + VIS_BITMAP_SIZE / 2); + gc->SetBrush(*wxLIGHT_GREY_BRUSH); + gc->FillPath(path); } // raw dot @@ -238,21 +240,21 @@ static void DrawControlGroupBox(wxDC& dc, ControlGroupBox* g) yy = g->control_group->controls[1]->control_ref->State(); yy -= g->control_group->controls[0]->control_ref->State(); - dc.SetPen(*wxGREY_PEN); - dc.SetBrush(*wxGREY_BRUSH); - DrawCoordinate(dc, xx, yy); + gc->SetPen(*wxTRANSPARENT_PEN); + gc->SetBrush(*wxGREY_BRUSH); + DrawCoordinate(gc, xx, yy); // adjusted dot if (x != 0 || y != 0) { - dc.SetPen(*wxRED_PEN); - dc.SetBrush(*wxRED_BRUSH); + gc->SetBrush(*wxRED_BRUSH); // XXX: The adjusted values flip the Y axis to be in the format // the Wii expects. Should this be in WiimoteEmu.cpp instead? - DrawCoordinate(dc, x, -y); + DrawCoordinate(gc, x, -y); } } break; + case GROUP_TYPE_FORCE: { ControlState raw_dot[3]; @@ -270,69 +272,67 @@ static void DrawControlGroupBox(wxDC& dc, ControlGroupBox* g) } // deadzone rect for forward/backward visual - dc.SetBrush(*wxLIGHT_GREY_BRUSH); - dc.SetPen(*wxLIGHT_GREY_PEN); + gc->SetPen(*wxTRANSPARENT_PEN); + gc->SetBrush(*wxLIGHT_GREY_BRUSH); int deadzone_height = deadzone * VIS_BITMAP_SIZE; - DrawCenteredRectangle(dc, 0, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE, deadzone_height); + DrawCenteredRectangle(gc, 0, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE, deadzone_height); #define LINE_HEIGHT 2 int line_y; // raw forward/background line - dc.SetPen(*wxGREY_PEN); - dc.SetBrush(*wxGREY_BRUSH); + gc->SetBrush(*wxGREY_BRUSH); line_y = VIS_COORD(raw_dot[2]); - DrawCenteredRectangle(dc, VIS_BITMAP_SIZE / 2, line_y, VIS_BITMAP_SIZE, LINE_HEIGHT); + DrawCenteredRectangle(gc, VIS_BITMAP_SIZE / 2, line_y, VIS_BITMAP_SIZE, LINE_HEIGHT); // adjusted forward/background line if (adj_dot[2] != 0.0) { - dc.SetPen(*wxRED_PEN); - dc.SetBrush(*wxRED_BRUSH); + gc->SetBrush(*wxRED_BRUSH); line_y = VIS_COORD(adj_dot[2]); - DrawCenteredRectangle(dc, VIS_BITMAP_SIZE / 2, line_y, VIS_BITMAP_SIZE, LINE_HEIGHT); + DrawCenteredRectangle(gc, VIS_BITMAP_SIZE / 2, line_y, VIS_BITMAP_SIZE, LINE_HEIGHT); } #define DEADZONE_RECT_SIZE 32 // empty deadzone square - dc.SetBrush(*wxWHITE_BRUSH); - dc.SetPen(*wxLIGHT_GREY_PEN); - DrawCenteredRectangle(dc, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE / 2, DEADZONE_RECT_SIZE, + gc->SetPen(*wxLIGHT_GREY_PEN); + gc->SetBrush(*wxWHITE_BRUSH); + DrawCenteredRectangle(gc, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE / 2, DEADZONE_RECT_SIZE, DEADZONE_RECT_SIZE); // deadzone square - dc.SetBrush(*wxLIGHT_GREY_BRUSH); + gc->SetPen(*wxTRANSPARENT_PEN); + gc->SetBrush(*wxLIGHT_GREY_BRUSH); int dz_size = (deadzone * DEADZONE_RECT_SIZE); - DrawCenteredRectangle(dc, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE / 2, dz_size, dz_size); + DrawCenteredRectangle(gc, VIS_BITMAP_SIZE / 2, VIS_BITMAP_SIZE / 2, dz_size, dz_size); // raw dot - dc.SetPen(*wxGREY_PEN); - dc.SetBrush(*wxGREY_BRUSH); - DrawCoordinate(dc, raw_dot[1], raw_dot[0]); + gc->SetBrush(*wxGREY_BRUSH); + DrawCoordinate(gc, raw_dot[1], raw_dot[0]); // adjusted dot if (adj_dot[1] != 0 && adj_dot[0] != 0) { - dc.SetPen(*wxRED_PEN); - dc.SetBrush(*wxRED_BRUSH); - DrawCoordinate(dc, adj_dot[1], adj_dot[0]); + gc->SetBrush(*wxRED_BRUSH); + DrawCoordinate(gc, adj_dot[1], adj_dot[0]); } } break; + case GROUP_TYPE_BUTTONS: { - unsigned int button_count = ((unsigned int)g->control_group->controls.size()); + const unsigned int button_count = static_cast(g->control_group->controls.size()); + std::vector bitmasks(button_count); // draw the shit - dc.SetPen(*wxGREY_PEN); + gc->SetPen(*wxGREY_PEN); - unsigned int* const bitmasks = new unsigned int[button_count]; for (unsigned int n = 0; n < button_count; ++n) bitmasks[n] = (1 << n); unsigned int buttons = 0; - ((ControllerEmu::Buttons*)g->control_group)->GetState(&buttons, bitmasks); + ((ControllerEmu::Buttons*)g->control_group)->GetState(&buttons, bitmasks.data()); // Draw buttons in rows of 8 for (unsigned int row = 0; row < ceil((float)button_count / 8.0f); row++) @@ -343,155 +343,200 @@ static void DrawControlGroupBox(wxDC& dc, ControlGroupBox* g) for (unsigned int n = 0; n < buttons_to_draw; ++n) { - DrawButton(bitmasks, buttons, n, dc, g, row); + DrawButton(bitmasks, buttons, n, gc, g, row, null_matrix); } } - - delete[] bitmasks; } break; + case GROUP_TYPE_TRIGGERS: { - const unsigned int trigger_count = ((unsigned int)(g->control_group->controls.size())); + const unsigned int trigger_count = static_cast(g->control_group->controls.size()); + std::vector trigs(trigger_count); // draw the shit - dc.SetPen(*wxGREY_PEN); - ControlState deadzone = g->control_group->numeric_settings[0]->GetValue(); + gc->SetPen(*wxGREY_PEN); - ControlState* const trigs = new ControlState[trigger_count]; - ((ControllerEmu::Triggers*)g->control_group)->GetState(trigs); + ControlState deadzone = g->control_group->numeric_settings[0]->GetValue(); + ((ControllerEmu::Triggers*)g->control_group)->GetState(trigs.data()); for (unsigned int n = 0; n < trigger_count; ++n) { ControlState trig_r = g->control_group->controls[n]->control_ref->State(); // outline - dc.SetPen(*wxGREY_PEN); - dc.SetBrush(*wxWHITE_BRUSH); - dc.DrawRectangle(0, n * 12, 64, 14); + gc->SetBrush(*wxWHITE_BRUSH); + gc->DrawRectangle(0, n * 12, 64, 14); // raw - dc.SetBrush(*wxGREY_BRUSH); - dc.DrawRectangle(0, n * 12, trig_r * 64, 14); + gc->SetBrush(*wxGREY_BRUSH); + gc->DrawRectangle(0, n * 12, trig_r * 64, 14); // deadzone affected - dc.SetBrush(*wxRED_BRUSH); - dc.DrawRectangle(0, n * 12, trigs[n] * 64, 14); + gc->SetBrush(*wxRED_BRUSH); + gc->DrawRectangle(0, n * 12, trigs[n] * 64, 14); // text - dc.DrawText(StrToWxStr(g->control_group->controls[n]->name), 3, n * 12 + 1); + // We don't want the text to be scaled/zoomed + gc->SetTransform(null_matrix); + gc->DrawText(StrToWxStr(g->control_group->controls[n]->name), 3 * g->m_scale, + (n * 12 + 1) * g->m_scale); + gc->SetTransform(scale_matrix); } - delete[] trigs; - // deadzone box - dc.SetPen(*wxLIGHT_GREY_PEN); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(0, 0, deadzone * 64, trigger_count * 14); + gc->SetPen(*wxLIGHT_GREY_PEN); + gc->SetBrush(*wxTRANSPARENT_BRUSH); + gc->DrawRectangle(0, 0, deadzone * 64, trigger_count * 14); } break; + case GROUP_TYPE_MIXED_TRIGGERS: { const unsigned int trigger_count = ((unsigned int)(g->control_group->controls.size() / 2)); // draw the shit - dc.SetPen(*wxGREY_PEN); + gc->SetPen(*wxGREY_PEN); ControlState thresh = g->control_group->numeric_settings[0]->GetValue(); for (unsigned int n = 0; n < trigger_count; ++n) { - dc.SetBrush(*wxRED_BRUSH); + gc->SetBrush(*wxRED_BRUSH); ControlState trig_d = g->control_group->controls[n]->control_ref->State(); ControlState trig_a = trig_d > thresh ? 1 : g->control_group->controls[n + trigger_count]->control_ref->State(); - dc.DrawRectangle(0, n * 12, 64 + 20, 14); + gc->DrawRectangle(0, n * 12, 64 + 20, 14); if (trig_d <= thresh) - dc.SetBrush(*wxWHITE_BRUSH); - dc.DrawRectangle(trig_a * 64, n * 12, 64 + 20, 14); - dc.DrawRectangle(64, n * 12, 32, 14); + gc->SetBrush(*wxWHITE_BRUSH); + gc->DrawRectangle(trig_a * 64, n * 12, 64 + 20, 14); + gc->DrawRectangle(64, n * 12, 32, 14); // text - dc.DrawText(StrToWxStr(g->control_group->controls[n + trigger_count]->name), 3, n * 12 + 1); - dc.DrawText(StrToWxStr(std::string(1, g->control_group->controls[n]->name[0])), 64 + 3, - n * 12 + 1); + // We don't want the text to be scaled/zoomed + gc->SetTransform(null_matrix); + gc->DrawText(StrToWxStr(g->control_group->controls[n + trigger_count]->name), 3 * g->m_scale, + (n * 12 + 1) * g->m_scale); + gc->DrawText(StrToWxStr(std::string(1, g->control_group->controls[n]->name[0])), + (64 + 3) * g->m_scale, (n * 12 + 1) * g->m_scale); + gc->SetTransform(scale_matrix); } // threshold box - dc.SetPen(*wxLIGHT_GREY_PEN); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(thresh * 64, 0, 128, trigger_count * 14); + gc->SetPen(*wxLIGHT_GREY_PEN); + gc->SetBrush(*wxTRANSPARENT_BRUSH); + gc->DrawRectangle(thresh * 64, 0, 128, trigger_count * 14); } break; + case GROUP_TYPE_SLIDER: { const ControlState deadzone = g->control_group->numeric_settings[0]->GetValue(); ControlState state = g->control_group->controls[1]->control_ref->State() - g->control_group->controls[0]->control_ref->State(); - dc.SetPen(*wxGREY_PEN); - dc.SetBrush(*wxGREY_BRUSH); - dc.DrawRectangle(31 + state * 30, 0, 2, 14); + gc->SetPen(*wxTRANSPARENT_PEN); + gc->SetBrush(*wxGREY_BRUSH); + gc->DrawRectangle(31 + state * 30, 0, 2, 14); ControlState adj_state; ((ControllerEmu::Slider*)g->control_group)->GetState(&adj_state); if (state) { - dc.SetPen(*wxRED_PEN); - dc.SetBrush(*wxRED_BRUSH); - dc.DrawRectangle(31 + adj_state * 30, 0, 2, 14); + gc->SetBrush(*wxRED_BRUSH); + gc->DrawRectangle(31 + adj_state * 30, 0, 2, 14); } // deadzone box - dc.SetPen(*wxLIGHT_GREY_PEN); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(32 - deadzone * 32, 0, deadzone * 64, 14); + gc->SetPen(*wxLIGHT_GREY_PEN); + gc->SetBrush(*wxTRANSPARENT_BRUSH); + gc->DrawRectangle(32 - deadzone * 32, 0, deadzone * 64, 14); } break; + default: break; } + gc->SetTransform(null_matrix); +} + +static void DrawBorder(wxGraphicsContext* gc, double scale) +{ + double pen_width = std::round(scale); // Pen width = 1px * scale + + // Use the window caption bar color as a safe accent color. + wxPen border_pen(wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION), + static_cast(pen_width)); + border_pen.SetCap(wxCAP_PROJECTING); + + double width, height; + gc->GetSize(&width, &height); + + wxGraphicsPath path = gc->CreatePath(); + path.AddRectangle(pen_width / 2, pen_width / 2, width - pen_width, height - pen_width); + gc->SetPen(border_pen); + gc->StrokePath(path); } void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event)) { wxFont small_font(6, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD); + const wxColour font_color{0xB8B8B8}; g_controller_interface.UpdateInput(); GamepadPage* const current_page = - (GamepadPage*)m_pad_notebook->GetPage(m_pad_notebook->GetSelection()); + static_cast(m_pad_notebook->GetPage(m_pad_notebook->GetSelection())); + wxMemoryDC dc; auto lock = ControllerEmu::GetStateLock(); for (ControlGroupBox* g : current_page->control_groups) { - // if this control group has a bitmap - if (g->static_bitmap) + // Only if this control group has a bitmap + if (!g->static_bitmap) + continue; + + wxBitmap bitmap(g->static_bitmap->GetBitmap()); + // NOTE: Selecting the bitmap inherits the bitmap's ScaleFactor onto the DC as well. + dc.SelectObject(bitmap); + dc.SetBackground(*wxWHITE_BRUSH); + dc.Clear(); + +#ifdef __WXGTK20__ + int dc_height = 0; + dc.SetFont(small_font); + dc.GetTextExtent(g->control_group->name, nullptr, &dc_height); +#endif + + std::unique_ptr gc{wxGraphicsContext::Create(dc)}; + gc->DisableOffset(); + gc->SetFont(small_font, font_color); + +#ifdef __WXGTK20__ + double gc_height = 0; + gc->GetTextExtent(g->control_group->name, nullptr, &gc_height); + // On GTK2, wx creates a new empty Cairo/Pango context for the graphics context instead + // of reusing the wxMemoryDC one, this causes it to forget the screen DPI so fonts stop + // scaling, we need to scale it manually instead. + if (std::ceil(gc_height) < dc_height) { - wxMemoryDC dc; - wxBitmap bitmap(g->static_bitmap->GetBitmap()); - dc.SelectObject(bitmap); - dc.Clear(); - - dc.SetFont(small_font); - dc.SetTextForeground(0xC0C0C0); - - DrawControlGroupBox(dc, g); - - // box outline - // Windows XP color - dc.SetPen(wxPen("#7f9db9")); - dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle(0, 0, bitmap.GetWidth(), bitmap.GetHeight()); - - // label for sticks and stuff - if (64 == bitmap.GetHeight()) - dc.DrawText(StrToWxStr(g->control_group->name).Upper(), 4, 2); - - dc.SelectObject(wxNullBitmap); - g->static_bitmap->SetBitmap(bitmap); + wxFont fixed_font(small_font); + fixed_font.SetPointSize(static_cast(fixed_font.GetPointSize() * g->m_scale)); + gc->SetFont(fixed_font, font_color); } +#endif + + DrawControlGroupBox(gc.get(), g); + DrawBorder(gc.get(), g->m_scale); + + // label for sticks and stuff + if (g->HasBitmapHeading()) + gc->DrawText(StrToWxStr(g->control_group->name).Upper(), 4 * g->m_scale, 2 * g->m_scale); + + gc.reset(); + dc.SelectObject(wxNullBitmap); + g->static_bitmap->SetBitmap(bitmap); } }