diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 96a2139ae..9ca823595 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1765,8 +1765,8 @@ void CAudioPlayerGui::paintInfo() if (!m_show_playlist) // no playlist -> smaller Info-Box title_height -= m_fheight; - m_frameBuffer->paintBoxRel(m_x + 1, m_y + 1 , m_width - 2, title_height - 12, COL_MENUCONTENTSELECTED_PLUS_0, c_rad_mid); - m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, title_height - 10, 2, COL_MENUCONTENT_PLUS_6, c_rad_mid); + m_frameBuffer->paintBoxRel(m_x, m_y, m_width, title_height - 10, COL_MENUCONTENTSELECTED_PLUS_0, c_rad_mid); //NI + m_frameBuffer->paintBoxFrame(m_x, m_y, m_width, title_height - 10, 1, COL_MENUCONTENT_PLUS_6, c_rad_mid); //NI paintCover(); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index f849e473c..afa4586c4 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1538,8 +1538,8 @@ void CChannelList::paintDetails(int index) bool colored_event_C = (g_settings.theme.colored_events_channellist == 1); bool colored_event_N = (g_settings.theme.colored_events_channellist == 2); - frameBuffer->paintBoxRel(x+1, y + height + 1, full_width-2, info_height - 2, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE);//round - frameBuffer->paintBoxFrame(x, y + height, full_width, info_height, 2, COL_MENUCONTENT_PLUS_6, RADIUS_LARGE); + frameBuffer->paintBoxRel(x, y + height, full_width, info_height, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE);//round //NI + frameBuffer->paintBoxFrame(x, y + height, full_width, info_height, 1, COL_MENUCONTENT_PLUS_1, RADIUS_LARGE); //NI if ((*chanlist).empty()) return; @@ -1981,21 +1981,21 @@ void CChannelList::paintItem(int pos, const bool firstpaint) int pb_max = pb_space - 4; if (g_settings.progressbar_design != CProgressBar::PB_MONO) { if (liststart + pos != selected) { - fb_pixel_t pbgcol = COL_MENUCONTENT_PLUS_1; + fb_pixel_t pbgcol = COL_MENUCONTENT_PLUS_2; //NI if (pbgcol == bgcolor) pbgcol = COL_MENUCONTENT_PLUS_0; pb.setStatusColors(COL_MENUCONTENT_PLUS_3, pbgcol); } else { - fb_pixel_t pbgcol = COL_MENUCONTENTSELECTED_PLUS_0; + fb_pixel_t pbgcol = COL_MENUCONTENTSELECTED_PLUS_1; //NI if (pbgcol == bgcolor) pbgcol = COL_MENUCONTENT_PLUS_0; pb.setStatusColors(COL_MENUCONTENTSELECTED_PLUS_2, pbgcol); } } else { if (liststart + pos != selected) - pb.setStatusColors(COL_MENUCONTENT_PLUS_3, COL_MENUCONTENT_PLUS_1); + pb.setStatusColors(COL_MENUCONTENT_PLUS_3, COL_MENUCONTENT_PLUS_2); //NI else - pb.setStatusColors(COL_MENUCONTENTSELECTED_PLUS_2, COL_MENUCONTENTSELECTED_PLUS_0); + pb.setStatusColors(COL_MENUCONTENTSELECTED_PLUS_2, COL_MENUCONTENTSELECTED_PLUS_1); //NI } if (!(p_event->description.empty())) { diff --git a/src/gui/color.h b/src/gui/color.h index f87bdd8f6..29b8a4077 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -71,6 +71,7 @@ #define COL_MENUCONTENTDARK_PLUS_0 (COL_MENUCONTENTDARK + 0) #define COL_MENUCONTENTDARK_PLUS_2 (COL_MENUCONTENTDARK + 2) #define COL_MENUCONTENTSELECTED_PLUS_0 (COL_MENUCONTENTSELECTED + 0) +#define COL_MENUCONTENTSELECTED_PLUS_1 (COL_MENUCONTENTSELECTED + 1) //NI #define COL_MENUCONTENTSELECTED_PLUS_2 (COL_MENUCONTENTSELECTED + 2) #define COL_MENUCONTENTINACTIVE_PLUS_0 (COL_MENUCONTENTINACTIVE + 0) #define COL_MENUFOOT_PLUS_0 (COL_MENUFOOT + 0) @@ -95,6 +96,7 @@ #define COL_MENUCONTENTDARK_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTDARK + 0)]) #define COL_MENUCONTENTDARK_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTDARK + 2)]) #define COL_MENUCONTENTSELECTED_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTSELECTED + 0)]) +#define COL_MENUCONTENTSELECTED_PLUS_1 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTSELECTED + 1)]) //NI #define COL_MENUCONTENTSELECTED_PLUS_2 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTSELECTED + 2)]) #define COL_MENUCONTENTINACTIVE_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUCONTENTINACTIVE + 0)]) #define COL_MENUFOOT_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_MENUFOOT + 0)]) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index afe518ea4..aa78a4396 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -935,7 +935,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start showText(showPos, sy + toph); // small bottom box - frameBuffer->paintBoxRel(sx, sy+oy-botboxheight, ox, botboxheight, COL_MENUHEAD_PLUS_0); + frameBuffer->paintBoxRel(sx, sy+oy-botboxheight, ox, botboxheight, COL_MENUFOOT_PLUS_0); if (!mp_info) { static int iw = 0, ih = 0, io = 0; diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 707564462..0fe693566 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -91,21 +91,21 @@ void CUpnpBrowserGui::Init() { font_item = SNeutrinoSettings::FONT_TYPE_MENU; - topbox.enableFrame(true, 2); + topbox.enableFrame(true, 1); //NI topbox.setCorner(RADIUS_LARGE); - topbox.setColorAll(COL_MENUCONTENT_PLUS_6, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0, COL_MENUHEAD_TEXT); + topbox.setColorAll(COL_MENUCONTENT_PLUS_1, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0, COL_MENUHEAD_TEXT); topbox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU_INFO]); topbox.enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Head_gradient_direction); topbox.enableShadow(CC_SHADOW_ON, -1, true); - infobox.enableFrame(true, 2); + infobox.enableFrame(true, 1); //NI infobox.setCorner(RADIUS_LARGE); infobox.setColorAll(topbox.getColorFrame(), COL_MENUCONTENTDARK_PLUS_0); infobox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU]); infobox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction); infobox.enableShadow(CC_SHADOW_ON, -1, true); - timebox.enableFrame(true, 2); + timebox.enableFrame(true, 1); //NI timebox.setCorner(RADIUS_LARGE); timebox.setColorAll(infobox.getColorFrame(), infobox.getColorBody()); timebox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_MENU]); diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index 45541d3b0..cdba0195b 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -760,7 +760,7 @@ void CKeyboardInput::paintKey(int row, int column) int radius = CORNER_RADIUS_SMALL; frameBuffer->paintBoxRel(xpos, ypos, key_w, key_h, bgcolor, radius); - frameBuffer->paintBoxFrame(xpos, ypos, key_w, key_h, KEY_FRAME_WIDTH, COL_MENUCONTENT_PLUS_2, radius); //NI + frameBuffer->paintBoxFrame(xpos, ypos, key_w, key_h, KEY_FRAME_WIDTH, COL_MENUCONTENT_PLUS_1, radius); //NI if (keyboard[row][column].empty()) return; diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index e367709b5..aadba4ecd 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -265,14 +265,14 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text fb_pixel_t right_frame_col, right_bg_col; if (active) { right_bg_col = right_bgcol; - right_frame_col = COL_MENUCONTENT_PLUS_6; + right_frame_col = COL_MENUCONTENT_PLUS_1; //NI } else { right_bg_col = COL_MENUCONTENTINACTIVE_TEXT; right_frame_col = COL_MENUCONTENTINACTIVE_TEXT; } CComponentsShapeSquare col(stringstartposOption, y + 2, dx - stringstartposOption + x - 2, item_height - 4, NULL, false, right_frame_col, right_bg_col); - col.setFrameThickness(2); //NI + col.setFrameThickness(1); //NI col.setCorner(RADIUS_LARGE); col.paint(false); } @@ -1499,8 +1499,7 @@ void CMenuWidget::paintHint(int pos) //NI info_box->removeLineBreaks(str); info_box->setText(str, CTextBox::AUTO_WIDTH, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT], COL_MENUCONTENT_TEXT); info_box->setCorner(RADIUS_LARGE); - info_box->setColorAll(COL_MENUCONTENT_PLUS_6, COL_MENUCONTENTDARK_PLUS_0); - info_box->setColorBody(COL_MENUCONTENT_PLUS_0); //NI + info_box->setColorAll(COL_MENUCONTENT_PLUS_1, COL_MENUCONTENT_PLUS_0); //NI info_box->enableShadow(); info_box->setPicture(item->hintIcon ? item->hintIcon : ""); info_box->enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_MENUFOOT_PLUS_0, g_settings.theme.menu_Hint_gradient_direction);// COL_MENUFOOT_PLUS_0 is default footer color @@ -2324,7 +2323,7 @@ int CMenuSeparator::paint(bool selected) if ((type & LINE)) { int grad = g_settings.theme.menu_Separator_gradient_enable ? CC_COLGRAD_COL_DARK_LIGHT_DARK : CC_COLGRAD_OFF; - paintBoxRel(x+10, y+(height>>1), dx-20, 2, COL_MENUCONTENT_PLUS_3, 0, CORNER_NONE, grad, COL_MENUCONTENT_PLUS_0, CFrameBuffer::gradientHorizontal, CColorGradient::light); + paintBoxRel(x+10, y+(height>>1), dx-20, 1, COL_MENUCONTENT_PLUS_1, 0, CORNER_NONE, grad, COL_MENUCONTENT_PLUS_0, CFrameBuffer::gradientHorizontal, CColorGradient::light); //NI } if ((type & STRING)) {