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

[DEV] WORK

Browse Source
This commit is contained in:
Edouard DUPIN 2014-08-14 07:34:43 +02:00
parent 9cb928b973
commit 43505fcc37
7 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/etk vendored

@ -1 +1 @@
Subproject commit 4c20238d3c6a6aee05fa2819fefb9c41075510c7 Subproject commit 28e619250d6ccab36d4eb33abfdc446b0279b7c8

2
external/ewolsa vendored

@ -1 +1 @@
Subproject commit 33fe9dfba589f3e8b3d518790397de9828eb7617 Subproject commit 875e52574e5012e2ccaf2c6dbc1167b3cfe1129a

2
monk

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

17
sources/ewol/Dimension.cpp
View File

@ -298,3 +298,20 @@ std::ostream& ewol::operator <<(std::ostream& _os, const ewol::Dimension& _obj)
_os << _obj.get(_obj.getType()) << _obj.getType(); _os << _obj.get(_obj.getType()) << _obj.getType();
return _os; return _os;
} }
template<> std::string etk::to_string<ewol::Dimension>(const ewol::Dimension& _obj) {
return _obj;
}
template<> std::u32string etk::to_u32string<ewol::Dimension>(const ewol::Dimension& _obj) {
return etk::to_u32string(etk::to_string(_obj));
}
template<> bool etk::from_string<ewol::Dimension>(ewol::Dimension& _variableRet, const std::string& _value) {
_variableRet = ewol::Dimension(_value);
return true;
}
template<> bool etk::from_string<ewol::Dimension>(ewol::Dimension& _variableRet, const std::u32string& _value) {
return from_string(_variableRet, etk::to_string(_value));
}

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

@ -253,12 +253,12 @@ bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
EWOL_VERBOSE(getName() << " : Generate event : " << eventPressed); EWOL_VERBOSE(getName() << " : Generate event : " << eventPressed);
generateEventId(eventPressed); generateEventId(eventPressed);
EWOL_VERBOSE(getName() << " : Generate event : " << eventValue << " val=" << m_value ); EWOL_VERBOSE(getName() << " : Generate event : " << eventValue << " val=" << m_value );
generateEventId(eventValue, etk::to_string(m_value)); generateEventId(eventValue, etk::to_string(m_value.get()));
if( false == m_toggleMode if( false == m_toggleMode
&& true == m_value) { && true == m_value) {
setValue(false); setValue(false);
EWOL_VERBOSE(getName() << " : Generate event : " << ewol::widget::Button::eventValue << " val=" << m_value); EWOL_VERBOSE(getName() << " : Generate event : " << ewol::widget::Button::eventValue << " val=" << m_value);
generateEventId(eventValue, etk::to_string(m_value)); generateEventId(eventValue, etk::to_string(m_value.get()));
} }
} }
markToRedraw(); markToRedraw();

2
sources/ewol/widget/ContextMenu.h
View File

@ -59,8 +59,10 @@ namespace ewol {
void setPositionMark(enum markPosition position, vec2 arrowPos); void setPositionMark(enum markPosition position, vec2 arrowPos);
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 onRegenerateDisplay(); virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventInput(const ewol::event::Input& _event);

2
sources/ewol/widget/ListFileSystem.h
View File

@ -158,9 +158,11 @@ namespace ewol {
bool getShowTemporaryFiles() const { bool getShowTemporaryFiles() const {
return m_showFile; return m_showFile;
}; };
/*
public: // glocal derived functions public: // glocal derived functions
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;
*/
}; };
}; };
}; };