From: Syed Khaja Moinuddin Date: Sun, 14 Apr 2013 07:48:08 +0000 (+0900) Subject: New GUI 3.5 bitmaps applied in ColorPicker. X-Git-Tag: accepted/tizen_2.1/20130425.033138~231^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9a30bfdbcedd22dd9f0ba10b684980ee8dae87d;p=platform%2Fframework%2Fnative%2Fuifw.git New GUI 3.5 bitmaps applied in ColorPicker. Signed-off-by: Syed Khaja Moinuddin Change-Id: I8f55fd40aad091f44690cb3413f1de4b66c50bcf Signed-off-by: Syed Khaja Moinuddin --- diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_01.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_01.#.png index 095e550..4832735 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_01.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_button_01.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_left.png index 3519ce3..00bd91d 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_button_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png index cbc8521..6943212 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef.#.png index 48d34d5..b0e69cf 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_dim.#.png index 88fcf23..b0e69cf 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_dim.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_dim.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_press.#.png index 3939650..b92a942 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_press.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_01_ef_press.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_left_ef.png index 7364de4..f0af76f 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_left_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_left_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_right_ef.png index 3378050..eb787c3 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_right_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_right_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef.#.png index 0dd5acf..15b358b 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef_dim.#.png index 0fd1f0d..15b358b 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef_dim.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef_dim.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef_press.#.png index ba91ca2..39a2b62 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef_press.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_01_ef_press.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_left_ef.png index 8053e38..415eb77 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_left_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_left_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_right_ef.png index 1e62d77..9770f9b 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_right_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_right_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef.#.png index 0dd5acf..15b358b 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_dim.#.png index 0fd1f0d..15b358b 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_dim.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_dim.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_press.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_press.#.png index ba91ca2..39a2b62 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_press.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_01_ef_press.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_left_ef.png index 8053e38..415eb77 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_left_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_left_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png index 1e62d77..9770f9b 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_01.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_01.#.png index 9d5ccbd..48564e5 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_01.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_01.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_left.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_left.png index be90710..9ce3c35 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_left.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_button_right.png b/res/common/usr/share/osp/bitmaps/720x1280/00_button_right.png index fc5dbcf..2a69668 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_button_right.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_button_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01.#.png deleted file mode 100755 index d8f5378..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01.#.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef.#.png index 6d488fd..f24fea2 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_dim.#.png index d6c7cad..f24fea2 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_dim.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_dim.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_press.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_press.#.png index f5d2ac7..9ae8b7a 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_press.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_01_ef_press.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_left_ef.png index 89c8d4c..7313577 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_left_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_left_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_right_ef.png index 6853b59..4dd9622 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_right_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_right_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_01_ef_dim.#.png index 3b81648..230673c 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_01_ef_dim.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_01_ef_dim.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_left_ef.png index 48185a6..8c069a7 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_left_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_left_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_right_ef.png index d880257..b94eb15 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_right_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_right_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01.#.png deleted file mode 100755 index 48564e5..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01.#.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_dim.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_dim.#.png index 3b81648..230673c 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_dim.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_01_ef_dim.#.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_left_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_left_ef.png index 48185a6..8c069a7 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_left_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_left_ef.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png index d880257..b94eb15 100644 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png differ diff --git a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp index 241296e..e1379aa 100755 --- a/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ColorPickerPresenter.cpp @@ -986,6 +986,17 @@ _ColorPickerPresenter::DrawArrowButton(Canvas& canvas, const FloatRectangle& rcB { result r = E_SUCCESS; bool isCustomBitmap = false; + _ControlOrientation orientation = _ControlManager::GetInstance()->GetOrientation(); + + FloatDimension rightLeftArrowIconSize; + GET_DIMENSION_CONFIG(COLORPICKER::ARROW_BUTTON_ARROW_ICON_SIZE, orientation, rightLeftArrowIconSize); + + FloatRectangle rightLeftArrowIconBounds; + rightLeftArrowIconBounds.x = rcButton.x + (rcButton.width - rightLeftArrowIconSize.width) / 2.0f; + rightLeftArrowIconBounds.y = rcButton.y + (rcButton.height - rightLeftArrowIconSize.height) / 2.0f; + rightLeftArrowIconBounds.width = rightLeftArrowIconSize.width; + rightLeftArrowIconBounds.height = rightLeftArrowIconSize.height; + if (__pColorPicker->IsEnabled() == false) { @@ -1002,12 +1013,12 @@ _ColorPickerPresenter::DrawArrowButton(Canvas& canvas, const FloatRectangle& rcB if (drawLeftButton) { - r = DrawResourceBitmap(canvas, rcButton, __pLeftArrowDisabledBitmap); + r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pLeftArrowDisabledBitmap); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } else { - r = DrawResourceBitmap(canvas, rcButton, __pRightArrowDisabledBitmap); + r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pRightArrowDisabledBitmap); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } } @@ -1026,12 +1037,12 @@ _ColorPickerPresenter::DrawArrowButton(Canvas& canvas, const FloatRectangle& rcB if (drawLeftButton) { - r = DrawResourceBitmap(canvas, rcButton, __pLeftArrowPressedBitmap); + r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pLeftArrowPressedBitmap); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } else { - r = DrawResourceBitmap(canvas, rcButton, __pRightArrowPressedBitmap); + r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pRightArrowPressedBitmap); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } } @@ -1050,12 +1061,12 @@ _ColorPickerPresenter::DrawArrowButton(Canvas& canvas, const FloatRectangle& rcB if (drawLeftButton) { - r = DrawResourceBitmap(canvas, rcButton, __pLeftArrowNormalBitmap); + r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pLeftArrowNormalBitmap); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } else { - r = DrawResourceBitmap(canvas, rcButton, __pRightArrowNormalBitmap); + r = DrawResourceBitmap(canvas, rightLeftArrowIconBounds, __pRightArrowNormalBitmap); SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); } } diff --git a/src/ui/inc/FUi_ResourceColorPickerConfig.h b/src/ui/inc/FUi_ResourceColorPickerConfig.h index 644607e..41e9f0b 100755 --- a/src/ui/inc/FUi_ResourceColorPickerConfig.h +++ b/src/ui/inc/FUi_ResourceColorPickerConfig.h @@ -54,6 +54,7 @@ DECLARE_UI_CONFIG(COLORPICKER); DECLARE_IMAGE_CONFIG(BAR_BG_LANDSCAPE_NORMAL, 21); //Dimension config DECLARE_DIMENSION_CONFIG(DEFAULT_SIZE, 1); + DECLARE_DIMENSION_CONFIG(ARROW_BUTTON_ARROW_ICON_SIZE, 2); //Shape config DECLARE_SHAPE_CONFIG(ARROW_BUTTON_LEFT_MARGIN, 1); DECLARE_SHAPE_CONFIG(ARROW_BUTON_TOP_MARGIN, 2); @@ -72,4 +73,4 @@ DECLARE_UI_CONFIG(COLORPICKER); DECLARE_FIXED_VALUE_CONFIG(BLOCK_MARGIN, 1); DECLARE_END_UI_CONFIG(COLORPICKER); -#endif //_FUI_RESOURCE_COLORPICKER_CONFIG_H_ \ No newline at end of file +#endif //_FUI_RESOURCE_COLORPICKER_CONFIG_H_ diff --git a/src/ui/resource/FUi_ResourceColorPickerConfig.cpp b/src/ui/resource/FUi_ResourceColorPickerConfig.cpp index 31cb87b..61c941c 100755 --- a/src/ui/resource/FUi_ResourceColorPickerConfig.cpp +++ b/src/ui/resource/FUi_ResourceColorPickerConfig.cpp @@ -77,6 +77,7 @@ START_UI_CONFIG(COLORPICKER); ADD_SHAPE_CONFIG(BAR_WIDTH, 476); ADD_SHAPE_CONFIG(DIVIDER_MARGIN, 16); ADD_SHAPE_CONFIG(DIVIDER_WIDTH, 656); + ADD_DIMENSION_CONFIG(ARROW_BUTTON_ARROW_ICON_SIZE, 45, 45); ADD_DIMENSION_CONFIG(DEFAULT_SIZE, 688, 336); } END_UI_CONFIG_MODE(720x1280);