CMenuWidget: adapt to current CComponentsInfoBox changes

Origin commit data
------------------
Branch: ni/coolstream
Commit: 03d276d90a
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-03 (Fri, 03 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
2012-08-03 23:05:24 +02:00
parent ec1088aac9
commit a635bfb3e0

View File

@@ -1079,7 +1079,7 @@ void CMenuWidget::paintHint(int pos)
int xpos = x - ConnectLineBox_Width; int xpos = x - ConnectLineBox_Width;
int ypos2 = y + height + rad + SHADOW_OFFSET + INFO_BOX_Y_OFFSET; int ypos2 = y + height + rad + SHADOW_OFFSET + INFO_BOX_Y_OFFSET;
int iwidth = width+sb_width; int iwidth = width+sb_width;
#if 0
if (hint_painted) { if (hint_painted) {
/* clear detailsline line */ /* clear detailsline line */
// TODO CComponents::hide with param restore ? or auto (if it have saved screens) ? // TODO CComponents::hide with param restore ? or auto (if it have saved screens) ?
@@ -1099,6 +1099,18 @@ void CMenuWidget::paintHint(int pos)
} }
} }
hint_painted = false; hint_painted = false;
#endif
if (hint_painted) {
/* clear detailsline line */
if (details_line)
details_line->hide();
/* clear info box */
if (info_box)
info_box->hide(hint_painted);
hint_painted = false;
}
else if (info_box){
info_box->hide(hint_painted);
} }
if (pos < 0) if (pos < 0)
return; return;
@@ -1107,12 +1119,18 @@ void CMenuWidget::paintHint(int pos)
//printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText(item->hint)); //printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText(item->hint));
if (item->hintIcon.empty() && item->hint == NONEXISTANT_LOCALE) { if (item->hintIcon.empty() && item->hint == NONEXISTANT_LOCALE) {
#if 0
if (info_box != NULL) { if (info_box != NULL) {
if (savescreen) if (savescreen)
#endif
if (info_box)
info_box->hide();
#if 0
info_box->restore(); info_box->restore();
else else
info_box->hide(); info_box->hide();
} }
#endif
return; return;
} }