diff --git a/doxygen.dox b/doxygen.dox index 6ac5bd4e..5fb0899e 100644 --- a/doxygen.dox +++ b/doxygen.dox @@ -7,7 +7,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "EWOL" PROJECT_NUMBER = OUTPUT_DIRECTORY = "doxygen/" -CREATE_SUBDIRS = YES +CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES @@ -88,11 +88,13 @@ INPUT = sources \ external/ejson \ external/esvg \ external/etk \ - external/exml + external/exml \ + doc/ INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cpp \ - *.h + *.h \ + *.md RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO @@ -162,31 +164,14 @@ SEARCHENGINE = YES # configuration options related to the LaTeX output #--------------------------------------------------------------------------- GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -LATEX_SOURCE_CODE = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -GENERATE_MAN = NO +GENERATE_MAN = YES MAN_OUTPUT = man MAN_EXTENSION = .3 MAN_LINKS = NO @@ -197,7 +182,7 @@ GENERATE_XML = NO XML_OUTPUT = xml XML_SCHEMA = XML_DTD = -XML_PROGRAMLISTING = YES +XML_PROGRAMLISTING = NO #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- @@ -206,9 +191,6 @@ GENERATE_AUTOGEN_DEF = NO # configuration options related to the Perl module output #--------------------------------------------------------------------------- GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- @@ -232,17 +214,17 @@ PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES +CLASS_DIAGRAMS = NO MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO DOT_FONTNAME = FreeSans DOT_FONTSIZE = 10 DOT_FONTPATH = -CLASS_GRAPH = YES +CLASS_GRAPH = NO COLLABORATION_GRAPH = NO GROUP_GRAPHS = NO -UML_LOOK = NO +UML_LOOK = YES TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = NO INCLUDED_BY_GRAPH = NO @@ -265,3 +247,6 @@ DOT_CLEANUP = YES # Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = YES +MARKDOWN_SUPPORT = YES + +ALIASES += license="@par License:\n" diff --git a/sources/ewol/docBook.h b/sources/ewol/docBook.h index f2bd2a18..e69de29b 100644 --- a/sources/ewol/docBook.h +++ b/sources/ewol/docBook.h @@ -1,18 +0,0 @@ -/** -@mainpage Ewol Library framework - -
-

Ewol Library framework

