diff --git a/external/etk b/external/etk index 4b07b050..5f8b0944 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 4b07b0501793357ffe59333c5d1b2229b1334b54 +Subproject commit 5f8b094486e0812fef4c59d3d226ae32ba275c71 diff --git a/sources/ewol/compositing/Text.cpp b/sources/ewol/compositing/Text.cpp index f5a486c1..02bf0874 100644 --- a/sources/ewol/compositing/Text.cpp +++ b/sources/ewol/compositing/Text.cpp @@ -652,7 +652,7 @@ void ewol::Text::Print(const etk::UString& text, const etk::Vectorglyph; // retrieve glyph index from character code - int32_t glyph_index = FT_Get_Char_Index(m_fftFace, property.m_UVal); + int32_t glyph_index = FT_Get_Char_Index(m_fftFace, property.m_UVal.Get()); // load glyph image into the slot (erase previous one) error = FT_Load_Glyph(m_fftFace, // handle to face object glyph_index, // glyph index diff --git a/sources/ewol/renderer/resources/TexturedFont.cpp b/sources/ewol/renderer/resources/TexturedFont.cpp index 6f3ffce4..558be3d0 100644 --- a/sources/ewol/renderer/resources/TexturedFont.cpp +++ b/sources/ewol/renderer/resources/TexturedFont.cpp @@ -303,7 +303,7 @@ int32_t ewol::TexturedFont::GetIndex(const uniChar_t charcode, const ewol::font: if (charcode < 0x20) { return 0; } else if (charcode < 0x80) { - return charcode - 0x1F; + return charcode.Get() - 0x1F; } else { for (int32_t iii=0x80-0x20; iii < m_listElement[displayMode].Size(); iii++) { if ((m_listElement[displayMode])[iii].m_UVal == charcode) { diff --git a/sources/ewol/widget/Entry.cpp b/sources/ewol/widget/Entry.cpp index caf1332f..88c0ab10 100644 --- a/sources/ewol/widget/Entry.cpp +++ b/sources/ewol/widget/Entry.cpp @@ -112,7 +112,7 @@ void widget::Entry::CalculateMinMaxSize(void) ewol::Widget::CalculateMinMaxSize(); // get generic padding vec2 padding = m_shaper.GetPadding(); - int32_t minHeight = m_oObjectText.CalculateSize('A').y(); + int32_t minHeight = m_oObjectText.CalculateSize(etk::UniChar('A')).y(); vec2 minimumSizeBase(20, minHeight); // add padding : minimumSizeBase += padding*2.0f; @@ -167,7 +167,7 @@ void widget::Entry::OnRegenerateDisplay(void) vec2 tmpSizeText = tmpSizeShaper - padding * 2.0f; vec2 tmpOriginText = (m_size - tmpSizeText) / 2.0f; // sometimes, the user define an height bigger than the real size needed ==> in this case we need to center the text in the shaper ... - int32_t minHeight = m_oObjectText.CalculateSize('A').y(); + int32_t minHeight = m_oObjectText.CalculateSize(etk::UniChar('A')).y(); if (tmpSizeText.y()>minHeight) { tmpOriginText += vec2(0,(tmpSizeText.y()-minHeight)/2.0f); } @@ -377,18 +377,18 @@ bool widget::Entry::OnEventEntry(const ewol::EventEntry& _event) //return GenEventInputExternal(eventEnter, -1, -1); // remove curent selected data ... RemoveSelected(); - if( '\n' == _event.GetChar() - || '\r' == _event.GetChar()) { + if( _event.GetChar() == '\n' + || _event.GetChar() == '\r') { GenerateEventId(eventEnter, m_data); return true; - } else if (0x7F == _event.GetChar()) { + } else if (_event.GetChar() == 0x7F) { // SUPPR : if (m_data.Size() > 0 && m_displayCursorPos 0 && m_displayCursorPos != 0) { m_data.Remove(m_displayCursorPos-1, 1);