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

[DEV] add override attribute

Browse Source
This commit is contained in:
Edouard DUPIN 2016-03-10 23:48:55 +01:00
parent f1a0b784f6
commit 229f45d158
35 changed files with 220 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ewol/object/Worker.h
View File

@ -24,7 +24,7 @@ namespace ewol {
* @brief Constructor.
*/
Worker();
void init();
void init() override;
public:
/**
* @brief Factory
@ -35,7 +35,7 @@ namespace ewol {
*/
virtual ~Worker();
public:
virtual void destroy();
void destroy() override;
};
}
}

24
ewol/widget/Button.h
View File

@ -56,7 +56,7 @@ namespace ewol {
* @param[in] _shaperName Shaper file properties
*/
Button();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(Button, "Button");
/**
@ -80,19 +80,19 @@ namespace ewol {
*/
void CheckStatus();
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void calculateMinMaxSize();
virtual void onChangeSize();
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool onEventEntry(const ewol::event::Entry& _event);
virtual void onDetectPresenceToggleWidget() {
virtual void onDraw() override;
public:
void calculateMinMaxSize() override;
void onChangeSize() override;
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
bool onEventEntry(const ewol::event::Entry& _event) override;
void onDetectPresenceToggleWidget() override {
propertyToggleMode.set(true);
}
private: // derived function
virtual void periodicCall(const ewol::event::Time& _event);
virtual void onLostFocus();
protected:
void periodicCall(const ewol::event::Time& _event) override;
void onLostFocus() override;
protected:
virtual void onChangePropertyShape();
virtual void onChangePropertyValue();

17
ewol/widget/ButtonColor.h
View File

@ -44,27 +44,26 @@ namespace ewol {
* @param[in] _shaperName The new shaper filename.
*/
ButtonColor();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(ButtonColor, "ButtonColor");
/**
* @brief Main destructor.
*/
virtual ~ButtonColor();
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void calculateMinMaxSize();
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
protected:
void onDraw() override;
public:
void calculateMinMaxSize() override;
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
private:
/**
* @brief internal system to change the property of the current status
* @param[in] _newStatusId new state
*/
void changeStatusIn(int32_t _newStatusId);
// Derived function
virtual void periodicCall(const ewol::event::Time& _event);
void periodicCall(const ewol::event::Time& _event) override;
// Callback function:
void onCallbackColorChange(const etk::Color<>& _color);
protected:

20
ewol/widget/CheckBox.h
View File

@ -46,7 +46,7 @@ namespace ewol {
* @param[in] _shaperName Shaper file properties
*/
CheckBox();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(CheckBox, "CheckBox");
/**
@ -63,15 +63,15 @@ namespace ewol {
* @brief update the status with the internal satte of the button ...
*/
void CheckStatus();
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void calculateMinMaxSize();
virtual void onChangeSize();
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool onEventEntry(const ewol::event::Entry& _event);
virtual void periodicCall(const ewol::event::Time& _event);
protected:
void onDraw() override;
public:
void calculateMinMaxSize() override;
void onChangeSize() override;
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
bool onEventEntry(const ewol::event::Entry& _event) override;
void periodicCall(const ewol::event::Time& _event) override;
protected:
virtual void onChangePropertyShape();
virtual void onChangePropertyValue();

12
ewol/widget/ColorBar.h
View File

@ -33,12 +33,12 @@ namespace ewol {
private:
ewol::compositing::Drawing m_draw; //!< Compositing drawing element
vec2 m_currentUserPos;
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void calculateMinMaxSize();
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
protected:
void onDraw() override;
public:
void calculateMinMaxSize() override;
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
protected:
virtual void onChangePropertyValue();
};

20
ewol/widget/Container.h
View File

@ -59,16 +59,16 @@ namespace ewol {
* @brief Unlink the subwidget Node.
*/
void subWidgetUnLink();
public: // Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay();
virtual void onChangeSize();
virtual void calculateMinMaxSize();
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
virtual ewol::ObjectShared getSubObjectNamed(const std::string& _objectName);
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
virtual void setOffset(const vec2& _newVal);
virtual void requestDestroyFromChild(const ewol::ObjectShared& _child);
public:
void systemDraw(const ewol::DrawProperty& _displayProp) override;
void onRegenerateDisplay() override;
void onChangeSize() override;
void calculateMinMaxSize() override;
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override;
ewol::ObjectShared getSubObjectNamed(const std::string& _objectName) override;
bool loadXML(const std::shared_ptr<const exml::Element>& _node) override;
void setOffset(const vec2& _newVal) override;
void requestDestroyFromChild(const ewol::ObjectShared& _child) override;
};
};
};

19
ewol/widget/Container2.h
View File

@ -157,20 +157,19 @@ namespace ewol {
*/
virtual void subWidgetReplace(const ewol::WidgetShared& _oldWidget,
const ewol::WidgetShared& _newWidget);
public: // Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay();
virtual void onChangeSize() {
public:
void systemDraw(const ewol::DrawProperty& _displayProp) override;
void onRegenerateDisplay() override;
void onChangeSize() override {
onChangeSizePadded();
}
virtual void calculateMinMaxSize() {
void calculateMinMaxSize() override {
calculateMinMaxSizePadded();
}
//virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
virtual ewol::ObjectShared getSubObjectNamed(const std::string& _objectName);
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
virtual void setOffset(const vec2& _newVal);
virtual void requestDestroyFromChild(const ewol::ObjectShared& _child);
ewol::ObjectShared getSubObjectNamed(const std::string& _objectName) override;
bool loadXML(const std::shared_ptr<const exml::Element>& _node) override;
void setOffset(const vec2& _newVal) override;
void requestDestroyFromChild(const ewol::ObjectShared& _child) override;
};
};
};

22
ewol/widget/ContainerN.h
View File

@ -39,7 +39,7 @@ namespace ewol {
protected:
bvec2 m_subExpend; //!< reference of the sub element expention requested.
// herited function
virtual bvec2 canExpand();
virtual bvec2 canExpand() override;
public:
/**
* @brief remove all sub element from the widget.
@ -90,16 +90,16 @@ namespace ewol {
* @param[in] _newWidget the element pointer.
*/
virtual void subWidgetUnLink(ewol::WidgetShared _newWidget);
public:// Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay();
virtual void onChangeSize();
virtual void calculateMinMaxSize();
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
virtual ewol::ObjectShared getSubObjectNamed(const std::string& _objectName);
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
virtual void setOffset(const vec2& _newVal);
virtual void requestDestroyFromChild(const ewol::ObjectShared& _child);
public:
void systemDraw(const ewol::DrawProperty& _displayProp) override;
void onRegenerateDisplay() override;
void onChangeSize() override;
void calculateMinMaxSize() override;
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override;
ewol::ObjectShared getSubObjectNamed(const std::string& _objectName) override;
bool loadXML(const std::shared_ptr<const exml::Element>& _node) override;
void setOffset(const vec2& _newVal) override;
void requestDestroyFromChild(const ewol::ObjectShared& _child) override;
protected:
virtual void onChangePropertyLockExpand();
};

18
ewol/widget/ContextMenu.h
View File

@ -38,7 +38,7 @@ namespace ewol {
eproperty::List<enum markPosition> propertyArrawBorder;
protected:
ContextMenu();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(ContextMenu, "ContextMenu");
virtual ~ContextMenu();
@ -54,14 +54,14 @@ namespace ewol {
public:
void setPositionMarkAuto(const vec2& _origin, const vec2& _size);
void setPositionMark(enum markPosition _position, const vec2& _arrowPos);
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual void onChangeSize();
virtual void calculateMinMaxSize();
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
protected:
void onDraw() override;
public:
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
void onChangeSize() override;
void calculateMinMaxSize() override;
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override;
protected:
virtual void onChangePropertyArrowPos();
virtual void onChangePropertyArrawBorder();

24
ewol/widget/Entry.h
View File

@ -57,7 +57,7 @@ namespace ewol {
* @param[in] _newData The USting that might be set in the Entry box (no event generation!!)
*/
Entry();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(Entry, "Entry");
/**
@ -105,18 +105,18 @@ namespace ewol {
* @note This request a regeneration of the display
*/
virtual void removeSelected();
public: // Derived function
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool onEventEntry(const ewol::event::Entry& _event);
virtual void onEventClipboard(enum gale::context::clipBoard::clipboardListe _clipboardID);
virtual void calculateMinMaxSize();
protected: // Derived function
virtual void onDraw();
virtual void onGetFocus();
virtual void onLostFocus();
public:
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
bool onEventEntry(const ewol::event::Entry& _event) override;
void onEventClipboard(enum gale::context::clipBoard::clipboardListe _clipboardID) override;
void calculateMinMaxSize() override;
protected:
void onDraw() override;
void onGetFocus() override;
void onLostFocus() override;
virtual void changeStatusIn(int32_t _newStatusId);
virtual void periodicCall(const ewol::event::Time& _event);
void periodicCall(const ewol::event::Time& _event) override;
private: // callback functions
void onCallbackShortCut(const std::string& _value);
void onCallbackEntryClean();

13
ewol/widget/Gird.h
View File

@ -122,6 +122,7 @@ namespace ewol {
*/
virtual void subWidgetUnLink(int32_t _colId, int32_t _rowId);
private:
// TODO : property
ivec2 m_borderSize; //!< Border size needed for all the display
public:
/**
@ -136,12 +137,12 @@ namespace ewol {
const ivec2& getBorderSize() {
return m_borderSize;
};
public: // Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay();
virtual ewol::WidgetShared getWidgetAtPos(const vec2& pos);
virtual void onChangeSize();
virtual void calculateMinMaxSize();
public:
virtual void systemDraw(const ewol::DrawProperty& _displayProp) override;
virtual void onRegenerateDisplay() override;
virtual ewol::WidgetShared getWidgetAtPos(const vec2& pos) override;
virtual void onChangeSize() override;
virtual void calculateMinMaxSize() override;
};
};
};

14
ewol/widget/Image.h
View File

@ -58,13 +58,13 @@ namespace ewol {
void set(const std::string& _file, const gale::Dimension& _border);
protected:
vec2 m_imageRenderSize; //!< size of the image when we render it
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void calculateMinMaxSize();
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
protected:
void onDraw() override;
public:
void calculateMinMaxSize() override;
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
bool loadXML(const std::shared_ptr<const exml::Element>& _node) override;
protected:
virtual void onChangePropertySource();
virtual void onChangePropertyImageSize();

6
ewol/widget/Joystick.h
View File

@ -83,9 +83,9 @@ namespace ewol {
*/
void getProperty(float& _distance, float& _angle);
public: // Derived function
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
public:
virtual void onRegenerateDisplay() override;
virtual bool onEventInput(const ewol::event::Input& _event) override;
};
};
};

14
ewol/widget/Label.h
View File

@ -47,13 +47,13 @@ namespace ewol {
* @brief destructor
*/
virtual ~Label();
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void calculateMinMaxSize();
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
protected:
void onDraw() override;
public:
void calculateMinMaxSize() override;
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
bool loadXML(const std::shared_ptr<const exml::Element>& _node) override;
protected:
virtual void onChangePropertyValue();
virtual void onChangePropertyAutoTranslate();

4
ewol/widget/Layer.h
View File

@ -32,8 +32,8 @@ namespace ewol {
* @brief Desstructor
*/
virtual ~Layer();
public: // Derived function
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
public:
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override;
};
};
};

16
ewol/widget/List.h
View File

@ -26,7 +26,7 @@ namespace ewol {
List();
public:
virtual ~List();
virtual void calculateMinMaxSize();
void calculateMinMaxSize() override;
void setLabel(std::string _newLabel);
// drawing capabilities ....
private:
@ -76,13 +76,13 @@ namespace ewol {
* @param[in] _id Id of the raw that might be visible.
*/
void setRawVisible(int32_t _id);
protected: // Derived function
virtual void onGetFocus();
virtual void onLostFocus();
virtual void onDraw();
public: // Derived function
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
protected:
void onGetFocus() override;
void onLostFocus() override;
void onDraw() override;
public:
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
};
};
};

14
ewol/widget/ListFileSystem.h
View File

@ -44,13 +44,13 @@ namespace ewol {
int32_t m_colorIdBackground1; //!< Color of the Background.
int32_t m_colorIdBackground2; //!< Color of the Background 2.
int32_t m_colorIdBackgroundSelected; //!< Color of line selected.
protected : // Derived function from the List...
virtual etk::Color<> getBasicBG();
virtual uint32_t getNuberOfColomn();
virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg);
virtual uint32_t getNuberOfRaw();
virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg);
virtual bool onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y);
protected:
etk::Color<> getBasicBG() override;
uint32_t getNuberOfColomn() override;
bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg) override;
uint32_t getNuberOfRaw() override;
bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg) override;
bool onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) override;
protected:
// TODO: use shred_ptr
std::vector<etk::FSNode *> m_list; //!< List of all element in the path. (they are filtered)

