xrUICore: CUITrackBar - Added support for value output via CUIStatic …

…(":output_wnd" in xml)
OpenXRay · Jan 16, 2019 · e94970a · e94970a
1 parent f52d576
commit e94970a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/src/xrUICore/TrackBar/UITrackBar.cpp b/src/xrUICore/TrackBar/UITrackBar.cpp
@@ -13,6 +13,12 @@ CUITrackBar::CUITrackBar()
     m_pSlider = new CUI3tButton();
     AttachChild(m_pSlider);
     m_pSlider->SetAutoDelete(true);
+
+    m_static = new CUIStatic();
+    m_static->Enable(false);
+    AttachChild(m_static);
+    m_static->SetAutoDelete(true);
+
     m_b_mouse_capturer = false;
 }
 
@@ -106,6 +112,7 @@ void CUITrackBar::Draw()
 {
     CUI_IB_FrameLineWnd::Draw();
     m_pSlider->Draw();
+    m_static->Draw();
 }
 
 void CUITrackBar::Update()
@@ -290,6 +297,20 @@ void CUITrackBar::UpdatePos()
         pos.x = free_space - pos.x;
 
     m_pSlider->SetWndPos(pos);
+
+    if (m_static->IsEnabled())
+    {
+        string256 buff;      
+        if (m_b_is_float)
+        {
+            xr_sprintf(buff, (m_static_format == nullptr ? "%.1f" : m_static_format.c_str()), m_f_val);
+        }
+        else
+        {
+            xr_sprintf(buff, (m_static_format == nullptr ? "%d" : m_static_format.c_str()), m_i_val);
+        }
+        m_static->TextItemControl()->SetTextST(buff);
+    }
 }
 
 void CUITrackBar::OnMessage(LPCSTR message)

diff --git a/src/xrUICore/TrackBar/UITrackBar.h b/src/xrUICore/TrackBar/UITrackBar.h
@@ -34,6 +34,9 @@ class XRUICORE_API CUITrackBar : public CUI_IB_FrameLineWnd, public CUIOptionsIt
     void SetOptIBounds(int imin, int imax);
     void SetOptFBounds(float fmin, float fmax);
 
+    CUIStatic* m_static;
+    shared_str m_static_format;
+
 protected:
     void UpdatePos();
     void UpdatePosRelativeToMouse();

diff --git a/src/xrUICore/XML/UIXmlInitBase.cpp b/src/xrUICore/XML/UIXmlInitBase.cpp
@@ -1167,6 +1167,15 @@ bool CUIXmlInitBase::InitTrackBar(CUIXml& xml_doc, LPCSTR path, int index, CUITr
         }
     }
 
+    string512 buf;
+    strconcat(sizeof(buf), buf, path, ":output_wnd");
+    if (xml_doc.NavigateToNode(buf, index))
+    {
+        InitStatic(xml_doc, buf, index, pWnd->m_static);
+        pWnd->m_static_format = xml_doc.ReadAttrib(buf, index, "format", nullptr);
+        pWnd->m_static->Enable(true);
+    }
+
     return true;
 }