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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 5c077b22e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-19 (Fri, 19 May 2017)
This commit is contained in:
vanhofen
2017-05-19 21:18:09 +02:00
parent e1837412ed da1903c11d
commit e75807ed88
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/cables.xml
View File

@@ -534,7 +534,7 @@
<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="618000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

9
src/gui/lua/lua_cc_text.cpp
View File

@@ -208,10 +208,11 @@ int CLuaInstCCText::CCTextSetText(lua_State *L)
std::string text = "";
lua_Integer mode = D->mode;
lua_Integer font_text = D->font_text;
tableLookup(L, "text", text);
tableLookup(L, "mode", mode);
tableLookup(L, "font_text", font_text);
if (lua_istable(L, -1)){
tableLookup(L, "text", text);
tableLookup(L, "mode", mode);
tableLookup(L, "font_text", font_text);
}
D->ct->setText(text, mode, g_Font[font_text]);
return 0;
}

13
src/gui/widget/hintbox.cpp
View File

@@ -162,6 +162,8 @@ void CHintBox::init(const std::string& Text, const int& Width, const std::string
if (!Text.empty())
addHintItem(Text, text_mode, Picon, COL_MENUCONTENT_TEXT, hb_font);
else
ReSize();
}
CHintBox::~CHintBox()
@@ -312,13 +314,8 @@ void CHintBox::addHintItem(const std::string& Text, const int& text_mode, const
info_box->setPicture(Picon);
info_box->doPaintBg(false);
/* recalculate new hintbox height */
/* recalculate new hintbox dimensions and position*/
ReSize();
/* set hint box position general to center and refresh window */
setCenterPos(CC_ALONG_X);
y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - height) >> 2),
Refresh();
}
void CHintBox::setMsgText(const std::string& Text, const uint& hint_id, const int& mode, Font* font_text, const fb_pixel_t& color_text, const int& style)
@@ -350,6 +347,10 @@ void CHintBox::ReSize()
h += item->getHeight();
}
height = min(HINTBOX_MAX_HEIGHT, max(HINTBOX_MIN_HEIGHT, max(height,h)));
/* set hint box position general to center and refresh window */
setCenterPos(CC_ALONG_X);
y = frameBuffer->getScreenY() + ((frameBuffer->getScreenHeight() - height) >> 2),
Refresh();
}