PowerControl: Simplify Next, Select and SelectNext

This commit is contained in:
Kamil Trzciński 2022-12-19 22:17:05 +01:00
parent 130a6fb745
commit 06f2d9a702
5 changed files with 41 additions and 93 deletions

View file

@ -107,7 +107,7 @@ namespace PowerControl
{
if (!RTSS.IsOSDForeground())
return;
rootMenu.Prev();
rootMenu.Next(-1);
setDismissTimer();
dismissNeptuneInput();
}, true);
@ -116,7 +116,7 @@ namespace PowerControl
{
if (!RTSS.IsOSDForeground())
return;
rootMenu.Next();
rootMenu.Next(1);
setDismissTimer();
dismissNeptuneInput();
}, true);
@ -125,7 +125,7 @@ namespace PowerControl
{
if (!RTSS.IsOSDForeground())
return;
rootMenu.SelectPrev();
rootMenu.SelectNext(-1);
setDismissTimer();
dismissNeptuneInput();
});
@ -134,7 +134,7 @@ namespace PowerControl
{
if (!RTSS.IsOSDForeground())
return;
rootMenu.SelectNext();
rootMenu.SelectNext(1);
setDismissTimer();
dismissNeptuneInput();
});
@ -156,9 +156,10 @@ namespace PowerControl
GlobalHotKey.RegisterHotKey("VolumeUp", () =>
{
if (neptuneDeviceState.buttons5.HasFlag(SDCButton5.BTN_QUICK_ACCESS))
rootMenu.SelectNext("Brightness");
rootMenu.Select("Brightness");
else
rootMenu.SelectNext("Volume");
rootMenu.Select("Volume");
rootMenu.SelectNext(1);
setDismissTimer();
dismissNeptuneInput();
});
@ -166,9 +167,10 @@ namespace PowerControl
GlobalHotKey.RegisterHotKey("VolumeDown", () =>
{
if (neptuneDeviceState.buttons5.HasFlag(SDCButton5.BTN_QUICK_ACCESS))
rootMenu.SelectPrev("Brightness");
rootMenu.Select("Brightness");
else
rootMenu.SelectPrev("Volume");
rootMenu.Select("Volume");
rootMenu.SelectNext(-1);
setDismissTimer();
dismissNeptuneInput();
});
@ -265,19 +267,19 @@ namespace PowerControl
}
else if (input.buttons0 == SDCButton0.BTN_DPAD_LEFT)
{
rootMenu.SelectPrev();
rootMenu.SelectNext(-1);
}
else if (input.buttons0 == SDCButton0.BTN_DPAD_RIGHT)
{
rootMenu.SelectNext();
rootMenu.SelectNext(1);
}
else if (input.buttons0 == SDCButton0.BTN_DPAD_UP)
{
rootMenu.Prev();
rootMenu.Next(-1);
}
else if (input.buttons0 == SDCButton0.BTN_DPAD_DOWN)
{
rootMenu.Next();
rootMenu.Next(1);
}
}