WIP numeric widgets

darbyjohnston · Apr 30, 2023 · d696c50 · d696c50
1 parent 1c021a7
commit d696c50
Show file tree

Hide file tree

Showing 16 changed files with 423 additions and 110 deletions.
diff --git a/etc/Icons/Decrement.svg b/etc/Icons/Decrement.svg
diff --git a/etc/Icons/Increment.svg b/etc/Icons/Increment.svg
diff --git a/lib/tlUI/CMakeLists.txt b/lib/tlUI/CMakeLists.txt
@@ -15,6 +15,7 @@ set(HEADERS
     IWidgetInline.h
     IWidgetOptions.h
     IconLibrary.h
+    IncButton.h
     IntEdit.h
     IntModel.h
     IntSlider.h
@@ -57,6 +58,7 @@ set(SOURCE
     IWidget.cpp
     IWidgetOptions.cpp
     IconLibrary.cpp
+    IncButton.cpp
     IntEdit.cpp
     IntModel.cpp
     IntSlider.cpp

diff --git a/lib/tlUI/FloatEdit.cpp b/lib/tlUI/FloatEdit.cpp
@@ -4,6 +4,9 @@
 
 #include <tlUI/FloatEdit.h>
 
+#include <tlUI/IncButton.h>
+#include <tlUI/LineEdit.h>
+
 #include <tlCore/StringFormat.h>
 
 namespace tl
@@ -13,6 +16,9 @@ namespace tl
         struct FloatEdit::Private
         {
             std::shared_ptr<FloatModel> model;
+            std::shared_ptr<LineEdit> lineEdit;
+            std::shared_ptr<IncButton> incrementButton;
+            std::shared_ptr<IncButton> decrementButton;
             int digits = 3;
             int precision = 2;
 
@@ -24,13 +30,16 @@ namespace tl
             const std::shared_ptr<system::Context>& context,
             const std::shared_ptr<IWidget>& parent)
         {
-            LineEdit::_init(context, parent);
-            _name = "tl::ui::FloatEdit";
+            IWidget::_init("tl::ui::FloatEdit", context, parent);
             TLRENDER_P();
 
+            p.lineEdit = LineEdit::create(context, shared_from_this());
+            p.incrementButton = IncButton::create(context, shared_from_this());
+            p.decrementButton = IncButton::create(context, shared_from_this());
+
             setModel(FloatModel::create(context));
 
-            _floatUpdate();
+            _textUpdate();
         }
 
         FloatEdit::FloatEdit() :
@@ -66,16 +75,16 @@ namespace tl
                     p.model->observeValue(),
                     [this](float)
                     {
-                        _floatUpdate();
+                        _textUpdate();
                     });
                 p.rangeObserver = observer::ValueObserver<math::FloatRange>::create(
                     p.model->observeRange(),
                     [this](const math::FloatRange&)
                     {
-                        _floatUpdate();
+                        _textUpdate();
                     });
             }
-            _floatUpdate();
+            _textUpdate();
         }
 
         void FloatEdit::setDigits(int value)
@@ -84,7 +93,7 @@ namespace tl
             if (value == p.digits)
                 return;
             p.digits = value;
-            _floatUpdate();
+            _textUpdate();
         }
 
         void FloatEdit::setPrecision(int value)
@@ -93,44 +102,45 @@ namespace tl
             if (value == p.precision)
                 return;
             p.precision = value;
-            _floatUpdate();
+            _textUpdate();
+        }
+
+        void FloatEdit::setFontRole(FontRole value)
+        {
+            _p->lineEdit->setFontRole(value);
         }
 
