From 3ac25147ddc7b64b61dbb0013b8cd15fa3e39340 Mon Sep 17 00:00:00 2001 From: Myung Jin Kim Date: Tue, 9 Jul 2013 15:14:32 +0900 Subject: [PATCH] apply divider color Change-Id: Ibc1564952a5c4424ad2f3238dd475d1c5f695f84 --- src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp | 16 ++++++++-------- src/ui/resource/FUi_ResourceCheckButtonConfig.cpp | 4 ++-- src/ui/resource/FUi_ResourceFooterConfig.cpp | 8 ++++---- src/ui/resource/FUi_ResourceHeaderConfig.cpp | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp index abcb88b..bbd00fb 100644 --- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp +++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp @@ -1265,14 +1265,14 @@ _CheckButtonPresenter::DrawCheckBitmap(void) float dividerRightMargin = 0.0f; Color dividerLeftColor; - Color dividerRightColor; + //Color dividerRightColor; FloatDimension minDimension(0.0f, 0.0f); GET_SHAPE_CONFIG(CHECKBUTTON::DIVIDER_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, dividerWidth); GET_SHAPE_CONFIG(CHECKBUTTON::DIVIDER_TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, dividerTopMargin); GET_SHAPE_CONFIG(CHECKBUTTON::DIVIDER_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, dividerRightMargin); GET_COLOR_CONFIG(HEADER::DIVIDER_LINE_LEFT_NORMAL, dividerLeftColor); - GET_COLOR_CONFIG(HEADER::DIVIDER_LINE_RIGHT_NORMAL, dividerRightColor); + //GET_COLOR_CONFIG(HEADER::DIVIDER_LINE_RIGHT_NORMAL, dividerRightColor); GET_DIMENSION_CONFIG(CHECKBUTTON::MIN_DIMENSION, __pCheckButton->GetOrientation(), minDimension); @@ -1286,14 +1286,14 @@ _CheckButtonPresenter::DrawCheckBitmap(void) if (checkStyle == CHECK_BUTTON_STYLE_ONOFF_SLIDING_WITH_DIVIDER) { pCanvas->SetForegroundColor(dividerLeftColor); - pCanvas->SetLineWidth(dividerWidth/2); - pCanvas->DrawLine(FloatPoint(__onOffSlidingButtonBounds.x - dividerRightMargin + dividerWidth/2, dividerTopMargin), - FloatPoint(__onOffSlidingButtonBounds.x - dividerRightMargin + dividerWidth/2, dividerTopMargin + bounds.height - dividerTopMargin * 2)); - - pCanvas->SetForegroundColor(dividerRightColor); - pCanvas->SetLineWidth(dividerWidth/2); + pCanvas->SetLineWidth(dividerWidth); pCanvas->DrawLine(FloatPoint(__onOffSlidingButtonBounds.x - dividerRightMargin + dividerWidth, dividerTopMargin), FloatPoint(__onOffSlidingButtonBounds.x - dividerRightMargin + dividerWidth, dividerTopMargin + bounds.height - dividerTopMargin * 2)); + + //pCanvas->SetForegroundColor(dividerRightColor); + //pCanvas->SetLineWidth(dividerWidth/2); + //pCanvas->DrawLine(FloatPoint(__onOffSlidingButtonBounds.x - dividerRightMargin + dividerWidth, dividerTopMargin), + // FloatPoint(__onOffSlidingButtonBounds.x - dividerRightMargin + dividerWidth, dividerTopMargin + bounds.height - dividerTopMargin * 2)); } } diff --git a/src/ui/resource/FUi_ResourceCheckButtonConfig.cpp b/src/ui/resource/FUi_ResourceCheckButtonConfig.cpp index 56988ec..00de74d 100644 --- a/src/ui/resource/FUi_ResourceCheckButtonConfig.cpp +++ b/src/ui/resource/FUi_ResourceCheckButtonConfig.cpp @@ -53,8 +53,8 @@ START_UI_CONFIG(CHECKBUTTON); ADD_COLOR_CONFIG(DETAILED_ICON_TEXT_HIGHLIGHTED, $F032L1); ADD_COLOR_CONFIG(DETAILED_ICON_TEXT_SELECTED, $F032L1); - ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0222); + ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221L4); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0221L4); // bitmap ADD_IMAGE_CONFIG(MARK_ICON_BG_NORMAL, #00_check_bg.png); diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp index eb86ed5..4f387c6 100644 --- a/src/ui/resource/FUi_ResourceFooterConfig.cpp +++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp @@ -139,11 +139,11 @@ START_UI_CONFIG(FOOTER); ADD_COLOR_CONFIG(SOFTKEY_ICON_PRESSED, $B052L8); ADD_COLOR_CONFIG(SOFTKEY_ICON_HIGHLIGHTED, $B052L8); - ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0221); + ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221L2); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0221L2); - ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0221); + ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0221L2); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0221L2); ADD_COLOR_CONFIG(MORE_ICON_NORMAL, $B052L1); ADD_COLOR_CONFIG(MORE_ICON_DISABLED, $B052L1D); diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp index b7cd2c3..79660a1 100644 --- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp +++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp @@ -125,11 +125,11 @@ START_UI_CONFIG(HEADER); ADD_COLOR_CONFIG(BADGE_ICON_BG_NORMAL, $B0519); ADD_COLOR_CONFIG(BADGE_ICON_TEXT_NORMAL, $B052L7); - ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0221); + ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_NORMAL, $B0221L2); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_NORMAL, $B0221L2); - ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0221); - ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0221); + ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0221L2); + ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0221L2); ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L1P); ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L1P); -- 2.7.4