diff --git a/external/etk b/external/etk index e56a7466..28c433bb 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit e56a7466c6ad272194ba645875402e871c2fa0dd +Subproject commit 28c433bb4e598726c7caeb8edec3b50a154bb9c2 diff --git a/external/ewolsa b/external/ewolsa index a657e619..875e5257 160000 --- a/external/ewolsa +++ b/external/ewolsa @@ -1 +1 @@ -Subproject commit a657e619550fe0135e42075b97076343fcf0c902 +Subproject commit 875e52574e5012e2ccaf2c6dbc1167b3cfe1129a diff --git a/external/exml b/external/exml index ce3c68cc..c7d2b2e8 160000 --- a/external/exml +++ b/external/exml @@ -1 +1 @@ -Subproject commit ce3c68cc5b1d995c47886488b4ab56d2c973f913 +Subproject commit c7d2b2e8719f30b3d5a1e8330838e44f8d1a179a diff --git a/monk b/monk index 895e1878..85ebc5ec 160000 --- a/monk +++ b/monk @@ -1 +1 @@ -Subproject commit 895e18786ce732e8cc1c282863677c21e1806062 +Subproject commit 85ebc5ec327c3920264de479c8b1049c1b81596c diff --git a/sources/ewol/compositing/Shaper.cpp b/sources/ewol/compositing/Shaper.cpp index fa23faee..106a75f9 100644 --- a/sources/ewol/compositing/Shaper.cpp +++ b/sources/ewol/compositing/Shaper.cpp @@ -625,18 +625,18 @@ const etk::Color& ewol::compositing::Shaper::getColor(int32_t _id) { -std::string std::to_string(const ewol::compositing::Shaper& _obj) { +template<> std::string std::to_string(const ewol::compositing::Shaper& _obj) { return _obj.getSource(); } -std::u32string std::to_u32string(const ewol::compositing::Shaper& _obj) { +template<> std::u32string std::to_u32string(const ewol::compositing::Shaper& _obj) { return std::to_u32string(std::to_string(_obj)); } -bool std::from_string(ewol::compositing::Shaper& _variableRet, const std::string& _value) { +template<> bool std::from_string(ewol::compositing::Shaper& _variableRet, const std::string& _value) { _variableRet.setSource(_value); return true; } -bool std::from_string(ewol::compositing::Shaper& _variableRet, const std::u32string& _value) { +template<> bool std::from_string(ewol::compositing::Shaper& _variableRet, const std::u32string& _value) { return from_string(_variableRet, std::to_string(_value)); } \ No newline at end of file diff --git a/sources/ewol/compositing/Shaper.h b/sources/ewol/compositing/Shaper.h index bc1a5b6b..1a5439fb 100644 --- a/sources/ewol/compositing/Shaper.h +++ b/sources/ewol/compositing/Shaper.h @@ -291,16 +291,16 @@ namespace ewol { float _yValButtom, const float* _table, bool _displayOutside); + public: + /* **************************************************** + * == operator + *****************************************************/ + bool operator== (const Shaper& _obj) const { + return _obj.m_name == m_name; + } }; }; }; -namespace std { - std::string to_string(const ewol::compositing::Shaper& _obj); - std::u32string to_u32string(const ewol::compositing::Shaper& _obj); - bool from_string(ewol::compositing::Shaper& _variableRet, const std::string& _value); - bool from_string(ewol::compositing::Shaper& _variableRet, const std::u32string& _value); -}; - #endif diff --git a/sources/ewol/object/Object.h b/sources/ewol/object/Object.h index 48b47f64..114d8ff3 100644 --- a/sources/ewol/object/Object.h +++ b/sources/ewol/object/Object.h @@ -31,6 +31,7 @@ namespace ewol { #include #include #include +#include #include #define DECLARE_FACTORY(className) \ diff --git a/sources/ewol/object/Param.h b/sources/ewol/object/Param.h index 2c3f5219..d6bb9330 100644 --- a/sources/ewol/object/Param.h +++ b/sources/ewol/object/Param.h @@ -119,6 +119,9 @@ namespace ewol { operator MY_TYPE() const { return m_value; } + inline MY_TYPE& operator *() const { + return m_value; + } }; template std::ostream& operator <<(std::ostream& _os, const ewol::object::Param& _obj) { diff --git a/sources/ewol/object/ParamRange.h b/sources/ewol/object/ParamRange.h index 3e1832db..7559bfd6 100644 --- a/sources/ewol/object/ParamRange.h +++ b/sources/ewol/object/ParamRange.h @@ -125,7 +125,7 @@ namespace ewol { } }; - template std::ostream& operator <<(std::ostream& _os, const ewol::object::Param& _obj) { + template std::ostream& operator <<(std::ostream& _os, const ewol::object::ParamRange& _obj) { _os << _obj.get(); return _os; } diff --git a/sources/ewol/widget/Button.cpp b/sources/ewol/widget/Button.cpp index 829f2dc6..a4e944ae 100644 --- a/sources/ewol/widget/Button.cpp +++ b/sources/ewol/widget/Button.cpp @@ -318,7 +318,7 @@ void ewol::widget::Button::periodicCall(const ewol::event::Time& _event) { markToRedraw(); } - +/* bool ewol::widget::Button::onSetConfig(const ewol::object::Config& _conf) { if (true == ewol::widget::Container2::onSetConfig(_conf)) { return true; @@ -398,5 +398,5 @@ bool ewol::widget::Button::onGetConfig(const char* _config, std::string& _result return false; } - +*/ diff --git a/sources/ewol/widget/Button.h b/sources/ewol/widget/Button.h index e3263013..a39e1900 100644 --- a/sources/ewol/widget/Button.h +++ b/sources/ewol/widget/Button.h @@ -19,6 +19,7 @@ #include + namespace ewol { namespace widget { /** @@ -140,8 +141,10 @@ namespace ewol { void CheckStatus(); protected: // Derived function virtual void onDraw(); + /* virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; + */ public: // Derived function virtual void calculateMinMaxSize(); virtual void calculateSize(const vec2& _availlable);