diff --git a/Sources/tools/Display/Display.cpp b/Sources/tools/Display/Display.cpp index d8ba659..e5bf719 100644 --- a/Sources/tools/Display/Display.cpp +++ b/Sources/tools/Display/Display.cpp @@ -61,17 +61,10 @@ static cairo_font_face_t * m_cairoFont[2][2] = {{NULL, NULL},{ NULL, NULL}}; static cairo_font_face_t * m_cairoFont[2][2] = {{NULL, NULL},{ NULL, NULL}}; void Display::Init(void) { - /* - charWidth = gdk_char_width(myFont[FONT_ITALIC_YES][FONT_BOLD_NO], 'Z'); - EDN_INFO("Font Width = %d", charWidth); - charHeignt = gdk_char_height(myFont[FONT_ITALIC_YES][FONT_BOLD_NO], 'Z'); - EDN_INFO("Font Height = %d", charHeignt); - */ - - m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO] = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); - m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO] = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_NORMAL); - m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES] = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); - m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES] = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_BOLD); + m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO] = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); + m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO] = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_NORMAL); + m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES] = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); + m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES] = cairo_toy_font_face_create(POLICE_NAME, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_WEIGHT_BOLD); if ( NULL == m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]) { EDN_ASSERT(FALSE, "basic font ERROR"); } @@ -96,10 +89,10 @@ void Display::Init(void) void Display::UnInit(void) { // clean the builder... - free(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]); - free(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]); - free(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES]); - free(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES]); + cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_NO]); + cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_NO]); + cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_NO][FONT_BOLD_YES]); + cairo_font_face_destroy(m_cairoFont[FONT_ITALIC_YES][FONT_BOLD_YES]); } @@ -289,7 +282,7 @@ void DrawerManager::SpaceText(color_ts & SelectColor, int32_t x, int32_t y,int32 void DrawerManager::Flush(void) { if (true == m_haveWork) { - //EDN_WARNING("flush : \"" << m_dataToDisplay << "\""); + //EDN_WARNING("flush : \"" << m_dataToDisplay << "\"" << " bold=" << m_selectColor->GetBold() << " italic=" << m_selectColor->GetItalic()); m_haveWork = false; cairo_set_font_face(m_cairo, Display::GetFont(m_selectColor->GetBold(), m_selectColor->GetItalic())); diff --git a/avancement.boo b/avancement.boo index cd424b0..6413f7d 100644 --- a/avancement.boo +++ b/avancement.boo @@ -10,7 +10,7 @@ - sys : replace TAB with space when Tab is pressed - sys : Catch F[1-12] ==> for user personal event - BUG : Correction du bug des entré bizard tel que les chapot et les guillemets - - BUG : de sélection quand la ligne est pleine et la première ligne séctionnée. + - BUG : de sélection quand la ligne est pleine et la première ligne séctionnée. ==> regarder après avoir fait le display ligne par ligne... - BUG : de copier coller sur les éàè ... - BUG : les caractère multiples type chapot ... - BUG : italique non généré