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

[DEV] update the change on 'enum' to 'enum class'

Browse Source
This commit is contained in:
Edouard DUPIN 2016-04-29 23:16:07 +02:00
parent a9ca1f12f8
commit 21581a6ce0
34 changed files with 253 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ewol/compositing/Area.cpp
View File

@ -66,7 +66,7 @@ void ewol::compositing::Area::draw(bool _disableDepthTest) {
// color : // color :
m_GLprogram->sendAttribute(m_GLColor, m_coordColor); m_GLprogram->sendAttribute(m_GLColor, m_coordColor);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, m_coord.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, m_coord.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
} }

2
ewol/compositing/Drawing.cpp
View File

@ -314,7 +314,7 @@ void ewol::compositing::Drawing::draw(bool _disableDepthTest) {
// color : // color :
m_GLprogram->sendAttribute(m_GLColor, m_coordColor); m_GLprogram->sendAttribute(m_GLColor, m_coordColor);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, m_coord.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, m_coord.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
} }

2
ewol/compositing/Image.cpp
View File

@ -97,7 +97,7 @@ void ewol::compositing::Image::draw(bool _disableDepthTest) {
// color : // color :
m_GLprogram->sendAttribute(m_GLColor, m_coordColor); m_GLprogram->sendAttribute(m_GLColor, m_coordColor);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, m_coord.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, m_coord.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
} }

4
ewol/compositing/Shaper.cpp
View File

@ -197,8 +197,8 @@ void ewol::compositing::Shaper::draw(bool _disableDepthTest) {
m_GLprogram->setTexture0(m_GLtexID, m_resourceTexture->getRendererId()); m_GLprogram->setTexture0(m_GLtexID, m_resourceTexture->getRendererId());
} }
// Request the draw of the elements : // Request the draw of the elements :
//gale::openGL::drawArrays(gale::openGL::render_triangle, 0, SHAPER_NB_MAX_VERTEX); //gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, SHAPER_NB_MAX_VERTEX);
gale::openGL::drawArrays(gale::openGL::render_triangleStrip, 0, m_nbVertexToDisplay); gale::openGL::drawArrays(gale::openGL::renderMode::triangleStrip, 0, m_nbVertexToDisplay);
m_GLprogram->unUse(); m_GLprogram->unUse();
} }

4
ewol/compositing/Text.cpp
View File

