History

Working on plugin active concept

Brad Davis committed 11 years ago

Commit 7f8f5f61 parent 8a054029 files · +22 −15Browse files

Showing the changes to libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp (1 of 9 files). Show all

Unified · Split

libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp+3−0
@@ -79,6 +79,7 @@ bool ViveControllerManager::isSupported() const { · 78 unmodified lines
79}79}
80 80
81void ViveControllerManager::activate() {81void ViveControllerManager::activate() {
82 InputPlugin::activate();
82#ifdef Q_OS_WIN83#ifdef Q_OS_WIN
83 CONTAINER->addMenu(MENU_PATH);84 CONTAINER->addMenu(MENU_PATH);
84 CONTAINER->addMenuItem(MENU_PATH, RENDER_CONTROLLERS,85 CONTAINER->addMenuItem(MENU_PATH, RENDER_CONTROLLERS,
@@ -143,6 +144,8 @@ void ViveControllerManager::activate() { · 58 unmodified lines
143}144}
144 145
145void ViveControllerManager::deactivate() {146void ViveControllerManager::deactivate() {
147 InputPlugin::deactivate();
148
146#ifdef Q_OS_WIN149#ifdef Q_OS_WIN
147 CONTAINER->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS);150 CONTAINER->removeMenuItem(MENU_NAME, RENDER_CONTROLLERS);
148 CONTAINER->removeMenu(MENU_PATH);151 CONTAINER->removeMenu(MENU_PATH);