From 3af8ef44cc33702f6948b77bf79bd292ee816557 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 4 Nov 2013 22:34:40 +0100 Subject: [PATCH] [DEV] small change --- sources/ewol/renderer/EMultiCast.h | 9 +++++++-- sources/ewol/widget/Button.h | 24 ++++++++++++++++++------ sources/ewol/widget/Label.cpp | 1 + sources/ewol/widget/Label.h | 16 ++++++++++++---- sources/ewol/widget/Layer.h | 4 +++- sources/ewol/widget/Widget.h | 4 +++- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/sources/ewol/renderer/EMultiCast.h b/sources/ewol/renderer/EMultiCast.h index bd86da02..6fee1310 100644 --- a/sources/ewol/renderer/EMultiCast.h +++ b/sources/ewol/renderer/EMultiCast.h @@ -21,7 +21,10 @@ namespace ewol { private: class MessageList { public: - MessageList(const char* _message=NULL, ewol::EObject* _object=NULL) : m_message(_message), m_object(_object) { } + MessageList(const char* _message=NULL, ewol::EObject* _object=NULL) : + m_message(_message), m_object(_object) { + + } const char* m_message; ewol::EObject* m_object; }; @@ -29,7 +32,9 @@ namespace ewol { public: EMultiCast(); ~EMultiCast(void); - void anonymousSend(const char* const _messageId, const etk::UString& _data) { send(NULL, _messageId, _data); }; + void anonymousSend(const char* const _messageId, const etk::UString& _data) { + send(NULL, _messageId, _data); + }; void send(ewol::EObject* _object, const char* const _message, const etk::UString& _data); void rm(ewol::EObject* _object); void add(ewol::EObject* _object, const char* const _message); diff --git a/sources/ewol/widget/Button.h b/sources/ewol/widget/Button.h index 924a99d0..c6d86768 100644 --- a/sources/ewol/widget/Button.h +++ b/sources/ewol/widget/Button.h @@ -79,12 +79,16 @@ namespace widget { * @brief get the current displayed composition * @return The base widget */ - ewol::Widget* getSubWidget(void) const { return m_subWidget[0]; }; + ewol::Widget* getSubWidget(void) const { + return m_subWidget[0]; + }; /** * @brief get the current displayed composition * @return The toggle widget */ - ewol::Widget* getSubWidgetToggle(void) const { return m_subWidget[1]; }; + ewol::Widget* getSubWidgetToggle(void) const { + return m_subWidget[1]; + }; protected: bool m_value; //!< Current state of the button. public: @@ -99,7 +103,9 @@ namespace widget { * @return True : The button is pressed. * @return false : The button is released. */ - bool getValue(void) const { return m_value; }; + bool getValue(void) const { + return m_value; + }; protected: buttonLock_te m_lock; //!< Current lock state of the button. public: @@ -112,7 +118,9 @@ namespace widget { * @brief get the current button lock value. * @return The requested lock mode */ - buttonLock_te getLock(void) const { return m_lock; }; + buttonLock_te getLock(void) const { + return m_lock; + }; protected: bool m_toggleMode; //!< The button is able to toggle. public: @@ -125,7 +133,9 @@ namespace widget { * @brief get the current toggle mode. * @return the current toggle mode. */ - bool getToggleMode(void) const { return m_toggleMode; }; + bool getToggleMode(void) const { + return m_toggleMode; + }; private: bool m_mouseHover; //!< Flag to know where the mouse is (inside the displayed widget (if not fill)). bool m_buttonPressed; //!< Flag to know if the button is curently pressed. @@ -147,7 +157,9 @@ namespace widget { virtual bool onSetConfig(const ewol::EConfig& _conf); virtual bool onGetConfig(const char* _config, etk::UString& _result) const; public: // Derived function - virtual const char * const getObjectType(void) { return "widget::Button"; }; + virtual const char * const getObjectType(void) { + return "widget::Button"; + }; virtual void calculateMinMaxSize(void); virtual void calculateSize(const vec2& _availlable); virtual void onRegenerateDisplay(void); diff --git a/sources/ewol/widget/Label.cpp b/sources/ewol/widget/Label.cpp index ef26f91d..2bd08a2c 100644 --- a/sources/ewol/widget/Label.cpp +++ b/sources/ewol/widget/Label.cpp @@ -131,3 +131,4 @@ bool widget::Label::loadXML(exml::Element* _node) { setLabel(_node->getText()); return true; } + diff --git a/sources/ewol/widget/Label.h b/sources/ewol/widget/Label.h index bddbf881..9fdacc83 100644 --- a/sources/ewol/widget/Label.h +++ b/sources/ewol/widget/Label.h @@ -36,23 +36,31 @@ namespace widget { /** * @brief destructor */ - virtual ~Label(void) { }; + virtual ~Label(void) { + + }; /** * @brief change the label displayed * @param[in] _newLabel The displayed decorated text. */ void setLabel(const etk::UString& _newLabel); - inline void setValue(const etk::UString& _newLabel) { setLabel(_newLabel); }; + inline void setValue(const etk::UString& _newLabel) { + setLabel(_newLabel); + }; /** * @brief get the current displayed label * @return The displayed decorated text. */ etk::UString getLabel(void); - inline etk::UString getValue(void) { return getLabel(); }; + inline etk::UString getValue(void) { + return getLabel(); + }; protected: // Derived function virtual void onDraw(void); public: // Derived function - virtual const char * const getObjectType(void) { return "Ewol::Label"; }; + virtual const char * const getObjectType(void) { + return "Ewol::Label"; + }; virtual void calculateMinMaxSize(void); virtual void onRegenerateDisplay(void); virtual bool onEventInput(const ewol::EventInput& _event); diff --git a/sources/ewol/widget/Layer.h b/sources/ewol/widget/Layer.h index 51ec689d..b523dfa0 100644 --- a/sources/ewol/widget/Layer.h +++ b/sources/ewol/widget/Layer.h @@ -31,7 +31,9 @@ namespace widget { */ virtual ~Layer(void); public: - virtual const char * const getObjectType(void) { return "Ewol::Layer"; }; + virtual const char * const getObjectType(void) { + return "Ewol::Layer"; + }; virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); }; diff --git a/sources/ewol/widget/Widget.h b/sources/ewol/widget/Widget.h index ab241716..72bca519 100644 --- a/sources/ewol/widget/Widget.h +++ b/sources/ewol/widget/Widget.h @@ -503,7 +503,9 @@ namespace ewol { * @brief periodic call of this widget * @param _event Current time property */ - virtual void periodicCall(const ewol::EventTime& _event) { }; + virtual void periodicCall(const ewol::EventTime& _event) { + + }; public: /** * @brief get the widget at the specific windows absolute position