[DEV] end coding style
This commit is contained in:
parent
b63e6d33b2
commit
90eb3d1ae3
2
external/agg
vendored
2
external/agg
vendored
@ -1 +1 @@
|
||||
Subproject commit 3970e6969827ec485bdf260f003653f27d1e8749
|
||||
Subproject commit 2de5439047f081e585d13df926b6cbc2103b49e4
|
2
external/ege
vendored
2
external/ege
vendored
@ -1 +1 @@
|
||||
Subproject commit 319b4552d1d90522b87b3c6913d716cd033d4a2c
|
||||
Subproject commit cc9f514fb31e8400ee9d5d2b244ce2cafdbdacae
|
2
external/ejson
vendored
2
external/ejson
vendored
@ -1 +1 @@
|
||||
Subproject commit a788a3c450585c42dd59cf8e3813bd1a4a241c5e
|
||||
Subproject commit 61f4b68621a3ba5cc137901956d8f021fc7ef7a2
|
2
external/etk
vendored
2
external/etk
vendored
@ -1 +1 @@
|
||||
Subproject commit 63906e9b7726c0ad630e12409843d7381febaf24
|
||||
Subproject commit 15f270da8a23ecf629d171e688579f497be6acd3
|
2
external/exml
vendored
2
external/exml
vendored
@ -1 +1 @@
|
||||
Subproject commit 33d1e95085e090eec9860213ba97a1616442d159
|
||||
Subproject commit 6a652e96c9b07919882a82d6f11f7d331f7414d6
|
@ -24,7 +24,7 @@ namespace ewol {
|
||||
* @param[in] _argv Standard argv
|
||||
* @return normal error int for the application error management
|
||||
*/
|
||||
int32_t Run(int32_t _argc, const char* _argv[]);
|
||||
int32_t run(int32_t _argc, const char* _argv[]);
|
||||
/**
|
||||
* @brief get EWOL version
|
||||
* @return The string that describe ewol version
|
||||
|
@ -134,7 +134,7 @@ void MacOs::setKeyboard(ewol::SpecialKey _keyboardMode, int32_t _unichar, bool _
|
||||
* @param std IO
|
||||
* @return std IO
|
||||
*/
|
||||
int ewol::Run(int _argc, const char *_argv[]) {
|
||||
int ewol::run(int _argc, const char *_argv[]) {
|
||||
etk::setArgZero(_argv[0]);
|
||||
interface = new MacOSInterface(_argc, _argv);
|
||||
if (NULL == interface) {
|
||||
|
@ -1289,7 +1289,7 @@ class X11Interface : public ewol::eContext {
|
||||
* @param std IO
|
||||
* @return std IO
|
||||
*/
|
||||
int ewol::Run(int _argc, const char *_argv[]) {
|
||||
int ewol::run(int _argc, const char *_argv[]) {
|
||||
etk::setArgZero(_argv[0]);
|
||||
X11Interface* interface = new X11Interface(_argc, _argv);
|
||||
if (NULL == interface) {
|
||||
|
@ -189,7 +189,7 @@ void widget::Button::calculateMinMaxSize(void) {
|
||||
markToRedraw();
|
||||
}
|
||||
|
||||
void widget::Button::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::Button::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
if (true == m_hide){
|
||||
// widget is hidden ...
|
||||
return;
|
||||
|
@ -151,7 +151,7 @@ namespace widget {
|
||||
virtual void calculateMinMaxSize(void);
|
||||
virtual void calculateSize(const vec2& _availlable);
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
virtual bool onEventInput(const ewol::EventInput& _event);
|
||||
virtual bool onEventEntry(const ewol::EventEntry& _event);
|
||||
virtual bool loadXML(exml::Element* _node);
|
||||
|
@ -84,14 +84,14 @@ void widget::Container::onObjectRemove(ewol::EObject* _removeObject) {
|
||||
}
|
||||
}
|
||||
|
||||
void widget::Container::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::Container::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
if (true == m_hide){
|
||||
// widget is hidden ...
|
||||
return;
|
||||
}
|
||||
ewol::Widget::systemDraw(_displayProp);
|
||||
if (NULL!=m_subWidget) {
|
||||
ewol::drawProperty prop = _displayProp;
|
||||
ewol::DrawProperty prop = _displayProp;
|
||||
prop.limit(m_origin, m_size);
|
||||
m_subWidget->systemDraw(prop);
|
||||
}
|
||||
|
@ -50,7 +50,7 @@ namespace widget {
|
||||
virtual void subWidgetRemoveDelayed(void);
|
||||
|
||||
public: // Derived function
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual void onObjectRemove(ewol::EObject* _removeObject);
|
||||
virtual void calculateSize(const vec2& _availlable);
|
||||
|
@ -182,7 +182,7 @@ void widget::ContainerN::onObjectRemove(ewol::EObject* _removeObject) {
|
||||
}
|
||||
}
|
||||
|
||||
void widget::ContainerN::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::ContainerN::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
if (true == m_hide){
|
||||
// widget is hidden ...
|
||||
return;
|
||||
@ -190,7 +190,7 @@ void widget::ContainerN::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
// local widget draw
|
||||
ewol::Widget::systemDraw(_displayProp);
|
||||
// subwidget draw
|
||||
ewol::drawProperty prop = _displayProp;
|
||||
ewol::DrawProperty prop = _displayProp;
|
||||
prop.limit(m_origin, m_size);
|
||||
for (int32_t iii=m_subWidget.size()-1; iii >= 0; iii--) {
|
||||
if (NULL != m_subWidget[iii]) {
|
||||
|
@ -75,7 +75,7 @@ namespace widget {
|
||||
*/
|
||||
virtual void subWidgetUnLink(ewol::Widget* _newWidget);
|
||||
public:// Derived function
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual void onObjectRemove(ewol::EObject* _removeObject);
|
||||
virtual void calculateSize(const vec2& _availlable);
|
||||
|
@ -340,7 +340,7 @@ void widget::Gird::subWidgetUnLink(int32_t _colId, int32_t _rowId) {
|
||||
EWOL_WARNING("[" << getId() << "] Can not unLink unExistant widget");
|
||||
}
|
||||
|
||||
void widget::Gird::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::Gird::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
ewol::Widget::systemDraw(_displayProp);
|
||||
for (int32_t iii=0; iii<m_subWidget.size(); iii++) {
|
||||
if (NULL != m_subWidget[iii].widget) {
|
||||
|
@ -130,7 +130,7 @@ namespace widget {
|
||||
*/
|
||||
const ivec2& getBorderSize(void) { return m_borderSize; };
|
||||
public: // Derived function
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual ewol::Widget* getWidgetAtPos(const vec2& pos);
|
||||
virtual void onObjectRemove(ewol::EObject* _removeObject);
|
||||
|
@ -51,7 +51,7 @@ void widget::Mesh::onDraw(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void widget::Mesh::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::Mesh::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
ewol::openGL::push();
|
||||
// here we invert the reference of the standard openGl view because the reference in the common display is Top left and not buttom left
|
||||
glViewport( m_origin.x(),
|
||||
|
@ -33,7 +33,7 @@ namespace widget {
|
||||
public: // Derived function
|
||||
virtual const char * const getObjectType(void) { return "widget::Mesh"; };
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual void systemDraw(const ewol::drawProperty& displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& displayProp);
|
||||
virtual void onDraw(void);
|
||||
virtual bool onEventInput(const ewol::EventInput& _event);
|
||||
virtual void periodicCall(const ewol::EventTime& _event);
|
||||
|
@ -93,7 +93,7 @@ void widget::PopUp::calculateSize(const vec2& _available) {
|
||||
markToRedraw();
|
||||
}
|
||||
|
||||
void widget::PopUp::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::PopUp::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
if (true == m_hide){
|
||||
// widget is hidden ...
|
||||
return;
|
||||
@ -102,7 +102,7 @@ void widget::PopUp::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
if (NULL!=m_subWidget) {
|
||||
if( m_shaper.getNextDisplayedStatus() == -1
|
||||
&& m_shaper.getTransitionStatus() >= 1.0) {
|
||||
ewol::drawProperty prop = _displayProp;
|
||||
ewol::DrawProperty prop = _displayProp;
|
||||
prop.limit(m_origin, m_size);
|
||||
m_subWidget->systemDraw(prop);
|
||||
}
|
||||
|
@ -91,7 +91,7 @@ namespace widget {
|
||||
virtual bool onGetConfig(const char* _config, etk::UString& _result) const;
|
||||
public: // Derived function
|
||||
virtual void periodicCall(const ewol::EventTime& _event);
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual void calculateSize(const vec2& _available);
|
||||
virtual bool onEventInput(const ewol::EventInput& _event);
|
||||
|
@ -54,12 +54,12 @@ void widget::Scroll::calculateMinMaxSize(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void widget::Scroll::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::Scroll::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
if (m_hide == true) {
|
||||
return;
|
||||
}
|
||||
if (NULL!=m_subWidget) {
|
||||
ewol::drawProperty prop = _displayProp;
|
||||
ewol::DrawProperty prop = _displayProp;
|
||||
prop.limit(m_origin, m_size);
|
||||
m_subWidget->systemDraw(prop);
|
||||
}
|
||||
|
@ -62,7 +62,7 @@ namespace widget {
|
||||
void calculateMinMaxSize(void);
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual bool onEventInput(const ewol::EventInput& _event);
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
virtual ewol::Widget* getWidgetAtPos(const vec2& _pos);
|
||||
protected: // Derived function
|
||||
virtual void onDraw(void);
|
||||
|
@ -201,7 +201,7 @@ void widget::WSlider::periodicCall(const ewol::EventTime& _event) {
|
||||
markToRedraw();
|
||||
}
|
||||
|
||||
void widget::WSlider::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::WSlider::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
if (true == m_hide){
|
||||
// widget is hidden ...
|
||||
return;
|
||||
@ -210,7 +210,7 @@ void widget::WSlider::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
ewol::Widget::systemDraw(_displayProp);
|
||||
|
||||
// subwidget draw
|
||||
ewol::drawProperty prop = _displayProp;
|
||||
ewol::DrawProperty prop = _displayProp;
|
||||
prop.limit(m_origin, m_size);
|
||||
|
||||
if (m_windowsDestination == m_windowsSources) {
|
||||
|
@ -90,7 +90,7 @@ namespace widget {
|
||||
return "Ewol::WSlider";
|
||||
};
|
||||
virtual void calculateSize(const vec2& _availlable);
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual ewol::Widget* getWidgetAtPos(const vec2& _pos);
|
||||
virtual void periodicCall(const ewol::EventTime& _event);
|
||||
|
@ -16,12 +16,12 @@
|
||||
#undef __class__
|
||||
#define __class__ "DrawProperty"
|
||||
|
||||
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::drawProperty& _obj) {
|
||||
etk::CCout& ewol::operator <<(etk::CCout& _os, const ewol::DrawProperty& _obj) {
|
||||
_os << "{ windowsSize=" << _obj.m_windowsSize << " start=" << _obj.m_origin << " stop=" << (_obj.m_origin+_obj.m_size) << "}";
|
||||
return _os;
|
||||
}
|
||||
|
||||
void ewol::drawProperty::limit(const vec2& _origin, const vec2& _size) {
|
||||
void ewol::DrawProperty::limit(const vec2& _origin, const vec2& _size) {
|
||||
m_size += m_origin;
|
||||
m_origin.setMax(_origin);
|
||||
m_size.setMin(_origin+_size);
|
||||
@ -235,7 +235,7 @@ void ewol::Widget::setOffset(const vec2& _newVal) {
|
||||
/
|
||||
(0,0)
|
||||
*/
|
||||
void ewol::Widget::systemDraw(const drawProperty& _displayProp) {
|
||||
void ewol::Widget::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
if (true == m_hide){
|
||||
// widget is hidden ...
|
||||
return;
|
||||
@ -249,7 +249,7 @@ void ewol::Widget::systemDraw(const drawProperty& _displayProp) {
|
||||
return;
|
||||
}
|
||||
|
||||
drawProperty tmpSize = _displayProp;
|
||||
ewol::DrawProperty tmpSize = _displayProp;
|
||||
tmpSize.limit(m_origin, m_size);
|
||||
if (tmpSize.m_size.x() <= 0 || tmpSize.m_size.y() <= 0) {
|
||||
return;
|
||||
|
@ -31,7 +31,7 @@ namespace ewol {
|
||||
#define ULTIMATE_MAX_SIZE (99999999)
|
||||
|
||||
namespace ewol {
|
||||
class drawProperty{
|
||||
class DrawProperty{
|
||||
/*
|
||||
/--> m_windowsSize
|
||||
*--------------------------------------------------*
|
||||
@ -62,7 +62,7 @@ namespace ewol {
|
||||
ivec2 m_size; //!< Windows clipping upper widget (can not be <0 and >m_windowsSize)
|
||||
void limit(const vec2& _origin, const vec2& _size);
|
||||
};
|
||||
etk::CCout& operator <<(etk::CCout& _os, const ewol::drawProperty& _obj);
|
||||
etk::CCout& operator <<(etk::CCout& _os, const ewol::DrawProperty& _obj);
|
||||
|
||||
typedef enum {
|
||||
gravityCenter=0x00,
|
||||
@ -635,7 +635,7 @@ namespace ewol {
|
||||
* @param[in] _displayProp properties of the current display
|
||||
* @note : INTERNAL EWOL SYSTEM
|
||||
*/
|
||||
virtual void systemDraw(const drawProperty& _displayProp);
|
||||
virtual void systemDraw(const DrawProperty& _displayProp);
|
||||
protected:
|
||||
/**
|
||||
* @brief Common widget drawing function (called by the drawing thread [Android, X11, ...])
|
||||
|
@ -333,7 +333,7 @@ void widget::WidgetScrooled::onDraw(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void widget::WidgetScrooled::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void widget::WidgetScrooled::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
ewol::openGL::push();
|
||||
if (SCROLL_MODE_CENTER == m_scroollingMode) {
|
||||
// here we invert the reference of the standard openGl view because the reference in the common display is Top left and not buttom left
|
||||
|
@ -46,7 +46,7 @@ namespace widget {
|
||||
virtual const char * const getObjectType(void) { return "EwolWidgetScrooled"; };
|
||||
virtual void onRegenerateDisplay(void);
|
||||
virtual bool onEventInput(const ewol::EventInput& _event);
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
protected:
|
||||
/**
|
||||
* @brief For mouse event when we have a scrolling UP and dows, specify the number of pixel that we scrooled
|
||||
|
@ -102,7 +102,7 @@ void ewol::Windows::sysDraw(void) {
|
||||
mat4 newOne;
|
||||
ewol::openGL::setBasicMatrix(newOne);
|
||||
|
||||
ewol::drawProperty displayProp;
|
||||
ewol::DrawProperty displayProp;
|
||||
displayProp.m_windowsSize = m_size;
|
||||
displayProp.m_origin.setValue(0,0);
|
||||
displayProp.m_size = m_size;
|
||||
@ -124,7 +124,7 @@ void ewol::Windows::onRegenerateDisplay(void) {
|
||||
|
||||
//#define TEST_PERFO_WINDOWS
|
||||
|
||||
void ewol::Windows::systemDraw(const ewol::drawProperty& _displayProp) {
|
||||
void ewol::Windows::systemDraw(const ewol::DrawProperty& _displayProp) {
|
||||
ewol::Widget::systemDraw(_displayProp);
|
||||
#ifdef TEST_PERFO_WINDOWS
|
||||
int64_t ___startTime0 = ewol::getTime();
|
||||
|
@ -63,7 +63,7 @@ namespace ewol {
|
||||
*/
|
||||
void setBackgroundColor(const etk::Color<float>& _color);
|
||||
protected: // Derived function
|
||||
virtual void systemDraw(const ewol::drawProperty& _displayProp);
|
||||
virtual void systemDraw(const ewol::DrawProperty& _displayProp);
|
||||
public: // Derived function
|
||||
virtual const char * const getObjectType(void) { return "ewol::Windows"; };
|
||||
virtual void onRegenerateDisplay(void);
|
||||
|
Loading…
x
Reference in New Issue
Block a user