From 47b37d440543ecec165702b856bda6c9e42459e1 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sat, 28 Mar 2015 20:59:53 +0100 Subject: [PATCH] CComponentsButton: disable gradient Not necessary as long not all or most gui buttons can provide gradient --- src/gui/components/cc_frm_button.cpp | 8 ++++---- src/gui/components/cc_frm_button.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/components/cc_frm_button.cpp b/src/gui/components/cc_frm_button.cpp index 3c70efa4a..0d5a3ed17 100644 --- a/src/gui/components/cc_frm_button.cpp +++ b/src/gui/components/cc_frm_button.cpp @@ -101,12 +101,12 @@ void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const height = h; shadow = has_shadow; shadow_w = SHADOW_OFFSET; - col_frame = color_frame; - col_body = color_body; - col_shadow = color_shadow; - col_body_gradient = g_settings.gradiant; + col_body_gradient = false/*g_settings.gradiant*/; //gradient is prepared for use but disabled at the moment till some other parts of gui parts are provide gradient setColBodyGradient(CColorGradient::gradientLight2Dark, CFrameBuffer::gradientVertical, CColorGradient::light); + col_frame = color_frame; + col_body = col_body_gradient? COL_DARK_GRAY : color_body; + col_shadow = color_shadow; cc_item_enabled = enabled; cc_item_selected = selected; diff --git a/src/gui/components/cc_frm_button.h b/src/gui/components/cc_frm_button.h index cfead2d37..95d2a9d09 100644 --- a/src/gui/components/cc_frm_button.h +++ b/src/gui/components/cc_frm_button.h @@ -35,7 +35,7 @@ #include #include -#define COL_BUTTON_BODY COL_DARK_GRAY +#define COL_BUTTON_BODY COL_INFOBAR_SHADOW_PLUS_1 #define COL_BUTTON_TEXT_ENABLED COL_BLACK #define COL_BUTTON_TEXT_DISABLED COL_LIGHT_GRAY