Merge pull request #9114 from howard-stearns/bubble-state

bubble state

libraries/networking/src/NodeList.cpp

@@ -751,6 +751,7 @@ bool NodeList::sockAddrBelongsToDomainOrNode(const HifiSockAddr& sockAddr) {
 }
 
 void NodeList::ignoreNodesInRadius(float radiusToIgnore, bool enabled) {
+    bool isEnabledChange = _ignoreRadiusEnabled.get() != enabled;
     _ignoreRadiusEnabled.set(enabled);
     _ignoreRadius.set(radiusToIgnore);
 
@@ -759,6 +760,9 @@ void NodeList::ignoreNodesInRadius(float radiusToIgnore, bool enabled) {
     }, [this](const SharedNodePointer& destinationNode) {
         sendIgnoreRadiusStateToNode(destinationNode);
     });
+    if (isEnabledChange) {
+        emit ignoreRadiusEnabledChanged(enabled);
+    }
 }
 
 void NodeList::sendIgnoreRadiusStateToNode(const SharedNodePointer& destinationNode) {

libraries/networking/src/NodeList.h

@@ -108,6 +108,7 @@ signals:
     void limitOfSilentDomainCheckInsReached();
     void receivedDomainServerList();
     void ignoredNode(const QUuid& nodeID);
+    void ignoreRadiusEnabledChanged(bool isIgnored);
 
 private slots:
     void stopKeepalivePingTimer();
@@ -154,7 +155,7 @@ private:
     tbb::concurrent_unordered_set<QUuid, UUIDHasher> _ignoredNodeIDs;
 
     void sendIgnoreRadiusStateToNode(const SharedNodePointer& destinationNode);
-    Setting::Handle<bool> _ignoreRadiusEnabled { "IgnoreRadiusEnabled", false };
+    Setting::Handle<bool> _ignoreRadiusEnabled { "IgnoreRadiusEnabled", true };
     Setting::Handle<float> _ignoreRadius { "IgnoreRadius", 1.0f };
 
 #if (PR_BUILD || DEV_BUILD)

libraries/script-engine/src/UsersScriptingInterface.cpp

@@ -17,6 +17,7 @@ UsersScriptingInterface::UsersScriptingInterface() {
     // emit a signal when kick permissions have changed
     auto nodeList = DependencyManager::get<NodeList>();
     connect(nodeList.data(), &LimitedNodeList::canKickChanged, this, &UsersScriptingInterface::canKickChanged);
+    connect(nodeList.data(), &NodeList::ignoreRadiusEnabledChanged, this, &UsersScriptingInterface::ignoreRadiusEnabledChanged);
 }
 
 void UsersScriptingInterface::ignore(const QUuid& nodeID) {

libraries/script-engine/src/UsersScriptingInterface.h

@@ -100,6 +100,7 @@ public slots:
 
 signals:
     void canKickChanged(bool canKick);
+    void ignoreRadiusEnabledChanged(bool isEnabled);
 };
 
 

scripts/system/bubble.js

@@ -25,34 +25,30 @@ function buttonImageURL() {
     return TOOLS_PATH + 'bubble.svg';
 }
 
-var bubbleActive = Users.getIgnoreRadiusEnabled();
+function onBubbleToggled() {
+    var bubbleActive = Users.getIgnoreRadiusEnabled();
+    button.writeProperty('buttonState', bubbleActive ? 0 : 1);
+    button.writeProperty('defaultState', bubbleActive ? 0 : 1);
+    button.writeProperty('hoverState', bubbleActive ? 2 : 3);
+}
 
 // setup the mod button and add it to the toolbar
 var button = toolbar.addButton({
     objectName: 'bubble',
     imageURL: buttonImageURL(),
     visible: true,
-    buttonState: bubbleActive ? 0 : 1,
-    defaultState: bubbleActive ? 0 : 1,
-    hoverState: bubbleActive ? 2 : 3,
     alpha: 0.9
 });
+onBubbleToggled();
 
-
+button.clicked.connect(Users.toggleIgnoreRadius);
-// handle clicks on the toolbar button
+Users.ignoreRadiusEnabledChanged.connect(onBubbleToggled);
-function buttonClicked(){
-    Users.toggleIgnoreRadius();
-    bubbleActive = Users.getIgnoreRadiusEnabled();
-    button.writeProperty('buttonState', bubbleActive ? 0 : 1);
-    button.writeProperty('defaultState', bubbleActive ? 0 : 1);
-    button.writeProperty('hoverState', bubbleActive ? 2 : 3);
-}
-
-button.clicked.connect(buttonClicked);
 
 // cleanup the toolbar button and overlays when script is stopped
 Script.scriptEnding.connect(function() {
     toolbar.removeButton('bubble');
+    button.clicked.disconnect(Users.toggleIgnoreRadius);
+    Users.ignoreRadiusEnabledChanged.disconnect(onBubbleToggled);
 });
 
 }()); // END LOCAL_SCOPE