8
ewol/widget/Menu.h
View File

@ -42,10 +42,10 @@ namespace ewol {
DECLARE_WIDGET_FACTORY(Menu, "Menu");
virtual ~Menu();
private:
virtual void subWidgetRemoveAll();
virtual int32_t subWidgetAdd(ewol::WidgetShared _newWidget);
virtual void subWidgetRemove(ewol::WidgetShared _newWidget);
virtual void subWidgetUnLink(ewol::WidgetShared _newWidget);
void subWidgetRemoveAll() override;
int32_t subWidgetAdd(ewol::WidgetShared _newWidget) override;
void subWidgetRemove(ewol::WidgetShared _newWidget) override;
void subWidgetUnLink(ewol::WidgetShared _newWidget) override;
private:
std::vector<ewol::widget::MenuElement> m_listElement;
int32_t m_staticId; // unique ID for every element of the menu ...

24
ewol/widget/PopUp.h
View File

@ -34,7 +34,7 @@ namespace ewol {
* @param[in] _shaperName Shaper file properties
*/
PopUp();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(PopUp, "PopUp");
/**
@ -43,18 +43,18 @@ namespace ewol {
virtual ~PopUp();
protected:
ewol::compositing::Shaper m_shaper; //!< Compositing theme.
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void periodicCall(const ewol::event::Time& _event);
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay();
virtual void onChangeSize();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
protected:
virtual bool onStartAnnimation(enum ewol::Widget::annimationMode _mode);
virtual void onStopAnnimation();
void onDraw() override;
public:
void periodicCall(const ewol::event::Time& _event) override;
void systemDraw(const ewol::DrawProperty& _displayProp) override;
void onRegenerateDisplay() override;
void onChangeSize() override;
bool onEventInput(const ewol::event::Input& _event) override;
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override;
protected:
bool onStartAnnimation(enum ewol::Widget::annimationMode _mode) override;
void onStopAnnimation() override;
protected:
virtual void onChangePropertyShape();
virtual void onChangePropertyLockExpand();

12
ewol/widget/ProgressBar.h
View File

@ -30,17 +30,17 @@ namespace ewol {
eproperty::Value<etk::Color<>> propertyTextColorBgOff; //!< bar color disable
protected:
ProgressBar();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(ProgressBar, "ProgressBar");
virtual ~ProgressBar();
private:
ewol::compositing::Drawing m_draw; // basic drawing element
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void onRegenerateDisplay();
virtual void calculateMinMaxSize();
protected:
void onDraw() override;
public:
void onRegenerateDisplay() override;
void calculateMinMaxSize() override;
protected:
virtual void onChangePropertyValue();
virtual void onChangePropertyTextColorFg();

18
ewol/widget/Scroll.h
View File

@ -44,18 +44,18 @@ namespace ewol {
enum gale::key::type m_highSpeedType;
protected:
Scroll();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(Scroll, "Scroll");
virtual ~Scroll();
public: // Derived function
void calculateMinMaxSize();
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
protected: // Derived function
virtual void onDraw();
public:
void calculateMinMaxSize() override;
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
void systemDraw(const ewol::DrawProperty& _displayProp) override;
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override;
protected:
void onDraw() override;
protected:
virtual void onChangePropertyLimit();
virtual void onChangePropertyShapeVert();

4
ewol/widget/Select.h
View File

@ -53,8 +53,8 @@ namespace ewol {
void optionClear();
void optionAdd(int32_t _value, std::string _name);
protected:
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
virtual void updateGui();
bool loadXML(const std::shared_ptr<const exml::Element>& _node) override;
void updateGui() override;
protected:
void onCallbackOpenMenu();
void onCallbackLabelPressed(int32_t _value);

14
ewol/widget/Sizer.h
View File

@ -53,14 +53,14 @@ namespace ewol {
* @brief Destructor
*/
virtual ~Sizer();
public: // Derived function
virtual void onChangeSize();
virtual void calculateMinMaxSize();
public:
void onChangeSize() override;
void calculateMinMaxSize() override;
// overwrite the set fuction to start annimations ...
virtual int32_t subWidgetAdd(ewol::WidgetShared _newWidget);
virtual int32_t subWidgetAddStart(ewol::WidgetShared _newWidget);
virtual void subWidgetRemove(ewol::WidgetShared _newWidget);
virtual void subWidgetUnLink(ewol::WidgetShared _newWidget);
int32_t subWidgetAdd(ewol::WidgetShared _newWidget) override;
int32_t subWidgetAddStart(ewol::WidgetShared _newWidget) override;
void subWidgetRemove(ewol::WidgetShared _newWidget) override;
void subWidgetUnLink(ewol::WidgetShared _newWidget) override;
protected:
virtual void onChangePropertyMode();
virtual void onChangePropertyBorderSize();

8
ewol/widget/Slider.h
View File

@ -47,10 +47,10 @@ namespace ewol {
etk::Color<> m_textColorBg; //!< Background color
void updateValue(float _newValue);
public: // Derived function
virtual void onDraw();
virtual void calculateMinMaxSize();
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
void onDraw() override;
void calculateMinMaxSize() override;
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
protected:
virtual void onChangePropertyValue();
virtual void onChangePropertyMinimum();

10
ewol/widget/Spacer.h
View File

@ -38,10 +38,12 @@ namespace ewol {
virtual ~Spacer();
private:
ewol::compositing::Drawing m_draw; //!< Compositing drawing element
public: // Derived function
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos) { return nullptr; };
virtual void onRegenerateDisplay();
virtual void onDraw();
public:
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override {
return nullptr;
};
void onRegenerateDisplay() override;
void onDraw() override;
protected:
virtual void onChangePropertyColor();
};

12
ewol/widget/WSlider.h
View File

@ -67,12 +67,12 @@ namespace ewol {
* @param[in] _widgetName Name of the subwidget name
*/
void subWidgetSelectSet(const std::string& _widgetName);
public: // Derived function
virtual void onChangeSize();
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
virtual void onRegenerateDisplay();
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
virtual void periodicCall(const ewol::event::Time& _event);
public:
void onChangeSize() override;
void systemDraw(const ewol::DrawProperty& _displayProp) override;
void onRegenerateDisplay() override;
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override;
void periodicCall(const ewol::event::Time& _event) override;
protected:
virtual void onChangePropertySelectWidget();
virtual void onChangePropertyTransitionMode();

4
ewol/widget/Widget.h
View File

@ -514,8 +514,8 @@ namespace ewol {
* @return the type of the cursor.
*/
virtual enum gale::context::cursor getCursor();
public: // Derived function
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
public:
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node) override;
public:
/**
* @brief need to be call When the size of the current widget have change ==> this force the system to recalculate all the widget positions

14
ewol/widget/WidgetScrolled.h
View File

@ -74,19 +74,19 @@ namespace ewol {
* @param[in] _shaperName Shaper name if the scrolled widget.
*/
WidgetScrolled();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(WidgetScrolled, "WidgetScrolled");
/**
* @brief Scroll widget destructor.
*/
virtual ~WidgetScrolled();
protected: // Derived function
virtual void onDraw();
public: // Derived function
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
protected:
void onDraw() override;
public:
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
void systemDraw(const ewol::DrawProperty& _displayProp) override;
protected:
/**
* @brief For mouse event when we have a scrolling UP and dows, specify the number of pixel that we scrooled

14
ewol/widget/Windows.h
View File

@ -73,14 +73,14 @@ namespace ewol {
* @param[IN] the new requested color.
*/
void setBackgroundColor(const etk::Color<float>& _color);
protected: // Derived function
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
protected:
void systemDraw(const ewol::DrawProperty& _displayProp) override;
public: // Derived function
virtual void onRegenerateDisplay();
virtual void onChangeSize();
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos);
virtual void requestDestroyFromChild(const ewol::ObjectShared& _child);
virtual ewol::ObjectShared getSubObjectNamed(const std::string& _objectName);
void onRegenerateDisplay() override;
void onChangeSize() override;
ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override;
void requestDestroyFromChild(const ewol::ObjectShared& _child) override;
ewol::ObjectShared getSubObjectNamed(const std::string& _objectName) override;
void setTitle(const std::string& _title);
public:
enum popUpMessageType {

2
ewol/widget/meta/ColorChooser.h
View File

@ -33,7 +33,7 @@ namespace ewol {
eproperty::Value<etk::Color<>> propertyValue;
protected:
ColorChooser();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(ColorChooser, "ColorChooser");
virtual ~ColorChooser();

2
ewol/widget/meta/FileChooser.cpp
View File

@ -145,7 +145,7 @@ void ewol::widget::FileChooser::onChangePropertyPath() {
void ewol::widget::FileChooser::onChangePropertyFile() {
propertySetOnWidgetNamed("[" + etk::to_string(getId()) + "]file-shooser:entry-file", "value", propertyFile);
updateCurrentFolder();
//updateCurrentFolder();
}
void ewol::widget::FileChooser::onChangePropertyLabelTitle() {

6
ewol/widget/meta/FileChooser.h
View File

@ -77,15 +77,15 @@ namespace ewol {
eproperty::Value<std::string> propertyLabelCancel;
protected:
FileChooser();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(FileChooser, "FileChooser");
virtual ~FileChooser();
private:
std::string getCompleateFileName();
void updateCurrentFolder();
public: // Derived function
virtual void onGetFocus();
public:
void onGetFocus() override;
private:
// callback functions:
void onCallbackEntryFolderChangeValue(const std::string& _value);

2
ewol/widget/meta/Parameter.h
View File

@ -48,7 +48,7 @@ namespace ewol {
ewol::widget::LabelShared m_widgetTitle;
ewol::widget::ParameterListShared m_paramList;
ewol::widget::WSliderShared m_wSlider;
private: //callback functions:
private:
void onCallbackMenuclosed();
void onCallbackParameterSave();
void onCallbackMenuSelected(const int32_t& _value);

18
ewol/widget/meta/ParameterList.h
View File

@ -45,7 +45,7 @@ namespace ewol {
std::vector<ewol::widget::elementPL *> m_list;
protected:
ParameterList();
void init();
void init() override;
public:
DECLARE_WIDGET_FACTORY(ParameterList, "ParameterList");
virtual ~ParameterList();
@ -68,14 +68,14 @@ namespace ewol {
void menuClear();
void menuSeparator();
public: // Derived function
virtual void onRegenerateDisplay();
virtual bool onEventInput(const ewol::event::Input& _event);
virtual void calculateMinMaxSize();
protected: // Derived function
virtual void onGetFocus();
virtual void onLostFocus();
virtual void onDraw();
public:
void onRegenerateDisplay() override;
bool onEventInput(const ewol::event::Input& _event) override;
void calculateMinMaxSize() override;
protected:
void onGetFocus() override;
void onLostFocus() override;
void onDraw() override;
};
};
};

6
ewol/widget/meta/SpinBase.h
View File

@ -82,7 +82,7 @@ namespace ewol {
* @param[in] _mode The mode to display the elements
*/
SpinBase();
void init();
void init() override;
public:
/**
* @brief Destructor
@ -93,8 +93,8 @@ namespace ewol {
ewol::widget::ButtonShared m_widgetButtonDown;
ewol::widget::ButtonShared m_widgetButtonUp;
virtual void updateGui();
public: // Derived function
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node);
public:
virtual bool loadXML(const std::shared_ptr<const exml::Element>& _node) override;
protected:
virtual void onChangePropertySpinMode();
virtual void onChangePropertyShape();