mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-11 09:18:40 +12:00
Input: remember registered ldd controllers
- Don't reset ldd pads when saving a pad config - Prevent configuration of registered ldd pads in the gui while ingame
This commit is contained in:
parent
69ea573b0d
commit
eb5ec211c2
9 changed files with 172 additions and 56 deletions
|
@ -119,13 +119,26 @@ void gs_frame::keyPressEvent(QKeyEvent *keyEvent)
|
|||
switch (keyEvent->key())
|
||||
{
|
||||
case Qt::Key_L:
|
||||
if (keyEvent->modifiers() == Qt::AltModifier) { static int count = 0; screenshot.success("Made forced mark %d in log", ++count); }
|
||||
if (keyEvent->modifiers() == Qt::AltModifier)
|
||||
{
|
||||
static int count = 0;
|
||||
screenshot.success("Made forced mark %d in log", ++count);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case Qt::Key_Return:
|
||||
if (keyEvent->modifiers() == Qt::AltModifier) { toggle_fullscreen(); return; }
|
||||
if (keyEvent->modifiers() == Qt::AltModifier)
|
||||
{
|
||||
toggle_fullscreen();
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case Qt::Key_Escape:
|
||||
if (visibility() == FullScreen) { toggle_fullscreen(); return; }
|
||||
if (visibility() == FullScreen)
|
||||
{
|
||||
toggle_fullscreen();
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case Qt::Key_P:
|
||||
if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys && Emu.IsRunning())
|
||||
|
@ -135,14 +148,14 @@ void gs_frame::keyPressEvent(QKeyEvent *keyEvent)
|
|||
}
|
||||
break;
|
||||
case Qt::Key_S:
|
||||
if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys && (!Emu.IsStopped()))
|
||||
if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys && !Emu.IsStopped())
|
||||
{
|
||||
Emu.Stop();
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case Qt::Key_R:
|
||||
if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys && (!Emu.GetBoot().empty()))
|
||||
if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys && !Emu.GetBoot().empty())
|
||||
{
|
||||
Emu.Restart();
|
||||
return;
|
||||
|
@ -151,8 +164,16 @@ void gs_frame::keyPressEvent(QKeyEvent *keyEvent)
|
|||
case Qt::Key_E:
|
||||
if (keyEvent->modifiers() == Qt::ControlModifier && !m_disable_kb_hotkeys)
|
||||
{
|
||||
if (Emu.IsReady()) { Emu.Run(true); return; }
|
||||
else if (Emu.IsPaused()) { Emu.Resume(); return; }
|
||||
if (Emu.IsReady())
|
||||
{
|
||||
Emu.Run(true);
|
||||
return;
|
||||
}
|
||||
else if (Emu.IsPaused())
|
||||
{
|
||||
Emu.Resume();
|
||||
return;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case Qt::Key_F12:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue