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

[DEV] remove etk_min and etk_max & etk::Color<> interface

Browse Source
This commit is contained in:
Edouard DUPIN 2014-07-03 21:03:26 +02:00
parent ed8626e6a7
commit 2196919531
36 changed files with 147 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/agg vendored

@ -1 +1 @@
Subproject commit 04556d63d1bac4b9e6d3a569a56a2f6b6113736a
Subproject commit f2a9ffcdb201285f6d449f573a8c58e130d09b0b

2
external/eaudiofx vendored

@ -1 +1 @@
Subproject commit 361840c7f732f2446631c6619e9388bbd0852297
Subproject commit d62f5fd5c65d7c7b72efb68835bf9eb7d008e0a4

2
external/egami vendored

@ -1 +1 @@
Subproject commit 34eac48f5114151bab137e9cb177513c7cf42d96
Subproject commit 4cfeb0a91c02852c0ada6f5fc805fa3c2abeb792

2
external/ege vendored

@ -1 +1 @@
Subproject commit 73455cc61be78fd2a76466fb8c6a1aaabe68bf61
Subproject commit 0eeae19eaa4d38a0f6cb06d90c4cb31f55251b7e

2
external/esvg vendored

@ -1 +1 @@
Subproject commit a6c50c8f94cce5e14c9448a809fc9d1acc268c81
Subproject commit ac34d1f5317c3fd952b67d5c01ee4183914ae166

2
external/etk vendored

@ -1 +1 @@
Subproject commit cfc4d435b433fba9414330815b29e26cfe82927d
Subproject commit cf877f50473e8bfd0c940de4355fb856545d9422

2
external/ewolsa vendored

@ -1 +1 @@
Subproject commit 9569402acee2fdbe6baf591a5db0fec940380f48
Subproject commit 730685f470e91d4cf78db288aaf8a4705f9bf09f

8
sources/ewol/Dimension.cpp
View File

@ -183,12 +183,12 @@ vec2 ewol::Dimension::get(enum ewol::Dimension::distance _type) const {
void ewol::Dimension::set(const vec2& _size, enum ewol::Dimension::distance _type) {
// set min max on input to limit error :
vec2 size(etk_avg(0.0f,_size.x(),9999999.0f),
etk_avg(0.0f,_size.y(),9999999.0f));
vec2 size(std::avg(0.0f,_size.x(),9999999.0f),
std::avg(0.0f,_size.y(),9999999.0f));
switch(_type) {
case ewol::Dimension::Pourcent: {
vec2 size2(etk_avg(0.0f,_size.x(),100.0f),
etk_avg(0.0f,_size.y(),100.0f));
vec2 size2(std::avg(0.0f,_size.x(),100.0f),
std::avg(0.0f,_size.y(),100.0f));
m_data = vec2(size2.x()*0.01f, size2.y()*0.01f);
//EWOL_VERBOSE("Set % : " << size2 << " == > " << m_data);
break;

10
sources/ewol/compositing/Shaper.cpp
View File

@ -260,7 +260,7 @@ bool ewol::compositing::Shaper::periodicCall(const ewol::event::Time& _event) {
float timeRelativity = m_config->getNumber(m_confIdChangeTime) / 1000.0;
m_stateTransition += _event.getDeltaCall() / timeRelativity;
//m_stateTransition += _event.getDeltaCall();
m_stateTransition = etk_avg(0.0f, m_stateTransition, 1.0f);
m_stateTransition = std::avg(0.0f, m_stateTransition, 1.0f);
//EWOL_DEBUG("relative=" << timeRelativity << " Transition : " << m_stateTransition);
}
return true;
@ -459,10 +459,10 @@ void ewol::compositing::Shaper::setShape(const vec2& _origin, const vec2& _size,
border.yTop() - borderTmp.yTop(),
border.xRight() - borderTmp.xRight(),
border.yButtom() + borderTmp.yButtom());
ewol::Padding inside(insideBorder.xLeft() + etk_max(0.0f, paddingIn.xLeft()),
insideBorder.yTop() - etk_max(0.0f, paddingIn.yTop()),
insideBorder.xRight() - etk_max(0.0f, paddingIn.xRight()),
insideBorder.yButtom() + etk_max(0.0f, paddingIn.yButtom()));
ewol::Padding inside(insideBorder.xLeft() + std::max(0.0f, paddingIn.xLeft()),
insideBorder.yTop() - std::max(0.0f, paddingIn.yTop()),
insideBorder.xRight() - std::max(0.0f, paddingIn.xRight()),
insideBorder.yButtom() + std::max(0.0f, paddingIn.yButtom()));
#endif
/*

32
sources/ewol/compositing/TextBase.cpp
View File

@ -125,10 +125,10 @@ void ewol::compositing::TextBase::setPos(const vec3& _pos) {
// check min max for display area
if (m_nbCharDisplayed != 0) {
EWOL_VERBOSE("update size 1 " << m_sizeDisplayStart << " " << m_sizeDisplayStop);
m_sizeDisplayStop.setX(etk_max(m_position.x(), m_sizeDisplayStop.x()));
m_sizeDisplayStop.setY(etk_max(m_position.y(), m_sizeDisplayStop.y()));
m_sizeDisplayStart.setX(etk_min(m_position.x(), m_sizeDisplayStart.x()));
m_sizeDisplayStart.setY(etk_min(m_position.y(), m_sizeDisplayStart.y()));
m_sizeDisplayStop.setX(std::max(m_position.x(), m_sizeDisplayStop.x()));
m_sizeDisplayStop.setY(std::max(m_position.y(), m_sizeDisplayStop.y()));
m_sizeDisplayStart.setX(std::min(m_position.x(), m_sizeDisplayStart.x()));
m_sizeDisplayStart.setY(std::min(m_position.y(), m_sizeDisplayStart.y()));
EWOL_VERBOSE("update size 2 " << m_sizeDisplayStart << " " << m_sizeDisplayStop);
}
// update position
@ -143,10 +143,10 @@ void ewol::compositing::TextBase::setPos(const vec3& _pos) {
EWOL_VERBOSE("update size 0 " << m_sizeDisplayStart << " " << m_sizeDisplayStop);
} else {
EWOL_VERBOSE("update size 3 " << m_sizeDisplayStart << " " << m_sizeDisplayStop);
m_sizeDisplayStop.setX(etk_max(m_position.x(), m_sizeDisplayStop.x()));
m_sizeDisplayStop.setY(etk_max(m_position.y(), m_sizeDisplayStop.y()));
m_sizeDisplayStart.setX(etk_min(m_position.x(), m_sizeDisplayStart.x()));
m_sizeDisplayStart.setY(etk_min(m_position.y(), m_sizeDisplayStart.y()));
m_sizeDisplayStop.setX(std::max(m_position.x(), m_sizeDisplayStop.x()));
m_sizeDisplayStop.setY(std::max(m_position.y(), m_sizeDisplayStop.y()));
m_sizeDisplayStart.setX(std::min(m_position.x(), m_sizeDisplayStart.x()));
m_sizeDisplayStart.setY(std::min(m_position.y(), m_sizeDisplayStart.y()));
EWOL_VERBOSE("update size 4 " << m_sizeDisplayStart << " " << m_sizeDisplayStop);
}
}
@ -821,11 +821,11 @@ vec3 ewol::compositing::TextBase::calculateSizeHTML(const std::string& _text) {
//EWOL_DEBUG(" 1 Stop pos=" << m_sizeDisplayStop);
// get the last elements
m_sizeDisplayStop.setValue(etk_max(m_position.x(), m_sizeDisplayStop.x()) ,
etk_max(m_position.y(), m_sizeDisplayStop.y()) ,
m_sizeDisplayStop.setValue(std::max(m_position.x(), m_sizeDisplayStop.x()) ,
std::max(m_position.y(), m_sizeDisplayStop.y()) ,
0);
m_sizeDisplayStart.setValue(etk_min(m_position.x(), m_sizeDisplayStart.x()) ,
etk_min(m_position.y(), m_sizeDisplayStart.y()) ,
m_sizeDisplayStart.setValue(std::min(m_position.x(), m_sizeDisplayStart.x()) ,
std::min(m_position.y(), m_sizeDisplayStart.y()) ,
0);
//EWOL_DEBUG(" 2 Start pos=" << m_sizeDisplayStart);
@ -852,11 +852,11 @@ vec3 ewol::compositing::TextBase::calculateSizeHTML(const std::u32string& _text)
//EWOL_DEBUG(" 1 Stop pos=" << m_sizeDisplayStop);
// get the last elements
m_sizeDisplayStop.setValue(etk_max(m_position.x(), m_sizeDisplayStop.x()) ,
etk_max(m_position.y(), m_sizeDisplayStop.y()) ,
m_sizeDisplayStop.setValue(std::max(m_position.x(), m_sizeDisplayStop.x()) ,
std::max(m_position.y(), m_sizeDisplayStop.y()) ,
0);
m_sizeDisplayStart.setValue(etk_min(m_position.x(), m_sizeDisplayStart.x()) ,
etk_min(m_position.y(), m_sizeDisplayStart.y()) ,
m_sizeDisplayStart.setValue(std::min(m_position.x(), m_sizeDisplayStart.x()) ,
std::min(m_position.y(), m_sizeDisplayStart.y()) ,
0);
//EWOL_DEBUG(" 2 Start pos=" << m_sizeDisplayStart);

2
sources/ewol/compositing/TextDF.cpp
View File

@ -30,7 +30,7 @@ ewol::compositing::TextDF::~TextDF() {
}
void ewol::compositing::TextDF::updateSizeToRender(const vec2& _size) {
float minSize = etk_min(_size.x(), _size.y());
float minSize = std::min(_size.x(), _size.y());
if (m_fontDF != nullptr) {
setFontSize(m_fontDF->getSize(minSize));
}

8
sources/ewol/context/Fps.h
View File

@ -85,13 +85,13 @@ namespace ewol {
EWOL_INFO(m_displayName << " : processTime : " << (float)((float)processTimeLocal / 1000.0) << "ms ");
}
if (drwingDone) {
min = etk_min(min, processTimeLocal);
max = etk_max(max, processTimeLocal);
min = std::min(min, processTimeLocal);
max = std::max(max, processTimeLocal);
avg += processTimeLocal;
drwingDone = false;
} else {
min_idle = etk_min(min_idle, processTimeLocal);
max_idle = etk_max(max_idle, processTimeLocal);
min_idle = std::min(min_idle, processTimeLocal);
max_idle = std::max(max_idle, processTimeLocal);
avg_idle += processTimeLocal;
}
}

2
sources/ewol/context/InputManager.cpp
View File

@ -194,7 +194,7 @@ int32_t ewol::context::InputManager::localGetDestinationId(enum ewol::key::type
if (true == m_eventInputSaved[iii].isUsed) {
if (m_eventInputSaved[iii].curentWidgetEvent == _destWidget) {
if (iii != _realInputId) {
lastMinimum = etk_max(lastMinimum, m_eventInputSaved[iii].destinationInputId);
lastMinimum = std::max(lastMinimum, m_eventInputSaved[iii].destinationInputId);
}
}
}

2
sources/ewol/resource/DistanceFieldFont.cpp
View File

@ -204,7 +204,7 @@ void ewol::resource::DistanceFieldFont::generateDistanceField(const egami::Image
}
uint8_t val = 255 - (unsigned char) outside[iii];
// TODO : Remove multiple size of the map ...
_output.set(ivec2(xxx, yyy), etk::Color<>((int32_t)val,(int32_t)val,(int32_t)val,256));
_output.set(ivec2(xxx, yyy), etk::Color<>((int32_t)val,(int32_t)val,(int32_t)val,255));
}
}
}

2
sources/ewol/resource/FontFreeType.cpp
View File

@ -197,7 +197,7 @@ bool ewol::resource::FontFreeType::drawGlyph(egami::Image& _imageOut,
return false;
}
// draw it on the output Image :
etk::Color<> tlpppp(0xFFFFFF00);
etk::Color<> tlpppp(0xFF, 0xFF, 0xFF, 0x00);
for(int32_t jjj=0; jjj < slot->bitmap.rows;jjj++) {
for(int32_t iii=0; iii < slot->bitmap.width; iii++){
tlpppp = _imageOut.get(ivec2(_glyphPosition.x()+iii, _glyphPosition.y()+jjj));

2
sources/ewol/resource/ImageDF.cpp
View File

@ -124,7 +124,7 @@ void ewol::resource::ImageDF::generateDistanceField(const egami::ImageMono& _inp
}
uint8_t val = 255 - (unsigned char) outside[iii];
// TODO : Remove multiple size of the map ...
_output.set(ivec2(xxx, yyy), etk::Color<>((int32_t)val,(int32_t)val,(int32_t)val,256));
_output.set(ivec2(xxx, yyy), etk::Color<>((int32_t)val,(int32_t)val,(int32_t)val,255));
}
}
}

2
sources/ewol/resource/VirtualBufferObject.cpp
View File

@ -17,7 +17,7 @@
ewol::resource::VirtualBufferObject::VirtualBufferObject(int32_t _number) :
m_exist(false) {
addObjectType("ewol::VirtualBufferObject");
m_nbVBO = etk_avg(1, _number, NB_VBO_MAX);
m_nbVBO = std::avg(1, _number, NB_VBO_MAX);
for (size_t iii=0; iii<NB_VBO_MAX; iii++) {
m_vbo[iii]=0;
m_vboUsed[iii]=false;

23
sources/ewol/widget/ColorBar.cpp
View File

@ -39,18 +39,17 @@ void ewol::widget::ColorBar::calculateMinMaxSize() {
markToRedraw();
}
static etk::Color<> s_listColorWhite(0xFFFFFFFF);
static etk::Color<> s_listColorBlack(0x000000FF);
static etk::Color<> s_listColorWhite(0xFF, 0xFF, 0xFF, 0xFF);
static etk::Color<> s_listColorBlack(0x00, 0x00, 0x00, 0xFF);
#define NB_BAND_COLOR (6)
static etk::Color<> s_listColor[NB_BAND_COLOR+1] = {
0xFF0000FF,
0xFFFF00FF,
0x00FF00FF,
0x00FFFFFF,
0x0000FFFF,
0xFF00FFFF,
0xFF0000FF
};
etk::Color<>(0xFF, 0x00, 0x00, 0xFF),
etk::Color<>(0xFF, 0xFF, 0x00, 0xFF),
etk::Color<>(0x00, 0xFF, 0x00, 0xFF),
etk::Color<>(0x00, 0xFF, 0xFF, 0xFF),
etk::Color<>(0x00, 0x00, 0xFF, 0xFF),
etk::Color<>(0xFF, 0x00, 0xFF, 0xFF),
etk::Color<>(0xFF, 0x00, 0x00, 0xFF)};
etk::Color<> ewol::widget::ColorBar::getCurrentColor() {
return m_currentColor;
@ -169,8 +168,8 @@ bool ewol::widget::ColorBar::onEventInput(const ewol::event::Input& _event) {
vec2 relativePos = relativePosition(_event.getPos());
//EWOL_DEBUG("Event on BT ...");
if (1 == _event.getId()) {
relativePos.setValue( etk_max(etk_min(relativePos.x(), m_size.x()),0),
etk_max(etk_min(relativePos.y(), m_size.y()),0));
relativePos.setValue( std::avg(0.0f, m_size.x(),relativePos.x()),
std::avg(0.0f, m_size.y(),relativePos.y()) );
if( ewol::key::statusSingle == _event.getStatus()
|| ewol::key::statusMove == _event.getStatus()) {
// nothing to do ...

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

@ -209,8 +209,8 @@ void ewol::widget::ContainerN::calculateMinMaxSize() {
m_subExpend.setY(true);
}
vec2 tmpSize = it->getCalculateMinSize();
m_minSize.setValue( etk_max(tmpSize.x(), m_minSize.x()),
etk_max(tmpSize.y(), m_minSize.y()) );
m_minSize.setValue( std::max(tmpSize.x(), m_minSize.x()),
std::max(tmpSize.y(), m_minSize.y()) );
}
}
//EWOL_ERROR("[" << getId() << "] {" << getObjectType() << "} Result min size : " << m_minSize);

8
sources/ewol/widget/ContextMenu.cpp
View File

@ -81,8 +81,8 @@ void ewol::widget::ContextMenu::calculateSize(const vec2& _availlable) {
}
int32_t minWidth = 100;
int32_t maxWidth = 300;
subWidgetSize.setX((int32_t)etk_max(minWidth, subWidgetSize.x()));
subWidgetSize.setX((int32_t)etk_min(maxWidth, subWidgetSize.x()));
subWidgetSize.setX((int32_t)std::max(minWidth, (int32_t)subWidgetSize.x()));
subWidgetSize.setX((int32_t)std::min(maxWidth, (int32_t)subWidgetSize.x()));
subWidgetSize.setY((int32_t)subWidgetSize.y());
// set config to the Sub-widget
@ -103,9 +103,9 @@ void ewol::widget::ContextMenu::calculateSize(const vec2& _availlable) {
break;
}
// set the widget position at the border of the screen
subWidgetOrigin.setX( (int32_t)( etk_max(0, (subWidgetOrigin.x()-padding.x()))
subWidgetOrigin.setX( (int32_t)( std::max(0, (int32_t)(subWidgetOrigin.x()-padding.x()))
+ padding.x()) );
subWidgetOrigin.setY( (int32_t)( etk_max(0, (subWidgetOrigin.y()-padding.y()))
subWidgetOrigin.setY( (int32_t)( std::max(0, (int32_t)(subWidgetOrigin.y()-padding.y()))
+ padding.y()) );
switch (m_arrawBorder)
{

10
sources/ewol/widget/Entry.cpp
View File

@ -373,7 +373,7 @@ bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
// SUPPR :
if (m_data.size() > 0 && m_displayCursorPos < (int64_t)m_data.size()) {
m_data.erase(m_displayCursorPos, 1);
m_displayCursorPos = etk_max(m_displayCursorPos, 0);
m_displayCursorPos = std::max(m_displayCursorPos, 0);
m_displayCursorPosSelection = m_displayCursorPos;
}
} else if (_event.getChar() == 0x08) {
@ -381,7 +381,7 @@ bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
if (m_data.size() > 0 && m_displayCursorPos != 0) {
m_data.erase(m_displayCursorPos-1, 1);
m_displayCursorPos--;
m_displayCursorPos = etk_max(m_displayCursorPos, 0);
m_displayCursorPos = std::max(m_displayCursorPos, 0);
m_displayCursorPosSelection = m_displayCursorPos;
}
} else if(_event.getChar() >= 20) {
@ -421,7 +421,7 @@ bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
default:
return false;
}
m_displayCursorPos = etk_avg(0, m_displayCursorPos, (int64_t)m_data.size());
m_displayCursorPos = std::avg(0, m_displayCursorPos, (int32_t)m_data.size());
m_displayCursorPosSelection = m_displayCursorPos;
markToRedraw();
return true;
@ -529,10 +529,10 @@ void ewol::widget::Entry::updateTextPosition() {
EWOL_DEBUG("cursorPos=" << pixelCursorPos << "px maxSize=" << tmpUserSize << "px tmp1=" << tmp1);
if (tmp1<10) {
// set the cursor on le left
m_displayStartPosition = etk_min(-pixelCursorPos+10, 0);
m_displayStartPosition = std::min(-pixelCursorPos+10, 0);
} else if (tmp1>tmpUserSize-10) {
// set the cursor of the Right
m_displayStartPosition = etk_min(-pixelCursorPos + tmpUserSize - 10, 0);
m_displayStartPosition = std::min(-pixelCursorPos + tmpUserSize - 10, 0);
}
// else : the cursor is inside the display
//m_displayStartPosition = -totalWidth + tmpUserSize;

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

@ -113,10 +113,10 @@ void ewol::widget::Gird::calculateMinMaxSize() {
vec2 tmpSize = m_subWidget[iii].widget->getCalculateMinSize();
EWOL_DEBUG(" [" << iii << "] subWidgetMinSize=" << tmpSize);
// for all we get the max size :
m_uniformSizeRow = etk_max(tmpSize.y(), m_uniformSizeRow);
m_uniformSizeRow = std::max((int32_t)tmpSize.y(), m_uniformSizeRow);
// for the colomn size : We set the autamatic value in negative :
if (m_sizeCol[m_subWidget[iii].col] <= 0) {
m_sizeCol[m_subWidget[iii].col] = etk_min(m_sizeCol[m_subWidget[iii].col], -tmpSize.x() );
m_sizeCol[m_subWidget[iii].col] = std::min(m_sizeCol[m_subWidget[iii].col], (int32_t)-tmpSize.x() );
}
}
}

2
sources/ewol/widget/Joystick.cpp
View File

@ -57,7 +57,7 @@ ewol::widget::Joystick::~Joystick() {
void ewol::widget::Joystick::calculateSize(const vec2& availlable) {
float minimumSize = etk_min(availlable.x(), availlable.y());
float minimumSize = std::min(availlable.x(), availlable.y());
m_size.setValue(minimumSize, minimumSize);
markToRedraw();
}

8
sources/ewol/widget/Label.cpp
View File

@ -58,8 +58,8 @@ void ewol::widget::Label::calculateMinMaxSize() {
vec3 minSize = m_text.calculateSizeDecorated(m_label);
//EWOL_DEBUG("[" << getId() << "] {" << getObjectType() << "} minSize : " << minSize);
m_minSize.setX(etk_avg(tmpMin.x(), 4 + minSize.x(), tmpMax.x()));
m_minSize.setY(etk_avg(tmpMin.y(), 4 + minSize.y(), tmpMax.y()));
m_minSize.setX(std::avg(tmpMin.x(), 4 + minSize.x(), tmpMax.x()));
m_minSize.setY(std::avg(tmpMin.y(), 4 + minSize.y(), tmpMax.y()));
EWOL_VERBOSE("[" << getId() << "] {" << getObjectType() << "} Result min size : " << tmpMin << " < " << m_minSize << " < " << tmpMax);
}
@ -88,8 +88,8 @@ void ewol::widget::Label::onRegenerateDisplay() {
// to know the size of one line :
vec3 minSize = m_text.calculateSize(char32_t('A'));
//minSize.setX(etk_max(minSize.x(), m_minSize.x()));
//minSize.setY(etk_max(minSize.y(), m_minSize.y()));
//minSize.setX(std::max(minSize.x(), m_minSize.x()));
//minSize.setY(std::max(minSize.y(), m_minSize.y()));
if (tmpMax.x() <= 999999) {
m_text.setTextAlignement(0, tmpMax.x()-2*paddingSize, ewol::compositing::alignLeft);
}

2
sources/ewol/widget/List.cpp
View File

@ -185,7 +185,7 @@ void ewol::widget::List::onRegenerateDisplay() {
// get the maximum size of the colomn :
vec3 textSize = tmpText->calculateSize(myTextToWrite);
sizeColom = etk_max(sizeColom, textSize.x());
sizeColom = std::max(sizeColom, (int32_t)textSize.x());
tmpText->setColor(fg);
tmpText->setPos(vec3(tmpOriginX + displayPositionX, displayPositionY, 0) );

10
sources/ewol/widget/List.h
View File

@ -43,7 +43,7 @@ namespace ewol {
protected:
// function call to display the list :
virtual etk::Color<> getBasicBG() {
return etk::Color<>(0xFFFFFFFF);
return etk::Color<>(0xFF, 0xFF, 0xFF, 0xFF);
}
virtual uint32_t getNuberOfColomn() {
return 1;
@ -57,12 +57,12 @@ namespace ewol {
};
virtual bool getElement(int32_t _colomn, int32_t _raw, std::string &_myTextToWrite, etk::Color<> &_fg, etk::Color<> &_bg) {
_myTextToWrite = "";
_bg = 0xFFFFFFFF;
_fg = 0x000000FF;
_bg = etk::Color<>(0xFF, 0xFF, 0xFF, 0xFF);
_fg = etk::Color<>(0x00, 0x00, 0x00, 0xFF);
if (_raw % 2) {
_bg = 0xFFFFFFFF;
_bg = etk::Color<>(0xFF, 0xFF, 0xFF, 0xFF);
} else {
_bg = 0x7F7F7FFF;
_bg = etk::Color<>(0x7F, 0x7F, 0x7F, 0xFF);
}
return false;
};

8
sources/ewol/widget/ProgressBar.cpp
View File

@ -35,7 +35,7 @@ ewol::widget::ProgressBar::ProgressBar() {
m_textColorFg = etk::color::black;
m_textColorBgOn = 0x00FF00FF;
m_textColorBgOn = etk::Color<>(0x00, 0xFF, 0x00, 0xFF);
m_textColorBgOff = etk::color::black;
m_textColorBgOff.setA(0x3F);
@ -53,13 +53,13 @@ ewol::widget::ProgressBar::~ProgressBar() {
void ewol::widget::ProgressBar::calculateMinMaxSize() {
vec2 tmpMin = m_userMinSize.getPixel();
m_minSize.setValue( etk_max(tmpMin.x(), 40),
etk_max(tmpMin.y(), dotRadius*2) );
m_minSize.setValue( std::max(tmpMin.x(), 40.0f),
std::max(tmpMin.y(), dotRadius*2.0f) );
markToRedraw();
}
void ewol::widget::ProgressBar::setValue(float _val) {
m_value = etk_avg(0, _val, 1);
m_value = std::avg(0.0f, _val, 1.0f);
markToRedraw();
}

26
sources/ewol/widget/Scroll.cpp
View File

@ -94,9 +94,9 @@ void ewol::widget::Scroll::onRegenerateDisplay() {
if( m_size.y() < scrollSize.y()
|| scrollOffset.y()!=0) {
float lenScrollBar = m_size.y()*m_size.y() / scrollSize.y();
lenScrollBar = etk_avg(10, lenScrollBar, m_size.y());
lenScrollBar = std::avg(10.0f, lenScrollBar, m_size.y());
float originScrollBar = scrollOffset.y() / (scrollSize.y()-m_size.y()*m_limit.y());
originScrollBar = etk_avg(0.0, originScrollBar, 1.0);
originScrollBar = std::avg(0.0f, originScrollBar, 1.0f);
originScrollBar *= (m_size.y()-lenScrollBar);
m_shaperV.setShape(vec2(m_size.x() - paddingVert.x(), 0),
vec2(paddingVert.x(), m_size.y()),
@ -106,9 +106,9 @@ void ewol::widget::Scroll::onRegenerateDisplay() {
if( m_size.x() < scrollSize.x()
|| scrollOffset.x()!=0) {
float lenScrollBar = (m_size.x()-paddingHori.xLeft())*(m_size.x()-paddingVert.x()) / scrollSize.x();
lenScrollBar = etk_avg(10, lenScrollBar, (m_size.x()-paddingVert.x()));
lenScrollBar = std::avg(10.0f, lenScrollBar, (m_size.x()-paddingVert.x()));
float originScrollBar = scrollOffset.x() / (scrollSize.x()-m_size.x()*m_limit.x());
originScrollBar = etk_avg(0.0, originScrollBar, 1.0);
originScrollBar = std::avg(0.0f, originScrollBar, 1.0f);
originScrollBar *= (m_size.x()-paddingHori.xRight()-lenScrollBar);
m_shaperH.setShape(vec2(0, 0),
vec2(m_size.x()-paddingVert.x(), paddingHori.y()),
@ -145,7 +145,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
m_highSpeedButton = 1;
// force direct scrolling in this case
scrollOffset.setY((int32_t)(scrollSize.y() * (relativePos.y()-SCROLL_BAR_SPACE) / (m_size.y()-SCROLL_BAR_SPACE*2)));
scrollOffset.setY(etk_avg(0, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
markToRedraw();
if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset);
@ -162,7 +162,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
m_highSpeedButton = 1;
// force direct scrolling in this case
scrollOffset.setX((int32_t)(scrollSize.x() * (relativePos.x()-SCROLL_BAR_SPACE) / (m_size.x()-SCROLL_BAR_SPACE*2)));
scrollOffset.setY(etk_avg(0, scrollOffset.x(), (scrollSize.x() - m_size.x()*m_limit.x())));
scrollOffset.setY(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*m_limit.x())));
markToRedraw();
if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset);
@ -175,7 +175,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
&& _event.getStatus() == ewol::key::statusUp) {
if(m_size.y() < scrollSize.y()) {
scrollOffset.setY(scrollOffset.y()-m_pixelScrolling);
scrollOffset.setY(etk_avg(0, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
markToRedraw();
if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset);
@ -186,7 +186,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
&& _event.getStatus() == ewol::key::statusUp) {
if(m_size.y() < scrollSize.y()) {
scrollOffset.setY(scrollOffset.y()+m_pixelScrolling);
scrollOffset.setY(etk_avg(0, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
markToRedraw();
if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset);
@ -256,7 +256,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
}
markToRedraw();
}
scrollOffset.setY(etk_avg(0, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset);
}
@ -265,7 +265,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
if( m_highSpeedMode == speedModeEnableHorizontal
&& _event.getStatus() == ewol::key::statusMove) {
scrollOffset.setX((int32_t)(scrollSize.x() * (relativePos.x()-SCROLL_BAR_SPACE) / (m_size.x()-SCROLL_BAR_SPACE*2)));
scrollOffset.setX(etk_avg(0, scrollOffset.x(), (scrollSize.x() - m_size.x()*m_limit.x() )));
scrollOffset.setX(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*m_limit.x() )));
markToRedraw();
if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset);
@ -275,7 +275,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
if( m_highSpeedMode == speedModeEnableVertical
&& _event.getStatus() == ewol::key::statusMove) {
scrollOffset.setY((int32_t)(scrollSize.y() * (relativePos.y()-SCROLL_BAR_SPACE) / (m_size.y()-SCROLL_BAR_SPACE*2)));
scrollOffset.setY(etk_avg(0, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.x())));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.x())));
markToRedraw();
if (nullptr!=m_subWidget) {
m_subWidget->setOffset(scrollOffset);
@ -319,11 +319,11 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
//scrollOffset.x = (int32_t)(scrollSize.x * x / m_size.x);
if (m_limit.x() != 0.0f) {
scrollOffset.setX(scrollOffset.x() + (relativePos.x() - m_highSpeedStartPos.x()));
scrollOffset.setX(etk_avg(0, scrollOffset.x(), (scrollSize.x() - m_size.x()*m_limit.x())));
scrollOffset.setX(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*m_limit.x())));
}
if (m_limit.y() != 0.0f) {
scrollOffset.setY(scrollOffset.y() - (relativePos.y() - m_highSpeedStartPos.y()));
scrollOffset.setY(etk_avg(0, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*m_limit.y())));
}
// update current position:
m_highSpeedStartPos = relativePos;

12
sources/ewol/widget/Slider.cpp
View File

@ -48,13 +48,13 @@ ewol::widget::Slider::~Slider() {
void ewol::widget::Slider::calculateMinMaxSize() {
vec2 minTmp = m_userMinSize.getPixel();
m_minSize.setValue(etk_max(minTmp.x(), 40),
etk_max(minTmp.y(), dotRadius*2) );
m_minSize.setValue(std::max(minTmp.x(), 40.0f),
std::max(minTmp.y(), dotRadius*2.0f) );
markToRedraw();
}
void ewol::widget::Slider::setValue(int32_t _val) {
m_value = etk_max(etk_min(_val, m_max), m_min);
m_value = std::max(std::min(_val, m_max), m_min);
markToRedraw();
}
@ -64,13 +64,13 @@ int32_t ewol::widget::Slider::getValue() {
void ewol::widget::Slider::setMin(int32_t _val) {
m_min = _val;
m_value = etk_max(etk_min(m_value, m_max), m_min);
m_value = std::max(std::min(m_value, m_max), m_min);
markToRedraw();
}
void ewol::widget::Slider::setMax(int32_t _val) {
m_max = _val;
m_value = etk_max(etk_min(m_value, m_max), m_min);
m_value = std::max(std::min(m_value, m_max), m_min);
markToRedraw();
}
@ -110,7 +110,7 @@ bool ewol::widget::Slider::onEventInput(const ewol::event::Input& _event) {
EWOL_VERBOSE("Event on Slider (" << relativePos.x() << "," << relativePos.y() << ")");
int32_t oldValue = m_value;
m_value = m_min + (float)(relativePos.x() - dotRadius) / (float)(m_size.x()-2*dotRadius) * (float)(m_max-m_min);
m_value = etk_max(etk_min(m_value, m_max), m_min);
m_value = std::max(std::min(m_value, m_max), m_min);
if (oldValue != m_value) {
EWOL_DEBUG(" new value : " << m_value << " in [" << m_min << ".." << m_max << "]");
generateEventId(eventChange, std::to_string(m_value));

2
sources/ewol/widget/WSlider.cpp
View File

@ -210,7 +210,7 @@ void ewol::widget::WSlider::periodicCall(const ewol::event::Time& _event) {
}
}
m_slidingProgress += _event.getDeltaCall()/m_transitionSpeed;
m_slidingProgress = etk_avg(0.0f, m_slidingProgress, 1.0f);
m_slidingProgress = std::avg(0.0f, m_slidingProgress, 1.0f);
}
calculateSize(m_size);
markToRedraw();

18
sources/ewol/widget/Widget.cpp
View File

@ -322,15 +322,15 @@ void ewol::Widget::systemDraw(const ewol::DrawProperty& _displayProp) {
if( (_displayProp.m_origin.x() > m_origin.x())
|| (_displayProp.m_origin.x() + _displayProp.m_size.x() < m_size.x() + m_origin.x()) ) {
// here we invert the reference of the standard openGl view because the reference in the common display is Top left and not buttom left
int32_t tmpOriginX = etk_max(_displayProp.m_origin.x(), m_origin.x());
int32_t tmpOriginX = std::max(_displayProp.m_origin.x(), m_origin.x());
int32_t tmppp1 = _displayProp.m_origin.x() + _displayProp.m_size.x();
int32_t tmppp2 = m_origin.x() + m_size.x();
int32_t tmpclipX = etk_min(tmppp1, tmppp2) - tmpOriginX;
int32_t tmpclipX = std::min(tmppp1, tmppp2) - tmpOriginX;
int32_t tmpOriginY = etk_max(_displayProp.m_origin.y(), m_origin.y());
int32_t tmpOriginY = std::max(_displayProp.m_origin.y(), m_origin.y());
tmppp1 = _displayProp.m_origin.y() + _displayProp.m_size.y();
tmppp2 = m_origin.y() + m_size.y();
//int32_t tmpclipY = etk_min(tmppp1, tmppp2) - tmpOriginX;
//int32_t tmpclipY = std::min(tmppp1, tmppp2) - tmpOriginX;
glViewport( tmpOriginX,
tmpOriginY,
@ -396,7 +396,7 @@ void ewol::Widget::setZoom(float _newVal) {
if (m_zoom == _newVal) {
return;
}
m_zoom = etk_avg(0.0000001,_newVal,1000000.0);
m_zoom = std::avg(0.0000001f,_newVal,1000000.0f);
markToRedraw();
}
@ -468,8 +468,8 @@ void ewol::Widget::setNoMinSize() {
void ewol::Widget::checkMinSize() {
vec2 pixelSize = m_userMinSize.getPixel();
m_minSize.setX(etk_max(m_minSize.x(), pixelSize.x()));
m_minSize.setY(etk_max(m_minSize.y(), pixelSize.y()));
m_minSize.setX(std::max(m_minSize.x(), pixelSize.x()));
m_minSize.setY(std::max(m_minSize.y(), pixelSize.y()));
}
void ewol::Widget::setMaxSize(const ewol::Dimension& _size) {
@ -497,8 +497,8 @@ void ewol::Widget::setNoMaxSize() {
void ewol::Widget::checkMaxSize() {
vec2 pixelSize = m_userMaxSize.getPixel();
m_maxSize.setX(etk_min(m_maxSize.x(), pixelSize.x()));
m_maxSize.setY(etk_min(m_maxSize.y(), pixelSize.y()));
m_maxSize.setX(std::min(m_maxSize.x(), pixelSize.x()));
m_maxSize.setY(std::min(m_maxSize.y(), pixelSize.y()));
}
vec2 ewol::Widget::getSize() {

58
sources/ewol/widget/WidgetScrolled.cpp
View File

@ -50,9 +50,9 @@ void ewol::widget::WidgetScrolled::onRegenerateDisplay() {
if( m_size.y() < m_maxSize.y()
|| m_originScrooled.y()!=0) {
float lenScrollBar = m_size.y()*m_size.y() / m_maxSize.y();
lenScrollBar = etk_avg(10, lenScrollBar, m_size.y());
lenScrollBar = std::avg(10.0f, lenScrollBar, m_size.y());
float originScrollBar = m_originScrooled.y() / (m_maxSize.y()-m_size.y()*m_limitScrolling);
originScrollBar = etk_avg(0.0, originScrollBar, 1.0);
originScrollBar = std::avg(0.0f, originScrollBar, 1.0f);
originScrollBar *= (m_size.y()-lenScrollBar);
m_shaperV.setShape(vec2(m_size.x() - paddingVert.x(), 0),
vec2(paddingVert.x(), m_size.y()),
@ -62,9 +62,9 @@ void ewol::widget::WidgetScrolled::onRegenerateDisplay() {
if( m_size.x() < m_maxSize.x()
|| m_originScrooled.x()!=0) {
float lenScrollBar = (m_size.x()-paddingHori.xLeft())*(m_size.x()-paddingVert.x()) / m_maxSize.x();
lenScrollBar = etk_avg(10, lenScrollBar, (m_size.x()-paddingVert.x()));
lenScrollBar = std::avg(10.0f, lenScrollBar, (m_size.x()-paddingVert.x()));
float originScrollBar = m_originScrooled.x() / (m_maxSize.x()-m_size.x()*m_limitScrolling);
originScrollBar = etk_avg(0.0, originScrollBar, 1.0);
originScrollBar = std::avg(0.0f, originScrollBar, 1.0f);
originScrollBar *= (m_size.x()-paddingHori.xRight()-lenScrollBar);
m_shaperH.setShape(vec2(0, 0),
vec2(m_size.x()-paddingVert.x(), paddingHori.y()),
@ -97,7 +97,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
m_highSpeedButton = 1;
// force direct scrolling in this case
m_originScrooled.setY((int32_t)(m_maxSize.y() * (relativePos.y()-paddingV.yButtom()) / (m_size.y()-paddingV.yButtom()*2)));
m_originScrooled.setY(etk_avg(0, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_originScrooled.setY(std::avg(0.0f, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
markToRedraw();
return true;
}
@ -111,7 +111,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
m_highSpeedButton = 1;
// force direct scrolling in this case
m_originScrooled.setX((int32_t)(m_maxSize.x() * (relativePos.x()-paddingH.xLeft()) / (m_size.x()-paddingH.xLeft()*2)));
m_originScrooled.setX(etk_avg(0, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
m_originScrooled.setX(std::avg(0.0f, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
markToRedraw();
return true;
}
@ -123,7 +123,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
changeZoom(1);
/*
float zoom = getZoom()*1.1;
zoom = etk_avg(0.1, zoom, 5000);
zoom = std::avg(0.1f, zoom, 5000.0f);
setZoom(zoom);
*/
} else {
@ -131,7 +131,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
|| m_originScrooled.y() != 0
|| m_size.y()*m_limitScrolling < m_maxSize.y() ) {
m_originScrooled.setY(m_originScrooled.y()-m_pixelScrolling);
m_originScrooled.setY(etk_avg(0, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_originScrooled.setY(std::avg(0.0f, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
markToRedraw();
return true;
}
@ -142,7 +142,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
changeZoom(-1);
/*
float zoom = getZoom()*0.9;
zoom = etk_avg(0.1, zoom, 5000);
zoom = std::avg(0.1f, zoom, 5000.0f);
setZoom(zoom);
*/
} else {
@ -150,7 +150,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
|| m_originScrooled.y()!=0
|| m_size.y()*m_limitScrolling < m_maxSize.y() ) {
m_originScrooled.setY(m_originScrooled.y()+m_pixelScrolling);
m_originScrooled.setY(etk_avg(0, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_originScrooled.setY(std::avg(0.0f, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
markToRedraw();
return true;
}
@ -162,7 +162,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
|| m_originScrooled.x()!=0
|| m_size.x()*m_limitScrolling < m_maxSize.x() ) {
m_originScrooled.setX(m_originScrooled.x()-m_pixelScrolling);
m_originScrooled.setX(etk_avg(0, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
m_originScrooled.setX(std::avg(0.0f, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
markToRedraw();
return true;
}
@ -173,7 +173,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
|| m_originScrooled.x()!=0
|| m_size.x()*m_limitScrolling < m_maxSize.x() ) {
m_originScrooled.setX(m_originScrooled.x()+m_pixelScrolling);
m_originScrooled.setX(etk_avg(0, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
m_originScrooled.setX(std::avg(0.0f, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
markToRedraw();
return true;
}
@ -242,20 +242,20 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
}
markToRedraw();
}
m_originScrooled.setY(etk_avg(0, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_originScrooled.setY(std::avg(0.0f, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
return true;
}
if ( m_highSpeedMode == ewol::widget::Scroll::speedModeEnableHorizontal
&& _event.getStatus() == ewol::key::statusMove) {
m_originScrooled.setX((int32_t)(m_maxSize.x() * (relativePos.x()-paddingH.xLeft()) / (m_size.x()-paddingH.x())));
m_originScrooled.setX(etk_avg(0, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
m_originScrooled.setX(std::avg(0.0f, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
markToRedraw();
return true;
}
if ( m_highSpeedMode == ewol::widget::Scroll::speedModeEnableVertical
&& _event.getStatus() == ewol::key::statusMove) {
m_originScrooled.setY((int32_t)(m_maxSize.y() * (relativePos.y()-paddingV.yButtom()) / (m_size.y()-paddingV.y())));
m_originScrooled.setY(etk_avg(0, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_originScrooled.setY(std::avg(0.0f, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
markToRedraw();
return true;
}
@ -291,8 +291,8 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
if (_event.getStatus() == ewol::key::statusMove) {
m_originScrooled.setX(m_originScrooled.x() - (relativePos.x() - m_fingerMoveStartPos[idTable].x())*0.5f);
m_originScrooled.setY(m_originScrooled.y() - (relativePos.y() - m_fingerMoveStartPos[idTable].y())*0.5f);
m_originScrooled.setX(etk_avg(0, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
m_originScrooled.setY(etk_avg(0, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_originScrooled.setX(std::avg(0.0f, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
m_originScrooled.setY(std::avg(0.0f, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_fingerMoveStartPos[idTable] = relativePos;
EWOL_VERBOSE("SCROOL == > MOVE m_originScrooled=" << m_originScrooled << " " << relativePos << " " << m_highSpeedStartPos);
markToRedraw();
@ -342,8 +342,8 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
//m_originScrooled.x = (int32_t)(m_maxSize.x * x / m_size.x);
m_originScrooled.setX(m_originScrooled.x() - (relativePos.x() - m_highSpeedStartPos.x()));
m_originScrooled.setY(m_originScrooled.y() - (relativePos.y() - m_highSpeedStartPos.y()));
m_originScrooled.setX(etk_avg(0, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
m_originScrooled.setY(etk_avg(0, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_originScrooled.setX(std::avg(0.0f, m_originScrooled.x(), (m_maxSize.x() - m_size.x()*m_limitScrolling)));
m_originScrooled.setY(std::avg(0.0f, m_originScrooled.y(), (m_maxSize.y() - m_size.y()*m_limitScrolling)));
m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y());
EWOL_VERBOSE("SCROOL == > MOVE m_originScrooled=" << m_originScrooled << " " << relativePos << " " << m_highSpeedStartPos);
markToRedraw();
@ -364,14 +364,14 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
float tmp1=m_size.x() / m_maxSize.y();
float tmp2=m_size.y() / m_maxSize.x();
//EWOL_INFO(" elements Zoom : " << tmp1 << " " << tmp2);
tmp1 = etk_min(tmp1, tmp2);
tmp1 = std::min(tmp1, tmp2);
if ( _event.getId() == 4
&& _event.getStatus() == ewol::key::statusUp) {
m_zoom -= 0.1;
if (tmp1 < 1.0) {
m_zoom = etk_max(tmp1, m_zoom);
m_zoom = std::max(tmp1, m_zoom);
} else {
m_zoom = etk_max(1.0, m_zoom);
m_zoom = std::max(1.0f, m_zoom);
}
markToRedraw();
return true;
@ -379,9 +379,9 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
&& _event.getStatus() == ewol::key::statusUp) {
m_zoom += 0.1;
if (tmp1 > 1.0) {
m_zoom = etk_min(tmp1, m_zoom);
m_zoom = std::min(tmp1, m_zoom);
} else {
m_zoom = etk_min(1.0, m_zoom);
m_zoom = std::min(1.0f, m_zoom);
}
markToRedraw();
return true;
@ -445,18 +445,18 @@ void ewol::widget::WidgetScrolled::setScrollingPositionDynamic(vec2 _borderWidth
// check scrooling in X
if (_currentPosition.x() < (m_originScrooled.x() + _borderWidth.x()) ) {
m_originScrooled.setX(_currentPosition.x() - _borderWidth.x());
m_originScrooled.setX(etk_max(0.0, m_originScrooled.x()));
m_originScrooled.setX(std::max(0.0f, m_originScrooled.x()));
} else if (_currentPosition.x() > (m_originScrooled.x()+m_size.x()-2*_borderWidth.x()) ) {
m_originScrooled.setX(_currentPosition.x() - m_size.x() + 2*_borderWidth.x());
m_originScrooled.setX(etk_max(0.0, m_originScrooled.x()));
m_originScrooled.setX(std::max(0.0f, m_originScrooled.x()));
}
// check scrooling in Y
if (_currentPosition.y() < (m_originScrooled.y() + _borderWidth.y()) ) {
m_originScrooled.setY(_currentPosition.y() - _borderWidth.y());
m_originScrooled.setY(etk_max(0.0, m_originScrooled.y()));
m_originScrooled.setY(std::max(0.0f, m_originScrooled.y()));
} else if (_currentPosition.y() > (m_originScrooled.y()+m_size.y()-2*_borderWidth.y()) ) {
m_originScrooled.setY(_currentPosition.y() - m_size.y() + 2*_borderWidth.y());
m_originScrooled.setY(etk_max(0.0, m_originScrooled.y()));
m_originScrooled.setY(std::max(0.0f, m_originScrooled.y()));
}
}
@ -464,7 +464,7 @@ void ewol::widget::WidgetScrolled::scroolingMode(enum scrollingMode _newMode) {
m_scroollingMode = _newMode;
if (m_scroollingMode == scroolModeGame) {
// set the scene maximum size :
m_maxSize.setValue(etk_max(m_size.x(), m_size.y()),
m_maxSize.setValue(std::max(m_size.x(), m_size.y()),
m_maxSize.x());
m_zoom = 1;
}

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

@ -111,7 +111,7 @@ namespace ewol {
* @param[in] _poucentageLimit pourcent of the limit of view nothing in the widget when arriving at the end ...
*/
void setLimitScrolling(float _poucentageLimit) {
m_limitScrolling = etk_avg(0.1f, _poucentageLimit,0.9f);
m_limitScrolling = std::avg(0.1f, _poucentageLimit,0.9f);
};
};
};

6
sources/ewol/widget/meta/ColorChooser.cpp
View File

@ -58,7 +58,7 @@ ewol::widget::ColorChooser::ColorChooser() :
m_widgetRed->setFill(bvec2(true,false));
m_widgetRed->setMin(0);
m_widgetRed->setMax(255);
sliderColor = 0xFF0000FF;
sliderColor = etk::Color<>(0xFF, 0x00, 0x00, 0xFF);
m_widgetRed->setColor(sliderColor);
subWidgetAdd(m_widgetRed.get());
m_widgetGreen = new ewol::widget::Slider();
@ -66,7 +66,7 @@ ewol::widget::ColorChooser::ColorChooser() :
m_widgetGreen->setExpand(bvec2(true,false));
m_widgetGreen->setFill(bvec2(true,false));
m_widgetGreen->setMin(0);
sliderColor = 0x00FF00FF;
sliderColor = etk::Color<>(0x00, 0xFF, 0x00, 0xFF);
m_widgetGreen->setColor(sliderColor);
m_widgetGreen->setMax(255);
subWidgetAdd(m_widgetGreen.get());
@ -75,7 +75,7 @@ ewol::widget::ColorChooser::ColorChooser() :
m_widgetBlue->setExpand(bvec2(true,false));
m_widgetBlue->setFill(bvec2(true,false));
m_widgetBlue->setMin(0);
sliderColor = 0x0000FFFF;
sliderColor = etk::Color<>(0x00, 0x00, 0xFF, 0xFF);
m_widgetBlue->setColor(sliderColor);
m_widgetBlue->setMax(255);
subWidgetAdd(m_widgetBlue.get());

4
sources/ewol/widget/meta/ParameterList.cpp
View File

@ -121,7 +121,7 @@ void ewol::widget::ParameterList::onRegenerateDisplay() {
// set background color :
ewol::compositing::Drawing * tmpDraw = new ewol::compositing::Drawing();
tmpDraw->setColor(0xFFFFFFFF);
tmpDraw->setColor(etk::Color<>(0xFF, 0xFF, 0xFF, 0xFF));
tmpDraw->setPos(vec3(0,0,0) );
tmpDraw->rectangleWidth(vec3(m_size.x(), m_size.y(), 0) );
@ -140,7 +140,7 @@ void ewol::widget::ParameterList::onRegenerateDisplay() {
for (int32_t iii=startRaw; iii<nbRaw && iii<(int32_t)(startRaw+displayableRaw); iii++) {
std::string myTextToWrite = "???";
etk::Color<> fg(0x000000FF);
etk::Color<> fg(0x00, 0x00, 0x00, 0xFF);
if (m_list[iii] != nullptr) {
myTextToWrite = m_list[iii]->m_label;
}

4
sources/ewol/widget/meta/StdPopUp.cpp
View File

@ -42,7 +42,7 @@ ewol::widget::StdPopUp::StdPopUp() :
mySpacer = new ewol::widget::Spacer();
mySpacer->setExpand(bvec2(true,false));
mySpacer->setColor(etk::Color<>(0x888888FF));
mySpacer->setColor(etk::Color<>(0x88, 0x88, 0x88, 0xFF));
mySpacer->setMinSize(ewol::Dimension(vec2(0,3),ewol::Dimension::Pixel));
mySizerVert->subWidgetAdd(mySpacer);
@ -62,7 +62,7 @@ ewol::widget::StdPopUp::StdPopUp() :
mySpacer = new ewol::widget::Spacer();
mySpacer->setExpand(bvec2(true,false));
mySpacer->setColor(etk::Color<>(0x888888FF));
mySpacer->setColor(etk::Color<>(0x88, 0x88, 0x88, 0xFF));
mySpacer->setMinSize(ewol::Dimension(vec2(0,3),ewol::Dimension::Pixel));
mySizerVert->subWidgetAdd(mySpacer);