CBEBouquetWidget: use hidden marker instead too large NEUTRINO_ICON_HIDDEN

This commit is contained in:
2018-01-05 00:52:58 +01:00
parent b10501499f
commit c73cc5852a

View File

@@ -57,7 +57,7 @@ CBEBouquetWidget::CBEBouquetWidget()
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_DUMMY_SMALL, &action_icon_width, &ih);
status_icon_width = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_HIDDEN, &iw, &ih);
frameBuffer->getIconSize(NEUTRINO_ICON_HIDDEN_MARKER, &iw, &ih);
status_icon_width = std::max(status_icon_width, iw);
frameBuffer->getIconSize(NEUTRINO_ICON_LOCK_MARKER, &iw, &ih);
status_icon_width = std::max(status_icon_width, iw);
@@ -109,7 +109,7 @@ void CBEBouquetWidget::paintItem(int pos)
item_font->RenderString(x + text_offset, ypos + item_height, width - text_offset - SCROLLBAR_WIDTH - 5*OFFSET_INNER_MID - 4*status_icon_width, (*Bouquets)[current]->bFav ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : (*Bouquets)[current]->Name, color);
if ((*Bouquets)[current]->bHidden)
frameBuffer->paintIcon(NEUTRINO_ICON_HIDDEN, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height);
frameBuffer->paintIcon(NEUTRINO_ICON_HIDDEN_MARKER, x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - status_icon_width, ypos, item_height);
if ((*Bouquets)[current]->bLocked != g_settings.parentallock_defaultlocked)
frameBuffer->paintIcon(NEUTRINO_ICON_LOCK_MARKER, x + width - SCROLLBAR_WIDTH - 2*OFFSET_INNER_MID - 2*status_icon_width, ypos, item_height);