- Edouard DUPIN (C)
- License : BSD 3 clauses -
- -Ewol is a basic graphic inteface for : - - Linux (X11) - - Windows - - MacOs - - Andoid - - Ios (in-progress) - - -*/ \ No newline at end of file diff --git a/sources/ewol/widget/Button.h b/sources/ewol/widget/Button.h index 219b03dc..6d8a5fca 100644 --- a/sources/ewol/widget/Button.h +++ b/sources/ewol/widget/Button.h @@ -21,6 +21,7 @@ namespace widget { /** + * @ingroup ewolWidgetGroup * @brief a composed button is a button with an inside composed with the specify XML element == > this permit to generate standard element simple */ class Button : public ewol::Widget { diff --git a/sources/ewol/widget/ButtonColor.h b/sources/ewol/widget/ButtonColor.h index f7914503..d326292e 100644 --- a/sources/ewol/widget/ButtonColor.h +++ b/sources/ewol/widget/ButtonColor.h @@ -21,8 +21,10 @@ extern const char * const ewolEventButtonColorChange; namespace widget { - class ButtonColor : public ewol::Widget - { + /** + * @ingroup ewolWidgetGroup + */ + class ButtonColor : public ewol::Widget { public: static void init(ewol::WidgetManager& _widgetManager); private: @@ -65,7 +67,9 @@ namespace widget { virtual void onDraw(void); public: // Derived function virtual void calculateMinMaxSize(void); - virtual const char * const getObjectType(void) { return "widget::ButtonColor"; }; + virtual const char * const getObjectType(void) { + return "widget::ButtonColor"; + }; virtual void onRegenerateDisplay(void); virtual bool onEventInput(const ewol::EventInput& _event); virtual void onReceiveMessage(const ewol::EMessage& _msg); diff --git a/sources/ewol/widget/CheckBox.h b/sources/ewol/widget/CheckBox.h index c5b1ffff..b23c8225 100644 --- a/sources/ewol/widget/CheckBox.h +++ b/sources/ewol/widget/CheckBox.h @@ -19,8 +19,10 @@ extern const char* const ewolEventCheckBoxClicked; namespace widget { - class CheckBox : public ewol::Widget - { + /** + * @ingroup ewolWidgetGroup + */ + class CheckBox : public ewol::Widget { public: static void init(ewol::WidgetManager& _widgetManager); public: @@ -39,7 +41,9 @@ namespace widget { protected: // Derived function virtual void onDraw(void); public: // Derived function - virtual const char * const getObjectType(void) { return "Ewol::CheckBox"; }; + virtual const char * const getObjectType(void) { + return "widget::CheckBox"; + }; virtual void calculateMinMaxSize(void); virtual void onRegenerateDisplay(void); virtual bool onEventInput(const ewol::EventInput& _event); diff --git a/sources/ewol/widget/ColorBar.h b/sources/ewol/widget/ColorBar.h index b2f431b5..0b98cdc0 100644 --- a/sources/ewol/widget/ColorBar.h +++ b/sources/ewol/widget/ColorBar.h @@ -18,8 +18,10 @@ extern const char * const ewolEventColorBarChange; namespace widget { - class ColorBar :public ewol::Widget - { + /** + * @ingroup ewolWidgetGroup + */ + class ColorBar :public ewol::Widget { public: ColorBar(void); virtual ~ColorBar(void); diff --git a/sources/ewol/widget/Composer.h b/sources/ewol/widget/Composer.h index 5efc8e29..6f0f39b4 100644 --- a/sources/ewol/widget/Composer.h +++ b/sources/ewol/widget/Composer.h @@ -16,6 +16,7 @@ namespace widget { /** + * @ingroup ewolWidgetGroup * @brief the composer widget is a widget that create a link on a string.file to parse the data and generate some widget tree */ class Composer : public widget::Container @@ -83,7 +84,7 @@ namespace widget const etk::UString& _overloadData=""); public: // herited functions: virtual const char * const getObjectType(void) { - return "ewol::widget::Composer"; + return "widget::Composer"; }; }; }; diff --git a/sources/ewol/widget/Container.h b/sources/ewol/widget/Container.h index 928ea07b..851aa111 100644 --- a/sources/ewol/widget/Container.h +++ b/sources/ewol/widget/Container.h @@ -15,6 +15,7 @@ namespace widget { /** + * @ingroup ewolWidgetGroup * @brief the Cotainer widget is a widget that have an only one subWidget */ class Container : public ewol::Widget { @@ -58,7 +59,7 @@ namespace widget { virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); virtual ewol::Widget* getWidgetNamed(const etk::UString& _widgetName); virtual const char * const getObjectType(void) { - return "ewol::widget::Container"; + return "widget::Container"; }; virtual bool loadXML(exml::Element* _node); virtual void setOffset(const vec2& _newVal); diff --git a/sources/ewol/widget/ContainerN.h b/sources/ewol/widget/ContainerN.h index 189a9a5c..7d1eb8ce 100644 --- a/sources/ewol/widget/ContainerN.h +++ b/sources/ewol/widget/ContainerN.h @@ -15,6 +15,7 @@ namespace widget { /** + * @ingroup ewolWidgetGroup * @brief the Cotainer widget is a widget that have an only one subWidget */ class ContainerN : public ewol::Widget { @@ -89,7 +90,7 @@ namespace widget { virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); virtual ewol::Widget* getWidgetNamed(const etk::UString& _widgetName); virtual const char * const getObjectType(void) { - return "Ewol::ContainerN"; + return "widget::ContainerN"; }; virtual bool loadXML(exml::Element* _node); virtual void setOffset(const vec2& _newVal); diff --git a/sources/ewol/widget/ContextMenu.h b/sources/ewol/widget/ContextMenu.h index eb419611..21a41269 100644 --- a/sources/ewol/widget/ContextMenu.h +++ b/sources/ewol/widget/ContextMenu.h @@ -25,6 +25,9 @@ namespace widget { CONTEXT_MENU_MARK_LEFT, CONTEXT_MENU_MARK_NONE }markPosition_te; + /** + * @ingroup ewolWidgetGroup + */ class ContextMenu : public widget::Container { public: static void init(ewol::WidgetManager& _widgetManager); @@ -65,7 +68,7 @@ namespace widget { virtual void calculateSize(const vec2& availlable); virtual void calculateMinMaxSize(void); virtual const char * const getObjectType(void) { - return "ewol::ContextMenu"; + return "widget::ContextMenu"; }; virtual ewol::Widget* getWidgetAtPos(const vec2& pos); }; diff --git a/sources/ewol/widget/Drawable.cpp b/sources/ewol/widget/Drawable.cpp deleted file mode 100644 index 42cc0fd9..00000000 --- a/sources/ewol/widget/Drawable.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @author Edouard DUPIN - * - * @copyright 2011, Edouard DUPIN, all right reserved - * - * @license BSD v3 (see license file) - */ - -#include - - -widget::Drawable::Drawable(void) { - // nothing to do ... -} - -widget::Drawable::~Drawable(void) { - clearOObjectList(); -} - - -void widget::Drawable::addOObject(ewol::Compositing* newObject, int32_t pos) { - if (NULL == newObject) { - EWOL_ERROR("Try to add an empty object in the Widget generic display system"); - return; - } - if (pos < 0 || pos >= m_listOObject.size() ) { - m_listOObject.pushBack(newObject); - } else { - m_listOObject.insert(pos, newObject); - } -} - - -void widget::Drawable::clearOObjectList(void) { - for (int32_t iii=0; iiidraw(); - } - } -} - - - diff --git a/sources/ewol/widget/Drawable.h b/sources/ewol/widget/Drawable.h deleted file mode 100644 index 47925865..00000000 --- a/sources/ewol/widget/Drawable.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @author Edouard DUPIN - * - * @copyright 2011, Edouard DUPIN, all right reserved - * - * @license BSD v3 (see license file) - */ - -#ifndef __EWOL_WIDGET_DRAWABLE_H__ -#define __EWOL_WIDGET_DRAWABLE_H__ - -#include -#include - - -namespace widget { - class Drawable : public ewol::Widget { - public: - Drawable(void); - virtual ~Drawable(void); - // Derived function - virtual const char * const getObjectType(void) { return "widget::drawable"; }; - - private: - etk::Vector m_listOObject; //!< generic element to display... - public: - void addOObject(ewol::Compositing* newObject, int32_t pos=-1); - void clearOObjectList(void); - protected: // Derived function - virtual void onDraw(void); - }; - -}; - -#endif - diff --git a/sources/ewol/widget/Entry.h b/sources/ewol/widget/Entry.h index 6db8764c..e3d2166b 100644 --- a/sources/ewol/widget/Entry.h +++ b/sources/ewol/widget/Entry.h @@ -21,13 +21,14 @@ namespace widget { /** + * @ingroup ewolWidgetGroup * @brief Entry box display : * - * @code - * ---------------------------------------------- - * | Editable Text | - * ---------------------------------------------- - * @endcode + * ~~~~~~~~~~~~~~~~~~~~~~ + * ---------------------------------------------- + * | Editable Text | + * ---------------------------------------------- + * ~~~~~~~~~~~~~~~~~~~~~~ */ class Entry : public ewol::Widget { public: @@ -200,7 +201,7 @@ namespace widget { virtual void onReceiveMessage(const ewol::EMessage& _msg); virtual void onEventClipboard(ewol::clipBoard::clipboardListe_te _clipboardID); virtual const char * const getObjectType(void) { - return "EwolEntry"; + return "widget::Entry"; }; virtual void calculateMinMaxSize(void); protected: // Derived function diff --git a/sources/ewol/widget/Gird.h b/sources/ewol/widget/Gird.h index 7514a23e..2ea11752 100644 --- a/sources/ewol/widget/Gird.h +++ b/sources/ewol/widget/Gird.h @@ -16,6 +16,9 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class Gird :public ewol::Widget { public: static void init(ewol::WidgetManager& _widgetManager); @@ -135,7 +138,7 @@ namespace widget { virtual ewol::Widget* getWidgetAtPos(const vec2& pos); virtual void onObjectRemove(ewol::EObject* _removeObject); virtual const char * const getObjectType(void) { - return "ewol::gird"; + return "widget::Gird"; }; virtual void calculateSize(const vec2& _availlable); virtual void calculateMinMaxSize(void); diff --git a/sources/ewol/widget/Image.h b/sources/ewol/widget/Image.h index 21e562e7..66e10c5f 100644 --- a/sources/ewol/widget/Image.h +++ b/sources/ewol/widget/Image.h @@ -19,6 +19,9 @@ extern const char * const ewolEventImagePressed; namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class Image :public ewol::Widget { public: // Event list of properties @@ -117,7 +120,7 @@ namespace widget { virtual bool onGetConfig(const char* _config, etk::UString& _result) const; public: // Derived function virtual const char * const getObjectType(void) { - return "Ewol::Image"; + return "widget::Image"; }; virtual void calculateMinMaxSize(void); virtual void onRegenerateDisplay(void); diff --git a/sources/ewol/widget/Joystick.cpp b/sources/ewol/widget/Joystick.cpp index d48ecb32..eef50671 100644 --- a/sources/ewol/widget/Joystick.cpp +++ b/sources/ewol/widget/Joystick.cpp @@ -64,7 +64,7 @@ void widget::Joystick::calculateSize(const vec2& availlable) { void widget::Joystick::onRegenerateDisplay(void) { if (true == needRedraw()) { // clean the object list ... - clearOObjectList(); + /* ewol::OObject2DColored * tmpOObjects = NULL; ewol::OObject2DTextured * tmpOOtexBg = NULL; diff --git a/sources/ewol/widget/Joystick.h b/sources/ewol/widget/Joystick.h index 7ebf8597..5feeba9a 100644 --- a/sources/ewol/widget/Joystick.h +++ b/sources/ewol/widget/Joystick.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include extern const char * const ewolEventJoystickEnable; @@ -23,7 +23,10 @@ namespace widget { JOYSTICK_NORMAL_MODE, JOYSTICK_ARROW_MODE, } joystickMode_te; - class Joystick :public widget::Drawable { + /** + * @ingroup ewolWidgetGroup + */ + class Joystick :public ewol::Widget { private: draw::Color m_colorFg; //!< Forground color draw::Color m_colorBg; //!< Background color @@ -42,7 +45,9 @@ namespace widget { Joystick(void); virtual ~Joystick(void); // Derived function - virtual const char * const getObjectType(void) { return "Ewol::Joystick"; }; + virtual const char * const getObjectType(void) { + return "widget::Joystick"; + }; virtual void calculateSize(const vec2& availlable); virtual void onRegenerateDisplay(void); virtual bool onEventInput(const ewol::EventInput& _event); diff --git a/sources/ewol/widget/Label.h b/sources/ewol/widget/Label.h index 9fdacc83..bf99e226 100644 --- a/sources/ewol/widget/Label.h +++ b/sources/ewol/widget/Label.h @@ -16,6 +16,9 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class Label : public ewol::Widget { public: // Event list of properties @@ -59,7 +62,7 @@ namespace widget { virtual void onDraw(void); public: // Derived function virtual const char * const getObjectType(void) { - return "Ewol::Label"; + return "widget::Label"; }; virtual void calculateMinMaxSize(void); virtual void onRegenerateDisplay(void); diff --git a/sources/ewol/widget/Layer.h b/sources/ewol/widget/Layer.h index b523dfa0..0c83c993 100644 --- a/sources/ewol/widget/Layer.h +++ b/sources/ewol/widget/Layer.h @@ -15,6 +15,9 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class Layer : public widget::ContainerN { public: /** @@ -32,7 +35,7 @@ namespace widget { virtual ~Layer(void); public: virtual const char * const getObjectType(void) { - return "Ewol::Layer"; + return "widget::Layer"; }; virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); }; diff --git a/sources/ewol/widget/List.h b/sources/ewol/widget/List.h index 3c2d785a..d856a533 100644 --- a/sources/ewol/widget/List.h +++ b/sources/ewol/widget/List.h @@ -16,11 +16,16 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class List : public widget::WidgetScrooled { public: List(void); // Derived function - virtual const char * const getObjectType(void) { return "ewol::List"; }; + virtual const char * const getObjectType(void) { + return "widget::List"; + }; virtual ~List(void); virtual void calculateMinMaxSize(void); void setLabel(etk::UString _newLabel); diff --git a/sources/ewol/widget/ListFileSystem.h b/sources/ewol/widget/ListFileSystem.h index 0304d706..b8305f88 100644 --- a/sources/ewol/widget/ListFileSystem.h +++ b/sources/ewol/widget/ListFileSystem.h @@ -18,6 +18,9 @@ extern const char * const ewolEventFSFolderSelect; extern const char * const ewolEventFSFolderValidate; namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class ListFileSystem : public widget::List { private: etk::Vector m_list; @@ -37,7 +40,9 @@ namespace widget { uint32_t getNuberOfRaw(void); bool getElement(int32_t _colomn, int32_t _raw, etk::UString& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg); bool onItemEvent(int32_t _IdInput, ewol::keyEvent::status_te _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); - const char * const getObjectType(void) { return "EwolListFileSystem"; }; + const char * const getObjectType(void) { + return "widget::ListFileSystem"; + }; public: // extern API : void setFolder(etk::UString _newFolder); diff --git a/sources/ewol/widget/Menu.h b/sources/ewol/widget/Menu.h index 2f9164c5..98912d0f 100644 --- a/sources/ewol/widget/Menu.h +++ b/sources/ewol/widget/Menu.h @@ -28,13 +28,16 @@ namespace widget { const char *m_generateEvent; etk::UString m_message; }; + /** + * @ingroup ewolWidgetGroup + */ class Menu :public widget::Sizer { public: Menu(void); virtual ~Menu(void); // Derived functionv virtual const char * const getObjectType(void) { - return "ewol::menu"; + return "widget::Menu"; }; private: virtual void subWidgetRemoveAll(void); diff --git a/sources/ewol/widget/Mesh.h b/sources/ewol/widget/Mesh.h index 95bf605b..9275069d 100644 --- a/sources/ewol/widget/Mesh.h +++ b/sources/ewol/widget/Mesh.h @@ -17,6 +17,9 @@ extern const char * const ewolEventMeshPressed; namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class Mesh :public ewol::Widget { private: // mesh name : @@ -31,7 +34,9 @@ namespace widget { Mesh(const etk::UString& filename); // automatic considering in the appl Data older virtual ~Mesh(void); public: // Derived function - virtual const char * const getObjectType(void) { return "widget::Mesh"; }; + virtual const char * const getObjectType(void) { + return "widget::Mesh"; + }; virtual void onRegenerateDisplay(void); virtual void systemDraw(const ewol::DrawProperty& displayProp); virtual void onDraw(void); diff --git a/sources/ewol/widget/PopUp.h b/sources/ewol/widget/PopUp.h index d374b109..de61e5de 100644 --- a/sources/ewol/widget/PopUp.h +++ b/sources/ewol/widget/PopUp.h @@ -18,6 +18,9 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class PopUp : public widget::Container { public: static void init(ewol::WidgetManager& _widgetManager); @@ -87,7 +90,9 @@ namespace widget { * @brief get the current animation mode. * @return The animation mode. */ - animation_te getAnimationMode(void) { return m_animation;}; + animation_te getAnimationMode(void) const { + return m_animation; + }; protected: // Derived function virtual void onDraw(void); diff --git a/sources/ewol/widget/ProgressBar.h b/sources/ewol/widget/ProgressBar.h index b169fe1e..048719f6 100644 --- a/sources/ewol/widget/ProgressBar.h +++ b/sources/ewol/widget/ProgressBar.h @@ -17,6 +17,9 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class ProgressBar : public ewol::Widget { public: static void init(ewol::WidgetManager& _widgetManager); @@ -49,7 +52,7 @@ namespace widget { public: // Derived function virtual void onRegenerateDisplay(void); virtual const char * const getObjectType(void) { - return "ewol::progressBar"; + return "widget::ProgressBar"; }; virtual void calculateMinMaxSize(void); }; diff --git a/sources/ewol/widget/Scroll.h b/sources/ewol/widget/Scroll.h index a4ff449a..0ff34a07 100644 --- a/sources/ewol/widget/Scroll.h +++ b/sources/ewol/widget/Scroll.h @@ -26,6 +26,9 @@ namespace widget { SCROLL_GREP_END_EVENT, }highSpeedMode_te; + /** + * @ingroup ewolWidgetGroup + */ class Scroll : public widget::Container { public: // Cinfig parameter list: @@ -58,7 +61,7 @@ namespace widget { const vec2& getLimit(void) const { return m_limit; }; public: // Derived function - virtual const char * const getObjectType(void) { return "ewol::widget::Scroll"; }; + virtual const char * const getObjectType(void) { return "widget::Scroll"; }; void calculateMinMaxSize(void); virtual void onRegenerateDisplay(void); virtual bool onEventInput(const ewol::EventInput& _event); diff --git a/sources/ewol/widget/Sizer.h b/sources/ewol/widget/Sizer.h index 77547848..7fb7d5d6 100644 --- a/sources/ewol/widget/Sizer.h +++ b/sources/ewol/widget/Sizer.h @@ -15,6 +15,9 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class Sizer : public widget::ContainerN { public: /** @@ -108,7 +111,7 @@ namespace widget { }; public: // Derived function virtual const char * const getObjectType(void) { - return "ewol::widget::Sizer"; + return "widget::Sizer"; }; virtual void calculateSize(const vec2& _availlable); virtual void calculateMinMaxSize(void); diff --git a/sources/ewol/widget/Slider.cpp b/sources/ewol/widget/Slider.cpp index e0a6385c..bc2e6cdf 100644 --- a/sources/ewol/widget/Slider.cpp +++ b/sources/ewol/widget/Slider.cpp @@ -8,10 +8,9 @@ #include -#include #include -extern const char * const ewolEventSliderChange = "ewol-event-slider-change"; +extern const char * const ewolEventSliderChange = "ewol-event-slider-change"; #undef __class__ #define __class__ "Slider" @@ -74,29 +73,30 @@ void widget::Slider::setMax(int32_t _val) { markToRedraw(); } +void widget::Slider::onDraw(void) { + m_draw.draw(); +} + void widget::Slider::onRegenerateDisplay(void) { - if (true == needRedraw()) { - // clean the object list ... - clearOObjectList(); - - ewol::Drawing * tmpDraw = new ewol::Drawing; - - tmpDraw->setColor(m_textColorFg); - // draw a line : - tmpDraw->setThickness(1); - tmpDraw->setPos(vec3(dotRadius, m_size.y()/2, 0) ); - tmpDraw->lineTo(vec3(m_size.x()-dotRadius, m_size.y()/2, 0) ); - tmpDraw->setThickness(0); - - etk::Color<> borderDot = m_textColorFg; - borderDot.setA(borderDot.a()/2); - tmpDraw->setPos(vec3(4+((float)(m_value-m_min)/(float)(m_max-m_min))*(float)(m_size.x()-2*dotRadius), m_size.y()/2, 0) ); - tmpDraw->setColorBg(borderDot); - tmpDraw->circle(dotRadius); - tmpDraw->setColorBg(m_textColorFg); - tmpDraw->circle(dotRadius/1.6); - addOObject(tmpDraw); + if (needRedraw() == false) { + return; } + // clean the object list ... + m_draw.clear(); + m_draw.setColor(m_textColorFg); + // draw a line : + m_draw.setThickness(1); + m_draw.setPos(vec3(dotRadius, m_size.y()/2, 0) ); + m_draw.lineTo(vec3(m_size.x()-dotRadius, m_size.y()/2, 0) ); + m_draw.setThickness(0); + + etk::Color<> borderDot = m_textColorFg; + borderDot.setA(borderDot.a()/2); + m_draw.setPos(vec3(4+((float)(m_value-m_min)/(float)(m_max-m_min))*(float)(m_size.x()-2*dotRadius), m_size.y()/2, 0) ); + m_draw.setColorBg(borderDot); + m_draw.circle(dotRadius); + m_draw.setColorBg(m_textColorFg); + m_draw.circle(dotRadius/1.6); } bool widget::Slider::onEventInput(const ewol::EventInput& _event) { diff --git a/sources/ewol/widget/Slider.h b/sources/ewol/widget/Slider.h index 6b1ac5a1..c403338a 100644 --- a/sources/ewol/widget/Slider.h +++ b/sources/ewol/widget/Slider.h @@ -12,13 +12,16 @@ #include #include #include -#include -#include +#include +#include extern const char * const ewolEventSliderChange; namespace widget { - class Slider :public widget::Drawable { + /** + * @ingroup ewolWidgetGroup + */ + class Slider :public ewol::Widget { public: static void init(ewol::WidgetManager& _widgetManager); public: @@ -28,16 +31,21 @@ namespace widget { int32_t getValue(void); void setMin(int32_t _val); void setMax(int32_t _val); - void setColor(etk::Color<> _newColor) { m_textColorFg = _newColor; }; - private: + void setColor(etk::Color<> _newColor) { + m_textColorFg = _newColor; + }; + protected: + ewol::Drawing m_draw; //!< drawing tool. int32_t m_value; int32_t m_min; int32_t m_max; etk::Color<> m_textColorFg; //!< Text color etk::Color<> m_textColorBg; //!< Background color - public: - // Derived function - virtual const char * const getObjectType(void) { return "Ewol::Slider"; } ; + public: // Derived function + virtual const char * const getObjectType(void) { + return "widget::Slider"; + } + virtual void onDraw(void); virtual void calculateMinMaxSize(void); virtual void onRegenerateDisplay(void); virtual bool onEventInput(const ewol::EventInput& _event); diff --git a/sources/ewol/widget/Spacer.h b/sources/ewol/widget/Spacer.h index 33e84d04..2c6ea0c2 100644 --- a/sources/ewol/widget/Spacer.h +++ b/sources/ewol/widget/Spacer.h @@ -17,6 +17,9 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class Spacer :public ewol::Widget { public: static void init(ewol::WidgetManager& _widgetManager); @@ -43,7 +46,9 @@ namespace widget { void setColor(etk::Color<> _newColor) { m_color = _newColor; markToRedraw(); }; public: // Derived function - virtual const char * const getObjectType(void) { return "ewol::spacer"; }; + virtual const char * const getObjectType(void) { + return "widget::Spacer"; + }; virtual ewol::Widget * getWidgetAtPos(const vec2& _pos) { return NULL; }; virtual void onRegenerateDisplay(void); virtual void onDraw(void); diff --git a/sources/ewol/widget/WSlider.h b/sources/ewol/widget/WSlider.h index 03bd0c1b..8a1b1ede 100644 --- a/sources/ewol/widget/WSlider.h +++ b/sources/ewol/widget/WSlider.h @@ -16,6 +16,9 @@ namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class WSlider :public widget::ContainerN { public: static void init(ewol::WidgetManager& _widgetManager); @@ -87,7 +90,7 @@ namespace widget { }; public: // Derived function virtual const char * const getObjectType(void) { - return "Ewol::WSlider"; + return "widget::WSlider"; }; virtual void calculateSize(const vec2& _availlable); virtual void systemDraw(const ewol::DrawProperty& _displayProp); diff --git a/sources/ewol/widget/Widget.h b/sources/ewol/widget/Widget.h index 72bca519..1626121e 100644 --- a/sources/ewol/widget/Widget.h +++ b/sources/ewol/widget/Widget.h @@ -96,6 +96,9 @@ namespace ewol { }; ~EventShortCut(void) { }; }; + /** + * @ingroup ewolWidgetGroup + */ class Widget : public EObject { public: // Config list of properties @@ -122,7 +125,7 @@ namespace ewol { * @return true if the object is compatible, otherwise false */ virtual const char * const getObjectType(void) { - return "Ewol::Widget"; + return "ewol::Widget"; }; // ---------------------------------------------------------------------------------------------------------------- // -- Hierarchy management: diff --git a/sources/ewol/widget/WidgetScrolled.h b/sources/ewol/widget/WidgetScrolled.h index 9282f62f..c4fc6c24 100644 --- a/sources/ewol/widget/WidgetScrolled.h +++ b/sources/ewol/widget/WidgetScrolled.h @@ -21,6 +21,9 @@ namespace widget { SCROLL_MODE_CENTER, //!< Zoom enable, no move left and right SCROLL_MODE_GAME, //!< Zoom enable, no move left and right } scrollingMode_te; + /** + * @ingroup ewolWidgetGroup + */ class WidgetScrooled : public ewol::Widget { private: etk::Vector m_listOObject; //!< generic element to display... @@ -43,7 +46,9 @@ namespace widget { protected: // Derived function virtual void onDraw(void); public: // Derived function - virtual const char * const getObjectType(void) { return "EwolWidgetScrooled"; }; + virtual const char * const getObjectType(void) { + return "widget::Scrooled"; + }; virtual void onRegenerateDisplay(void); virtual bool onEventInput(const ewol::EventInput& _event); virtual void systemDraw(const ewol::DrawProperty& _displayProp); diff --git a/sources/ewol/widget/Windows.h b/sources/ewol/widget/Windows.h index 1a7b85bf..d3c48f79 100644 --- a/sources/ewol/widget/Windows.h +++ b/sources/ewol/widget/Windows.h @@ -15,6 +15,9 @@ #include namespace ewol { + /** + * @ingroup ewolWidgetGroup + */ class Windows :public ewol::Widget { public: Windows(void); diff --git a/sources/ewol/widget/meta/ColorChooser.h b/sources/ewol/widget/meta/ColorChooser.h index 1ab3e65c..acf464e9 100644 --- a/sources/ewol/widget/meta/ColorChooser.h +++ b/sources/ewol/widget/meta/ColorChooser.h @@ -22,13 +22,17 @@ extern const char * const ewolEventColorChooserChange; namespace widget { - class ColorChooser : public widget::Sizer - { + /** + * @ingroup ewolWidgetGroup + */ + class ColorChooser : public widget::Sizer { public: ColorChooser(void); ~ColorChooser(void); // Derived function - virtual const char * const getObjectType(void) { return "widget::ColorChooser"; }; + virtual const char * const getObjectType(void) { + return "widget::ColorChooser"; + }; // Derived function virtual void onReceiveMessage(const ewol::EMessage& _msg); // Derived function diff --git a/sources/ewol/widget/meta/FileChooser.h b/sources/ewol/widget/meta/FileChooser.h index af4faf00..d0593c22 100644 --- a/sources/ewol/widget/meta/FileChooser.h +++ b/sources/ewol/widget/meta/FileChooser.h @@ -19,6 +19,9 @@ #include namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class FileChooser : public widget::PopUp { public: // Event list of properties diff --git a/sources/ewol/widget/meta/Parameter.h b/sources/ewol/widget/meta/Parameter.h index f9263404..00831b7c 100644 --- a/sources/ewol/widget/meta/Parameter.h +++ b/sources/ewol/widget/meta/Parameter.h @@ -23,12 +23,17 @@ extern const char * const ewolEventParameterClose; namespace widget { + /** + * @ingroup ewolWidgetGroup + */ class Parameter : public widget::PopUp { public: Parameter(void); ~Parameter(void); // Derived function - virtual const char * const getObjectType(void) { return "EwolParameter"; }; + virtual const char * const getObjectType(void) { + return "EwolParameter"; + }; // Derived function virtual void onReceiveMessage(const ewol::EMessage& _msg); // Derived function diff --git a/sources/ewol/widget/meta/ParameterList.h b/sources/ewol/widget/meta/ParameterList.h index faaf7b8e..a394e9ca 100644 --- a/sources/ewol/widget/meta/ParameterList.h +++ b/sources/ewol/widget/meta/ParameterList.h @@ -12,7 +12,6 @@ #include #include #include -#include extern const char * const ewolEventParameterListSelect; @@ -34,6 +33,9 @@ namespace widget { ~elementPL(void) {}; }; + /** + * @ingroup ewolWidgetGroup + */ class ParameterList :public widget::WidgetScrooled { private: int32_t m_idSelected; @@ -61,7 +63,9 @@ namespace widget { void menuSeparator(void); public: // Derived function - virtual const char * const getObjectType(void) { return "EwolParameterList"; }; + virtual const char * const getObjectType(void) { + return "widgetParameterList"; + }; virtual void onRegenerateDisplay(void); virtual bool onEventInput(const ewol::EventInput& _event); virtual void calculateMinMaxSize(void); diff --git a/sources/ewol/widget/meta/StdPopUp.h b/sources/ewol/widget/meta/StdPopUp.h index a1be1067..471b95cc 100644 --- a/sources/ewol/widget/meta/StdPopUp.h +++ b/sources/ewol/widget/meta/StdPopUp.h @@ -13,14 +13,12 @@ #include #include #include - namespace widget { /** + * @ingroup ewolWidgetGroup * @brief The std pop up widget is a siple message widget to notyfy user of some simple things, like: - */ -/** - * @page DSP_Perfo Performances : - * 
+	 *
+	 * ~~~~~~~~~~~~~~~~~~~~~
 	 * 	+---------------------------------+---+---+---+
 	 * 	| Windows name...                 | _ | O | X |
 	 * 	+---------------------------------+---+---+---+
@@ -39,7 +37,7 @@ namespace widget {
 	 * 	|                                             |
 	 * 	|                                             |
 	 * 	+---------------------------------------------+
-	 *
+ * ~~~~~~~~~~~~~~~~~~~~~ */ class StdPopUp : public widget::PopUp { public: @@ -77,11 +75,14 @@ namespace widget { widget::Button* addButton(const etk::UString& _text, bool _autoExit=false); public: // Derived function virtual const char * const getObjectType(void) { - return "ewol::StdPopUp"; + return "widget::StdPopUp"; }; virtual void onObjectRemove(ewol::EObject* _removeObject); virtual void onReceiveMessage(const ewol::EMessage& _msg); }; + /** + * @} + */ }; #endif diff --git a/sources/lutin_ewol.py b/sources/lutin_ewol.py index 2a54347c..5dea1fec 100755 --- a/sources/lutin_ewol.py +++ b/sources/lutin_ewol.py @@ -93,7 +93,6 @@ def Create(target): 'ewol/widget/Composer.cpp', 'ewol/widget/Container.cpp', 'ewol/widget/ContainerN.cpp', - 'ewol/widget/Drawable.cpp', 'ewol/widget/Entry.cpp', 'ewol/widget/Joystick.cpp', 'ewol/widget/Label.cpp',