add override to fix class structure shit

Forairaaaaa · May 21, 2024 · fb4c7f8 · fb4c7f8
1 parent 7f63340
commit fb4c7f8
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/src/widgets/selector/base/selector.cpp b/src/widgets/selector/base/selector.cpp
@@ -87,9 +87,6 @@ void SelectorBase::goTo(int optionIndex)
 
     _selector_base_data.hovering_option_index = optionIndex;
     onGoTo();
-
-    // Hover option
-    ((OptionBase*)getHoveringWidget())->hover();
 }
 
 void SelectorBase::selectOption()

diff --git a/src/widgets/selector/base/selelctor.h b/src/widgets/selector/base/selelctor.h
@@ -40,7 +40,7 @@ namespace SmoothUIToolKit
                 inline size_t getOptionNum() { return _selector_base_data.current_widget->getChildren().size(); }
                 inline int getHoveringOptionIndex() { return _selector_base_data.hovering_option_index; }
                 WidgetBase* getHoveringWidget();
-                bool isHoveringOptionSelected();
+                virtual bool isHoveringOptionSelected();
 
             public:
                 /**

diff --git a/src/widgets/selector/smooth_selector/smooth_selector.cpp b/src/widgets/selector/smooth_selector/smooth_selector.cpp
@@ -18,6 +18,9 @@ void SmoothSelector::onGoTo()
     // Get selected widget frame
     auto target_frame = ((SmoothOption*)getHoveringWidget())->getTransition().getTargetPoint();
     getTransition().moveTo(target_frame);
+
+    // Hover
+    ((SmoothOption*)getHoveringWidget())->hover();
 }
 
 void SmoothSelector::moveTo(int optionIndex) { goTo(optionIndex); }
@@ -27,3 +30,31 @@ void SmoothSelector::jumpTo(int optionIndex)
     goTo(optionIndex);
     getTransition().jumpTo(getTransition().getTargetPoint());
 }
+
+bool SmoothSelector::isHoveringOptionSelected()
+{
+    auto hovering_widget = getHoveringWidget();
+    if (hovering_widget == nullptr)
+        return false;
+    return ((SmoothOption*)hovering_widget)->isSelected();
+}
+
+void SmoothSelector::selectOption()
+{
+    auto hovering_widget = getHoveringWidget();
+    if (hovering_widget == nullptr)
+        return;
+
+    ((SmoothOption*)hovering_widget)->select();
+    onSelectOption();
+}
+
+void SmoothSelector::unSelectOption()
+{
+    auto hovering_widget = getHoveringWidget();
+    if (hovering_widget == nullptr)
+        return;
+
+    ((SmoothOption*)hovering_widget)->unSelect();
+    onUnSelectOption();
+}
diff --git a/src/widgets/selector/smooth_selector/smooth_selector.h b/src/widgets/selector/smooth_selector/smooth_selector.h
@@ -21,6 +21,14 @@ namespace SmoothUIToolKit
             class SmoothSelector : public SmoothWidgetBase, public SelectorBase
             {
             public:
+                // Override to fit new class structure
+
+                bool isHoveringOptionSelected() override;
+
+                void selectOption() override;
+
+                void unSelectOption() override;
+
                 /**
                  * @brief Override to add option frame matching
                  *