atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] try to set work of the parameters

Browse Source
This commit is contained in:
Edouard DUPIN 2014-08-13 07:50:00 +02:00
parent 91091b7ccb
commit 5c7fe3bda5
11 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/etk vendored

@ -1 +1 @@
Subproject commit e56a7466c6ad272194ba645875402e871c2fa0dd Subproject commit 28c433bb4e598726c7caeb8edec3b50a154bb9c2

2
external/ewolsa vendored

@ -1 +1 @@
Subproject commit a657e619550fe0135e42075b97076343fcf0c902 Subproject commit 875e52574e5012e2ccaf2c6dbc1167b3cfe1129a

2
external/exml vendored

@ -1 +1 @@
Subproject commit ce3c68cc5b1d995c47886488b4ab56d2c973f913 Subproject commit c7d2b2e8719f30b3d5a1e8330838e44f8d1a179a

2
monk

@ -1 +1 @@
Subproject commit 895e18786ce732e8cc1c282863677c21e1806062 Subproject commit 85ebc5ec327c3920264de479c8b1049c1b81596c

8
sources/ewol/compositing/Shaper.cpp
View File

@ -625,18 +625,18 @@ const etk::Color<float>& ewol::compositing::Shaper::getColor(int32_t _id) {
std::string std::to_string(const ewol::compositing::Shaper& _obj) { template<> std::string std::to_string<ewol::compositing::Shaper>(const ewol::compositing::Shaper& _obj) {
return _obj.getSource(); return _obj.getSource();
} }
std::u32string std::to_u32string(const ewol::compositing::Shaper& _obj) { template<> std::u32string std::to_u32string<ewol::compositing::Shaper>(const ewol::compositing::Shaper& _obj) {
return std::to_u32string(std::to_string(_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>(ewol::compositing::Shaper& _variableRet, const std::string& _value) {
_variableRet.setSource(_value); _variableRet.setSource(_value);
return true; return true;
} }
bool std::from_string(ewol::compositing::Shaper& _variableRet, const std::u32string& _value) { template<> bool std::from_string<ewol::compositing::Shaper>(ewol::compositing::Shaper& _variableRet, const std::u32string& _value) {
return from_string(_variableRet, std::to_string(_value)); return from_string(_variableRet, std::to_string(_value));
} }

14
sources/ewol/compositing/Shaper.h
View File

@ -291,16 +291,16 @@ namespace ewol {
float _yValButtom, float _yValButtom,
const float* _table, const float* _table,
bool _displayOutside); 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 #endif

1
sources/ewol/object/Object.h
View File

@ -31,6 +31,7 @@ namespace ewol {
#include <ewol/object/Message.h> #include <ewol/object/Message.h>
#include <ewol/object/ParameterList.h> #include <ewol/object/ParameterList.h>
#include <ewol/object/Param.h> #include <ewol/object/Param.h>
#include <ewol/object/ParamRange.h>
#include <ewol/object/ParamList.h> #include <ewol/object/ParamList.h>
#define DECLARE_FACTORY(className) \ #define DECLARE_FACTORY(className) \

3
sources/ewol/object/Param.h
View File

@ -119,6 +119,9 @@ namespace ewol {
operator MY_TYPE() const { operator MY_TYPE() const {
return m_value; return m_value;
} }
inline MY_TYPE& operator *() const {
return m_value;
}
}; };
template<typename MY_TYPE> std::ostream& operator <<(std::ostream& _os, const ewol::object::Param<MY_TYPE>& _obj) { template<typename MY_TYPE> std::ostream& operator <<(std::ostream& _os, const ewol::object::Param<MY_TYPE>& _obj) {

2
sources/ewol/object/ParamRange.h
View File

@ -125,7 +125,7 @@ namespace ewol {
} }
}; };
template<typename MY_TYPE> std::ostream& operator <<(std::ostream& _os, const ewol::object::Param<MY_TYPE>& _obj) { template<typename MY_TYPE> std::ostream& operator <<(std::ostream& _os, const ewol::object::ParamRange<MY_TYPE>& _obj) {
_os << _obj.get(); _os << _obj.get();
return _os; return _os;
} }

4
sources/ewol/widget/Button.cpp
View File

@ -318,7 +318,7 @@ void ewol::widget::Button::periodicCall(const ewol::event::Time& _event) {
markToRedraw(); markToRedraw();
} }
/*
bool ewol::widget::Button::onSetConfig(const ewol::object::Config& _conf) { bool ewol::widget::Button::onSetConfig(const ewol::object::Config& _conf) {
if (true == ewol::widget::Container2::onSetConfig(_conf)) { if (true == ewol::widget::Container2::onSetConfig(_conf)) {
return true; return true;
@ -398,5 +398,5 @@ bool ewol::widget::Button::onGetConfig(const char* _config, std::string& _result
return false; return false;
} }
*/

3
sources/ewol/widget/Button.h
View File

@ -19,6 +19,7 @@
#include <ewol/widget/Manager.h> #include <ewol/widget/Manager.h>
namespace ewol { namespace ewol {
namespace widget { namespace widget {
/** /**
@ -140,8 +141,10 @@ namespace ewol {
void CheckStatus(); void CheckStatus();
protected: // Derived function protected: // Derived function
virtual void onDraw(); virtual void onDraw();
/*
virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onSetConfig(const ewol::object::Config& _conf);
virtual bool onGetConfig(const char* _config, std::string& _result) const; virtual bool onGetConfig(const char* _config, std::string& _result) const;
*/
public: // Derived function public: // Derived function
virtual void calculateMinMaxSize(); virtual void calculateMinMaxSize();
virtual void calculateSize(const vec2& _availlable); virtual void calculateSize(const vec2& _availlable);