mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
CMenuWidget: branch devel_cc Fix merge errors
Some braces were lost during the last merges.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ac1550277
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1151,6 +1151,7 @@ void CMenuWidget::paintHint(int pos)
|
|||||||
details_line->setHMarkTop(imarkh);
|
details_line->setHMarkTop(imarkh);
|
||||||
details_line->setHMarkDown(markh);
|
details_line->setHMarkDown(markh);
|
||||||
details_line->syncSysColors();
|
details_line->syncSysColors();
|
||||||
|
}
|
||||||
#if 0
|
#if 0
|
||||||
details_line->paint(savescreen);
|
details_line->paint(savescreen);
|
||||||
#endif
|
#endif
|
||||||
@@ -1166,6 +1167,7 @@ void CMenuWidget::paintHint(int pos)
|
|||||||
info_box->syncSysColors();
|
info_box->syncSysColors();
|
||||||
info_box->setShadowOnOff(CC_SHADOW_ON);
|
info_box->setShadowOnOff(CC_SHADOW_ON);
|
||||||
info_box->setPicture(item->hintIcon);
|
info_box->setPicture(item->hintIcon);
|
||||||
|
}
|
||||||
#if 0
|
#if 0
|
||||||
/* force full paint - menu-over i.e. option chooser with pulldown can overwrite */
|
/* force full paint - menu-over i.e. option chooser with pulldown can overwrite */
|
||||||
info_box->paint(savescreen, true);
|
info_box->paint(savescreen, true);
|
||||||
|
Reference in New Issue
Block a user