add zero size support to viewer.SetTextSize

rdiankov · Mar 20, 2024 · f7a8847 · f7a8847
1 parent 9b1f9c6
commit f7a8847
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/plugins/qtcoinrave/qtcoinviewer.cpp b/plugins/qtcoinrave/qtcoinviewer.cpp
@@ -280,7 +280,11 @@ void QtCoinViewer::_InitConstructor(std::istream& sinput)
     _messageNodes[1] = new SoText2();
     pmsgsep->addChild(_messageNodes[1]);
 
-    _ivRoot->addChild(pmsgsep);
+    _messageSwitch = new SoSwitch();
+    _messageSwitch->whichChild.setValue(SO_SWITCH_ALL);
+    _messageSwitch->addChild(pmsgsep);
+
+    _ivRoot->addChild(_messageSwitch);
     _ivRoot->addChild(_ivCamera);
 
     SoEventCallback * ecb = new SoEventCallback;
@@ -675,10 +679,12 @@ void QtCoinViewer::SetTextSize(double size)
 
 void QtCoinViewer::_SetTextSize(double size)
 {
-    if ( size > 0 ) {
+    if ( size >= 0 ) {
         // TODO: use a font that does not rely on hardcoded breakpoints
         // move down to next text size breakpoint so that message shadow aligns nicely
         _messageFont->size = _GetTextBaseSize(size);
+        // hide HUD text if requested size is 0
+        _messageSwitch->whichChild.setValue(size == 0 ? SO_SWITCH_NONE : SO_SWITCH_ALL);
         // adjust the text offsets
         _messageBaseTranslation->translation.setValue(_GetMessageBaseTranslation());
         _messageShadowTranslation->translation.setValue(_GetMessageShadowTranslation());

diff --git a/plugins/qtcoinrave/qtcoinviewer.h b/plugins/qtcoinrave/qtcoinviewer.h
@@ -417,6 +417,7 @@ public slots:
     std::list< boost::shared_ptr<IvDragger> > _plistdraggers;     /// draggers drawn
     SoEventCallback* _eventKeyboardCB;
 
+    SoSwitch* _messageSwitch;
     SoFont* _messageFont;
     boost::array<SoText2*,2> _messageNodes;
     SoTranslation* _messageBaseTranslation;

diff --git a/plugins/qtosgrave/osgviewerwidget.cpp b/plugins/qtosgrave/osgviewerwidget.cpp
@@ -1170,7 +1170,7 @@ void QOSGViewerWidget::SetViewport(int width, int height)
 
 void QOSGViewerWidget::SetHUDTextSize(double size)
 {
-    if ( size > 0 ) {
+    if ( size >= 0 ) {
         _hudTextSize = size;
 
         float scale = this->devicePixelRatio();