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

infoviewer: try to fix infobar font artifacts

Browse Source 
hiding text boxes after resizing them will probably hide the new size
instead of the old one, so hide first, then resize


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad063b590
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-04 (Sun, 04 Feb 2018)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2018-02-04 20:28:45 +01:00
committed by vanhofen
parent acbb69ac00
commit 2d8836081c
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/gui/infoviewer.cpp
View File

@@ -4,7 +4,7 @@
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Bugfixes/cleanups (C) 2007-2013,2015 Stefan Seyfried Bugfixes/cleanups (C) 2007-2013,2015-2018 Stefan Seyfried
(C) 2008 Novell, Inc. Author: Stefan Seyfried (C) 2008 Novell, Inc. Author: Stefan Seyfried
Kommentar: Kommentar:
@@ -1847,35 +1847,38 @@ void CInfoViewer::display_Info(const char *current, const char *next,
if (current && update_current){ if (current && update_current){
if (txt_curr_event == NULL) if (txt_curr_event == NULL)
txt_curr_event = new CComponentsTextTransp(NULL, xStart, CurrInfoY - height, currTimeX - xStart, height); txt_curr_event = new CComponentsTextTransp(NULL, xStart, CurrInfoY - height, currTimeX - xStart, height);
else else {
txt_curr_event->setDimensionsAll(xStart, CurrInfoY - height, currTimeX - xStart, height);
txt_curr_event->setItemName("txt_curr_event");
txt_curr_event->setText(current, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
if (txt_curr_event->isPainted()) if (txt_curr_event->isPainted())
txt_curr_event->hide(); txt_curr_event->hide();
txt_curr_event->setDimensionsAll(xStart, CurrInfoY - height, currTimeX - xStart, height);
}
txt_curr_event->setItemName("txt_curr_event");
txt_curr_event->setText(current, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
txt_curr_event->paint(CC_SAVE_SCREEN_YES); txt_curr_event->paint(CC_SAVE_SCREEN_YES);
if (runningStart && starttimes){ if (runningStart && starttimes){
if (txt_curr_start == NULL) if (txt_curr_start == NULL)
txt_curr_start = new CComponentsTextTransp(NULL, InfoX, CurrInfoY - height, info_time_width, height); txt_curr_start = new CComponentsTextTransp(NULL, InfoX, CurrInfoY - height, info_time_width, height);
else else {
txt_curr_start->setDimensionsAll(InfoX, CurrInfoY - height, info_time_width, height);
txt_curr_start->setItemName("txt_curr_start");
txt_curr_start->setText(runningStart, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
if (txt_curr_start->isPainted()) if (txt_curr_start->isPainted())
txt_curr_start->hide(); txt_curr_start->hide();
txt_curr_start->setDimensionsAll(InfoX, CurrInfoY - height, info_time_width, height);
}
txt_curr_start->setItemName("txt_curr_start");
txt_curr_start->setText(runningStart, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
txt_curr_start->paint(CC_SAVE_SCREEN_YES); txt_curr_start->paint(CC_SAVE_SCREEN_YES);
} }
if (runningRest){ if (runningRest){
if (txt_curr_rest == NULL) if (txt_curr_rest == NULL)
txt_curr_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height); txt_curr_rest = new CComponentsTextTransp(NULL, currTimeX, CurrInfoY - height, currTimeW, height);
else else {
txt_curr_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height);
txt_curr_rest->setItemName("txt_curr_rest");
txt_curr_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
if (txt_curr_rest->isPainted()) if (txt_curr_rest->isPainted())
txt_curr_rest->hide(); txt_curr_rest->hide();
txt_curr_rest->setDimensionsAll(currTimeX, CurrInfoY - height, currTimeW, height);
}
txt_curr_rest->setItemName("txt_curr_rest");
txt_curr_rest->setText(runningRest, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
txt_curr_rest->paint(CC_SAVE_SCREEN_YES); txt_curr_rest->paint(CC_SAVE_SCREEN_YES);
} }
} }
@@ -1885,35 +1888,38 @@ void CInfoViewer::display_Info(const char *current, const char *next,
{ {
if (txt_next_event == NULL) if (txt_next_event == NULL)
txt_next_event = new CComponentsTextTransp(NULL, xStart, NextInfoY, nextTimeX - xStart, height); txt_next_event = new CComponentsTextTransp(NULL, xStart, NextInfoY, nextTimeX - xStart, height);
else else {
txt_next_event->setDimensionsAll(xStart, NextInfoY, nextTimeX - xStart, height);
txt_next_event->setItemName("txt_next_event");
txt_next_event->setText(next, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_N ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
if (txt_next_event->isPainted()) if (txt_next_event->isPainted())
txt_next_event->hide(); txt_next_event->hide();
txt_next_event->setDimensionsAll(xStart, NextInfoY, nextTimeX - xStart, height);
}
txt_next_event->setItemName("txt_next_event");
txt_next_event->setText(next, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_N ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
txt_next_event->paint(CC_SAVE_SCREEN_YES); txt_next_event->paint(CC_SAVE_SCREEN_YES);
if (nextStart && starttimes){ if (nextStart && starttimes){
if (txt_next_start == NULL) if (txt_next_start == NULL)
txt_next_start = new CComponentsTextTransp(NULL, InfoX, NextInfoY, info_time_width, height); txt_next_start = new CComponentsTextTransp(NULL, InfoX, NextInfoY, info_time_width, height);
else else {
txt_next_start->setDimensionsAll(InfoX, NextInfoY, info_time_width, height);
txt_next_start->setItemName("txt_next_start");
txt_next_start->setText(nextStart, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_N ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
if (txt_next_start->isPainted()) if (txt_next_start->isPainted())
txt_next_start->hide(); txt_next_start->hide();
txt_next_start->setDimensionsAll(InfoX, NextInfoY, info_time_width, height);
}
txt_next_start->setItemName("txt_next_start");
txt_next_start->setText(nextStart, CTextBox::NO_AUTO_LINEBREAK, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_N ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
txt_next_start->paint(CC_SAVE_SCREEN_YES); txt_next_start->paint(CC_SAVE_SCREEN_YES);
} }
if (nextDuration){ if (nextDuration){
if (txt_next_in == NULL) if (txt_next_in == NULL)
txt_next_in = new CComponentsTextTransp(NULL, nextTimeX, NextInfoY, nextTimeW, height); txt_next_in = new CComponentsTextTransp(NULL, nextTimeX, NextInfoY, nextTimeW, height);
else else {
txt_next_in->setDimensionsAll(nextTimeX, NextInfoY, nextTimeW, height);
txt_next_in->setItemName("txt_next_in");
txt_next_in->setText(nextDuration, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_N ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
if (txt_next_in->isPainted()) if (txt_next_in->isPainted())
txt_next_in->hide(); txt_next_in->hide();
txt_next_in->setDimensionsAll(nextTimeX, NextInfoY, nextTimeW, height);
}
txt_next_in->setItemName("txt_next_in");
txt_next_in->setText(nextDuration, CTextBox::RIGHT, g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO], colored_event_N ? COL_COLORED_EVENTS_TEXT : COL_INFOBAR_TEXT);
txt_next_in->paint(CC_SAVE_SCREEN_YES); txt_next_in->paint(CC_SAVE_SCREEN_YES);
} }
} }