mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-02-22 21:09:27 -06:00
changes to shortcut topic for keyboard viewer
This commit is contained in:
@@ -78,7 +78,7 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
|
||||
{ "super" , hasKeyModifier(k.modifier, KeyModifier::Super) }
|
||||
}
|
||||
},
|
||||
{ "action", action.name },
|
||||
{ "action", action.identifier },
|
||||
};
|
||||
json.push_back(shortcutJson);
|
||||
}
|
||||
|
||||
@@ -166,7 +166,12 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
|
||||
const Parameters p = codegen::bake<Parameters>(configuration);
|
||||
|
||||
_port = p.port.value_or(_port);
|
||||
_address = p.address.value_or(_address);
|
||||
if (p.address.has_value()) {
|
||||
_address = p.address.value();
|
||||
}
|
||||
else {
|
||||
_address = "192.168.1.8"; //global::windowDelegate
|
||||
}
|
||||
_webSocketInterface = p.webSocketInterface.value_or(_webSocketInterface);
|
||||
|
||||
auto startOrStop = [this]() {
|
||||
|
||||
Reference in New Issue
Block a user