From 558f2265ee684db0d3bbbf7c8a3eb7f032854156 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 15 Aug 2016 00:30:47 +0200 Subject: [PATCH 1/3] upnpbrowser: use COL_SHADOW_PLUS_0 instead of COL_SHADOW_PLUS_1 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1209485c6bc1e72c036d8960f20094ea31ece35a Author: vanhofen Date: 2016-08-15 (Mon, 15 Aug 2016) Origin message was: ------------------ - upnpbrowser: use COL_SHADOW_PLUS_0 instead of COL_SHADOW_PLUS_1 --- src/gui/upnpbrowser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index 7f44bf0a8..ddb257f9f 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -87,19 +87,19 @@ void CUpnpBrowserGui::Init() topbox.setCorner(RADIUS_LARGE); topbox.setColorAll(COL_MENUCONTENT_PLUS_6, COL_MENUHEAD_PLUS_0, COL_MENUCONTENTDARK_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_1, g_settings.theme.menu_Head_gradient_direction); + topbox.enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Head_gradient_direction); ibox.enableFrame(true, 2); ibox.setCorner(RADIUS_LARGE); ibox.setColorAll(topbox.getColorFrame(), COL_MENUCONTENTDARK_PLUS_0); ibox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]); - ibox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_1, g_settings.theme.menu_Hint_gradient_direction); + ibox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction); timebox.enableFrame(true, 2); timebox.setCorner(RADIUS_LARGE); timebox.setColorAll(ibox.getColorFrame(), ibox.getColorBody()); timebox.setTextFont(g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE]); - timebox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_1, g_settings.theme.menu_Hint_gradient_direction); + timebox.enableColBodyGradient(g_settings.theme.menu_Hint_gradient, COL_SHADOW_PLUS_0, g_settings.theme.menu_Hint_gradient_direction); m_width = m_frameBuffer->getScreenWidthRel(); m_height = m_frameBuffer->getScreenHeightRel(); From 69e4dfd1b1c6b5befdd0077f4de626783a2ec3e2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 15 Aug 2016 00:31:27 +0200 Subject: [PATCH 2/3] colors: remove obsolete COL_SHADOW_PLUS_1 we should use only one shadow color (COL_SHADOW_PLUS_0) Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ff044c92085139218e6f7f3335c78eb7c6cc83b2 Author: vanhofen Date: 2016-08-15 (Mon, 15 Aug 2016) Origin message was: ------------------ - colors: remove obsolete COL_SHADOW_PLUS_1 we should use only one shadow color (COL_SHADOW_PLUS_0) --- src/gui/color.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/color.h b/src/gui/color.h index cc18af0b0..f87bdd8f6 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -53,7 +53,6 @@ #ifdef FB_USE_PALETTE #define COL_SHADOW_PLUS_0 (COL_SHADOW + 0) -#define COL_SHADOW_PLUS_1 (COL_SHADOW + 1) #define COL_INFOBAR_PLUS_0 (COL_INFOBAR + 0) #define COL_INFOBAR_PLUS_1 (COL_INFOBAR + 1) #define COL_INFOBAR_PLUS_3 (COL_INFOBAR + 3) @@ -78,7 +77,6 @@ #define COL_BACKGROUND_PLUS_0 (COL_BACKGROUND + 0) #else #define COL_SHADOW_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_SHADOW + 0)]) -#define COL_SHADOW_PLUS_1 (CFrameBuffer::getInstance()->realcolor[(COL_SHADOW + 1)]) #define COL_INFOBAR_PLUS_0 (CFrameBuffer::getInstance()->realcolor[(COL_INFOBAR + 0)]) #define COL_INFOBAR_PLUS_1 (CFrameBuffer::getInstance()->realcolor[(COL_INFOBAR + 1)]) #define COL_INFOBAR_PLUS_3 (CFrameBuffer::getInstance()->realcolor[(COL_INFOBAR + 3)]) From 832649cb4606653811271519d02dc91d310453fe Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 15 Aug 2016 00:32:57 +0200 Subject: [PATCH 3/3] luainstance: add missing entry for shadow color Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/a9446a084a97d69ad5ad33f300ba5e949dc0adc1 Author: vanhofen Date: 2016-08-15 (Mon, 15 Aug 2016) Origin message was: ------------------ - luainstance: add missing entry for shadow color --- src/gui/lua/luainstance.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp index 934bfcfb0..d5de296b6 100644 --- a/src/gui/lua/luainstance.cpp +++ b/src/gui/lua/luainstance.cpp @@ -198,6 +198,7 @@ static void set_lua_variables(lua_State *L) { "MENUCONTENTSELECTED_TEXT_PLUS_2", (lua_Unsigned) (COL_MENUCONTENTSELECTED_TEXT_PLUS_2) }, { "MENUCONTENTINACTIVE_TEXT", (lua_Unsigned) (COL_MENUCONTENTINACTIVE_TEXT) }, { "MENUFOOT_TEXT", (lua_Unsigned) (COL_MENUFOOT_TEXT) }, + { "SHADOW_PLUS_0", (lua_Unsigned) (COL_SHADOW_PLUS_0) }, { "MENUHEAD_PLUS_0", (lua_Unsigned) (COL_MENUHEAD_PLUS_0) }, { "MENUCONTENT_PLUS_0", (lua_Unsigned) (COL_MENUCONTENT_PLUS_0) }, { "MENUCONTENT_PLUS_1", (lua_Unsigned) (COL_MENUCONTENT_PLUS_1) },