-        void FloatEdit::keyPressEvent(KeyEvent& event)
+        void FloatEdit::setGeometry(const math::BBox2i& value)
         {
-            LineEdit::keyPressEvent(event);
+            IWidget::setGeometry(value);
             TLRENDER_P();
-            if (!event.accept)
-            {
-                switch (event.key)
-                {
-                case Key::Down:
-                    event.accept = true;
-                    p.model->subtractStep();
-                    break;
-                case Key::Up:
-                    event.accept = true;
-                    p.model->addStep();
-                    break;
-                case Key::PageUp:
-                    event.accept = true;
-                    p.model->addLargeStep();
-                    break;
-                case Key::PageDown:
-                    event.accept = true;
-                    p.model->subtractLargeStep();
-                    break;
-                }
-            }
+            math::BBox2i g = value;
+            const int buttonsWidth = std::max(
+                p.incrementButton->getSizeHint().x,
+                p.decrementButton->getSizeHint().x);
+            g.max.x -= buttonsWidth;
+            p.lineEdit->setGeometry(g);
+            g = value;
+            g.min.x = g.max.x - buttonsWidth;
+            g.max.y = g.min.y + g.h() / 2;
+            p.incrementButton->setGeometry(g);
+            g.min.y = g.max.y;
+            g.max.y = value.max.y;
+            p.decrementButton->setGeometry(g);
         }
 
-        void FloatEdit::keyReleaseEvent(KeyEvent& event)
+        void FloatEdit::sizeHintEvent(const SizeHintEvent& event)
         {
-            LineEdit::keyPressEvent(event);
-            event.accept = true;
+            IWidget::sizeHintEvent(event);
+            TLRENDER_P();
+            _sizeHint = p.lineEdit->getSizeHint();
+            const int buttonsWidth = std::max(
+                p.incrementButton->getSizeHint().x,
+                p.decrementButton->getSizeHint().x);
+            _sizeHint.x += buttonsWidth;
         }
 
-        void FloatEdit::_floatUpdate()
+        void FloatEdit::_textUpdate()
         {
             TLRENDER_P();
             std::string text;
@@ -143,8 +153,8 @@ namespace tl
                     arg(range.getMin() < 0 ? "-" : "").
                     arg(0.F, p.precision, p.precision + 1 + p.digits);
             }
-            setText(text);
-            setFormat(format);
+            p.lineEdit->setText(text);
+            p.lineEdit->setFormat(format);
         }
     }
 }
diff --git a/lib/tlUI/FloatEdit.h b/lib/tlUI/FloatEdit.h
@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <tlUI/LineEdit.h>
+#include <tlUI/IWidget.h>
 #include <tlUI/FloatModel.h>
 
 namespace tl
 {
     namespace ui
     {
         //! Floating point number editor.
-        class FloatEdit : public LineEdit
+        class FloatEdit : public IWidget
         {
             TLRENDER_NON_COPYABLE(FloatEdit);
 
@@ -43,11 +43,14 @@ namespace tl
             //! Set the display precision.
             void setPrecision(int);
 
-            void keyPressEvent(KeyEvent&) override;
-            void keyReleaseEvent(KeyEvent&) override;
+            //! Set the font role.
+            void setFontRole(FontRole);
+
+            void setGeometry(const math::BBox2i&) override;
+            void sizeHintEvent(const SizeHintEvent&) override;
 
         private:
-            void _floatUpdate();
+            void _textUpdate();
 
             TLRENDER_PRIVATE();
         };

diff --git a/lib/tlUI/FloatModel.cpp b/lib/tlUI/FloatModel.cpp
@@ -87,13 +87,13 @@ namespace tl
             _p->step = value;
         }
 
-        void FloatModel::addStep()
+        void FloatModel::incrementStep()
         {
             TLRENDER_P();
             setValue(p.value->get() + p.step);
         }
 
-        void FloatModel::subtractStep()
+        void FloatModel::decrementStep()
         {
             TLRENDER_P();
             setValue(p.value->get() - p.step);
@@ -109,13 +109,13 @@ namespace tl
             _p->largeStep = value;
         }
 
-        void FloatModel::addLargeStep()
+        void FloatModel::incrementLargeStep()
         {
             TLRENDER_P();
             setValue(p.value->get() + p.largeStep);
         }
 
-        void FloatModel::subtractLargeStep()
+        void FloatModel::decrementLargeStep()
         {
             TLRENDER_P();
             setValue(p.value->get() - p.largeStep);