forked from eden-emu/eden
		
	kraken: Fix errors from rebase and format files
This commit is contained in:
		
							parent
							
								
									66cf94709a
								
							
						
					
					
						commit
						0292fe0198
					
				
					 20 changed files with 83 additions and 53 deletions
				
			
		|  | @ -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()); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 german77
						german77