mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Commit: b5fd21283e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
This commit is contained in:
vanhofen
2016-08-15 19:35:50 +02:00
parent 2be5df305e a5939c02ac
commit 9e6edc885d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_extra.h
View File

@@ -139,7 +139,7 @@ bool paintBoxRel0( const int& x,
* @param[in] y position
* @param[in] dx witdh
* @param[in] dy height
* @param[in] *font pointer to font type object, default = NULL, sets g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL] as default font
* @param[in] *font pointer to font type object, default = NULL, sets g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO] as default font
* @param[in] color_body color of box, default = COL_MENUCONTENT_PLUS_0
* @param[in] font_style font style
* @li CComponentsText::FONT_STYLE_REGULAR (default)

2
src/gui/components/cc_item_text.cpp
View File

@@ -118,7 +118,7 @@ void CComponentsText::initCCText()
{
//set default font, if is no font definied
if (ct_font == NULL)
ct_font = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL];
ct_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO];
//define height from font size
height = max(height, ct_font->getHeight());

4
src/gui/upnpbrowser.cpp
View File

@@ -108,12 +108,12 @@ void CUpnpBrowserGui::Init()
m_width = m_frameBuffer->getScreenWidthRel();
m_height = m_frameBuffer->getScreenHeightRel();
m_sheight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
m_iheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]->getHeight();
m_theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
m_buttonHeight = m_theight;
m_mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
m_fheight = g_Font[SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM]->getHeight();
m_title_height = m_mheight*2 + 20 + m_sheight + 4;
m_title_height = m_iheight*3 + 20; // 3 lines + offset
m_info_height = m_mheight*2;
m_listmaxshow = (m_height - m_info_height - m_title_height - m_theight - 2*m_buttonHeight) / (m_fheight);
m_height = m_theight + m_info_height + m_title_height + 2*m_buttonHeight + m_listmaxshow * m_fheight; // recalc height

8
src/gui/upnpbrowser.h
View File

@@ -79,10 +79,10 @@ class CUpnpBrowserGui : public CMenuTarget, public CListHelpers
unsigned int m_listmaxshow;
unsigned int m_deviceliststart;
unsigned int m_selecteddevice;
int m_fheight; // Fonthoehe Inhalt
int m_theight; // Fonthoehe Titel
int m_mheight; // Fonthoehe Info
int m_sheight; // Fonthoehe Status
int m_fheight; // items font height
int m_theight; // title font height
int m_mheight; // lower box font height
int m_iheight; // upper box font height
int m_buttonHeight;
int m_title_height;
int m_info_height;