Add stylus tip and barrel button support to cursor condition

This commit is contained in:
WarmUpTill
2026-11-06 21:50:35 +01:00
parent b3f47cdb68
commit 796cbf77e9
7 changed files with 155 additions and 0 deletions

View File

@@ -37,6 +37,10 @@ const static std::map<MacroConditionCursor::Button, std::string> buttonTypes = {
"AdvSceneSwitcher.condition.cursor.button.middle"},
{MacroConditionCursor::Button::RIGHT,
"AdvSceneSwitcher.condition.cursor.button.right"},
{MacroConditionCursor::Button::PEN_TIP,
"AdvSceneSwitcher.condition.cursor.button.penTip"},
{MacroConditionCursor::Button::PEN_BARREL,
"AdvSceneSwitcher.condition.cursor.button.penBarrel"},
};
bool MacroConditionCursor::CheckClick()
@@ -48,6 +52,10 @@ bool MacroConditionCursor::CheckClick()
return _lastCheckTime < GetLastMouseMiddleClickTime();
case MacroConditionCursor::Button::RIGHT:
return _lastCheckTime < GetLastMouseRightClickTime();
case MacroConditionCursor::Button::PEN_TIP:
return _lastCheckTime < GetLastPenTipClickTime();
case MacroConditionCursor::Button::PEN_BARREL:
return _lastCheckTime < GetLastPenBarrelClickTime();
}
return false;
}
@@ -61,6 +69,10 @@ bool MacroConditionCursor::CheckHeld()
return IsMouseMiddleButtonDown() || CheckClick();
case MacroConditionCursor::Button::RIGHT:
return IsMouseRightButtonDown() || CheckClick();
case MacroConditionCursor::Button::PEN_TIP:
return IsPenTipDown() || CheckClick();
case MacroConditionCursor::Button::PEN_BARREL:
return IsPenBarrelDown() || CheckClick();
}
return false;
}