Replaced white Colon bitmap with magenta colon bitmap in Time Picker

Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: Ie75a94ec9a032e9bc21d3959bc184e261ef21741

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_date_picker_dot.png b/res/common/usr/share/osp/bitmaps/480x800/00_date_picker_dot.png
old mode 100755 (executable)
new mode 100644 (file)
index 6a7fc53..7624a6c
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_date_picker_dot.png and b/res/common/usr/share/osp/bitmaps/480x800/00_date_picker_dot.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_date_picker_dot.png b/res/common/usr/share/osp/bitmaps/720x1280/00_date_picker_dot.png
old mode 100755 (executable)
new mode 100644 (file)
index 6a7fc53..7624a6c
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_date_picker_dot.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_date_picker_dot.png differ

diff --git a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
index 3b95377..33a5511 100755 (executable)
--- a/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_DateTimePresenter.cpp
@@ -75,6 +75,7 @@ _DateTimePresenter::_DateTimePresenter(int pickerStyle, const String& title)
        , __pPmBoxPressedEffectBitmap(null)
        , __pPmBoxDisabledEffectBitmap(null)
        , __pColonBitmap(null)
+       , __pColonDisabledBitmap(null)
        , __pBgNormalBitmap(null)
        , __pBgEffectBitmap(null)
        , __pFont(null)
@@ -109,6 +110,9 @@ _DateTimePresenter::Dispose(void)
        delete __pColonBitmap;
        __pColonBitmap = null;
 
+       delete __pColonDisabledBitmap;
+       __pColonDisabledBitmap = null;
+
        delete __pBgNormalBitmap;
        __pBgNormalBitmap = null;
 
@@ -1135,6 +1139,7 @@ void
 _DateTimePresenter::LoadResource(void)
 {
        Color color;
+       Color colonDisabledColor;
        result r = E_SUCCESS;
        Bitmap* pColonBitmap = null;
        Bitmap* pBgBitmap = null;
@@ -1155,11 +1160,16 @@ _DateTimePresenter::LoadResource(void)
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
        GET_COLOR_CONFIG(DATETIMEPICKER::TEXT_NORMAL, color);
+       GET_COLOR_CONFIG(DATETIMEPICKER::TEXT_DISABLED, colonDisabledColor);
 
-       __pColonBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pColonBitmap, Color::GetColor(COLOR_ID_WHITE), color);
+       __pColonBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pColonBitmap, Color::GetColor(COLOR_ID_MAGENTA), color);
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, (__pColonBitmap != null), , r, "[%s] Propagating.", GetErrorMessage(r));
 
+       __pColonDisabledBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pColonBitmap, Color::GetColor(COLOR_ID_MAGENTA), colonDisabledColor);
+       r = GetLastResult();
+       SysTryCatch(NID_UI_CTRL, (__pColonDisabledBitmap != null), , r, "[%s] Propagating.", GetErrorMessage(r));
+
        r = GET_BITMAP_CONFIG_N(DATETIMEPICKER::BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBgBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -1195,6 +1205,9 @@ CATCH:
        delete __pColonBitmap;
        __pColonBitmap = null;
 
+       delete __pColonDisabledBitmap;
+       __pColonDisabledBitmap = null;
+
        delete pBgBitmap;
 
        delete __pBgNormalBitmap;
@@ -1239,11 +1252,16 @@ _DateTimePresenter::DrawColon(Canvas& canvas)
                colonBounds.x += colonMargin;
        }
 
-       if (__pColonBitmap != null)
+       if (__pView->IsEnabled() && __pColonBitmap != null)
        {
                r = canvas.DrawBitmap(colonBounds, *__pColonBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r));
        }
+       else if (!__pView->IsEnabled() && __pColonDisabledBitmap != null)
+       {
+               r = canvas.DrawBitmap(colonBounds, *__pColonDisabledBitmap);
+               SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r));
+       }
 }
 
 void

diff --git a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
index ecff9a9..c62acaf 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditTimePresenter.cpp
@@ -443,12 +443,12 @@ _EditTimePresenter::LoadResource(void)
        r = GET_BITMAP_CONFIG_N(EDITTIME::COLON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r));
 
-       __pColonColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_WHITE),
+       __pColonColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                                                              colonTextColor);
        SysTryCatch(NID_UI_CTRL, (__pColonColorReplacementBitmap != null), r = GetLastResult(), GetLastResult(),
                        "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
-       __pColonDisabledColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_WHITE),
+       __pColonDisabledColorReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                        colonTextDisabledColor);
        SysTryCatch(NID_UI_CTRL, (__pColonDisabledColorReplacementBitmap != null), r = GetLastResult(), GetLastResult(),
                        "[%s] Propagating.", GetErrorMessage(GetLastResult()));

diff --git a/src/ui/inc/FUiCtrl_DateTimePresenter.h b/src/ui/inc/FUiCtrl_DateTimePresenter.h
index 7202fc2..6d8ebbb 100644 (file)
--- a/src/ui/inc/FUiCtrl_DateTimePresenter.h
+++ b/src/ui/inc/FUiCtrl_DateTimePresenter.h
@@ -215,6 +215,7 @@ private:
        Tizen::Graphics::Bitmap* __pPmBoxPressedEffectBitmap;
        Tizen::Graphics::Bitmap* __pPmBoxDisabledEffectBitmap;
        Tizen::Graphics::Bitmap* __pColonBitmap;
+       Tizen::Graphics::Bitmap* __pColonDisabledBitmap;
        Tizen::Graphics::Bitmap* __pBgNormalBitmap;
        Tizen::Graphics::Bitmap* __pBgEffectBitmap;