From: wonyoung12.lee Date: Mon, 15 Apr 2013 09:05:52 +0000 (+0900) Subject: Adjust for Changed UX for TDIS-5190, changed item text and text BG color code in... X-Git-Tag: accepted/tizen_2.1/20130425.033138~203^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b5b27a11f81687373e690de18f364e8b74e1e7c;p=platform%2Fframework%2Fnative%2Fuifw.git Adjust for Changed UX for TDIS-5190, changed item text and text BG color code in white/black theme Change-Id: Id38da631019519952857fd0a3b61d9901c6a0b1d Signed-off-by: wonyoung12.lee --- diff --git a/inc/FUiUiConfigurationTypes.h b/inc/FUiUiConfigurationTypes.h old mode 100644 new mode 100755 index 7a051ac..ed1185e --- a/inc/FUiUiConfigurationTypes.h +++ b/inc/FUiUiConfigurationTypes.h @@ -89,7 +89,7 @@ struct _OSP_EXPORT_ ColorKey */ _OSP_EXPORT_ static const int TEXT_HIGHLIGHTED; }; - + struct CheckButton { /** @@ -2019,6 +2019,27 @@ struct _OSP_EXPORT_ ColorKey _OSP_EXPORT_ static const int TEXT_HIGHLIGHTED; /** + * The property key to get the inner normal text color of icon list + * + * @since 2.1 + */ + _OSP_EXPORT_ static const int INNER_TEXT_NORMAL; + + /** + * The property key to get the inner pressed text color of icon list + * + * @since 2.1 + */ + _OSP_EXPORT_ static const int INNER_TEXT_PRESSED; + + /** + * The property key to get the inner highlighted text color of icon list + * + * @since 2.1 + */ + _OSP_EXPORT_ static const int INNER_TEXT_HIGHLIGHTED; + + /** * The property key to get the background color of innex text area of icon list * * @since 2.1 @@ -2520,7 +2541,7 @@ struct _OSP_EXPORT_ ColorKey */ _OSP_EXPORT_ static const int ARROW_BG_NORMAL; }; - + struct _OSP_EXPORT_ Tab { /** diff --git a/src/ui/FUiUiConfiguration.cpp b/src/ui/FUiUiConfiguration.cpp index 7cf7eaf..45fee78 100644 --- a/src/ui/FUiUiConfiguration.cpp +++ b/src/ui/FUiUiConfiguration.cpp @@ -311,6 +311,9 @@ const int ColorKey::IconList::EMPTY_TEXT_NORMAL = _ICONLIST::EMPTY_TEXT_NORMAL_C const int ColorKey::IconList::TEXT_NORMAL = _ICONLIST::TEXT_NORMAL_COLOR; const int ColorKey::IconList::TEXT_PRESSED = _ICONLIST::TEXT_PRESSED_COLOR; const int ColorKey::IconList::TEXT_HIGHLIGHTED = _ICONLIST::TEXT_HIGHLIGHTED_COLOR; +const int ColorKey::IconList::INNER_TEXT_NORMAL = _ICONLIST::INNER_TEXT_NORMAL_COLOR; +const int ColorKey::IconList::INNER_TEXT_PRESSED = _ICONLIST::INNER_TEXT_PRESSED_COLOR; +const int ColorKey::IconList::INNER_TEXT_HIGHLIGHTED = _ICONLIST::INNER_TEXT_HIGHLIGHTED_COLOR; const int ColorKey::IconList::INNER_TEXT_BG_NORMAL = _ICONLIST::INNER_TEXT_BG_NORMAL_COLOR; const int ColorKey::IconList::ITEM_BG_PRESSED = _ICONLIST::ITEM_BG_PRESSED_COLOR; const int ColorKey::IconList::ITEM_BORDER_NORMAL = _ICONLIST::ITEM_BORDER_NORMAL_COLOR; diff --git a/src/ui/controls/FUiCtrl_IconListItemDrawingProperty.cpp b/src/ui/controls/FUiCtrl_IconListItemDrawingProperty.cpp index d53ecbe..e485f9d 100644 --- a/src/ui/controls/FUiCtrl_IconListItemDrawingProperty.cpp +++ b/src/ui/controls/FUiCtrl_IconListItemDrawingProperty.cpp @@ -219,11 +219,6 @@ _IconListItemDrawingProperty::Initialize(void) // Load Item Text Size & color GET_SHAPE_CONFIG(ICONLIST::FONT_SIZE, _CONTROL_ORIENTATION_PORTRAIT, __textSize); - - GET_COLOR_CONFIG(ICONLIST::TEXT_NORMAL, __normalTextColor); - GET_COLOR_CONFIG(ICONLIST::TEXT_PRESSED, __pressedTextColor); - GET_COLOR_CONFIG(ICONLIST::TEXT_HIGHLIGHTED, __highlightedTextColor); - GET_COLOR_CONFIG(ICONLIST::INNER_TEXT_BG_NORMAL, __inTextBackgroundColor); __inTextBackgroundColor.SetAlpha(0x80); @@ -424,6 +419,20 @@ _IconListItemDrawingProperty::SetItemLayout(void) __2LineTextYPos = __textYPos; break; } + + if (__textVerticalAlignment >= ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_INSIDE_TOP && __textVerticalAlignment <= ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_INSIDE_BOTTOM) + { + GET_COLOR_CONFIG(ICONLIST::INNER_TEXT_NORMAL, __normalTextColor); + GET_COLOR_CONFIG(ICONLIST::INNER_TEXT_PRESSED, __pressedTextColor); + GET_COLOR_CONFIG(ICONLIST::INNER_TEXT_HIGHLIGHTED, __highlightedTextColor); + } + else if (__textVerticalAlignment >= ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_OUTSIDE_TOP && __textVerticalAlignment <= ICON_LIST_VIEW_ITEM_TEXT_VERTICAL_ALIGNMENT_OUTSIDE_BOTTOM) + { + GET_COLOR_CONFIG(ICONLIST::TEXT_NORMAL, __normalTextColor); + GET_COLOR_CONFIG(ICONLIST::TEXT_PRESSED, __pressedTextColor); + GET_COLOR_CONFIG(ICONLIST::TEXT_HIGHLIGHTED, __highlightedTextColor); + } + __changed = true; return E_SUCCESS; diff --git a/src/ui/inc/FUi_ResourceIconListConfig.h b/src/ui/inc/FUi_ResourceIconListConfig.h old mode 100755 new mode 100644 index 8025040..3a9ad0a --- a/src/ui/inc/FUi_ResourceIconListConfig.h +++ b/src/ui/inc/FUi_ResourceIconListConfig.h @@ -34,6 +34,9 @@ DECLARE_UI_CONFIG(ICONLIST); DECLARE_COLOR_CONFIG(ITEM_BORDER_NORMAL, 7); DECLARE_COLOR_CONFIG(ITEM_BORDER_PRESSED, 8); DECLARE_COLOR_CONFIG(ITEM_BORDER_HIGHLIGHTED, 9); + DECLARE_COLOR_CONFIG(INNER_TEXT_NORMAL, 10); + DECLARE_COLOR_CONFIG(INNER_TEXT_PRESSED, 11); + DECLARE_COLOR_CONFIG(INNER_TEXT_HIGHLIGHTED, 12); DECLARE_IMAGE_CONFIG(ITEM_BORDER_NORMAL, 1); DECLARE_IMAGE_CONFIG(ITEM_BORDER_PRESSED, 2); DECLARE_IMAGE_CONFIG(ITEM_BORDER_HIGHLIGHTED, 3); diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp index 52b8b32..d53ca94 100755 --- a/src/ui/resource/FUi_ResourceConfigParser.cpp +++ b/src/ui/resource/FUi_ResourceConfigParser.cpp @@ -9,7 +9,7 @@ // http://floralicense.org/license/ // // Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, +// distributed under the License is distributed on an AS IS BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. @@ -80,8 +80,8 @@ public: namespace { -xmlSAXHandler mySaxHandler = {null, null, null, null, null, null, null, null, null, null, null, null, null, null, - Tizen::Ui::_Resource::ConfigParser::StartSaxFunc, +xmlSAXHandler mySaxHandler = {null, null, null, null, null, null, null, null, null, null, null, null, null, null, + Tizen::Ui::_Resource::ConfigParser::StartSaxFunc, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null}; } @@ -2568,7 +2568,7 @@ ConfigParser::GetColorKeyTable(void) const char* key ="FOOTER::SOFTKEY_TEXT_HIGHLIGHTED"; __pColorKeyTable->Add(ResourceKey(key), _FOOTER::SOFTKEY_TEXT_HIGHLIGHTED_COLOR); } - + { const char* key ="FOOTER::SOFTKEY_ICON_NORMAL"; __pColorKeyTable->Add(ResourceKey(key), _FOOTER::SOFTKEY_ICON_NORMAL_COLOR); @@ -2924,6 +2924,18 @@ ConfigParser::GetColorKeyTable(void) __pColorKeyTable->Add(ResourceKey(key), _ICONLIST::TEXT_HIGHLIGHTED_COLOR); } { + const char* key ="ICONLIST::INNER_TEXT_NORMAL"; + __pColorKeyTable->Add(ResourceKey(key), _ICONLIST::INNER_TEXT_NORMAL_COLOR); + } + { + const char* key ="ICONLIST::INNER_TEXT_PRESSED"; + __pColorKeyTable->Add(ResourceKey(key), _ICONLIST::INNER_TEXT_PRESSED_COLOR); + } + { + const char* key ="ICONLIST::INNER_TEXT_HIGHLIGHTED"; + __pColorKeyTable->Add(ResourceKey(key), _ICONLIST::INNER_TEXT_HIGHLIGHTED_COLOR); + } + { const char* key ="ICONLIST::INNER_TEXT_BG_NORMAL"; __pColorKeyTable->Add(ResourceKey(key), _ICONLIST::INNER_TEXT_BG_NORMAL_COLOR); } diff --git a/src/ui/resource/FUi_ResourceIconListConfig.cpp b/src/ui/resource/FUi_ResourceIconListConfig.cpp old mode 100755 new mode 100644 index e35e21e..1dd4bb4 --- a/src/ui/resource/FUi_ResourceIconListConfig.cpp +++ b/src/ui/resource/FUi_ResourceIconListConfig.cpp @@ -28,7 +28,10 @@ START_UI_CONFIG(ICONLIST); ADD_COLOR_CONFIG(TEXT_NORMAL, $F011L1); ADD_COLOR_CONFIG(TEXT_PRESSED, $F011L1); ADD_COLOR_CONFIG(TEXT_HIGHLIGHTED, $F011L1); - ADD_COLOR_CONFIG(INNER_TEXT_BG_NORMAL, $B014); + ADD_COLOR_CONFIG(INNER_TEXT_NORMAL, $F011L1P); + ADD_COLOR_CONFIG(INNER_TEXT_PRESSED, $F011L1P); + ADD_COLOR_CONFIG(INNER_TEXT_HIGHLIGHTED, $F011L1P); + ADD_COLOR_CONFIG(INNER_TEXT_BG_NORMAL, $B013); ADD_COLOR_CONFIG(ITEM_BG_PRESSED, $B013); ADD_COLOR_CONFIG(ITEM_BORDER_NORMAL, $W151); ADD_COLOR_CONFIG(ITEM_BORDER_PRESSED, $W151);