diff --git a/libs/ui/include/psemek/ui/element.hpp b/libs/ui/include/psemek/ui/element.hpp index 748abdf5..99370f41 100644 --- a/libs/ui/include/psemek/ui/element.hpp +++ b/libs/ui/include/psemek/ui/element.hpp @@ -65,10 +65,10 @@ namespace psemek::ui virtual bool transparent() const { return false; } - virtual std::shared_ptr style() const { return style_; } - virtual std::shared_ptr own_style() const { return own_style_; } - virtual std::shared_ptr set_style(std::shared_ptr st); - virtual std::shared_ptr set_own_style(std::shared_ptr st); + virtual std::shared_ptr style() const { return style_; } + virtual std::shared_ptr own_style() const { return own_style_; } + virtual std::shared_ptr set_style(std::shared_ptr st); + virtual std::shared_ptr set_own_style(std::shared_ptr st); virtual void style_updated() const; virtual void own_style_updated() const; @@ -89,8 +89,8 @@ namespace psemek::ui protected: virtual void release_children(); - virtual std::shared_ptr merged_style() const; - virtual std::shared_ptr merged_own_style() const; + virtual std::shared_ptr merged_style() const; + virtual std::shared_ptr merged_own_style() const; static bool in_text_input(); static void start_text_input(); @@ -101,10 +101,10 @@ namespace psemek::ui async::event_loop * loop_ = nullptr; bool enabled_ = true; bool hidden_ = false; - std::shared_ptr style_; - std::shared_ptr own_style_; - mutable std::shared_ptr merged_style_; - mutable std::shared_ptr merged_own_style_; + std::shared_ptr style_; + std::shared_ptr own_style_; + mutable std::shared_ptr merged_style_; + mutable std::shared_ptr merged_own_style_; bool reshape_posted_ = false; mutable std::vector> delayed_callbacks_; diff --git a/libs/ui/source/element.cpp b/libs/ui/source/element.cpp index 5f8cee7f..6e723e40 100644 --- a/libs/ui/source/element.cpp +++ b/libs/ui/source/element.cpp @@ -71,7 +71,7 @@ namespace psemek::ui return size_constraints()[1]; } - std::shared_ptr