From edb11bb7761c78aff4aca80a39440060ee1dc286 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 25 May 2021 22:57:28 +0200 Subject: [PATCH] epgview: another try with LOCALE_MDB_SAVE_POSTER_HINT Es scheint so, dass dynfont hier nicht korrekt funktioniert. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b2ef11f0908b1496345bcec393c5f778eb6c4c9a Author: vanhofen Date: 2021-05-25 (Tue, 25 May 2021) Origin message was: ------------------ - epgview: another try with LOCALE_MDB_SAVE_POSTER_HINT Es scheint so, dass dynfont hier nicht korrekt funktioniert. ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- src/gui/epgview.cpp | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 096b28e15..45c16e3bf 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1291,7 +1291,7 @@ mbkey.cover Filmcover erzeugen/löschen mbkey.cut Film schneiden mbkey.truncate Film kürzen mdb.save_poster Bild speichern -mdb.save_poster_hint Bild speichern mit %s +mdb.save_poster_hint Bild speichern mit "%s" menu.back Zurück menu.cancel Abbrechen menu.hint_a_pic Konfigurieren Sie den Audioplayer und den Bildbetrachter diff --git a/data/locale/english.locale b/data/locale/english.locale index 70da18a4a..aac7663d0 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1291,7 +1291,7 @@ mbkey.cover Create/remove movie cover mbkey.cut Cut movie mbkey.truncate Truncate movie mdb.save_poster Save poster -mdb.save_poster_hint Save poster with %s +mdb.save_poster_hint Save poster with "%s" menu.back Back menu.cancel Cancel menu.hint_a_pic Configure audio player and picture viewer diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index c8972f812..cf13b9e61 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -282,8 +282,10 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) int offs = fullClear ? 0 : cover_offset; frameBuffer->paintBoxRel(sx+offs, y, ox-SCROLLBAR_WIDTH-offs, sb, COL_MENUCONTENT_PLUS_0); // background of the text box - if (has_cover) { - if (!g_PicViewer->DisplayImage(cover ,sx+OFFSET_INNER_MID ,y+OFFSET_INNER_MID, cover_width, cover_height, CFrameBuffer::TM_NONE)) { + if (has_cover) + { + if (!g_PicViewer->DisplayImage(cover ,sx+OFFSET_INNER_MID ,y+OFFSET_INNER_MID, cover_width, cover_height, CFrameBuffer::TM_NONE)) + { cover_offset = 0; frameBuffer->paintBoxRel(sx, y, ox-SCROLLBAR_WIDTH, sb, COL_MENUCONTENT_PLUS_0); // background of the text box } @@ -291,8 +293,11 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) else { char hint[1024]; - snprintf(hint, sizeof(hint), g_Locale->getText(LOCALE_MDB_SAVE_POSTER_HINT), g_RCInput->getKeyName((neutrino_msg_t) g_settings.mbkey_cover)); - font->RenderString(sx+OFFSET_INNER_MID, y+OFFSET_INNER_MID+cover_height+OFFSET_INNER_MID+font->getHeight(), cover_width, hint, COL_MENUCONTENT_TEXT); + snprintf(hint, sizeof(hint), g_Locale->getText(LOCALE_MDB_SAVE_POSTER_HINT), g_RCInput->getKeyName((neutrino_msg_t) g_settings.mbkey_cover).c_str()); + int dynfont_width = cover_width; + int dynfont_height = font->getHeight(); + Font *dynfont = *CNeutrinoFonts::getInstance()->getDynFont(dynfont_width, dynfont_height, hint); + dynfont->RenderString(sx+OFFSET_INNER_MID, y+OFFSET_INNER_MID+cover_height+OFFSET_INNER_MID+dynfont->getHeight(), dynfont_width, hint, COL_MENUCONTENT_TEXT); } */ }