INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-26 09:07:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

kraken: Fix errors from rebase and format files

Browse Source
This commit is contained in:
german77
2021-10-15 19:07:47 -05:00
committed by Narr the Reg
parent 06a5ef5874
commit e0da5c1bbc
20 changed files with 83 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/yuzu/debugger/controller.cpp
View File

@ -10,7 +10,8 @@
#include "yuzu/configuration/configure_input_player_widget.h"
#include "yuzu/debugger/controller.h"
ControllerDialog::ControllerDialog(QWidget* parent) : QWidget(parent, Qt::Dialog) {
ControllerDialog::ControllerDialog(Core::System& system, QWidget* parent)
: QWidget(parent, Qt::Dialog) {
setObjectName(QStringLiteral("Controller"));
setWindowTitle(tr("Controller P1"));
resize(500, 350);
@ -20,7 +21,7 @@ ControllerDialog::ControllerDialog(QWidget* parent) : QWidget(parent, Qt::Dialog
Qt::WindowMaximizeButtonHint);
widget = new PlayerControlPreview(this);
widget->SetController(Core::System::GetInstance().HIDCore().GetEmulatedController(
widget->SetController(system.HIDCore().GetEmulatedController(
Core::HID::NpadIdType::Player1));
QLayout* layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
@ -45,6 +46,10 @@ QAction* ControllerDialog::toggleViewAction() {
return toggle_view_action;
}
void ControllerDialog::UnloadController() {
widget->UnloadController();
}
void ControllerDialog::showEvent(QShowEvent* ev) {
if (toggle_view_action) {
toggle_view_action->setChecked(isVisible());

9
src/yuzu/debugger/controller.h
View File

@ -11,6 +11,10 @@ class QHideEvent;
class QShowEvent;
class PlayerControlPreview;
namespace Core {
class System;
}
namespace InputCommon {
class InputSubsystem;
}
@ -19,11 +23,14 @@ class ControllerDialog : public QWidget {
Q_OBJECT
public:
explicit ControllerDialog(QWidget* parent = nullptr);
explicit ControllerDialog(Core::System& system, QWidget* parent = nullptr);
/// Returns a QAction that can be used to toggle visibility of this dialog.
QAction* toggleViewAction();
// Disables events from the emulated controller
void UnloadController();
protected:
void showEvent(QShowEvent* ev) override;
void hideEvent(QHideEvent* ev) override;