diff --git a/sources/appl/Gui/BufferView.cpp b/sources/appl/Gui/BufferView.cpp index 118c439..e322002 100644 --- a/sources/appl/Gui/BufferView.cpp +++ b/sources/appl/Gui/BufferView.cpp @@ -213,7 +213,7 @@ bool BufferView::getElement(int32_t _colomn, int32_t _raw, std::string& _myTextT } bool BufferView::onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) { - if (1 == _IdInput && _typeEvent == gale::key::status_single) { + if (1 == _IdInput && _typeEvent == gale::key::status::pressSingle) { APPL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); if( _raw >= 0 && _raw<(int64_t)m_list.size()) { diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp index 321eb97..63e17e6 100644 --- a/sources/appl/Gui/MainWindows.cpp +++ b/sources/appl/Gui/MainWindows.cpp @@ -126,7 +126,7 @@ void MainWindows::init() { ewol::widget::SpacerShared mySpacer = ewol::widget::Spacer::create(); mySpacer->propertyName.set("appl-Buffer-viewer-separator"); mySpacer->propertyColor.set(etk::color::black); - mySpacer->propertyMinSize.set(gale::Dimension(vec2(2,2), gale::Dimension::Pixel)); + mySpacer->propertyMinSize.set(gale::Dimension(vec2(2,2), gale::distance::pixel)); mySpacer->propertyExpand.set(bvec2(false,true)); mySpacer->propertyFill.set(bvec2(true,true)); mySpacer->propertyHide.set(true); @@ -152,7 +152,7 @@ void MainWindows::init() { mySpacer = ewol::widget::Spacer::create(); mySpacer->propertyName.set("appl-text-separator"); mySpacer->propertyColor.set(etk::color::black); - mySpacer->propertyMinSize.set(gale::Dimension(vec2(2,2), gale::Dimension::Pixel)); + mySpacer->propertyMinSize.set(gale::Dimension(vec2(2,2), gale::distance::pixel)); mySpacer->propertyExpand.set(bvec2(true,false)); mySpacer->propertyFill.set(bvec2(true,true)); mySpacer->propertyHide.set(true); diff --git a/sources/appl/Gui/TagFileList.cpp b/sources/appl/Gui/TagFileList.cpp index 46de636..70accf2 100644 --- a/sources/appl/Gui/TagFileList.cpp +++ b/sources/appl/Gui/TagFileList.cpp @@ -80,7 +80,7 @@ bool appl::TagFileList::getElement(int32_t _colomn, int32_t _raw, std::string& _ bool appl::TagFileList::onItemEvent(int32_t _IdInput, enum gale::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y) { - if (_typeEvent == gale::key::status_single) { + if (_typeEvent == gale::key::status::pressSingle) { EWOL_INFO("Event on List : IdInput=" << _IdInput << " colomn=" << _colomn << " raw=" << _raw ); if (_IdInput == 1) { int32_t previousRaw = m_selectedLine; diff --git a/sources/appl/Gui/TagFileSelection.cpp b/sources/appl/Gui/TagFileSelection.cpp index a225b45..84c9d65 100644 --- a/sources/appl/Gui/TagFileSelection.cpp +++ b/sources/appl/Gui/TagFileSelection.cpp @@ -35,11 +35,11 @@ void appl::TagFileSelection::init() { ewol::widget::PopUp::init(); ewol::widget::SizerShared mySizerVert; #if defined(__TARGET_OS__Android) - propertyMinSize.set(gale::Dimension(vec2(90,90), gale::Dimension::Pourcent)); + propertyMinSize.set(gale::Dimension(vec2(90,90), gale::distance::pourcent)); #elif defined(__TARGET_OS__Windows) - propertyMinSize.set(gale::Dimension(vec2(80,80), gale::Dimension::Pourcent)); + propertyMinSize.set(gale::Dimension(vec2(80,80), gale::distance::pourcent)); #else - propertyMinSize.set(gale::Dimension(vec2(80,80), gale::Dimension::Pourcent)); + propertyMinSize.set(gale::Dimension(vec2(80,80), gale::distance::pourcent)); #endif mySizerVert = ewol::widget::Sizer::create(); diff --git a/sources/appl/Gui/TextViewer.cpp b/sources/appl/Gui/TextViewer.cpp index 36a5201..85066ca 100644 --- a/sources/appl/Gui/TextViewer.cpp +++ b/sources/appl/Gui/TextViewer.cpp @@ -391,9 +391,9 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) { return true; } // just forward event == > manage directly in the buffer - if (_event.getType() == gale::key::keyboard_char) { + if (_event.getType() == gale::key::keyboard::character) { //APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent); - if (_event.getStatus() != gale::key::status_down) { + if (_event.getStatus() != gale::key::status::down) { return false; } char32_t localValue = _event.getChar(); @@ -443,44 +443,44 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) { return true; } // move events ... - if (_event.getStatus() == gale::key::status_down) { + if (_event.getStatus() == gale::key::status::down) { // selection when shift is set: m_buffer->setSelectMode(_event.getSpecialKey().getShift()); // check selection event ... switch(_event.getType()) { - case gale::key::keyboard_insert: + case gale::key::keyboard::insert: m_insertMode = m_insertMode==true?false:true; markToRedraw(); break; - case gale::key::keyboard_left: + case gale::key::keyboard::left: //APPL_INFO("keyEvent : "); moveCursorLeft(); break; - case gale::key::keyboard_right: + case gale::key::keyboard::right: //APPL_INFO("keyEvent : "); moveCursorRight(); break; - case gale::key::keyboard_up: + case gale::key::keyboard::up: //APPL_INFO("keyEvent : "); moveCursorUp(1); break; - case gale::key::keyboard_down: + case gale::key::keyboard::down: //APPL_INFO("keyEvent : "); moveCursorDown(1); break; - case gale::key::keyboard_pageUp: + case gale::key::keyboard::pageUp: //APPL_INFO("keyEvent : "); moveCursorUp(15); // TODO : Set the real number of line ... break; - case gale::key::keyboard_pageDown: + case gale::key::keyboard::pageDown: //APPL_INFO("keyEvent : "); moveCursorDown(15); // TODO : Set the real number of line ... break; - case gale::key::keyboard_start: + case gale::key::keyboard::start: //APPL_INFO("keyEvent : "); moveCursorLeft(moveEnd); break; - case gale::key::keyboard_end: + case gale::key::keyboard::end: //APPL_INFO("keyEvent : "); moveCursorRight(moveEnd); break; @@ -494,7 +494,7 @@ bool appl::TextViewer::onEventEntry(const ewol::event::Entry& _event) { bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { if ( _event.getId() != 0 - && _event.getStatus() == gale::key::status_down) { + && _event.getStatus() == gale::key::status::down) { keepFocus(); } //tic(); @@ -522,7 +522,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { relativePos.setX(0); } if ( _event.getId() == 12 - && _event.getStatus() == gale::key::status_single) { + && _event.getStatus() == gale::key::status::pressSingle) { APPL_TODO("RAT5 SAVE button ==> TODO implement"); // Rat5 save event //sendMultiCast(ednMsgGuiSave, "current"); @@ -532,7 +532,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { if (_event.getId() == 1) { // mouse selection : //if (_event.getType() == gale::key::typeMouse) { - if (_event.getStatus() == gale::key::status_down) { + if (_event.getStatus() == gale::key::status::down) { //if (_event.getSpecialKey().isSetShift() == false) { appl::Buffer::Iterator newPos = getMousePosition(relativePos); m_buffer->setSelectMode(false); @@ -541,7 +541,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { markToRedraw(); return true; //} - } else if (_event.getStatus() == gale::key::status_up) { + } else if (_event.getStatus() == gale::key::status::up) { appl::Buffer::Iterator newPos = getMousePosition(relativePos); moveCursor(newPos); m_buffer->setSelectMode(false); @@ -555,15 +555,15 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { return true; } //} - if (_event.getStatus() == gale::key::status_single) { - if ( _event.getType() == gale::key::type_mouse - || _event.getType() == gale::key::type_finger) { + if (_event.getStatus() == gale::key::status::pressSingle) { + if ( _event.getType() == gale::key::type::mouse + || _event.getType() == gale::key::type::finger) { appl::Buffer::Iterator newPos = getMousePosition(relativePos); moveCursor(newPos); markToRedraw(); return true; } - } else if (_event.getStatus() == gale::key::status_double) { + } else if (_event.getStatus() == gale::key::status::pressDouble) { mouseEventDouble(); // Copy selection : std::string value; @@ -573,7 +573,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { } markToRedraw(); return true; - } else if (_event.getStatus() == gale::key::status_triple) { + } else if (_event.getStatus() == gale::key::status::pressTriple) { mouseEventTriple(); // Copy selection : std::string value; @@ -583,7 +583,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { } markToRedraw(); return true; - } else if (_event.getStatus() == gale::key::status_move) { + } else if (_event.getStatus() == gale::key::status::move) { if (m_buffer->getSelectMode() == true) { //int64_t timeStart = ewol::getTime(); appl::Buffer::Iterator newPos = getMousePosition(relativePos); @@ -601,7 +601,7 @@ bool appl::TextViewer::onEventInput(const ewol::event::Input& _event) { } } } else if (2 == _event.getId()) { - if (gale::key::status_single == _event.getStatus()) { + if (gale::key::status::pressSingle == _event.getStatus()) { appl::Buffer::Iterator newPos = getMousePosition(relativePos); moveCursor(newPos); gale::context::clipBoard::request(gale::context::clipBoard::clipboardSelection); diff --git a/sources/appl/TextPluginAutoIndent.cpp b/sources/appl/TextPluginAutoIndent.cpp index 4d5de1a..5d56670 100644 --- a/sources/appl/TextPluginAutoIndent.cpp +++ b/sources/appl/TextPluginAutoIndent.cpp @@ -28,10 +28,10 @@ bool appl::TextPluginAutoIndent::onEventEntry(appl::TextViewer& _textDrawer, } //APPL_DEBUG("KB EVENT : " << _event); // just forward event == > manage directly in the buffer - if (_event.getType() != gale::key::keyboard_char) { + if (_event.getType() != gale::key::keyboard::character) { return false; } - if (_event.getStatus() != gale::key::status_down) { + if (_event.getStatus() != gale::key::status::down) { return false; } if (_event.getChar() != u32char::Return) { diff --git a/sources/appl/TextPluginMultiLineTab.cpp b/sources/appl/TextPluginMultiLineTab.cpp index ecc09eb..4036adf 100644 --- a/sources/appl/TextPluginMultiLineTab.cpp +++ b/sources/appl/TextPluginMultiLineTab.cpp @@ -24,11 +24,11 @@ bool appl::TextPluginMultiLineTab::onEventEntry(appl::TextViewer& _textDrawer, if (isEnable() == false) { return false; } - if (_event.getType() != gale::key::keyboard_char) { + if (_event.getType() != gale::key::keyboard::character) { return false; } //APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent); - if (_event.getStatus() != gale::key::status_down) { + if (_event.getStatus() != gale::key::status::down) { return false; } char32_t localValue = _event.getChar();