@ -56,7 +56,7 @@ void ewol::compositing::Text::drawMT(const mat4& _transformationMatrix, bool _en
// color : // color :
m_GLprogram->sendAttribute(m_GLColor, 4/*r,g,b,a*/, &m_coordColor[0]); m_GLprogram->sendAttribute(m_GLColor, 4/*r,g,b,a*/, &m_coordColor[0]);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, m_coord.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, m_coord.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
if (_enableDepthTest == true) { if (_enableDepthTest == true) {
gale::openGL::disable(gale::openGL::flag_depthTest); gale::openGL::disable(gale::openGL::flag_depthTest);
@ -94,7 +94,7 @@ void ewol::compositing::Text::drawD(bool _disableDepthTest) {
// color : // color :
m_GLprogram->sendAttribute(m_GLColor, m_coordColor); m_GLprogram->sendAttribute(m_GLColor, m_coordColor);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, m_coord.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, m_coord.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
} }

4
ewol/compositing/TextDF.cpp
View File

@ -64,7 +64,7 @@ void ewol::compositing::TextDF::drawMT(const mat4& _transformationMatrix, bool _
m_GLprogram->sendAttribute(m_GLColor, m_coordColor); m_GLprogram->sendAttribute(m_GLColor, m_coordColor);
m_GLprogram->sendAttribute(m_GLglyphLevel, m_glyphLevel); m_GLprogram->sendAttribute(m_GLglyphLevel, m_glyphLevel);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, m_coord.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, m_coord.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
if (_enableDepthTest == true) { if (_enableDepthTest == true) {
gale::openGL::disable(gale::openGL::flag_depthTest); gale::openGL::disable(gale::openGL::flag_depthTest);
@ -102,7 +102,7 @@ void ewol::compositing::TextDF::drawD(bool _disableDepthTest) {
m_GLprogram->sendAttribute(m_GLColor, m_coordColor); m_GLprogram->sendAttribute(m_GLColor, m_coordColor);
m_GLprogram->sendAttribute(m_GLglyphLevel, m_glyphLevel); m_GLprogram->sendAttribute(m_GLglyphLevel, m_glyphLevel);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, m_coord.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, m_coord.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
} }

26
ewol/context/Context.cpp
View File

@ -215,16 +215,16 @@ void ewol::Context::onPointer(enum gale::key::type _type,
const vec2& _pos, const vec2& _pos,
gale::key::status _state) { gale::key::status _state) {
switch (_state) { switch (_state) {
case gale::key::status_move: case gale::key::status::move:
//EWOL_DEBUG("Receive MSG : THREAD_INPUT_MOTION"); //EWOL_DEBUG("Receive MSG : THREAD_INPUT_MOTION");
m_input.motion(_type, _pointerID, _pos); m_input.motion(_type, _pointerID, _pos);
break; break;
case gale::key::status_down: case gale::key::status::down:
case gale::key::status_downRepeate: case gale::key::status::downRepeate:
//EWOL_DEBUG("Receive MSG : THREAD_INPUT_STATE"); //EWOL_DEBUG("Receive MSG : THREAD_INPUT_STATE");
m_input.state(_type, _pointerID, true, _pos); m_input.state(_type, _pointerID, true, _pos);
break; break;
case gale::key::status_up: case gale::key::status::up:
//EWOL_DEBUG("Receive MSG : THREAD_INPUT_STATE"); //EWOL_DEBUG("Receive MSG : THREAD_INPUT_STATE");
m_input.state(_type, _pointerID, false, _pos); m_input.state(_type, _pointerID, false, _pos);
break; break;
@ -244,9 +244,9 @@ void ewol::Context::onKeyboard(const gale::key::Special& _special,
// No windows ... // No windows ...
return; return;
} }
bool repeate = (_state == gale::key::status_downRepeate); bool repeate = (_state == gale::key::status::downRepeate);
bool isDown = (_state == gale::key::status_downRepeate) bool isDown = (_state == gale::key::status::downRepeate)
|| (_state == gale::key::status_down); || (_state == gale::key::status::down);
if (m_windowsCurrent->onEventShortCut(_special, if (m_windowsCurrent->onEventShortCut(_special,
_value, _value,
_type, _type,
@ -271,22 +271,22 @@ void ewol::Context::onKeyboard(const gale::key::Special& _special,
_type, _type,
isDown) == false) { isDown) == false) {
// generate the direct event ... // generate the direct event ...
if (_type == gale::key::keyboard_char) { if (_type == gale::key::keyboard::character) {
ewol::event::EntrySystem tmpEntryEvent(gale::key::keyboard_char, ewol::event::EntrySystem tmpEntryEvent(gale::key::keyboard::character,
gale::key::status_up, gale::key::status::up,
_special, _special,
_value); _value);
if(isDown == true) { if(isDown == true) {
tmpEntryEvent.m_event.setStatus(gale::key::status_down); tmpEntryEvent.m_event.setStatus(gale::key::status::down);
} }
tmpWidget->systemEventEntry(tmpEntryEvent); tmpWidget->systemEventEntry(tmpEntryEvent);
} else { // THREAD_KEYBORAD_MOVE } else { // THREAD_KEYBORAD_MOVE
ewol::event::EntrySystem tmpEntryEvent(_type, ewol::event::EntrySystem tmpEntryEvent(_type,
gale::key::status_up, gale::key::status::up,
_special, _special,
0); 0);
if(isDown == true) { if(isDown == true) {
tmpEntryEvent.m_event.setStatus(gale::key::status_down); tmpEntryEvent.m_event.setStatus(gale::key::status::down);
} }
tmpWidget->systemEventEntry(tmpEntryEvent); tmpWidget->systemEventEntry(tmpEntryEvent);
} }

58
ewol/context/InputManager.cpp
View File

@ -45,8 +45,8 @@ bool ewol::context::InputManager::localEventInput(enum gale::key::type _type,
enum gale::key::status _status, enum gale::key::status _status,
vec2 _pos) { vec2 _pos) {
if (_destWidget != nullptr) { if (_destWidget != nullptr) {
if ( _type == gale::key::type_mouse if ( _type == gale::key::type::mouse
|| _type == gale::key::type_finger) { || _type == gale::key::type::finger) {
// create the system Event : // create the system Event :
ewol::event::InputSystem tmpEventSystem(_type, _status, _IdInput, _pos, _destWidget, 0, m_specialKey); // TODO : set the real ID ... ewol::event::InputSystem tmpEventSystem(_type, _status, _IdInput, _pos, _destWidget, 0, m_specialKey); // TODO : set the real ID ...
// generate the event : // generate the event :
@ -68,7 +68,7 @@ void ewol::context::InputManager::abortElement(InputPoperty *_eventTable,
localEventInput(_type, localEventInput(_type,
_eventTable[_idInput].curentWidgetEvent.lock(), _eventTable[_idInput].curentWidgetEvent.lock(),
_eventTable[_idInput].destinationInputId, _eventTable[_idInput].destinationInputId,
gale::key::status_abort, gale::key::status::abort,
_eventTable[_idInput].posEvent); _eventTable[_idInput].posEvent);
} }
} }
@ -103,23 +103,23 @@ void ewol::context::InputManager::transfertEvent(ewol::WidgetShared _source, ewo
if (tmpWidget == _source) { if (tmpWidget == _source) {
// inform the widget that it does not receive the event now // inform the widget that it does not receive the event now
EVENT_DEBUG("GUI : Input ID=" << iii << " == >" << m_eventInputSaved[iii].destinationInputId << " [EVENT_INPUT_TYPE_ABORT] " << m_eventInputSaved[iii].posEvent); EVENT_DEBUG("GUI : Input ID=" << iii << " == >" << m_eventInputSaved[iii].destinationInputId << " [EVENT_INPUT_TYPE_ABORT] " << m_eventInputSaved[iii].posEvent);
localEventInput(gale::key::type_finger, tmpWidget, m_eventInputSaved[iii].destinationInputId, gale::key::status_abort, m_eventInputSaved[iii].posEvent); localEventInput(gale::key::type::finger, tmpWidget, m_eventInputSaved[iii].destinationInputId, gale::key::status::abort, m_eventInputSaved[iii].posEvent);
// set the new widget ... // set the new widget ...
m_eventInputSaved[iii].curentWidgetEvent = _destination; m_eventInputSaved[iii].curentWidgetEvent = _destination;
// inform the widget that he receive the event property now... // inform the widget that he receive the event property now...
EVENT_DEBUG("GUI : Input ID=" << iii << " == >" << m_eventInputSaved[iii].destinationInputId << " [EVENT_INPUT_TYPE_TRANSFERT] " << m_eventInputSaved[iii].posEvent); EVENT_DEBUG("GUI : Input ID=" << iii << " == >" << m_eventInputSaved[iii].destinationInputId << " [EVENT_INPUT_TYPE_TRANSFERT] " << m_eventInputSaved[iii].posEvent);
localEventInput(gale::key::type_finger, _destination, m_eventInputSaved[iii].destinationInputId, gale::key::status_transfert, m_eventInputSaved[iii].posEvent); localEventInput(gale::key::type::finger, _destination, m_eventInputSaved[iii].destinationInputId, gale::key::status::transfert, m_eventInputSaved[iii].posEvent);
} }
tmpWidget = m_eventMouseSaved[iii].curentWidgetEvent.lock(); tmpWidget = m_eventMouseSaved[iii].curentWidgetEvent.lock();
if (tmpWidget == _source) { if (tmpWidget == _source) {
// inform the widget that it does not receive the event now // inform the widget that it does not receive the event now
EVENT_DEBUG("GUI : Input ID=" << iii << " == >" << m_eventMouseSaved[iii].destinationInputId << " [EVENT_INPUT_TYPE_ABORT] " << m_eventMouseSaved[iii].posEvent); EVENT_DEBUG("GUI : Input ID=" << iii << " == >" << m_eventMouseSaved[iii].destinationInputId << " [EVENT_INPUT_TYPE_ABORT] " << m_eventMouseSaved[iii].posEvent);
localEventInput(gale::key::type_mouse, tmpWidget, m_eventMouseSaved[iii].destinationInputId, gale::key::status_abort, m_eventMouseSaved[iii].posEvent); localEventInput(gale::key::type::mouse, tmpWidget, m_eventMouseSaved[iii].destinationInputId, gale::key::status::abort, m_eventMouseSaved[iii].posEvent);
// set the new widget ... // set the new widget ...
m_eventMouseSaved[iii].curentWidgetEvent = _destination; m_eventMouseSaved[iii].curentWidgetEvent = _destination;
// inform the widget that he receive the event property now... // inform the widget that he receive the event property now...
EVENT_DEBUG("GUI : Input ID=" << iii << " == >" << m_eventMouseSaved[iii].destinationInputId << " [EVENT_INPUT_TYPE_TRANSFERT] " << m_eventMouseSaved[iii].posEvent); EVENT_DEBUG("GUI : Input ID=" << iii << " == >" << m_eventMouseSaved[iii].destinationInputId << " [EVENT_INPUT_TYPE_TRANSFERT] " << m_eventMouseSaved[iii].posEvent);
localEventInput(gale::key::type_mouse, _destination, m_eventMouseSaved[iii].destinationInputId, gale::key::status_transfert, m_eventMouseSaved[iii].posEvent); localEventInput(gale::key::type::mouse, _destination, m_eventMouseSaved[iii].destinationInputId, gale::key::status::transfert, m_eventMouseSaved[iii].posEvent);
} }
} }
} }
@ -144,9 +144,9 @@ void ewol::context::InputManager::unGrabPointer() {
void ewol::context::InputManager::newLayerSet() { void ewol::context::InputManager::newLayerSet() {
for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) { for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) {
// remove the property of this input ... // remove the property of this input ...
abortElement(m_eventInputSaved, iii, gale::key::type_finger); abortElement(m_eventInputSaved, iii, gale::key::type::finger);
cleanElement(m_eventInputSaved, iii); cleanElement(m_eventInputSaved, iii);
abortElement(m_eventMouseSaved, iii, gale::key::type_mouse); abortElement(m_eventMouseSaved, iii, gale::key::type::mouse);
cleanElement(m_eventMouseSaved, iii); cleanElement(m_eventMouseSaved, iii);
} }
} }
@ -172,7 +172,7 @@ ewol::context::InputManager::~InputManager() {
int32_t ewol::context::InputManager::localGetDestinationId(enum gale::key::type _type, int32_t ewol::context::InputManager::localGetDestinationId(enum gale::key::type _type,
ewol::WidgetShared _destWidget, ewol::WidgetShared _destWidget,
int32_t _realInputId) { int32_t _realInputId) {
if (_type == gale::key::type_finger) { if (_type == gale::key::type::finger) {
int32_t lastMinimum = 0; int32_t lastMinimum = 0;
for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) { for(int32_t iii=0; iii<MAX_MANAGE_INPUT; iii++) {
if (true == m_eventInputSaved[iii].isUsed) { if (true == m_eventInputSaved[iii].isUsed) {
@ -199,9 +199,9 @@ void ewol::context::InputManager::motion(enum gale::key::type _type,
return; return;
} }
InputPoperty *eventTable = nullptr; InputPoperty *eventTable = nullptr;
if (_type == gale::key::type_mouse) { if (_type == gale::key::type::mouse) {
eventTable = m_eventMouseSaved; eventTable = m_eventMouseSaved;
} else if (_type == gale::key::type_finger) { } else if (_type == gale::key::type::finger) {
eventTable = m_eventInputSaved; eventTable = m_eventInputSaved;
} else { } else {
EWOL_ERROR("Unknown type of event"); EWOL_ERROR("Unknown type of event");
@ -214,7 +214,7 @@ void ewol::context::InputManager::motion(enum gale::key::type _type,
} }
ewol::widget::WindowsShared tmpWindows = m_context.getWindows(); ewol::widget::WindowsShared tmpWindows = m_context.getWindows();
// special case for the mouse event 0 that represent the hover event of the system : // special case for the mouse event 0 that represent the hover event of the system :
if ( _type == gale::key::type_mouse if ( _type == gale::key::type::mouse
&& _pointerID == 0) { && _pointerID == 0) {
// this event is all time on the good widget ... and manage the enter and leave ... // this event is all time on the good widget ... and manage the enter and leave ...
// NOTE : the "layer widget" force us to get the widget at the specific position all the time : // NOTE : the "layer widget" force us to get the widget at the specific position all the time :
@ -239,7 +239,7 @@ void ewol::context::InputManager::motion(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
eventTable[_pointerID].curentWidgetEvent.lock(), eventTable[_pointerID].curentWidgetEvent.lock(),
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
gale::key::status_leave, gale::key::status::leave,
_pos); _pos);
} }
if (eventTable[_pointerID].isInside == false) { if (eventTable[_pointerID].isInside == false) {
@ -261,7 +261,7 @@ void ewol::context::InputManager::motion(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
tmpWidget, tmpWidget,
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
gale::key::status_enter, gale::key::status::enter,
_pos); _pos);
} }
EVENT_DEBUG("GUI : Input ID=" << _pointerID EVENT_DEBUG("GUI : Input ID=" << _pointerID
@ -271,7 +271,7 @@ void ewol::context::InputManager::motion(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
tmpWidget, tmpWidget,
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
gale::key::status_move, gale::key::status::move,
_pos); _pos);
} else if (eventTable[_pointerID].isUsed == true) { } else if (eventTable[_pointerID].isUsed == true) {
if (eventTable[_pointerID].isInside == true) { if (eventTable[_pointerID].isInside == true) {
@ -287,7 +287,7 @@ void ewol::context::InputManager::motion(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
eventTable[_pointerID].curentWidgetEvent.lock(), eventTable[_pointerID].curentWidgetEvent.lock(),
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
gale::key::status_leave, gale::key::status::leave,
_pos); _pos);
} }
} else { } else {
@ -303,7 +303,7 @@ void ewol::context::InputManager::motion(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
eventTable[_pointerID].curentWidgetEvent.lock(), eventTable[_pointerID].curentWidgetEvent.lock(),
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
gale::key::status_enter, gale::key::status::enter,
_pos); _pos);
} }
} }
@ -314,7 +314,7 @@ void ewol::context::InputManager::motion(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
eventTable[_pointerID].curentWidgetEvent.lock(), eventTable[_pointerID].curentWidgetEvent.lock(),
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
gale::key::status_move, gale::key::status::move,
_pos); _pos);
} }
} }
@ -331,10 +331,10 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
// convert position in open-GL coordonates ... // convert position in open-GL coordonates ...
InputPoperty *eventTable = nullptr; InputPoperty *eventTable = nullptr;
InputLimit localLimit; InputLimit localLimit;
if (_type == gale::key::type_mouse) { if (_type == gale::key::type::mouse) {
eventTable = m_eventMouseSaved; eventTable = m_eventMouseSaved;
localLimit = m_eventMouseLimit; localLimit = m_eventMouseLimit;
} else if (_type == gale::key::type_finger) { } else if (_type == gale::key::type::finger) {
eventTable = m_eventInputSaved; eventTable = m_eventInputSaved;
localLimit = m_eventInputLimit; localLimit = m_eventInputLimit;
} else { } else {
@ -374,7 +374,7 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
eventTable[_pointerID].curentWidgetEvent.lock(), eventTable[_pointerID].curentWidgetEvent.lock(),
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
gale::key::status_down, gale::key::status::down,
_pos); _pos);
} else { } else {
// Mark it used : // Mark it used :
@ -389,7 +389,7 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
// get destination widget : // get destination widget :
if(tmpWindows != nullptr) { if(tmpWindows != nullptr) {
if ( tmpWidget != nullptr if ( tmpWidget != nullptr
&& _type == gale::key::type_mouse) { && _type == gale::key::type::mouse) {
eventTable[_pointerID].curentWidgetEvent = tmpWidget; eventTable[_pointerID].curentWidgetEvent = tmpWidget;
} else { } else {
tmpWidget = tmpWindows->getWidgetAtPos(_pos); tmpWidget = tmpWindows->getWidgetAtPos(_pos);
@ -419,7 +419,7 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
tmpWidget, tmpWidget,
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
gale::key::status_down, gale::key::status::down,
_pos); _pos);
} }
} else { } else {
@ -451,7 +451,7 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
tmpWidget, tmpWidget,
_pointerID, _pointerID,
gale::key::status_up, gale::key::status::up,
_pos); _pos);
// generate event (single) // generate event (single)
if( std::abs(eventTable[_pointerID].downStart.x() - _pos.x()) < localLimit.DpiOffset if( std::abs(eventTable[_pointerID].downStart.x() - _pos.x()) < localLimit.DpiOffset
@ -469,7 +469,7 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
} }
// in grab mode the single to quinte event are not generated .... // in grab mode the single to quinte event are not generated ....
if( ( m_grabWidget.lock() == nullptr if( ( m_grabWidget.lock() == nullptr
|| _type != gale::key::type_mouse ) || _type != gale::key::type::mouse )
&& eventTable[_pointerID].nbClickEvent < nbClickMax) { && eventTable[_pointerID].nbClickEvent < nbClickMax) {
// generate event SINGLE : // generate event SINGLE :
eventTable[_pointerID].nbClickEvent++; eventTable[_pointerID].nbClickEvent++;
@ -480,7 +480,7 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
tmpWidget, tmpWidget,
eventTable[_pointerID].destinationInputId, eventTable[_pointerID].destinationInputId,
(enum gale::key::status)(gale::key::status_single + eventTable[_pointerID].nbClickEvent-1), (enum gale::key::status)(uint32_t(gale::key::status::pressSingle) + eventTable[_pointerID].nbClickEvent-1),
_pos); _pos);
if( eventTable[_pointerID].nbClickEvent >= nbClickMax) { if( eventTable[_pointerID].nbClickEvent >= nbClickMax) {
eventTable[_pointerID].nbClickEvent = 0; eventTable[_pointerID].nbClickEvent = 0;
@ -493,10 +493,10 @@ void ewol::context::InputManager::state(enum gale::key::type _type,
localEventInput(_type, localEventInput(_type,
tmpWidget, tmpWidget,
_pointerID, _pointerID,
gale::key::status_upAfter, gale::key::status::upAfter,
_pos); _pos);
// specific for tuch event // specific for tuch event
if (_type == gale::key::type_finger) { if (_type == gale::key::type::finger) {
cleanElement(eventTable, _pointerID); cleanElement(eventTable, _pointerID);
} }
} }

2
ewol/event/Entry.cpp
View File

@ -9,7 +9,7 @@
std::ostream& ewol::event::operator <<(std::ostream& _os, const ewol::event::Entry& _obj) { std::ostream& ewol::event::operator <<(std::ostream& _os, const ewol::event::Entry& _obj) {
_os << "{type=" << _obj.getType(); _os << "{type=" << _obj.getType();
_os << " status=" << _obj.getStatus(); _os << " status=" << _obj.getStatus();
if (_obj.getType() == gale::key::keyboard_char) { if (_obj.getType() == gale::key::keyboard::character) {
_os << " char=" << _obj.getChar(); _os << " char=" << _obj.getChar();
} }
_os << "}"; _os << "}";

6
ewol/resource/Colored3DObject.cpp
View File

@ -61,7 +61,7 @@ void ewol::resource::Colored3DObject::draw(std::vector<vec3>& _vertices,
// color : // color :
m_GLprogram->uniform4fv(m_GLColor, 1/*r,g,b,a*/, (float*)&_color); m_GLprogram->uniform4fv(m_GLColor, 1/*r,g,b,a*/, (float*)&_color);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, _vertices.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, _vertices.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
// Request the draw od the elements : // Request the draw od the elements :
//glDrawArrays(GL_LINES, 0, vertices.size()); //glDrawArrays(GL_LINES, 0, vertices.size());
@ -104,7 +104,7 @@ void ewol::resource::Colored3DObject::draw(std::vector<vec3>& _vertices,
// color : // color :
m_GLprogram->uniform4fv(m_GLColor, 1/*r,g,b,a*/, (float*)&_color); m_GLprogram->uniform4fv(m_GLColor, 1/*r,g,b,a*/, (float*)&_color);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_triangle, 0, _vertices.size()); gale::openGL::drawArrays(gale::openGL::renderMode::triangle, 0, _vertices.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
if (true == _depthtest) { if (true == _depthtest) {
if (false == _updateDepthBuffer) { if (false == _updateDepthBuffer) {
@ -144,7 +144,7 @@ void ewol::resource::Colored3DObject::drawLine(std::vector<vec3>& _vertices,
// color : // color :
m_GLprogram->uniform4fv(m_GLColor, 1/*r,g,b,a*/, (float*)&_color); m_GLprogram->uniform4fv(m_GLColor, 1/*r,g,b,a*/, (float*)&_color);
// Request the draw od the elements : // Request the draw od the elements :
gale::openGL::drawArrays(gale::openGL::render_line, 0, _vertices.size()); gale::openGL::drawArrays(gale::openGL::renderMode::line, 0, _vertices.size());
m_GLprogram->unUse(); m_GLprogram->unUse();
if (true == _depthtest) { if (true == _depthtest) {
if (false == _updateDepthBuffer) { if (false == _updateDepthBuffer) {

16
ewol/tools/message.cpp
View File

@ -20,16 +20,16 @@ void ewol::tools::message::create(enum ewol::tools::message::type _type, const s
return; return;
} }
switch(_type) { switch(_type) {
case ewol::tools::message::type_info: case ewol::tools::message::type::info:
tmpPopUp->propertyTitle.set("<bold>_T{Info}</bold>"); tmpPopUp->propertyTitle.set("<bold>_T{Info}</bold>");
break; break;
case ewol::tools::message::type_warning: case ewol::tools::message::type::warning:
tmpPopUp->propertyTitle.set("<bold><font color='orange'>_T{Warning}</font></bold>"); tmpPopUp->propertyTitle.set("<bold><font color='orange'>_T{Warning}</font></bold>");
break; break;
case ewol::tools::message::type_error: case ewol::tools::message::type::error:
tmpPopUp->propertyTitle.set("<bold><font color='red'>_T{Error}</font></bold>"); tmpPopUp->propertyTitle.set("<bold><font color='red'>_T{Error}</font></bold>");
break; break;
case ewol::tools::message::type_critical: case ewol::tools::message::type::critical:
tmpPopUp->propertyTitle.set("<bold><font colorBg='red'>_T{Critical}</font></bold>"); tmpPopUp->propertyTitle.set("<bold><font colorBg='red'>_T{Critical}</font></bold>");
break; break;
} }
@ -47,19 +47,19 @@ void ewol::tools::message::create(enum ewol::tools::message::type _type, const s
} }
void ewol::tools::message::displayInfo(const std::string& _message) { void ewol::tools::message::displayInfo(const std::string& _message) {
ewol::tools::message::create(ewol::tools::message::type_info, _message); ewol::tools::message::create(ewol::tools::message::type::info, _message);
} }
void ewol::tools::message::displayWarning(const std::string& _message) { void ewol::tools::message::displayWarning(const std::string& _message) {
ewol::tools::message::create(ewol::tools::message::type_warning, _message); ewol::tools::message::create(ewol::tools::message::type::warning, _message);
} }
void ewol::tools::message::displayError(const std::string& _message) { void ewol::tools::message::displayError(const std::string& _message) {
ewol::tools::message::create(ewol::tools::message::type_error, _message); ewol::tools::message::create(ewol::tools::message::type::error, _message);
} }
void ewol::tools::message::displayCritical(const std::string& _message) { void ewol::tools::message::displayCritical(const std::string& _message) {
ewol::tools::message::create(ewol::tools::message::type_critical, _message); ewol::tools::message::create(ewol::tools::message::type::critical, _message);
} }

10
ewol/tools/message.h
View File

@ -15,11 +15,11 @@
namespace ewol { namespace ewol {
namespace tools { namespace tools {
namespace message { namespace message {
enum type { enum class type {
type_info, //!< information message pop-up info, //!< information message pop-up
type_warning, //!< warning message pop-up warning, //!< warning message pop-up
type_error, //!< Error message pop-up error, //!< Error message pop-up
type_critical //!< Critical message pop-up critical //!< Critical message pop-up
}; };
/** /**
* @brief Create a simple pop-up message on the screen for application error. * @brief Create a simple pop-up message on the screen for application error.

14
ewol/widget/Button.cpp
View File

@ -93,8 +93,8 @@ bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
if(ewol::widget::Button::lockAccess == *propertyLock) { if(ewol::widget::Button::lockAccess == *propertyLock) {
return false; return false;
} }
if( gale::key::status_leave == _event.getStatus() if( gale::key::status::leave == _event.getStatus()
|| gale::key::status_abort == _event.getStatus()) { || gale::key::status::abort == _event.getStatus()) {
m_mouseHover = false; m_mouseHover = false;
m_buttonPressed = false; m_buttonPressed = false;
} else { } else {
@ -113,19 +113,19 @@ bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
EWOL_VERBOSE("Event on BT ... mouse hover : " << m_mouseHover); EWOL_VERBOSE("Event on BT ... mouse hover : " << m_mouseHover);
if (true == m_mouseHover) { if (true == m_mouseHover) {
if (1 == _event.getId()) { if (1 == _event.getId()) {
if(gale::key::status_down == _event.getStatus()) { if(gale::key::status::down == _event.getStatus()) {
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalDown); EWOL_VERBOSE(*propertyName << " : Generate event : " << signalDown);
signalDown.emit(); signalDown.emit();
m_buttonPressed = true; m_buttonPressed = true;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_up == _event.getStatus()) { if(gale::key::status::up == _event.getStatus()) {
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalUp); EWOL_VERBOSE(*propertyName << " : Generate event : " << signalUp);
signalUp.emit(); signalUp.emit();
m_buttonPressed = false; m_buttonPressed = false;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_single == _event.getStatus()) { if(gale::key::status::pressSingle == _event.getStatus()) {
if( ( *propertyValue == true if( ( *propertyValue == true
&& ewol::widget::Button::lockWhenPressed == propertyLock) && ewol::widget::Button::lockWhenPressed == propertyLock)
|| ( *propertyValue == false || ( *propertyValue == false
@ -157,8 +157,8 @@ bool ewol::widget::Button::onEventInput(const ewol::event::Input& _event) {
bool ewol::widget::Button::onEventEntry(const ewol::event::Entry& _event) { bool ewol::widget::Button::onEventEntry(const ewol::event::Entry& _event) {
//EWOL_DEBUG("BT PRESSED : \"" << UTF8_data << "\" size=" << strlen(UTF8_data)); //EWOL_DEBUG("BT PRESSED : \"" << UTF8_data << "\" size=" << strlen(UTF8_data));
if( _event.getType() == gale::key::keyboard_char if( _event.getType() == gale::key::keyboard::character
&& _event.getStatus() == gale::key::status_down && _event.getStatus() == gale::key::status::down
&& _event.getChar() == '\r') { && _event.getChar() == '\r') {
signalEnter.emit(); signalEnter.emit();
return true; return true;

8
ewol/widget/ButtonColor.cpp
View File

@ -124,7 +124,7 @@ void ewol::widget::ButtonColor::onRegenerateDisplay() {
bool ewol::widget::ButtonColor::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::ButtonColor::onEventInput(const ewol::event::Input& _event) {
bool previousHoverState = m_mouseHover; bool previousHoverState = m_mouseHover;
if(gale::key::status_leave == _event.getStatus()) { if(gale::key::status::leave == _event.getStatus()) {
m_mouseHover = false; m_mouseHover = false;
m_buttonPressed = false; m_buttonPressed = false;
} else { } else {
@ -144,15 +144,15 @@ bool ewol::widget::ButtonColor::onEventInput(const ewol::event::Input& _event) {
//EWOL_DEBUG("Event on BT ... mouse position : " << m_mouseHover); //EWOL_DEBUG("Event on BT ... mouse position : " << m_mouseHover);
if (true == m_mouseHover) { if (true == m_mouseHover) {
if (1 == _event.getId()) { if (1 == _event.getId()) {
if(gale::key::status_down == _event.getStatus()) { if(gale::key::status::down == _event.getStatus()) {
m_buttonPressed = true; m_buttonPressed = true;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_up == _event.getStatus()) { if(gale::key::status::up == _event.getStatus()) {
m_buttonPressed = false; m_buttonPressed = false;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_single == _event.getStatus()) { if(gale::key::status::pressSingle == _event.getStatus()) {
m_buttonPressed = false; m_buttonPressed = false;
m_mouseHover = false; m_mouseHover = false;
// create a context menu : // create a context menu :

14
ewol/widget/CheckBox.cpp
View File

@ -101,8 +101,8 @@ bool ewol::widget::CheckBox::onEventInput(const ewol::event::Input& _event) {
EWOL_VERBOSE("Event on BT : " << _event); EWOL_VERBOSE("Event on BT : " << _event);
bool previousHoverState = m_mouseHover; bool previousHoverState = m_mouseHover;
if( gale::key::status_leave == _event.getStatus() if( gale::key::status::leave == _event.getStatus()
|| gale::key::status_abort == _event.getStatus()) { || gale::key::status::abort == _event.getStatus()) {
m_mouseHover = false; m_mouseHover = false;
m_buttonPressed = false; m_buttonPressed = false;
} else { } else {
@ -122,19 +122,19 @@ bool ewol::widget::CheckBox::onEventInput(const ewol::event::Input& _event) {
EWOL_VERBOSE("Event on BT ... mouse hover : " << m_mouseHover); EWOL_VERBOSE("Event on BT ... mouse hover : " << m_mouseHover);
if (m_mouseHover == true) { if (m_mouseHover == true) {
if (_event.getId() == 1) { if (_event.getId() == 1) {
if(gale::key::status_down == _event.getStatus()) { if(gale::key::status::down == _event.getStatus()) {
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalDown); EWOL_VERBOSE(*propertyName << " : Generate event : " << signalDown);
signalDown.emit(); signalDown.emit();
m_buttonPressed = true; m_buttonPressed = true;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_up == _event.getStatus()) { if(gale::key::status::up == _event.getStatus()) {
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalUp); EWOL_VERBOSE(*propertyName << " : Generate event : " << signalUp);
signalUp.emit(); signalUp.emit();
m_buttonPressed = false; m_buttonPressed = false;
markToRedraw(); markToRedraw();
} }
if(gale::key::status_single == _event.getStatus()) { if(gale::key::status::pressSingle == _event.getStatus()) {
// inverse value : // inverse value :
propertyValue.set((*propertyValue)?false:true); propertyValue.set((*propertyValue)?false:true);
EWOL_VERBOSE(*propertyName << " : Generate event : " << signalPressed); EWOL_VERBOSE(*propertyName << " : Generate event : " << signalPressed);
@ -155,8 +155,8 @@ bool ewol::widget::CheckBox::onEventInput(const ewol::event::Input& _event) {
bool ewol::widget::CheckBox::onEventEntry(const ewol::event::Entry& _event) { bool ewol::widget::CheckBox::onEventEntry(const ewol::event::Entry& _event) {
//EWOL_DEBUG("BT PRESSED : \"" << UTF8_data << "\" size=" << strlen(UTF8_data)); //EWOL_DEBUG("BT PRESSED : \"" << UTF8_data << "\" size=" << strlen(UTF8_data));
if( _event.getType() == gale::key::keyboard_char if( _event.getType() == gale::key::keyboard::character
&& _event.getStatus() == gale::key::status_down && _event.getStatus() == gale::key::status::down
&& _event.getChar() == '\r') { && _event.getChar() == '\r') {
signalEnter.emit(); signalEnter.emit();
return true; return true;

4
ewol/widget/ColorBar.cpp
View File

@ -161,8 +161,8 @@ bool ewol::widget::ColorBar::onEventInput(const ewol::event::Input& _event) {
if (1 == _event.getId()) { if (1 == _event.getId()) {
relativePos.setValue( std::avg(0.0f, m_size.x(),relativePos.x()), relativePos.setValue( std::avg(0.0f, m_size.x(),relativePos.x()),
std::avg(0.0f, m_size.y(),relativePos.y()) ); std::avg(0.0f, m_size.y(),relativePos.y()) );
if( gale::key::status_single == _event.getStatus() if( gale::key::status::pressSingle == _event.getStatus()
|| gale::key::status_move == _event.getStatus()) { || gale::key::status::move == _event.getStatus()) {
// nothing to do ... // nothing to do ...
m_currentUserPos.setValue( relativePos.x()/m_size.x(), m_currentUserPos.setValue( relativePos.x()/m_size.x(),
relativePos.y()/m_size.y() ); relativePos.y()/m_size.y() );

12
ewol/widget/ContextMenu.cpp
View File

@ -206,12 +206,12 @@ bool ewol::widget::ContextMenu::onEventInput(const ewol::event::Input& _event) {
if (ewol::widget::Container::getWidgetAtPos(_event.getPos()) != nullptr) { if (ewol::widget::Container::getWidgetAtPos(_event.getPos()) != nullptr) {
return false; return false;
} }
if( _event.getStatus() == gale::key::status_down if( _event.getStatus() == gale::key::status::down
|| _event.getStatus() == gale::key::status_move || _event.getStatus() == gale::key::status::move
|| _event.getStatus() == gale::key::status_single || _event.getStatus() == gale::key::status::pressSingle
|| _event.getStatus() == gale::key::status_up || _event.getStatus() == gale::key::status::up
|| _event.getStatus() == gale::key::status_enter || _event.getStatus() == gale::key::status::enter
|| _event.getStatus() == gale::key::status_leave ) { || _event.getStatus() == gale::key::status::leave ) {
// Auto-remove ... // Auto-remove ...
autoDestroy(); autoDestroy();
return true; return true;

36
ewol/widget/Entry.cpp
View File

@ -246,12 +246,12 @@ void ewol::widget::Entry::copySelectionToClipBoard(enum gale::context::clipBoard
bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) {
//EWOL_DEBUG("Event on Entry ... type=" << (int32_t)type << " id=" << IdInput); //EWOL_DEBUG("Event on Entry ... type=" << (int32_t)type << " id=" << IdInput);
if (_event.getId() == 1) { if (_event.getId() == 1) {
if (gale::key::status_single == _event.getStatus()) { if (gale::key::status::pressSingle == _event.getStatus()) {
keepFocus(); keepFocus();
signalClick.emit(); signalClick.emit();
//nothing to do ... //nothing to do ...
return true; return true;
} else if (gale::key::status_double == _event.getStatus()) { } else if (gale::key::status::pressDouble == _event.getStatus()) {
keepFocus(); keepFocus();
// select word // select word
m_displayCursorPosSelection = m_displayCursorPos-1; m_displayCursorPosSelection = m_displayCursorPos-1;
@ -296,19 +296,19 @@ bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) {
// Copy to clipboard Middle ... // Copy to clipboard Middle ...
copySelectionToClipBoard(gale::context::clipBoard::clipboardSelection); copySelectionToClipBoard(gale::context::clipBoard::clipboardSelection);
markToRedraw(); markToRedraw();
} else if (gale::key::status_triple == _event.getStatus()) { } else if (gale::key::status::pressTriple == _event.getStatus()) {
keepFocus(); keepFocus();
m_displayCursorPosSelection = 0; m_displayCursorPosSelection = 0;
m_displayCursorPos = propertyValue->size(); m_displayCursorPos = propertyValue->size();
} else if (gale::key::status_down == _event.getStatus()) { } else if (gale::key::status::down == _event.getStatus()) {
keepFocus(); keepFocus();
updateCursorPosition(_event.getPos()); updateCursorPosition(_event.getPos());
markToRedraw(); markToRedraw();
} else if (gale::key::status_move == _event.getStatus()) { } else if (gale::key::status::move == _event.getStatus()) {
keepFocus(); keepFocus();
updateCursorPosition(_event.getPos(), true); updateCursorPosition(_event.getPos(), true);
markToRedraw(); markToRedraw();
} else if (gale::key::status_up == _event.getStatus()) { } else if (gale::key::status::up == _event.getStatus()) {
keepFocus(); keepFocus();
updateCursorPosition(_event.getPos(), true); updateCursorPosition(_event.getPos(), true);
// Copy to clipboard Middle ... // Copy to clipboard Middle ...
@ -316,17 +316,17 @@ bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) {
markToRedraw(); markToRedraw();
} }
} }
else if( gale::key::type_mouse == _event.getType() else if( gale::key::type::mouse == _event.getType()
&& _event.getId() == 2) { && _event.getId() == 2) {
if( _event.getStatus() == gale::key::status_down if( _event.getStatus() == gale::key::status::down
|| _event.getStatus() == gale::key::status_move || _event.getStatus() == gale::key::status::move
|| _event.getStatus() == gale::key::status_up) { || _event.getStatus() == gale::key::status::up) {
keepFocus(); keepFocus();
// updatethe cursor position : // updatethe cursor position :
updateCursorPosition(_event.getPos()); updateCursorPosition(_event.getPos());
} }
// Paste current selection only when up button // Paste current selection only when up button
if (_event.getStatus() == gale::key::status_up) { if (_event.getStatus() == gale::key::status::up) {
keepFocus(); keepFocus();
// middle button => past data... // middle button => past data...
gale::context::clipBoard::request(gale::context::clipBoard::clipboardSelection); gale::context::clipBoard::request(gale::context::clipBoard::clipboardSelection);
@ -337,8 +337,8 @@ bool ewol::widget::Entry::onEventInput(const ewol::event::Input& _event) {
bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) { bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
if (_event.getType() == gale::key::keyboard_char) { if (_event.getType() == gale::key::keyboard::character) {
if(_event.getStatus() == gale::key::status_down) { if(_event.getStatus() == gale::key::status::down) {
// remove curent selected data ... // remove curent selected data ...
removeSelected(); removeSelected();
if( _event.getChar() == '\n' if( _event.getChar() == '\n'
@ -379,18 +379,18 @@ bool ewol::widget::Entry::onEventEntry(const ewol::event::Entry& _event) {
} }
return false; return false;
} else { } else {
if(_event.getStatus() == gale::key::status_down) { if(_event.getStatus() == gale::key::status::down) {
switch (_event.getType()) { switch (_event.getType()) {
case gale::key::keyboard_left: case gale::key::keyboard::left:
m_displayCursorPos--; m_displayCursorPos--;
break; break;
case gale::key::keyboard_right: case gale::key::keyboard::right:
m_displayCursorPos++; m_displayCursorPos++;
break; break;
case gale::key::keyboard_start: case gale::key::keyboard::start:
m_displayCursorPos = 0; m_displayCursorPos = 0;
break; break;
case gale::key::keyboard_end: case gale::key::keyboard::end:
m_displayCursorPos = propertyValue->size(); m_displayCursorPos = propertyValue->size();
break; break;
default: default:

2
ewol/widget/Image.cpp
View File

@ -135,7 +135,7 @@ void ewol::widget::Image::calculateMinMaxSize() {
bool ewol::widget::Image::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::Image::onEventInput(const ewol::event::Input& _event) {
//EWOL_DEBUG("Event on BT ..."); //EWOL_DEBUG("Event on BT ...");
if (_event.getId() == 1) { if (_event.getId() == 1) {
if(gale::key::status_single == _event.getStatus()) { if(gale::key::status::pressSingle == _event.getStatus()) {
signalPressed.emit(); signalPressed.emit();
return true; return true;
} }

8
ewol/widget/Joystick.cpp
View File

@ -100,8 +100,8 @@ Tangent Function: tan(teta) = Opposite / Adjacent
bool ewol::widget::Joystick::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::Joystick::onEventInput(const ewol::event::Input& _event) {
/* /*
if (1 == IdInput) { if (1 == IdInput) {
if( gale::key::status_down == typeEvent if( gale::key::status::down == typeEvent
|| gale::key::status_move == typeEvent) { || gale::key::status::move == typeEvent) {
// get local relative position // get local relative position
vec2 relativePos = relativePosition(pos); vec2 relativePos = relativePosition(pos);
float sizeElement = m_size.x*m_ratio; float sizeElement = m_size.x*m_ratio;
@ -126,7 +126,7 @@ bool ewol::widget::Joystick::onEventInput(const ewol::event::Input& _event) {
m_displayPos.y = sin(m_angle)*m_distance; m_displayPos.y = sin(m_angle)*m_distance;
} }
markToRedraw(); markToRedraw();
if(gale::key::status_down == typeEvent) { if(gale::key::status::down == typeEvent) {
signalEnable.emit(); signalEnable.emit();
} else { } else {
std::string tmp = std::string("distance=") + std::string(m_distance) + std::string("angle=") + std::string(m_angle+M_PI/2); std::string tmp = std::string("distance=") + std::string(m_distance) + std::string("angle=") + std::string(m_angle+M_PI/2);
@ -135,7 +135,7 @@ bool ewol::widget::Joystick::onEventInput(const ewol::event::Input& _event) {
//teta += M_PI/2; //teta += M_PI/2;
//EWOL_DEBUG("TETA = " << (m_angle*180/M_PI) << " deg distance = " << m_distance); //EWOL_DEBUG("TETA = " << (m_angle*180/M_PI) << " deg distance = " << m_distance);
return true; return true;
} else if( gale::key::status_up == typeEvent) { } else if( gale::key::status::up == typeEvent) {
if( true == m_lock if( true == m_lock
&& m_distance == 1) { && m_distance == 1) {
// nothing to do ... // nothing to do ...

2
ewol/widget/Label.cpp
View File

@ -127,7 +127,7 @@ void ewol::widget::Label::onRegenerateDisplay() {
bool ewol::widget::Label::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::Label::onEventInput(const ewol::event::Input& _event) {
//EWOL_DEBUG("Event on Label ..."); //EWOL_DEBUG("Event on Label ...");
if (_event.getId() == 1) { if (_event.getId() == 1) {
if (gale::key::status_single == _event.getStatus()) { if (gale::key::status::pressSingle == _event.getStatus()) {
// nothing to do ... // nothing to do ...
signalPressed.emit(); signalPressed.emit();
return true; return true;

2
ewol/widget/ListFileSystem.cpp
View File

@ -178,7 +178,7 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput,
offset = 2; offset = 2;
} }
} }
if (_typeEvent == gale::key::status_single) { if (_typeEvent == gale::key::status::pressSingle) {
EWOL_VERBOSE("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); EWOL_VERBOSE("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw );
if (1 == _IdInput) { if (1 == _IdInput) {
int32_t previousRaw = m_selectedLine; int32_t previousRaw = m_selectedLine;

2
ewol/widget/PopUp.cpp
View File

@ -33,7 +33,7 @@ void ewol::widget::PopUp::init() {
ewol::widget::Container::init(); ewol::widget::Container::init();
propertyFill.set(bvec2(false,false)); propertyFill.set(bvec2(false,false));
propertyShape.notifyChange(); propertyShape.notifyChange();
propertyMinSize.set(gale::Dimension(vec2(80,80),gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(80,80),gale::distance::pourcent));
propertyExpand.set(bvec2(false, false)); propertyExpand.set(bvec2(false, false));
} }
ewol::widget::PopUp::~PopUp() { ewol::widget::PopUp::~PopUp() {

64
ewol/widget/Scroll.cpp
View File

@ -30,7 +30,7 @@ ewol::widget::Scroll::Scroll() :
m_highSpeedStartPos(0,0), m_highSpeedStartPos(0,0),
m_highSpeedMode(speedModeDisable), m_highSpeedMode(speedModeDisable),
m_highSpeedButton(-1), m_highSpeedButton(-1),
m_highSpeedType(gale::key::type_unknow) { m_highSpeedType(gale::key::type::unknow) {
addObjectType("ewol::widget::Scroll"); addObjectType("ewol::widget::Scroll");
// Remove gravity property: (only keep top/buttom) // Remove gravity property: (only keep top/buttom)
propertyGravity.remove("center"); propertyGravity.remove("center");
@ -186,7 +186,7 @@ void ewol::widget::Scroll::onRegenerateDisplay() {
bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) { bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
//ewol::event::Input _event = event; //ewol::event::Input _event = event;
//_event.setType(gale::key::type_finger); //_event.setType(gale::key::type::finger);
vec2 relativePos = relativePosition(_event.getPos()); vec2 relativePos = relativePosition(_event.getPos());
vec2 scrollOffset(0,0); vec2 scrollOffset(0,0);
vec2 scrollSize(0,0); vec2 scrollSize(0,0);
@ -196,17 +196,17 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
} }
EWOL_VERBOSE("Get Event on scroll : " << _event); EWOL_VERBOSE("Get Event on scroll : " << _event);
relativePos.setY(m_size.y() - relativePos.y()); relativePos.setY(m_size.y() - relativePos.y());
if( _event.getType() == gale::key::type_mouse if( _event.getType() == gale::key::type::mouse
&& ( m_highSpeedType == gale::key::type_unknow && ( m_highSpeedType == gale::key::type::unknow
|| m_highSpeedType == gale::key::type_mouse) ) { || m_highSpeedType == gale::key::type::mouse) ) {
if( _event.getId() == 1 if( _event.getId() == 1
&& _event.getStatus() == gale::key::status_down) { && _event.getStatus() == gale::key::status::down) {
// check if selected the scrolling position whth the scrolling bar ... // check if selected the scrolling position whth the scrolling bar ...
if (relativePos.x() >= (m_size.x()-SCROLL_BAR_SPACE)) { if (relativePos.x() >= (m_size.x()-SCROLL_BAR_SPACE)) {
if( m_size.y() < scrollSize.y() if( m_size.y() < scrollSize.y()
|| scrollOffset.y() != 0) { || scrollOffset.y() != 0) {
m_highSpeedMode = speedModeEnableVertical; m_highSpeedMode = speedModeEnableVertical;
m_highSpeedType = gale::key::type_mouse; m_highSpeedType = gale::key::type::mouse;
m_highSpeedStartPos.setX(relativePos.x()); m_highSpeedStartPos.setX(relativePos.x());
m_highSpeedStartPos.setY(scrollOffset.y() / scrollSize.y() * (m_size.y()-SCROLL_BAR_SPACE*2)); m_highSpeedStartPos.setY(scrollOffset.y() / scrollSize.y() * (m_size.y()-SCROLL_BAR_SPACE*2));
m_highSpeedButton = 1; m_highSpeedButton = 1;
@ -223,7 +223,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
if( m_size.x() < scrollSize.x() if( m_size.x() < scrollSize.x()
|| scrollOffset.x()!=0) { || scrollOffset.x()!=0) {
m_highSpeedMode = speedModeEnableHorizontal; m_highSpeedMode = speedModeEnableHorizontal;
m_highSpeedType = gale::key::type_mouse; m_highSpeedType = gale::key::type::mouse;
m_highSpeedStartPos.setX(scrollOffset.x() / scrollSize.x() * (m_size.x()-SCROLL_BAR_SPACE*2)); m_highSpeedStartPos.setX(scrollOffset.x() / scrollSize.x() * (m_size.x()-SCROLL_BAR_SPACE*2));
m_highSpeedStartPos.setY(relativePos.y()); m_highSpeedStartPos.setY(relativePos.y());
m_highSpeedButton = 1; m_highSpeedButton = 1;
@ -239,7 +239,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
} }
return false; return false;
} else if( _event.getId() == 4 } else if( _event.getId() == 4
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status::up) {
EWOL_VERBOSE(" mode UP " << m_size.y() << "<" << scrollSize.y()); EWOL_VERBOSE(" mode UP " << m_size.y() << "<" << scrollSize.y());
if(m_size.y() < scrollSize.y()) { if(m_size.y() < scrollSize.y()) {
scrollOffset.setY(scrollOffset.y()-m_pixelScrolling); scrollOffset.setY(scrollOffset.y()-m_pixelScrolling);
@ -251,7 +251,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
} else if( _event.getId() == 5 } else if( _event.getId() == 5
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status::up) {
EWOL_VERBOSE(" mode DOWN " << m_size.y() << "<" << scrollSize.y()); EWOL_VERBOSE(" mode DOWN " << m_size.y() << "<" << scrollSize.y());
if(m_size.y() < scrollSize.y()) { if(m_size.y() < scrollSize.y()) {
scrollOffset.setY(scrollOffset.y()+m_pixelScrolling); scrollOffset.setY(scrollOffset.y()+m_pixelScrolling);
@ -263,28 +263,28 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
}else if (_event.getId() == 2) { }else if (_event.getId() == 2) {
if (_event.getStatus() == gale::key::status_down) { if (_event.getStatus() == gale::key::status::down) {
m_highSpeedMode = speedModeInit; m_highSpeedMode = speedModeInit;
m_highSpeedType = gale::key::type_mouse; m_highSpeedType = gale::key::type::mouse;
m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y()); m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y());
m_highSpeedButton = 2; m_highSpeedButton = 2;
// not really use... == > just keep some informations // not really use... == > just keep some informations
return false; return false;
} }
} else if( m_highSpeedMode != speedModeDisable } else if( m_highSpeedMode != speedModeDisable
&& _event.getStatus() == gale::key::status_leave) { && _event.getStatus() == gale::key::status::leave) {
m_highSpeedMode = speedModeDisable; m_highSpeedMode = speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
markToRedraw(); markToRedraw();
return true; return true;
} }
if ( _event.getId() == m_highSpeedButton if ( _event.getId() == m_highSpeedButton
&& m_highSpeedMode != speedModeDisable) { && m_highSpeedMode != speedModeDisable) {
if (_event.getStatus() == gale::key::status_up) { if (_event.getStatus() == gale::key::status::up) {
if (m_highSpeedMode == speedModeInit) { if (m_highSpeedMode == speedModeInit) {
// TODO : generate back the down event ... // TODO : generate back the down event ...
m_highSpeedMode = speedModeDisable; m_highSpeedMode = speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
return false; return false;
} else { } else {
m_highSpeedMode = speedModeGrepEndEvent; m_highSpeedMode = speedModeGrepEndEvent;
@ -292,15 +292,15 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
} else if (m_highSpeedMode == speedModeGrepEndEvent) { } else if (m_highSpeedMode == speedModeGrepEndEvent) {
if (_event.getStatus() == gale::key::status_single) { if (_event.getStatus() == gale::key::status::pressSingle) {
m_highSpeedMode = speedModeDisable; m_highSpeedMode = speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
m_highSpeedButton = -1; m_highSpeedButton = -1;
markToRedraw(); markToRedraw();
} }
return true; return true;
} else if( m_highSpeedMode == speedModeInit } else if( m_highSpeedMode == speedModeInit
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status::move) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :
if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10 if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10
|| std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) { || std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) {
@ -332,7 +332,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
if( m_highSpeedMode == speedModeEnableHorizontal if( m_highSpeedMode == speedModeEnableHorizontal
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status::move) {
scrollOffset.setX((int32_t)(scrollSize.x() * (relativePos.x()-SCROLL_BAR_SPACE) / (m_size.x()-SCROLL_BAR_SPACE*2))); scrollOffset.setX((int32_t)(scrollSize.x() * (relativePos.x()-SCROLL_BAR_SPACE) / (m_size.x()-SCROLL_BAR_SPACE*2)));
scrollOffset.setX(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*propertyLimit->x() ))); scrollOffset.setX(std::avg(0.0f, scrollOffset.x(), (scrollSize.x() - m_size.x()*propertyLimit->x() )));
markToRedraw(); markToRedraw();
@ -342,7 +342,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
if( m_highSpeedMode == speedModeEnableVertical if( m_highSpeedMode == speedModeEnableVertical
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status::move) {
scrollOffset.setY((int32_t)(scrollSize.y() * (relativePos.y()-SCROLL_BAR_SPACE) / (m_size.y()-SCROLL_BAR_SPACE*2))); scrollOffset.setY((int32_t)(scrollSize.y() * (relativePos.y()-SCROLL_BAR_SPACE) / (m_size.y()-SCROLL_BAR_SPACE*2)));
scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->x()))); scrollOffset.setY(std::avg(0.0f, scrollOffset.y(), (scrollSize.y() - m_size.y()*propertyLimit->x())));
markToRedraw(); markToRedraw();
@ -352,25 +352,25 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
} }
} else if( gale::key::type_finger == _event.getType() } else if( gale::key::type::finger == _event.getType()
&& ( gale::key::type_unknow == m_highSpeedType && ( gale::key::type::unknow == m_highSpeedType
|| gale::key::type_finger == m_highSpeedType ) ) { || gale::key::type::finger == m_highSpeedType ) ) {
if (1 == _event.getId()) { if (1 == _event.getId()) {
EWOL_VERBOSE("event: " << _event); EWOL_VERBOSE("event: " << _event);
if (gale::key::status_down == _event.getStatus()) { if (gale::key::status::down == _event.getStatus()) {
m_highSpeedMode = speedModeInit; m_highSpeedMode = speedModeInit;
m_highSpeedType = gale::key::type_finger; m_highSpeedType = gale::key::type::finger;
m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y()); m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y());
EWOL_VERBOSE("SCROOL == > INIT pos=" << m_highSpeedStartPos << " && curent scrollOffset=" << scrollOffset); EWOL_VERBOSE("SCROOL == > INIT pos=" << m_highSpeedStartPos << " && curent scrollOffset=" << scrollOffset);
return true; return true;
} else if (gale::key::status_upAfter == _event.getStatus()) { } else if (gale::key::status::upAfter == _event.getStatus()) {
m_highSpeedMode = speedModeDisable; m_highSpeedMode = speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
EWOL_VERBOSE("SCROOL == > DISABLE"); EWOL_VERBOSE("SCROOL == > DISABLE");
markToRedraw(); markToRedraw();
return true; return true;
} else if ( m_highSpeedMode == speedModeInit } else if ( m_highSpeedMode == speedModeInit
&& gale::key::status_move == _event.getStatus()) { && gale::key::status::move == _event.getStatus()) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :
if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10 if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10
|| std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) { || std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) {
@ -383,7 +383,7 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
if ( m_highSpeedMode == speedModeEnableFinger if ( m_highSpeedMode == speedModeEnableFinger
&& gale::key::status_move == _event.getStatus()) { && gale::key::status::move == _event.getStatus()) {
EWOL_VERBOSE("SCROOL == > INIT scrollOffset=" << scrollOffset.y() << " relativePos=" << relativePos.y() << " m_highSpeedStartPos=" << m_highSpeedStartPos.y()); EWOL_VERBOSE("SCROOL == > INIT scrollOffset=" << scrollOffset.y() << " relativePos=" << relativePos.y() << " m_highSpeedStartPos=" << m_highSpeedStartPos.y());
//scrollOffset.x = (int32_t)(scrollSize.x * x / m_size.x); //scrollOffset.x = (int32_t)(scrollSize.x * x / m_size.x);
if (propertyLimit->x() != 0.0f) { if (propertyLimit->x() != 0.0f) {
@ -407,9 +407,9 @@ bool ewol::widget::Scroll::onEventInput(const ewol::event::Input& _event) {
return true; return true;
} }
} else if ( m_highSpeedMode != speedModeDisable } else if ( m_highSpeedMode != speedModeDisable
&& gale::key::status_leave == _event.getStatus()) { && gale::key::status::leave == _event.getStatus()) {
m_highSpeedMode = speedModeDisable; m_highSpeedMode = speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
EWOL_VERBOSE("SCROOL == > DISABLE"); EWOL_VERBOSE("SCROOL == > DISABLE");
markToRedraw(); markToRedraw();
return true; return true;

4
ewol/widget/Slider.cpp
View File

@ -81,8 +81,8 @@ bool ewol::widget::Slider::onEventInput(const ewol::event::Input& _event) {
vec2 relativePos = relativePosition(_event.getPos()); vec2 relativePos = relativePosition(_event.getPos());
//EWOL_DEBUG("Event on Slider ..." << _event); //EWOL_DEBUG("Event on Slider ..." << _event);
if (1 == _event.getId()) { if (1 == _event.getId()) {
if( gale::key::status_single == _event.getStatus() if( gale::key::status::pressSingle == _event.getStatus()
|| gale::key::status_move == _event.getStatus()) { || gale::key::status::move == _event.getStatus()) {
// get the new position : // get the new position :
EWOL_VERBOSE("Event on Slider (" << relativePos.x() << "," << relativePos.y() << ")"); EWOL_VERBOSE("Event on Slider (" << relativePos.x() << "," << relativePos.y() << ")");
float oldValue = *propertyValue; float oldValue = *propertyValue;

70
ewol/widget/Widget.cpp
View File

@ -14,11 +14,11 @@
ewol::Widget::Widget() : ewol::Widget::Widget() :
propertyMinSize(this, "min-size", propertyMinSize(this, "min-size",
gale::Dimension(vec2(0,0),gale::Dimension::Pixel), gale::Dimension(vec2(0,0),gale::distance::pixel),
"User minimum size", "User minimum size",
&ewol::Widget::onChangePropertyMinSize), &ewol::Widget::onChangePropertyMinSize),
propertyMaxSize(this, "max-size", propertyMaxSize(this, "max-size",
gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel), gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::distance::pixel),
"User maximum size", "User maximum size",
&ewol::Widget::onChangePropertyMaxSize), &ewol::Widget::onChangePropertyMaxSize),
propertyExpand(this, "expand", propertyExpand(this, "expand",
@ -54,7 +54,7 @@ ewol::Widget::Widget() :
signalShortcut(this, "shortcut", ""), signalShortcut(this, "shortcut", ""),
m_needRegenerateDisplay(true), m_needRegenerateDisplay(true),
m_grabCursor(false), m_grabCursor(false),
m_cursorDisplay(gale::context::cursor_arrow), m_cursorDisplay(gale::context::cursor::arrow),
signalAnnimationStart(this, "annimation-start", ""), signalAnnimationStart(this, "annimation-start", ""),
signalAnnimationRatio(this, "annimation-ratio", ""), signalAnnimationRatio(this, "annimation-ratio", ""),
signalAnnimationStop(this, "annimation-stop", ""), signalAnnimationStop(this, "annimation-stop", ""),
@ -325,7 +325,7 @@ vec2 ewol::Widget::getCalculateMaxSize() {
} }
void ewol::Widget::setNoMinSize() { void ewol::Widget::setNoMinSize() {
propertyMinSize.set(gale::Dimension(vec2(0,0),gale::Dimension::Pixel)); propertyMinSize.set(gale::Dimension(vec2(0,0),gale::distance::pixel));
} }
void ewol::Widget::checkMinSize() { void ewol::Widget::checkMinSize() {
@ -335,7 +335,7 @@ void ewol::Widget::checkMinSize() {
} }
void ewol::Widget::setNoMaxSize() { void ewol::Widget::setNoMaxSize() {
propertyMaxSize.set(gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel)); propertyMaxSize.set(gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::distance::pixel));
} }
void ewol::Widget::checkMaxSize() { void ewol::Widget::checkMaxSize() {
@ -396,59 +396,59 @@ void ewol::Widget::shortCutAdd(const std::string& _descriptiveString, const std:
tmpElement->specialKey.setMeta(true); tmpElement->specialKey.setMeta(true);
} }
if(_descriptiveString.find("F12") != std::string::npos) { if(_descriptiveString.find("F12") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f12; tmpElement->keyboardMoveValue = gale::key::keyboard::f12;
} else if(_descriptiveString.find("F11") != std::string::npos) { } else if(_descriptiveString.find("F11") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f11; tmpElement->keyboardMoveValue = gale::key::keyboard::f11;
} else if(_descriptiveString.find("F10") != std::string::npos) { } else if(_descriptiveString.find("F10") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f10; tmpElement->keyboardMoveValue = gale::key::keyboard::f10;
} else if(_descriptiveString.find("F9") != std::string::npos) { } else if(_descriptiveString.find("F9") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f9; tmpElement->keyboardMoveValue = gale::key::keyboard::f9;
} else if(_descriptiveString.find("F8") != std::string::npos) { } else if(_descriptiveString.find("F8") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f8; tmpElement->keyboardMoveValue = gale::key::keyboard::f8;
} else if(_descriptiveString.find("F7") != std::string::npos) { } else if(_descriptiveString.find("F7") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f7; tmpElement->keyboardMoveValue = gale::key::keyboard::f7;
} else if(_descriptiveString.find("F6") != std::string::npos) { } else if(_descriptiveString.find("F6") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f6; tmpElement->keyboardMoveValue = gale::key::keyboard::f6;
} else if(_descriptiveString.find("F5") != std::string::npos) { } else if(_descriptiveString.find("F5") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f5; tmpElement->keyboardMoveValue = gale::key::keyboard::f5;
} else if(_descriptiveString.find("F4") != std::string::npos) { } else if(_descriptiveString.find("F4") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f4; tmpElement->keyboardMoveValue = gale::key::keyboard::f4;
} else if(_descriptiveString.find("F3") != std::string::npos) { } else if(_descriptiveString.find("F3") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f3; tmpElement->keyboardMoveValue = gale::key::keyboard::f3;
} else if(_descriptiveString.find("F2") != std::string::npos) { } else if(_descriptiveString.find("F2") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f2; tmpElement->keyboardMoveValue = gale::key::keyboard::f2;
} else if(_descriptiveString.find("F1") != std::string::npos) { } else if(_descriptiveString.find("F1") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_f1; tmpElement->keyboardMoveValue = gale::key::keyboard::f1;
} else if(_descriptiveString.find("LEFT") != std::string::npos) { } else if(_descriptiveString.find("LEFT") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_left; tmpElement->keyboardMoveValue = gale::key::keyboard::left;
} else if(_descriptiveString.find("RIGHT") != std::string::npos) { } else if(_descriptiveString.find("RIGHT") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_right; tmpElement->keyboardMoveValue = gale::key::keyboard::right;
} else if(_descriptiveString.find("UP") != std::string::npos) { } else if(_descriptiveString.find("UP") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_up; tmpElement->keyboardMoveValue = gale::key::keyboard::up;
} else if(_descriptiveString.find("DOWN") != std::string::npos) { } else if(_descriptiveString.find("DOWN") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_down; tmpElement->keyboardMoveValue = gale::key::keyboard::down;
} else if(_descriptiveString.find("PAGE_UP") != std::string::npos) { } else if(_descriptiveString.find("PAGE_UP") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_pageUp; tmpElement->keyboardMoveValue = gale::key::keyboard::pageUp;
} else if(_descriptiveString.find("PAGE_DOWN") != std::string::npos) { } else if(_descriptiveString.find("PAGE_DOWN") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_pageDown; tmpElement->keyboardMoveValue = gale::key::keyboard::pageDown;
} else if(_descriptiveString.find("START") != std::string::npos) { } else if(_descriptiveString.find("START") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_start; tmpElement->keyboardMoveValue = gale::key::keyboard::start;
} else if(_descriptiveString.find("END") != std::string::npos) { } else if(_descriptiveString.find("END") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_end; tmpElement->keyboardMoveValue = gale::key::keyboard::end;
} else if(_descriptiveString.find("PRINT") != std::string::npos) { } else if(_descriptiveString.find("PRINT") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_print; tmpElement->keyboardMoveValue = gale::key::keyboard::print;
} else if(_descriptiveString.find("ARRET_DEFIL") != std::string::npos) { } else if(_descriptiveString.find("ARRET_DEFIL") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_stopDefil; tmpElement->keyboardMoveValue = gale::key::keyboard::stopDefil;
} else if(_descriptiveString.find("WAIT") != std::string::npos) { } else if(_descriptiveString.find("WAIT") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_wait; tmpElement->keyboardMoveValue = gale::key::keyboard::wait;
} else if(_descriptiveString.find("INSERT") != std::string::npos) { } else if(_descriptiveString.find("INSERT") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_insert; tmpElement->keyboardMoveValue = gale::key::keyboard::insert;
} else if(_descriptiveString.find("CAPLOCK") != std::string::npos) { } else if(_descriptiveString.find("CAPLOCK") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_capLock; tmpElement->keyboardMoveValue = gale::key::keyboard::capLock;
} else if(_descriptiveString.find("CONTEXT_MENU") != std::string::npos) { } else if(_descriptiveString.find("CONTEXT_MENU") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_contextMenu; tmpElement->keyboardMoveValue = gale::key::keyboard::contextMenu;
} else if(_descriptiveString.find("NUM_LOCK") != std::string::npos) { } else if(_descriptiveString.find("NUM_LOCK") != std::string::npos) {
tmpElement->keyboardMoveValue = gale::key::keyboard_numLock; tmpElement->keyboardMoveValue = gale::key::keyboard::numLock;
} else { } else {
tmpElement->unicodeValue = _descriptiveString[_descriptiveString.size() -1]; tmpElement->unicodeValue = _descriptiveString[_descriptiveString.size() -1];
} }
@ -494,7 +494,7 @@ bool ewol::Widget::onEventShortCut(const gale::key::Special& _special,
&& m_localShortcut[iii]->specialKey.getCtrl() == _special.getCtrl() && m_localShortcut[iii]->specialKey.getCtrl() == _special.getCtrl()
&& m_localShortcut[iii]->specialKey.getAlt() == _special.getAlt() && m_localShortcut[iii]->specialKey.getAlt() == _special.getAlt()
&& m_localShortcut[iii]->specialKey.getMeta() == _special.getMeta() && m_localShortcut[iii]->specialKey.getMeta() == _special.getMeta()
&& ( ( m_localShortcut[iii]->keyboardMoveValue == gale::key::keyboard_unknow && ( ( m_localShortcut[iii]->keyboardMoveValue == gale::key::keyboard::unknow
&& m_localShortcut[iii]->unicodeValue == _unicodeValue) && m_localShortcut[iii]->unicodeValue == _unicodeValue)
|| ( m_localShortcut[iii]->keyboardMoveValue == _kbMove || ( m_localShortcut[iii]->keyboardMoveValue == _kbMove
&& m_localShortcut[iii]->unicodeValue == 0) && m_localShortcut[iii]->unicodeValue == 0)
@ -604,7 +604,7 @@ void ewol::Widget::onChangePropertyMaxSize() {
} }
if (error == true) { if (error == true) {
EWOL_ERROR("Can not set a 'min size' > 'max size' reset to maximum ..."); EWOL_ERROR("Can not set a 'min size' > 'max size' reset to maximum ...");
propertyMaxSize.setDirect(gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::Dimension::Pixel)); propertyMaxSize.setDirect(gale::Dimension(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),gale::distance::pixel));
} }
requestUpdateSize(); requestUpdateSize();
} }
@ -622,7 +622,7 @@ void ewol::Widget::onChangePropertyMinSize() {
} }
if (error == true) { if (error == true) {
EWOL_ERROR("Can not set a 'min size' > 'max size' set nothing ..."); EWOL_ERROR("Can not set a 'min size' > 'max size' set nothing ...");
propertyMinSize.setDirect(gale::Dimension(vec2(0,0),gale::Dimension::Pixel)); propertyMinSize.setDirect(gale::Dimension(vec2(0,0),gale::distance::pixel));
} }
requestUpdateSize(); requestUpdateSize();
} }

2
ewol/widget/Widget.h
View File

@ -58,7 +58,7 @@ namespace ewol {
EventShortCut() { EventShortCut() {
message = ""; message = "";
unicodeValue = 0; unicodeValue = 0;
keyboardMoveValue = gale::key::keyboard_unknow; keyboardMoveValue = gale::key::keyboard::unknow;
}; };
virtual ~EventShortCut() { }; virtual ~EventShortCut() { };
}; };

84
ewol/widget/WidgetScrolled.cpp
View File

@ -28,7 +28,7 @@ ewol::widget::WidgetScrolled::WidgetScrolled() :
m_pixelScrolling = 20; m_pixelScrolling = 20;
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
m_scroollingMode = scroolModeNormal; m_scroollingMode = scroolModeNormal;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
m_highSpeedButton = -1; m_highSpeedButton = -1;
m_limitScrolling = 0.5; m_limitScrolling = 0.5;
@ -91,17 +91,17 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
ewol::Padding paddingV = m_shaperV.getPadding(); ewol::Padding paddingV = m_shaperV.getPadding();
ewol::Padding paddingH = m_shaperH.getPadding(); ewol::Padding paddingH = m_shaperH.getPadding();
if (m_scroollingMode == scroolModeNormal) { if (m_scroollingMode == scroolModeNormal) {
if ( _event.getType() == gale::key::type_mouse if ( _event.getType() == gale::key::type::mouse
&& ( m_highSpeedType == gale::key::type_unknow && ( m_highSpeedType == gale::key::type::unknow
|| m_highSpeedType == gale::key::type_mouse) ) { || m_highSpeedType == gale::key::type::mouse) ) {
if ( _event.getId() == 1 if ( _event.getId() == 1
&& _event.getStatus() == gale::key::status_down) { && _event.getStatus() == gale::key::status::down) {
// check if selected the scrolling position whth the scrolling bar ... // check if selected the scrolling position whth the scrolling bar ...
if (relativePos.x() >= (m_size.x()-paddingV.x())) { if (relativePos.x() >= (m_size.x()-paddingV.x())) {
if( m_size.y() < m_maxSize.y() if( m_size.y() < m_maxSize.y()
|| m_originScrooled.y() != 0) { || m_originScrooled.y() != 0) {
m_highSpeedMode = ewol::widget::Scroll::speedModeEnableVertical; m_highSpeedMode = ewol::widget::Scroll::speedModeEnableVertical;
m_highSpeedType = gale::key::type_mouse; m_highSpeedType = gale::key::type::mouse;
m_highSpeedStartPos.setX(relativePos.x()); m_highSpeedStartPos.setX(relativePos.x());
m_highSpeedStartPos.setY(m_originScrooled.y() / m_maxSize.y() * (m_size.y()-paddingV.yButtom()*2)); m_highSpeedStartPos.setY(m_originScrooled.y() / m_maxSize.y() * (m_size.y()-paddingV.yButtom()*2));
m_highSpeedButton = 1; m_highSpeedButton = 1;
@ -115,7 +115,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
if( m_size.x() < m_maxSize.x() if( m_size.x() < m_maxSize.x()
|| m_originScrooled.x()!=0) { || m_originScrooled.x()!=0) {
m_highSpeedMode = ewol::widget::Scroll::speedModeEnableHorizontal; m_highSpeedMode = ewol::widget::Scroll::speedModeEnableHorizontal;
m_highSpeedType = gale::key::type_mouse; m_highSpeedType = gale::key::type::mouse;
m_highSpeedStartPos.setX(m_originScrooled.x() / m_maxSize.x() * (m_size.x()-paddingH.xLeft()*2)); m_highSpeedStartPos.setX(m_originScrooled.x() / m_maxSize.x() * (m_size.x()-paddingH.xLeft()*2));
m_highSpeedStartPos.setY(relativePos.y()); m_highSpeedStartPos.setY(relativePos.y());
m_highSpeedButton = 1; m_highSpeedButton = 1;
@ -128,7 +128,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} }
return false; return false;
} else if ( _event.getId() == 4 } else if ( _event.getId() == 4
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status::up) {
if (true == _event.getSpecialKey().getCtrl()) { if (true == _event.getSpecialKey().getCtrl()) {
changeZoom(1); changeZoom(1);
/* /*
@ -147,7 +147,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} }
} }
} else if ( _event.getId() == 5 } else if ( _event.getId() == 5
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status::up) {
if (true == _event.getSpecialKey().getCtrl()) { if (true == _event.getSpecialKey().getCtrl()) {
changeZoom(-1); changeZoom(-1);
/* /*
@ -166,7 +166,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} }
} }
} else if ( _event.getId() == 11 } else if ( _event.getId() == 11
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status::up) {
// Scrool Left // Scrool Left
if(m_size.x() < m_maxSize.x() if(m_size.x() < m_maxSize.x()
|| m_originScrooled.x()!=0 || m_originScrooled.x()!=0
@ -177,7 +177,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
return true; return true;
} }
} else if ( _event.getId() == 10 } else if ( _event.getId() == 10
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status::up) {
// Scrool Right // Scrool Right
if(m_size.x() < m_maxSize.x() if(m_size.x() < m_maxSize.x()
|| m_originScrooled.x()!=0 || m_originScrooled.x()!=0
@ -190,44 +190,44 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
}else if (_event.getId() == 2) { }else if (_event.getId() == 2) {
/* /*
if (true == ewol::isSetCtrl()) { if (true == ewol::isSetCtrl()) {
if (gale::key::status_down == typeEvent) { if (gale::key::status::down == typeEvent) {
float zoom = 1.0; float zoom = 1.0;
setZoom(zoom); setZoom(zoom);
} }
} else */{ } else */{
if (_event.getStatus() == gale::key::status_down) { if (_event.getStatus() == gale::key::status::down) {
m_highSpeedMode = ewol::widget::Scroll::speedModeInit; m_highSpeedMode = ewol::widget::Scroll::speedModeInit;
m_highSpeedType = gale::key::type_mouse; m_highSpeedType = gale::key::type::mouse;
m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y()); m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y());
m_highSpeedButton = 2; m_highSpeedButton = 2;
return true; return true;
} }
} }
} else if ( m_highSpeedMode != ewol::widget::Scroll::speedModeDisable } else if ( m_highSpeedMode != ewol::widget::Scroll::speedModeDisable
&& _event.getStatus() == gale::key::status_leave) { && _event.getStatus() == gale::key::status::leave) {
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
markToRedraw(); markToRedraw();
return true; return true;
} }
if ( _event.getId() == m_highSpeedButton if ( _event.getId() == m_highSpeedButton
&& m_highSpeedMode != ewol::widget::Scroll::speedModeDisable) { && m_highSpeedMode != ewol::widget::Scroll::speedModeDisable) {
if (_event.getStatus() == gale::key::status_upAfter) { if (_event.getStatus() == gale::key::status::upAfter) {
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
return false; return false;
} else if (m_highSpeedMode == ewol::widget::Scroll::speedModeGrepEndEvent) { } else if (m_highSpeedMode == ewol::widget::Scroll::speedModeGrepEndEvent) {
if (_event.getStatus() == gale::key::status_single) { if (_event.getStatus() == gale::key::status::pressSingle) {
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
m_highSpeedButton = -1; m_highSpeedButton = -1;
markToRedraw(); markToRedraw();
} }
return true; return true;
} else if (_event.getStatus() == gale::key::status_up) { } else if (_event.getStatus() == gale::key::status::up) {
return true; return true;
} else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit } else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status::move) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :
if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10 if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10
|| std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) { || std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) {
@ -256,23 +256,23 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
return true; return true;
} }
if ( m_highSpeedMode == ewol::widget::Scroll::speedModeEnableHorizontal if ( m_highSpeedMode == ewol::widget::Scroll::speedModeEnableHorizontal
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status::move) {
m_originScrooled.setX((int32_t)(m_maxSize.x() * (relativePos.x()-paddingH.xLeft()) / (m_size.x()-paddingH.x()))); m_originScrooled.setX((int32_t)(m_maxSize.x() * (relativePos.x()-paddingH.xLeft()) / (m_size.x()-paddingH.x())));
m_originScrooled.setX(std::avg(0.0f, 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(); markToRedraw();
return true; return true;
} }
if ( m_highSpeedMode == ewol::widget::Scroll::speedModeEnableVertical if ( m_highSpeedMode == ewol::widget::Scroll::speedModeEnableVertical
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status::move) {
m_originScrooled.setY((int32_t)(m_maxSize.y() * (relativePos.y()-paddingV.yButtom()) / (m_size.y()-paddingV.y()))); m_originScrooled.setY((int32_t)(m_maxSize.y() * (relativePos.y()-paddingV.yButtom()) / (m_size.y()-paddingV.y())));
m_originScrooled.setY(std::avg(0.0f, 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(); markToRedraw();
return true; return true;
} }
} }
} else if ( _event.getType() == gale::key::type_finger } else if ( _event.getType() == gale::key::type::finger
&& ( m_highSpeedType == gale::key::type_unknow && ( m_highSpeedType == gale::key::type::unknow
|| m_highSpeedType == gale::key::type_finger) ) { || m_highSpeedType == gale::key::type::finger) ) {
if (m_singleFingerMode == false) { if (m_singleFingerMode == false) {
// *********************** // ***********************
// ** Two finger mode : ** // ** Two finger mode : **
@ -281,9 +281,9 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
return false; return false;
} }
int32_t idTable = _event.getId()-1; int32_t idTable = _event.getId()-1;
if (_event.getStatus() == gale::key::status_down) { if (_event.getStatus() == gale::key::status::down) {
m_fingerPresent[idTable] = true; m_fingerPresent[idTable] = true;
} else if (_event.getStatus() == gale::key::status_upAfter) { } else if (_event.getStatus() == gale::key::status::upAfter) {
m_fingerPresent[idTable] = false; m_fingerPresent[idTable] = false;
} }
if (m_fingerScoolActivated == false) { if (m_fingerScoolActivated == false) {
@ -298,7 +298,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
if (m_fingerScoolActivated == true) { if (m_fingerScoolActivated == true) {
// 1: scroll... // 1: scroll...
// 2: remove all unneeded sub event ... ==> maybe a better methode ... // 2: remove all unneeded sub event ... ==> maybe a better methode ...
if (_event.getStatus() == gale::key::status_move) { if (_event.getStatus() == gale::key::status::move) {
m_originScrooled.setX(m_originScrooled.x() - (relativePos.x() - m_fingerMoveStartPos[idTable].x())*0.5f); 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.setY(m_originScrooled.y() - (relativePos.y() - m_fingerMoveStartPos[idTable].y())*0.5f);
m_originScrooled.setX(std::avg(0.0f, 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)));
@ -309,7 +309,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} }
if ( m_fingerPresent[0] == false if ( m_fingerPresent[0] == false
&& m_fingerPresent[1] == false) { && m_fingerPresent[1] == false) {
if (_event.getStatus() == gale::key::status_upAfter) { if (_event.getStatus() == gale::key::status::upAfter) {
// TODO : Reset event ... // TODO : Reset event ...
m_fingerScoolActivated = false; m_fingerScoolActivated = false;
_event.reset(); _event.reset();
@ -323,20 +323,20 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
// ************************** // **************************
if (_event.getId() == 1) { if (_event.getId() == 1) {
EWOL_VERBOSE("event 1 " << _event); EWOL_VERBOSE("event 1 " << _event);
if (_event.getStatus() == gale::key::status_down) { if (_event.getStatus() == gale::key::status::down) {
m_highSpeedMode = ewol::widget::Scroll::speedModeInit; m_highSpeedMode = ewol::widget::Scroll::speedModeInit;
m_highSpeedType = gale::key::type_finger; m_highSpeedType = gale::key::type::finger;
m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y()); m_highSpeedStartPos.setValue(relativePos.x(), relativePos.y());
EWOL_VERBOSE("SCROOL == > INIT"); EWOL_VERBOSE("SCROOL == > INIT");
return true; return true;
} else if (_event.getStatus() == gale::key::status_upAfter) { } else if (_event.getStatus() == gale::key::status::upAfter) {
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
EWOL_VERBOSE("SCROOL == > DISABLE"); EWOL_VERBOSE("SCROOL == > DISABLE");
markToRedraw(); markToRedraw();
return true; return true;
} else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit } else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeInit
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status::move) {
// wait that the cursor move more than 10 px to enable it : // wait that the cursor move more than 10 px to enable it :
if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10 if( std::abs(relativePos.x() - m_highSpeedStartPos.x()) > 10
|| std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) { || std::abs(relativePos.y() - m_highSpeedStartPos.y()) > 10 ) {
@ -348,7 +348,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} }
return true; return true;
} if ( m_highSpeedMode == ewol::widget::Scroll::speedModeEnableFinger } if ( m_highSpeedMode == ewol::widget::Scroll::speedModeEnableFinger
&& _event.getStatus() == gale::key::status_move) { && _event.getStatus() == gale::key::status::move) {
//m_originScrooled.x = (int32_t)(m_maxSize.x * x / m_size.x); //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.setX(m_originScrooled.x() - (relativePos.x() - m_highSpeedStartPos.x()));
m_originScrooled.setY(m_originScrooled.y() - (relativePos.y() - m_highSpeedStartPos.y())); m_originScrooled.setY(m_originScrooled.y() - (relativePos.y() - m_highSpeedStartPos.y()));
@ -360,9 +360,9 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
return true; return true;
} }
} else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeDisable } else if ( m_highSpeedMode == ewol::widget::Scroll::speedModeDisable
&& _event.getStatus() == gale::key::status_leave) { && _event.getStatus() == gale::key::status::leave) {
m_highSpeedMode = ewol::widget::Scroll::speedModeDisable; m_highSpeedMode = ewol::widget::Scroll::speedModeDisable;
m_highSpeedType = gale::key::type_unknow; m_highSpeedType = gale::key::type::unknow;
EWOL_VERBOSE("SCROOL == > DISABLE"); EWOL_VERBOSE("SCROOL == > DISABLE");
markToRedraw(); markToRedraw();
return true; return true;
@ -370,13 +370,13 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
} }
} }
} else if (m_scroollingMode == scroolModeCenter) { } else if (m_scroollingMode == scroolModeCenter) {
if (_event.getType() == gale::key::type_mouse) { if (_event.getType() == gale::key::type::mouse) {
float tmp1=m_size.x() / m_maxSize.y(); float tmp1=m_size.x() / m_maxSize.y();
float tmp2=m_size.y() / m_maxSize.x(); float tmp2=m_size.y() / m_maxSize.x();
//EWOL_INFO(" elements Zoom : " << tmp1 << " " << tmp2); //EWOL_INFO(" elements Zoom : " << tmp1 << " " << tmp2);
tmp1 = std::min(tmp1, tmp2); tmp1 = std::min(tmp1, tmp2);
if ( _event.getId() == 4 if ( _event.getId() == 4
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status::up) {
m_zoom -= 0.1; m_zoom -= 0.1;
if (tmp1 < 1.0) { if (tmp1 < 1.0) {
m_zoom = std::max(tmp1, m_zoom); m_zoom = std::max(tmp1, m_zoom);
@ -386,7 +386,7 @@ bool ewol::widget::WidgetScrolled::onEventInput(const ewol::event::Input& _event
markToRedraw(); markToRedraw();
return true; return true;
} else if ( _event.getId() == 5 } else if ( _event.getId() == 5
&& _event.getStatus() == gale::key::status_up) { && _event.getStatus() == gale::key::status::up) {
m_zoom += 0.1; m_zoom += 0.1;
if (tmp1 > 1.0) { if (tmp1 > 1.0) {
m_zoom = std::min(tmp1, m_zoom); m_zoom = std::min(tmp1, m_zoom);

4
ewol/widget/Windows.cpp
View File

@ -125,8 +125,8 @@ void ewol::widget::Windows::systemDraw(const ewol::DrawProperty& _displayProp) {
colorBg = m_resourceColor->get(m_colorBg); colorBg = m_resourceColor->get(m_colorBg);
} }
gale::openGL::clearColor(colorBg); gale::openGL::clearColor(colorBg);
gale::openGL::clear( gale::openGL::clearFlag_colorBuffer gale::openGL::clear( uint32_t(gale::openGL::clearFlag_colorBuffer)
| gale::openGL::clearFlag_depthBuffer); | uint32_t(gale::openGL::clearFlag_depthBuffer));
#ifdef TEST_PERFO_WINDOWS #ifdef TEST_PERFO_WINDOWS
float ___localTime0 = (float)(ewol::getTime() - ___startTime0) / 1000.0f; float ___localTime0 = (float)(ewol::getTime() - ___startTime0) / 1000.0f;
EWOL_ERROR(" Windows000 : " << ___localTime0 << "ms "); EWOL_ERROR(" Windows000 : " << ___localTime0 << "ms ");

4
ewol/widget/meta/Parameter.cpp
View File

@ -34,9 +34,9 @@ void ewol::widget::Parameter::init() {
ewol::widget::SizerShared mySizerHori = nullptr; ewol::widget::SizerShared mySizerHori = nullptr;
ewol::widget::SpacerShared mySpacer = nullptr; ewol::widget::SpacerShared mySpacer = nullptr;
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
propertyMinSize.set(gale::Dimension(vec2(90, 90), gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(90, 90), gale::distance::pourcent));
#else #else
propertyMinSize.set(gale::Dimension(vec2(80, 80), gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(80, 80), gale::distance::pourcent));
#endif #endif
mySizerVert = ewol::widget::Sizer::create(); mySizerVert = ewol::widget::Sizer::create();

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

@ -169,7 +169,7 @@ bool ewol::widget::ParameterList::onEventInput(const ewol::event::Input& _event)
// nothing to do ... done on upper widet ... // nothing to do ... done on upper widet ...
return true; return true;
} }
if (_event.getId() == 1 && _event.getStatus() == gale::key::status_single) { if (_event.getId() == 1 && _event.getStatus() == gale::key::status::pressSingle) {
vec2 relativePos = relativePosition(_event.getPos()); vec2 relativePos = relativePosition(_event.getPos());
// corection for the openGl abstraction // corection for the openGl abstraction
relativePos.setY(m_size.y() - relativePos.y()); relativePos.setY(m_size.y() - relativePos.y());

10
ewol/widget/meta/StdPopUp.cpp
View File

@ -28,7 +28,7 @@ ewol::widget::StdPopUp::StdPopUp() :
void ewol::widget::StdPopUp::init() { void ewol::widget::StdPopUp::init() {
ewol::widget::PopUp::init(); ewol::widget::PopUp::init();
propertyMinSize.set(gale::Dimension(vec2(20,10),gale::Dimension::Pourcent)); propertyMinSize.set(gale::Dimension(vec2(20,10),gale::distance::pourcent));
ewol::widget::SizerShared mySizerVert; ewol::widget::SizerShared mySizerVert;
ewol::widget::SpacerShared mySpacer; ewol::widget::SpacerShared mySpacer;
@ -48,12 +48,12 @@ void ewol::widget::StdPopUp::init() {
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->propertyExpand.set(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->propertyColor.set(etk::Color<>(0x88, 0x88, 0x88, 0xFF)); mySpacer->propertyColor.set(etk::Color<>(0x88, 0x88, 0x88, 0xFF));
mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,3),gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,3),gale::distance::pixel));
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->propertyExpand.set(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,5),gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,5),gale::distance::pixel));
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
m_comment = ewol::widget::Label::create(); m_comment = ewol::widget::Label::create();
@ -63,13 +63,13 @@ void ewol::widget::StdPopUp::init() {
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->propertyExpand.set(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,5),gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,5),gale::distance::pixel));
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
mySpacer = ewol::widget::Spacer::create(); mySpacer = ewol::widget::Spacer::create();
mySpacer->propertyExpand.set(bvec2(true,false)); mySpacer->propertyExpand.set(bvec2(true,false));
mySpacer->propertyColor.set(etk::Color<>(0x88, 0x88, 0x88, 0xFF)); mySpacer->propertyColor.set(etk::Color<>(0x88, 0x88, 0x88, 0xFF));
mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,3),gale::Dimension::Pixel)); mySpacer->propertyMinSize.set(gale::Dimension(vec2(0,3),gale::distance::pixel));
mySizerVert->subWidgetAdd(mySpacer); mySizerVert->subWidgetAdd(mySpacer);
m_title = ewol::widget::Label::create(); m_title = ewol::widget::Label::create();

2
sample/wallpaper/appl/WidgetDisplay.cpp
View File

@ -96,7 +96,7 @@ void appl::WidgetDisplay::periodicCall(const ewol::event::Time& _event) {
bool appl::WidgetDisplay::onEventInput(const ewol::event::Input& _event) { bool appl::WidgetDisplay::onEventInput(const ewol::event::Input& _event) {
//EWOL_DEBUG("Input event : " << _event); //EWOL_DEBUG("Input event : " << _event);
vec2 relPos = relativePosition(_event.getPos()); vec2 relPos = relativePosition(_event.getPos());
if (_event.getType() == gale::key::type_finger) { if (_event.getType() == gale::key::type::finger) {
keepFocus(); keepFocus();
if (1 == _event.getId()) { if (1 == _event.getId()) {
APPL_DEBUG("Touch event ... "); APPL_DEBUG("Touch event ... ");

20
tools/visual_test/appl/MainWindows.cpp
View File

@ -306,20 +306,20 @@ void appl::MainWindows::updateProperty() {
widgetSizer->subWidgetAdd(widgetSelectTmp); widgetSizer->subWidgetAdd(widgetSelectTmp);
widgetSelectTmp->propertyExpand.set(bvec2(true,false)); widgetSelectTmp->propertyExpand.set(bvec2(true,false));
widgetSelectTmp->propertyFill.set(bvec2(true,false)); widgetSelectTmp->propertyFill.set(bvec2(true,false));
widgetSelectTmp->optionAdd(gale::Dimension::Pourcent, "Pourcent"); widgetSelectTmp->optionAdd(gale::distance::pourcent, "Pourcent");
widgetSelectTmp->optionAdd(gale::Dimension::Pixel, "Pixel"); widgetSelectTmp->optionAdd(gale::distance::pixel, "Pixel");
widgetSelectTmp->optionAdd(gale::Dimension::Meter, "Meter"); widgetSelectTmp->optionAdd(gale::distance::meter, "Meter");
widgetSelectTmp->optionAdd(gale::Dimension::Centimeter, "Centimeter"); widgetSelectTmp->optionAdd(gale::distance::centimeter, "Centimeter");
widgetSelectTmp->optionAdd(gale::Dimension::Millimeter, "Millimeter"); widgetSelectTmp->optionAdd(gale::distance::millimeter, "Millimeter");
widgetSelectTmp->optionAdd(gale::Dimension::Kilometer, "Kilometer"); widgetSelectTmp->optionAdd(gale::distance::kilometer, "Kilometer");
widgetSelectTmp->optionAdd(gale::Dimension::Inch, "Inch"); widgetSelectTmp->optionAdd(gale::distance::inch, "Inch");
widgetSelectTmp->optionAdd(gale::Dimension::foot, "foot"); widgetSelectTmp->optionAdd(gale::distance::foot, "foot");
widgetSelectTmp->propertyValue.set(value.getType()); widgetSelectTmp->propertyValue.set(value.getType());
conn = widgetSelectTmp->signalValue.connect( conn = widgetSelectTmp->signalValue.connect(
[=](const int32_t& _value) { [=](const int32_t& _value) {
APPL_INFO("set parameter: gravity name=" << param->getName() << " value=" << (enum gale::Dimension::distance)_value); APPL_INFO("set parameter: gravity name=" << param->getName() << " value=" << (enum gale::distance)_value);
gale::Dimension lastValueInterpreted = paramValue->get(); gale::Dimension lastValueInterpreted = paramValue->get();
lastValueInterpreted.set(lastValueInterpreted.get(lastValueInterpreted.getType()), (enum gale::Dimension::distance)_value); lastValueInterpreted.set(lastValueInterpreted.get(lastValueInterpreted.getType()), (enum gale::distance)_value);
paramValue->set(lastValueInterpreted); paramValue->set(lastValueInterpreted);
return; return;
}); });