Skip to content

settings: Allow clearing a joystick button mapping #325

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

Closed
EdueskaWeiz wants to merge 1 commit into from
Closed

settings: Allow clearing a joystick button mapping #325

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 src/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,13 @@ PTZJoyButtonMapper::PTZJoyButtonMapper(QWidget *parent, size_t _button) : QPushB
{
setCheckable(true);
auto m = new QMenu;
m->addAction(obs_module_text("None"));
/* The "None" entry must be wired up like the hotkey entries below;
* without a triggered connection clicking it did nothing, so a button
* mapping could never be cleared (#269). The action carries no data, so
* on_menuAction() passes an empty hotkey name, which
* setJoystickButtonHotkey() interprets as "remove the mapping". */
auto none_action = m->addAction(obs_module_text("None"));
connect(none_action, &QAction::triggered, this, &PTZJoyButtonMapper::on_menuAction);
auto data = std::make_tuple(m, this);
using data_t = decltype(data);
obs_enum_hotkeys(
Expand Down
Loading