Skip to content

Allow empty combos. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dkosmari wants to merge 1 commit into
base: v0.2-dev
Choose a base branch
from
Open

Allow empty combos. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion source/ButtonComboInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ bool ButtonComboInfoIF::conflictsWith(const ButtonComboModule_ButtonComboOptions
if ((mControllerMask & other.controllerMask) == 0) {
return false;
}

// No conflicts when either button combo is empty.
if (!other.combo || !mCombo) {
return false;
}

if ((other.combo & mCombo) == mCombo || (other.combo & mCombo) == other.combo) {
return true;
}
Expand Down Expand Up @@ -141,4 +147,4 @@ int32_t ButtonComboInfoIF::ControllerTypeToChanIndex(const ButtonComboModule_Con
}

return -1;
}
}
9 changes: 2 additions & 7 deletions source/ButtonComboManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,6 @@ std::optional<std::shared_ptr<ButtonComboInfoIF>> ButtonComboManager::CreateComb
err = BUTTON_COMBO_MODULE_ERROR_INCOMPATIBLE_OPTIONS_VERSION;
return std::nullopt;
}
if (options.buttonComboOptions.basicCombo.combo == 0 ||
options.buttonComboOptions.basicCombo.controllerMask == BUTTON_COMBO_MODULE_CONTROLLER_NONE) {
err = BUTTON_COMBO_MODULE_ERROR_INVALID_COMBO;
return std::nullopt;
}
if (options.callbackOptions.callback == nullptr) {
err = BUTTON_COMBO_MODULE_ERROR_INVALID_ARGUMENT;
return std::nullopt;
Expand All @@ -302,7 +297,7 @@ std::optional<std::shared_ptr<ButtonComboInfoIF>> ButtonComboManager::CreateComb
switch (options.buttonComboOptions.type) {
case BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD_OBSERVER:
observer = true;
__attribute__((fallthrough));
[[fallthrough]];
case BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD: {
if (options.buttonComboOptions.optionalHoldForXMs == 0) {
err = BUTTON_COMBO_MODULE_ERROR_DURATION_MISSING;
Expand All @@ -319,7 +314,7 @@ std::optional<std::shared_ptr<ButtonComboInfoIF>> ButtonComboManager::CreateComb
}
case BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN_OBSERVER:
observer = true;
__attribute__((fallthrough));
[[fallthrough]];
case BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN: {
err = BUTTON_COMBO_MODULE_ERROR_SUCCESS;
return std::make_shared<ButtonComboInfoDown>(options.metaOptions.label,
Expand Down