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

Merge remote-tracking branch 'tuxbox/master'

Browse Source
This commit is contained in:
Stefan Seyfried
2017-02-01 22:03:40 +01:00
parent e44146bf73 4fcea5bfd5
commit 7497722646
45 changed files with 409 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/test_menu.cpp
View File

@@ -565,7 +565,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
else if (actionKey == "text_ext"){
if (text_ext == NULL)
text_ext = new CComponentsExtTextForm();
text_ext->setDimensionsAll(10, 20, 300, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight());
text_ext->setDimensionsAll(10, 20, 300, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight()+2*2);
text_ext->setLabelAndText("Label", "Text for demo", g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]);
text_ext->setFrameThickness(2);
// text_ext->setLabelWidthPercent(15/*%*/);
@@ -582,15 +582,12 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
text_ext->setDimensionsAll(10, 20, 300, 48);
text_ext->setLabelAndText("Label", "Text for demo", g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]);
text_ext->setFrameThickness(2);
// text_ext->setLabelWidthPercent(15/*%*/);
text_ext->paint0();
static_cast<CComponentsText*>(text_ext->getCCItem(1))->kill();
}
if (static_cast<CComponentsText*>(text_ext->getCCItem(1))-> paintBlink(500000, true)){
if (text_ext->paintBlink(500000, true)){
ShowHint("Testmenu: Blink","Testmenu: Blinking extended text is running ...", 700, 10);
}
if (text_ext->getTextObject()->cancelBlink()){
if (text_ext->cancelBlink()){
ShowHint("Testmenu: Blink","Testmenu: Blinking extended text stopped ...", 700, 2);
}
return res;
@@ -741,6 +738,9 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
ShowHint("Testmenu: Blink","Testmenu: Blinking image stopped ...", 700, 2);
}
iconform->kill();
delete iconform;
iconform = NULL;
return res;
}
else if (actionKey == "window"){