diff --git a/gui-builder/include/WidgetProperties/EditBoxSliderProperties.hpp b/gui-builder/include/WidgetProperties/EditBoxSliderProperties.hpp index bb9d1efa6..d9e641434 100644 --- a/gui-builder/include/WidgetProperties/EditBoxSliderProperties.hpp +++ b/gui-builder/include/WidgetProperties/EditBoxSliderProperties.hpp @@ -89,17 +89,17 @@ struct EditBoxSliderProperties : WidgetProperties pair.second["EditBox.DefaultTextStyle"] = {"TextStyle", tgui::Serializer::serialize(editBoxRenderer->getDefaultTextStyle())}; const auto sliderRenderer = editBoxSlider->getSliderSharedRenderer(); - pair.second["Borders"] = {"Outline", tgui::Serializer::serialize(sliderRenderer->getBorders())}; - pair.second["TrackColor"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getTrackColor())}; - pair.second["TrackColorHover"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getTrackColorHover())}; - pair.second["ThumbColor"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getThumbColor())}; - pair.second["ThumbColorHover"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getThumbColorHover())}; - pair.second["BorderColor"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getBorderColor())}; - pair.second["BorderColorHover"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getBorderColorHover())}; - pair.second["TextureTrack"] = {"Texture", tgui::Serializer::serialize(sliderRenderer->getTextureTrack())}; - pair.second["TextureTrackHover"] = {"Texture", tgui::Serializer::serialize(sliderRenderer->getTextureTrackHover())}; - pair.second["TextureThumb"] = {"Texture", tgui::Serializer::serialize(sliderRenderer->getTextureThumb())}; - pair.second["TextureThumbHover"] = {"Texture", tgui::Serializer::serialize(sliderRenderer->getTextureThumbHover())}; + pair.second["Slider.Borders"] = {"Outline", tgui::Serializer::serialize(sliderRenderer->getBorders())}; + pair.second["Slider.TrackColor"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getTrackColor())}; + pair.second["Slider.TrackColorHover"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getTrackColorHover())}; + pair.second["Slider.ThumbColor"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getThumbColor())}; + pair.second["Slider.ThumbColorHover"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getThumbColorHover())}; + pair.second["Slider.BorderColor"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getBorderColor())}; + pair.second["Slider.BorderColorHover"] = {"Color", tgui::Serializer::serialize(sliderRenderer->getBorderColorHover())}; + pair.second["Slider.TextureTrack"] = {"Texture", tgui::Serializer::serialize(sliderRenderer->getTextureTrack())}; + pair.second["Slider.TextureTrackHover"] = {"Texture", tgui::Serializer::serialize(sliderRenderer->getTextureTrackHover())}; + pair.second["Slider.TextureThumb"] = {"Texture", tgui::Serializer::serialize(sliderRenderer->getTextureThumb())}; + pair.second["Slider.TextureThumbHover"] = {"Texture", tgui::Serializer::serialize(sliderRenderer->getTextureThumbHover())}; return pair; } @@ -125,24 +125,6 @@ struct EditBoxSliderProperties : WidgetProperties else return "Left"; } - -private: - - const std::set m_editBoxProperties = { - "Padding", "CaretWidth", "TextColor", "TextColorDisabled", "TextColorFocused", "SelectedTextColor", - "SelectedTextBackgroundColor", "DefaultTextColor", "BackgroundColor", "BackgroundColorHover", - "BackgroundColorDisabled", "BackgroundColorFocused", "CaretColor", "CaretColorHover", "CaretColorFocused", - "BorderColor", "BorderColorHover", "BorderColorDisabled", "BorderColorFocused", "Texture", "TextureHover", - "TextureDisabled", "TextureFocused", "TextStyle", "DefaultTextStyle", "Borders" - }; - - const std::set m_SliderProperties = { - "Borders", "TrackColor", "TrackColorHover", "ThumbColor", "ThumbColorHover", - "BorderColor", "BorderColorHover", "TextureTrack", "TextureTrackHover", "TextureThumb", - "TextureThumbHover" - }; - - }; #endif // TGUI_GUI_BUILDER_EDIT_BOX_SLIDER_PROPERTIES_HPP diff --git a/gui-builder/include/WidgetProperties/SpinControlProperties.hpp b/gui-builder/include/WidgetProperties/SpinControlProperties.hpp index 57e054348..027f50677 100644 --- a/gui-builder/include/WidgetProperties/SpinControlProperties.hpp +++ b/gui-builder/include/WidgetProperties/SpinControlProperties.hpp @@ -102,22 +102,6 @@ struct SpinControlProperties : WidgetProperties pair.second["SpinText.DefaultTextStyle"] = {"TextStyle", tgui::Serializer::serialize(textRenderer->getDefaultTextStyle())}; return pair; } - -private: - - const std::set m_buttonProperties = { - "ButtonsBorders", "BorderBetweenArrows", "ButtonsBackgroundColor", "ButtonsBackgroundColorHover", "ArrowColor", - "ArrowColorHover", "ButtonsBorderColor", "TextureArrowUp", "TextureArrowUpHover", "TextureArrowDown", - "TextureArrowDownHover" - }; - - const std::set m_textProperties = { - "Padding", "CaretWidth", "TextColor", "TextColorDisabled", "TextColorFocused", "SelectedTextColor", - "SelectedTextBackgroundColor", "DefaultTextColor", "BackgroundColor", "BackgroundColorHover", - "BackgroundColorDisabled", "BackgroundColorFocused", "CaretColor", "CaretColorHover", "CaretColorFocused", - "BorderColor", "BorderColorHover", "BorderColorDisabled", "BorderColorFocused", "Texture", "TextureHover", - "TextureDisabled", "TextureFocused", "TextStyle", "DefaultTextStyle", "Borders" - }; }; #endif // TGUI_GUI_BUILDER_SPIN_CONTROL_PROPERTIES_HPP diff --git a/src/Widgets/EditBoxSlider.cpp b/src/Widgets/EditBoxSlider.cpp index 2e344ad89..684b3c125 100644 --- a/src/Widgets/EditBoxSlider.cpp +++ b/src/Widgets/EditBoxSlider.cpp @@ -23,6 +23,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #include +#include ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// namespace tgui @@ -214,6 +215,7 @@ namespace tgui { if (m_slider->getValue() != value && inRange(value)) { + std::cout << value << "\n"; m_slider->setValue(value); setString(String::fromNumberRounded(value, m_decimalPlaces)); return true; @@ -313,7 +315,7 @@ namespace tgui m_editBox->onTextChange.disconnectAll(); m_editBox->onTextChange([this](const String &text) { - m_slider->setValue(text.toFloat()); + setValue(text.toFloat()); }); m_editBox->onReturnOrUnfocus.disconnectAll();