mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

imageinfo: fix used font

Browse Source 
Font type was not defined.
Therefore font size was too small with auto font.
This commit is contained in:
Thilo Graf
2020-02-12 10:20:08 +01:00
parent 34f669c91f
commit e436f69d8b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/imageinfo.cpp
View File

@@ -3,7 +3,7 @@
Copyright (C) 2001 by Steffen Hehn 'McClean' Copyright (C) 2001 by Steffen Hehn 'McClean'
Implementation of component classes Implementation of component classes
Copyright (C) 2013, Thilo Graf 'dbt' Copyright (C) 2013-2020, Thilo Graf 'dbt'
License: GPL License: GPL
@@ -29,7 +29,7 @@
#include <version_hal.h> #include <version_hal.h>
#endif #endif
#include <gui/imageinfo.h> #include "imageinfo.h"
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
@@ -77,7 +77,7 @@ void CImageInfo::Init(void)
btn_red = NULL; btn_red = NULL;
btn_green = NULL; btn_green = NULL;
item_offset = OFFSET_INNER_MID; item_offset = OFFSET_INNER_MID;
item_font = NULL; item_font = g_Font[SNeutrinoSettings::FONT_TYPE_WINDOW_GENERAL];
item_height = 0; item_height = 0;
y_tmp = 0; y_tmp = 0;
license_txt = ""; license_txt = "";
@@ -425,14 +425,12 @@ void CImageInfo::InitInfos()
//create label and text items //create label and text items
y_tmp = 0; y_tmp = 0;
for (size_t i=0; i<v_info.size(); i++) { for (size_t i=0; i<v_info.size(); i++) {
CComponentsExtTextForm *item = new CComponentsExtTextForm(1, y_tmp, cc_info->getWidth(), 0, v_info[i].caption, v_info[i].info_text); CComponentsExtTextForm *item = new CComponentsExtTextForm(1, y_tmp, cc_info->getWidth(), 0, v_info[i].caption, v_info[i].info_text, item_font);
item->setLabelWidthPercent(15); item->setLabelWidthPercent(15);
if (!item_font){ //calculate initial height for info form
item_font = item->getFont(); item_height = item_font->getHeight();
//calculate initial height for info form
item_height = item_font->getHeight();
}
item->setHeight(item_height); item->setHeight(item_height);
cc_info->setHeight(v_info.size()*item_height); cc_info->setHeight(v_info.size()*item_height);