diff --git a/Sources/libagg/Android.mk b/Sources/libagg/Android.mk index 53bf01e6..14b495a5 100644 --- a/Sources/libagg/Android.mk +++ b/Sources/libagg/Android.mk @@ -2,33 +2,31 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := ewol -LOCAL_STATIC_LIBRARIES := libetk libtinyxml libzip libpng libfreetype +# name of the librairy +LOCAL_MODULE := agg -LOCAL_C_INCLUDES := $(LOCAL_PATH) +# name of the dependency +LOCAL_STATIC_LIBRARIES := libfreetype + +LOCAL_C_INCLUDES := $(LOCAL_PATH) \ + $(LOCAL_PATH)/agg-2.4/ \ + $(LOCAL_PATH)/agg-2.4/util/ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog -lz +ifeq ($(DEBUG),1) LOCAL_CFLAGS := -D__PLATFORM__Android \ - -D__MODE__Touch \ - -Wno-write-strings \ - -DETK_DEBUG_LEVEL=3 \ - -DEWOL_DEBUG_LEVEL=3 \ - -DEWOL_VERSION_TAG_NAME="\"UNKNOW-debug\"" \ - -DVERSION_BUILD_TIME="\"pasd_heure\"" \ - -DEWOL_USE_FREE_TYPE \ - -DDATA_IN_APK \ - -frtti + -DAGG_DEBUG_LEVEL=3 \ + -DAGG_VERSION_TAG_NAME="\"2.4-debug\"" +else +LOCAL_CFLAGS := -D__PLATFORM__Android \ + -DAGG_DEBUG_LEVEL=3 \ + -DAGG_VERSION_TAG_NAME="\"2.4-release\"" +endif # load the common sources file of the platform include $(LOCAL_PATH)/file.mk -LOCAL_SRC_FILES := ewol/base/guiAndroid.cpp $(FILE_LIST) - -# Ewol Test Software : -LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz +LOCAL_SRC_FILES := $(FILE_LIST) include $(BUILD_STATIC_LIBRARY) - - diff --git a/Sources/libagg/Linux.mk b/Sources/libagg/Linux.mk index de851a31..4dbfc131 100644 --- a/Sources/libagg/Linux.mk +++ b/Sources/libagg/Linux.mk @@ -13,13 +13,14 @@ LOCAL_C_INCLUDES := -I$(LOCAL_PATH) \ -I$(LOCAL_PATH)/agg-2.4/util/ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) -LOCAL_EXPORT_LDLIBS := ifeq ($(DEBUG),1) LOCAL_CFLAGS := -D__PLATFORM__Linux \ + -DAGG_DEBUG_LEVEL=3 \ -DAGG_VERSION_TAG_NAME="\"2.4-debug\"" else LOCAL_CFLAGS := -D__PLATFORM__Linux \ + -DAGG_DEBUG_LEVEL=3 \ -DAGG_VERSION_TAG_NAME="\"2.4-release\"" endif @@ -28,10 +29,4 @@ include $(LOCAL_PATH)/file.mk LOCAL_SRC_FILES := $(FILE_LIST) -#for freetype : https://github.com/cdave1/freetype2-android - -# Ewol Test Software : -LOCAL_LDLIBS := - - include $(BUILD_STATIC_LIBRARY) diff --git a/Sources/libagg/agg-2.4/agg_font_freetype.h b/Sources/libagg/agg-2.4/agg_font_freetype.h index 273243c3..ff2d41d9 100644 --- a/Sources/libagg/agg-2.4/agg_font_freetype.h +++ b/Sources/libagg/agg-2.4/agg_font_freetype.h @@ -19,8 +19,9 @@ #ifndef AGG_FONT_FREETYPE_INCLUDED #define AGG_FONT_FREETYPE_INCLUDED - -#include +extern "C" { + #include +} #include FT_FREETYPE_H diff --git a/Sources/libewol/Android.mk b/Sources/libewol/Android.mk index c4bf9e6c..5718b2e5 100644 --- a/Sources/libewol/Android.mk +++ b/Sources/libewol/Android.mk @@ -3,13 +3,14 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := ewol -LOCAL_STATIC_LIBRARIES := libetk libtinyxml libzip libpng libfreetype agg +LOCAL_STATIC_LIBRARIES := libetk libtinyxml libzip libpng libfreetype libagg libparsersvg LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) LOCAL_EXPORT_LDLIBS := -lGLESv1_CM -ldl -llog -lz +ifeq ($(DEBUG),1) LOCAL_CFLAGS := -D__PLATFORM__Android \ -D__MODE__Touch \ -Wno-write-strings \ @@ -17,9 +18,19 @@ LOCAL_CFLAGS := -D__PLATFORM__Android \ -DEWOL_DEBUG_LEVEL=3 \ -DEWOL_VERSION_TAG_NAME="\"UNKNOW-debug\"" \ -DVERSION_BUILD_TIME="\"pasd_heure\"" \ - -DEWOL_USE_FREE_TYPE \ -DDATA_IN_APK \ -frtti +else +LOCAL_CFLAGS := -D__PLATFORM__Android \ + -D__MODE__Touch \ + -Wno-write-strings \ + -DETK_DEBUG_LEVEL=1 \ + -DEWOL_DEBUG_LEVEL=1 \ + -DEWOL_VERSION_TAG_NAME="\"UNKNOW-debug\"" \ + -DVERSION_BUILD_TIME="\"pasd_heure\"" \ + -DDATA_IN_APK \ + -frtti +endif # load the common sources file of the platform include $(LOCAL_PATH)/file.mk diff --git a/Sources/libewol/Linux.mk b/Sources/libewol/Linux.mk index f8add591..8b696b3b 100644 --- a/Sources/libewol/Linux.mk +++ b/Sources/libewol/Linux.mk @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := ewol -LOCAL_STATIC_LIBRARIES := etk libfreetype tinyxml libzip libpng agg parsersvg +LOCAL_STATIC_LIBRARIES := etk libfreetype tinyxml libzip libpng agg parsersvg LOCAL_C_INCLUDES := -I$(LOCAL_PATH) @@ -19,6 +19,7 @@ LOCAL_CFLAGS := -D__PLATFORM__Linux \ -DVERSION_BUILD_TIME="\"pasd_heure\"" \ -DEWOL_USE_FREE_TYPE \ -Wall + else LOCAL_CFLAGS := -D__PLATFORM__Linux \ -Wno-write-strings \ @@ -27,6 +28,7 @@ LOCAL_CFLAGS := -D__PLATFORM__Linux \ -DEWOL_VERSION_TAG_NAME="\"UNKNOW-debug\"" \ -DVERSION_BUILD_TIME="\"pasd_heure\"" \ -DEWOL_USE_FREE_TYPE + endif # load the common sources file of the platform @@ -36,8 +38,6 @@ LOCAL_SRC_FILES := \ ewol/base/guiX11.cpp \ $(FILE_LIST) -#for freetype : https://github.com/cdave1/freetype2-android - # Ewol Test Software : LOCAL_LDLIBS := -lGL -lGLU -lz -lX11 diff --git a/Sources/libewol/ewol/FontBitmap.cpp b/Sources/libewol/ewol/FontBitmap.cpp deleted file mode 100644 index 49770871..00000000 --- a/Sources/libewol/ewol/FontBitmap.cpp +++ /dev/null @@ -1,526 +0,0 @@ -/** - ******************************************************************************* - * @file ewol/FontBitmap.cpp - * @brief ewol Font system (sources) - * @author Edouard DUPIN - * @date 29/10/2011 - * @par Project - * ewol - * - * @par Copyright - * Copyright 2011 Edouard DUPIN, all right reserved - * - * This software is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY. - * - * Licence summary : - * You can modify and redistribute the sources code and binaries. - * You can send me the bug-fix - * - * Term of the licence in in the file licence.txt. - * - ******************************************************************************* - */ - -#ifndef EWOL_USE_FREE_TYPE - -#include -#include -#include -#include - - -#undef __class__ -#define __class__ "ewol::FontBitmap" - -extern "C" -{ - typedef struct { - uniChar_t unicodeCharVal; - int32_t width; - texCoord_ts posStart; - texCoord_ts posStop; - etkFloat_t ratio; - }UTF8Element_ts; -} - - -namespace ewol -{ - class EbtFont - { - public: - EbtFont(etk::File newFile, etk::UString fontName, int32_t size) - { - m_loadedOK = false; - m_filename = newFile; - m_fontName = fontName; - m_size = size; - m_elements.Clear(); - for (int32_t iii=0x0; iii<0x81; iii++) { - UTF8Element_ts tmpchar; - tmpchar.unicodeCharVal = iii; - tmpchar.width = 0; - tmpchar.posStart.u = 0; - tmpchar.posStart.v = 0; - tmpchar.posStop.u = 0; - tmpchar.posStop.v = 0; - tmpchar.ratio = 0; - m_elements.PushBack(tmpchar); - } - if(false == m_filename.fOpenRead()) { - EWOL_ERROR("Can not Open the file named=\"" << m_filename << "\""); - return; - } - // load all element of the file ... - char elementLine[2048]; - int32_t lineID=1; - while (NULL != m_filename.fGets(elementLine, 2048) ) - { - //EWOL_DEBUG(" Read file Line : " << elementLine); - if ( '\n' != elementLine[0] // EOL - && '\0' != elementLine[0] // EOF - && '#' != elementLine[0] // Comment line - ) - { - if (0 == strncmp("name:", elementLine, 5)) { - char extractString[256] = ""; - sscanf(elementLine, "name:%s", extractString); - m_fontName = extractString; - EWOL_INFO("Find font named : \"" << m_fontName << "\""); - } else if (0 == strncmp("source:", elementLine, 7)) { - char extractString[256] = ""; - sscanf(elementLine, "source:%s", extractString); - m_bitmapName = extractString; - } else if (0 == strncmp("0x00", elementLine, 4)) { - int32_t GlyphPositionX; - int32_t GlyphPositionY; - int32_t GlyphSizeX; - int32_t GlyphSizeY; - sscanf(elementLine, "0x00 (%d,%d) (%d,%d)", &GlyphPositionX, &GlyphPositionY, &GlyphSizeX, &GlyphSizeY); - ClearAll(GlyphPositionX, GlyphPositionY, GlyphSizeX, GlyphSizeY); - } else if (0 == strncmp("0x", elementLine, 2)) { - uint32_t utf8Value; - int32_t GlyphPositionX; - int32_t GlyphPositionY; - int32_t GlyphSizeX; - int32_t GlyphSizeY; - sscanf(elementLine, "0x%x (%d,%d) (%d,%d)", &utf8Value, &GlyphPositionX, &GlyphPositionY, &GlyphSizeX, &GlyphSizeY); - SetGlyphID(utf8Value, lineID, GlyphPositionX, GlyphPositionY, GlyphSizeX, GlyphSizeY); - } else { - EWOL_ERROR("error when parsing the line : " << lineID << "\"" << elementLine << "\""); - } - } - lineID++; - } - // close the file at end of reading... - m_filename.fClose(); - // Load Bitmap : - etk::UString bitmapRealFile = m_filename.GetFolder() + "/" + m_bitmapName; - EWOL_INFO("load text font image : \"" << bitmapRealFile << "\""); - etk::File tmpFile(bitmapRealFile, m_filename.GetTypeAccess()); - m_textureId = ewol::texture::Load(tmpFile); - m_textureLoaded = true; - m_loadedOK = true; - }; - - ~EbtFont(void) - { - if (true == m_textureLoaded) { - ewol::Texture::UnLoad(m_textureId); - } - }; - bool loadedOK(void) - { - return m_loadedOK; - }; - private: - void ClearAll(int32_t x, int32_t y, int32_t w, int32_t h) - { - EWOL_DEBUG("Find default font glyph : (" << x << "," << y << ") (" << w << "," << h << ") "); - for (int32_t iii=0; iii< 0x80; iii++) { - m_elements[iii].posStart.u = (etkFloat_t)x / 512.0; - m_elements[iii].posStart.v = (etkFloat_t)y / 512.0; - m_elements[iii].posStop.u = (etkFloat_t)(x+w) / 512.0; - m_elements[iii].posStop.v = (etkFloat_t)(y+h) / 512.0; - m_elements[iii].ratio = (etkFloat_t)w/(etkFloat_t)h; - m_elements[iii].width = m_size * 1.48 * m_elements[iii].ratio; - } - }; - void SetGlyphID(int32_t utf8Value, int32_t lineID, int32_t x, int32_t y, int32_t w, int32_t h) - { - EWOL_DEBUG("Add font glyph : "<< utf8Value << " (" << x << "," << y << ") (" << w << "," << h << ") "); - if (utf8Value < 0x80) { - m_elements[utf8Value].posStart.u = (etkFloat_t)x / 512.0; - m_elements[utf8Value].posStart.v = (etkFloat_t)y / 512.0; - m_elements[utf8Value].posStop.u = (etkFloat_t)(x+w) / 512.0; - m_elements[utf8Value].posStop.v = (etkFloat_t)(y+h) / 512.0; - m_elements[utf8Value].ratio = (etkFloat_t)w/(etkFloat_t)h; - m_elements[utf8Value].width = m_size * 1.48 * m_elements[utf8Value].ratio; - } else { - EWOL_ERROR("not manage glyph with ID > 0x7F line : " << lineID); - } - }; - - public: - etk::File GetFileName(void) - { - return m_filename; - }; - etk::UString GetName(void) - { - return m_fontName; - }; - bool IsLoaded(void) - { - return m_textureLoaded; - }; - bool Check(etk::UString fontName, int32_t size) - { - if (m_loadedOK == -1) { - return false; - } - if( m_fontName == fontName - && m_size == size) - { - return true; - } - return false; - }; - - private: - etk::File m_filename; - bool m_loadedOK; - etk::UString m_fontName; - int32_t m_size; - uint32_t m_textureId; - bool m_textureLoaded; - etk::UString m_bitmapName; - etk::VectorType m_elements; // - public: - etk::VectorType & GetRefOnElement(void) - { - return m_elements; - }; - uint32_t GetOglId(void) - { - return ewol::Texture::GetGLID(m_textureId); - }; - int32_t GetHeight(void) - { - return m_size*1.42; - }; - int32_t GetSize(void) - { - return m_size; - }; - }; -}; - -static etk::VectorType s_listLoadedFonts; - -static etk::UString s_currentFolderName = ""; -static etk::UString s_currentDefaultFontName = ""; -static int32_t s_currentDefaultFontId = -1; - -void ewol::SetFontFolder(etk::UString folderName) -{ - if (s_currentFolderName != "") { - EWOL_WARNING("Change the FontFolder, old=\"" << s_currentFolderName << "\""); - } - EWOL_TODO("Check if folder exist"); - s_currentFolderName = folderName; - EWOL_INFO("New default font folder name=\"" << s_currentFolderName << "\""); -} - -void ewol::InitFont(void) -{ - // nothing to do ... -} - -void ewol::UnInitFont(void) -{ - EWOL_TODO("later"); -} - -void ewol::SetDefaultFont(etk::UString fontName, int32_t size) -{ - if (s_currentDefaultFontName != "") { - EWOL_WARNING("Change the default Ewol Font, old=\"" << s_currentDefaultFontName << "\""); - } - EWOL_INFO("New default Font Name=\"" << fontName << "\""); - int32_t tmpId = ewol::LoadFont(fontName, size); - if (-1 == tmpId) { - if (s_currentDefaultFontName == "") { - EWOL_ASSERT(-1 != tmpId, "Error to load the default Font\"" << fontName << "\""); - } else { - EWOL_CRITICAL("Unable to load the new default font:\"" << fontName << "\""); - } - return; - } - // save the default font parameters ... - s_currentDefaultFontName = fontName; - s_currentDefaultFontId = tmpId; -} - -int32_t ewol::GetDefaultFontId(void) -{ - return s_currentDefaultFontId; -} - -int32_t ewol::LoadFont(etk::UString fontName, int32_t size) -{ - // check if folder file - etk::UString tmpFileName = s_currentFolderName + "/" + fontName + ".ebt"; - etk::File fileName(tmpFileName, etk::FILE_TYPE_DATA); - if (false == fileName.Exist()) { - EWOL_ERROR("Font does not exist: \"" << fileName.GetCompleateName() << "\""); - return -1; - } - for (int32_t iii=0; iii < s_listLoadedFonts.Size(); iii++) { - if (true == s_listLoadedFonts[iii]->Check(fontName, size)) { - return iii; - } - } - EbtFont * tmpFont = new EbtFont(fileName, fontName, size); - s_listLoadedFonts.PushBack(tmpFont); - return s_listLoadedFonts.Size()-1; -} - - - -void ewol::UnloadFont(int32_t id) -{ - EWOL_TODO("I do not think it was a good idea... will be done later"); -} - - - -/* -void ewol::DrawText(int32_t fontID, - coord2D_ts & drawPosition, - const uniChar_t * unicodeString, - uint32_t & fontTextureId, - etk::VectorType & coord, - etk::VectorType & coordTex) -{ - EWOL_TODO("previous code does not work at all"); - - if(fontID>=s_listLoadedFonts.Size() || fontID < 0) { - EWOL_WARNING("try to display text with an fontID that does not existed " << fontID); - return; - } - etk::VectorType & listOfElement = s_listLoadedFonts[fontID]->GetRefOnElement(); - - fontTextureId = s_listLoadedFonts[fontID]->GetOglId(); - EWOL_DEBUG("**************** plop " << fontTextureId); - int32_t size = s_listLoadedFonts[fontID]->GetHeight(); - - etkFloat_t posDrawX = drawPosition.x; - while(*unicodeString != 0) { - int32_t tmpChar = *unicodeString++; - if (tmpChar >= 0x80) { - tmpChar = 0; - } - etkFloat_t sizeWidth = listOfElement[tmpChar].width; - if (tmpChar != 0x20) { - // set texture coordonates : - coordTex.PushBack(listOfElement[tmpChar].posStart); - texCoord_ts tmpTex; - tmpTex.u = listOfElement[tmpChar].posStop.u; - tmpTex.v = listOfElement[tmpChar].posStart.v; - coordTex.PushBack(tmpTex); - coordTex.PushBack(listOfElement[tmpChar].posStop); - tmpTex.u = listOfElement[tmpChar].posStart.u; - tmpTex.v = listOfElement[tmpChar].posStop.v; - coordTex.PushBack(tmpTex); - // set display positions : - coord2D_ts tmpCoord; - tmpCoord.x = posDrawX; - tmpCoord.y = drawPosition.y; - coord.PushBack(tmpCoord); - tmpCoord.x = posDrawX + sizeWidth; - coord.PushBack(tmpCoord); - tmpCoord.y = drawPosition.y + size; - coord.PushBack(tmpCoord); - tmpCoord.x = posDrawX; - coord.PushBack(tmpCoord); - } - posDrawX += sizeWidth; - } - drawPosition.x = posDrawX; -} -*/ - -void ewol::DrawText(int32_t fontID, // Id of the desire font - coord2D_ts & drawPosition, // position to start the writing (can be < 0) ==> no check - coord2D_ts & clipSize, // clipping size - const char * utf8String, // my UTF8 string - uint32_t & fontTextureId, // return the fontID needed to display this string - etk::VectorType & coord, // return the coordonates - etk::VectorType & coordTex) // return the texture coordonates -{ - // TODO : This code des not work, why ???? - /* - int32_t tmpstringLen = strlen(utf8String); - int32_t * tmpUnicodeString = new int32_t(tmpstringLen+1); - // TODO : generate a better convertor... - for (int32_t iii=0; iii=s_listLoadedFonts.Size() || fontID < 0) { - EWOL_WARNING("try to display text with an fontID that does not existed " << fontID); - return; - } - etk::VectorType & listOfElement = s_listLoadedFonts[fontID]->GetRefOnElement(); - char * tmpVal = (char*)utf8String; - - fontTextureId = s_listLoadedFonts[fontID]->GetOglId(); - //EWOL_DEBUG("**************** plop2 " << fontTextureId); - int32_t size = s_listLoadedFonts[fontID]->GetHeight(); - - etkFloat_t posDrawX = drawPosition.x; - while(*tmpVal != 0) { - int32_t tmpChar = *tmpVal++; - int32_t charIndex; - if (tmpChar >= 0x80) { - charIndex = 0; - } else if (tmpChar < 0x20) { - charIndex = 0; - } else if (tmpChar < 0x80) { - charIndex = tmpChar; // - 0x1F; - } else { - for (int32_t iii=0x80/*-0x20*/; iii < listOfElement.Size(); iii++) { - if (listOfElement[iii].unicodeCharVal == tmpChar) { - charIndex = iii; - break; - } - } - // TODO : Update if possible the mapping - charIndex = 0; - } - etkFloat_t sizeWidth = listOfElement[charIndex].width; - // check the clipping - if (clipSize.x>0 && posDrawX+sizeWidth > clipSize.x) { - // TODO : Create a better clipping methode ... - break; - } - // 0x01 == 0x20 == ' '; - if (tmpChar != 0x01) { - // NOTE : Android does not support the Quads elements ... - /* Step 1 : - * ******** - * ****** - * **** - * ** - * - */ - // set texture coordonates : - coordTex.PushBack(listOfElement[charIndex].posStart); - texCoord_ts tmpTex; - tmpTex.u = listOfElement[charIndex].posStop.u; - tmpTex.v = listOfElement[charIndex].posStart.v; - coordTex.PushBack(tmpTex); - coordTex.PushBack(listOfElement[charIndex].posStop); - // set display positions : - coord2D_ts tmpCoord; - tmpCoord.x = posDrawX; - tmpCoord.y = drawPosition.y; - coord.PushBack(tmpCoord); - tmpCoord.x = posDrawX + sizeWidth; - coord.PushBack(tmpCoord); - tmpCoord.y = drawPosition.y + size; - coord.PushBack(tmpCoord); - - /* Step 2 : - * - * ** - * **** - * ****** - * ******** - */ - - // set texture coordonates : - coordTex.PushBack(listOfElement[charIndex].posStart); - coordTex.PushBack(listOfElement[charIndex].posStop); - tmpTex.u = listOfElement[charIndex].posStart.u; - tmpTex.v = listOfElement[charIndex].posStop.v; - coordTex.PushBack(tmpTex); - - // set display positions : - tmpCoord.x = posDrawX; - tmpCoord.y = drawPosition.y; - coord.PushBack(tmpCoord); - tmpCoord.x = posDrawX + sizeWidth; - tmpCoord.y = drawPosition.y + size; - coord.PushBack(tmpCoord); - tmpCoord.x = posDrawX; - coord.PushBack(tmpCoord); - } - posDrawX += sizeWidth; - } - drawPosition.x = posDrawX; - -} - -int32_t ewol::GetWidth(int32_t fontID, const char * utf8String) -{ - if(fontID>=s_listLoadedFonts.Size() || fontID < 0) { - EWOL_WARNING("try to display text with an fontID that does not existed " << fontID); - return 0; - } - etk::VectorType & listOfElement = s_listLoadedFonts[fontID]->GetRefOnElement(); - char * tmpVal = (char*)utf8String; - - etkFloat_t posDrawX = 0.0; - while(*tmpVal != 0) { - int32_t tmpChar = *tmpVal++; - int32_t charIndex; - if (tmpChar >= 0x80) { - charIndex = 0; - } else if (tmpChar < 0x20) { - charIndex = 0; - } else if (tmpChar < 0x80) { - charIndex = tmpChar /*- 0x1F*/; - } else { - for (int32_t iii=0x80/*-0x20*/; iii < listOfElement.Size(); iii++) { - if (listOfElement[iii].unicodeCharVal == tmpChar) { - charIndex = iii; - break; - } - } - // TODO : Update if possible the mapping - charIndex = 0; - } - posDrawX += listOfElement[charIndex].width; - } - return posDrawX; -} - -int32_t ewol::GetHeight(int32_t fontID) -{ - if(fontID>=s_listLoadedFonts.Size() || fontID < 0) { - EWOL_WARNING("try to display text with an fontID that does not existed " << fontID); - return 10; - } - return s_listLoadedFonts[fontID]->GetHeight(); -} - - - - - - - - - - - - -#endif diff --git a/Sources/libewol/ewol/FontFreeType.cpp b/Sources/libewol/ewol/FontFreeType.cpp index 4ea88ef0..baa570bd 100644 --- a/Sources/libewol/ewol/FontFreeType.cpp +++ b/Sources/libewol/ewol/FontFreeType.cpp @@ -21,7 +21,6 @@ * ******************************************************************************* */ -#ifdef EWOL_USE_FREE_TYPE #include #include @@ -1213,6 +1212,3 @@ int32_t ewol::GetHeight(int32_t fontID) return m_listLoadedFont[fontID]->GetHeight(); } - -#endif - diff --git a/Sources/libewol/ewol/Texture.cpp b/Sources/libewol/ewol/Texture.cpp index 17f50668..c93d53f1 100644 --- a/Sources/libewol/ewol/Texture.cpp +++ b/Sources/libewol/ewol/Texture.cpp @@ -313,7 +313,7 @@ int32_t ewol::texture::Load(etk::File fileName, int32_t requestedWidth) delete (myBitmap); } else if (fileExtention == "svg") { // get the upper paw2 ot the size requested... - requestedWidth = nextP2(requestedWidth); + //requestedWidth = nextP2(requestedWidth); /*if (requestedWidth < 32) { requestedWidth = 32; }*/ diff --git a/Sources/libewol/ewol/Windows.cpp b/Sources/libewol/ewol/Windows.cpp index 943819ce..6bd2a6d8 100644 --- a/Sources/libewol/ewol/Windows.cpp +++ b/Sources/libewol/ewol/Windows.cpp @@ -274,6 +274,7 @@ void ewol::Windows::PopUpWidgetPush(ewol::Widget * widget) void ewol::Windows::KeyboardShow(ewol::keyboardMode_te mode) { +/* #if defined(__PLATFORM__Android) if (NULL == m_keyBoardwidget) { // Create the keyboard ... @@ -290,6 +291,7 @@ void ewol::Windows::KeyboardShow(ewol::keyboardMode_te mode) } CalculateSize(m_size.x, m_size.y); #endif +*/ } diff --git a/Sources/libewol/ewol/widget/Menu.h b/Sources/libewol/ewol/widget/Menu.h index 373dc65f..35441712 100644 --- a/Sources/libewol/ewol/widget/Menu.h +++ b/Sources/libewol/ewol/widget/Menu.h @@ -36,6 +36,7 @@ namespace ewol { class MenuElement { public : + MenuElement(void) : m_widgetPointer(NULL) { }; int32_t m_localId; int32_t m_parentId; ewol::EObject* m_widgetPointer; diff --git a/Sources/libewol/ewol/widget/PopUp.cpp b/Sources/libewol/ewol/widget/PopUp.cpp index 4b36f605..6cb69a43 100644 --- a/Sources/libewol/ewol/widget/PopUp.cpp +++ b/Sources/libewol/ewol/widget/PopUp.cpp @@ -44,6 +44,10 @@ ewol::PopUp::PopUp(void) m_colorEmptyArea.green = 0.0; m_colorEmptyArea.blue = 0.0; m_colorEmptyArea.alpha = 0.50; + + for (int32_t iii=0; iii