Merge "fix prevent bug" into tizen_2.2
authorSukwon Suh <sukwon.suh@samsung.com>
Tue, 25 Jun 2013 04:56:48 +0000 (04:56 +0000)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Tue, 25 Jun 2013 04:56:48 +0000 (04:56 +0000)
317 files changed:
inc/FUiControl.h
inc/FUiCtrlEditField.h
inc/FUiUiConfigurationTypes.h
res/common/usr/share/osp/bitmaps/480x800/00_category_panel_bg_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png [moved from res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png with 60% similarity]
res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_02.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png
res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png [moved from res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png with 60% similarity]
res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png [moved from res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png with 52% similarity]
res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png
res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_left.#.png [moved from res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_center_focus.#.png with 93% similarity]
res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_right.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png
res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png
res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_left.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_right.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png
res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png
res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png
res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png
res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_bottom.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_center.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_top.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_popup_bg.#.png
res/common/usr/share/osp/bitmaps/480x800/00_popup_bg_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_02_bg.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_bottom.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_left.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_right.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_top.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/00_popup_button_bg.#.png
res/common/usr/share/osp/bitmaps/480x800/00_popup_button_focus.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_popup_button_normal.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/00_popup_button_normal_bg.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/00_popup_title_bg.#.png
res/common/usr/share/osp/bitmaps/480x800/00_progress_bar.#.png
res/common/usr/share/osp/bitmaps/480x800/00_progress_bg.#.png
res/common/usr/share/osp/bitmaps/480x800/00_slider_handle.png
res/common/usr/share/osp/bitmaps/480x800/00_slider_handle_focus.png
res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_button_radio_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_button_radio_press_bg.png
res/common/usr/share/osp/bitmaps/480x800/black/00_check_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_check_bg.png
res/common/usr/share/osp/bitmaps/480x800/black/00_check_dim_bg.png
res/common/usr/share/osp/bitmaps/480x800/black/00_check_press_bg.png
res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_handler.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_handler_h.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_popup_bg.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_popup_bg_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_rollover_bg_line_focus.#.png [moved from res/common/usr/share/osp/bitmaps/480x800/00_fast_scroll_rollover_bg_line_focus.#.png with 100% similarity, mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_icon_jump.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_icon_jump_left.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_bottom_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_center_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_top_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bg_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_02_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_dim_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_normal_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_press_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/black/00_popup_title_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_progress_bar_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_progress_ef_bg.#.png
res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_h.#.png [moved from res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_bottom_focus.#.png with 91% similarity, mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_h_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_v.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_v_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef.png
res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef_dim.png
res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef_press.png
res/common/usr/share/osp/bitmaps/480x800/default/00_button_radio_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_button_radio_press_bg.png
res/common/usr/share/osp/bitmaps/480x800/default/00_check_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_check_bg.png
res/common/usr/share/osp/bitmaps/480x800/default/00_check_dim_bg.png
res/common/usr/share/osp/bitmaps/480x800/default/00_check_press_bg.png
res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_handler.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_handler_h.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_popup_bg.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_popup_bg_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_rollover_bg_line_focus.#.png [moved from res/common/usr/share/osp/bitmaps/480x800/00_progress_ef.#.png with 94% similarity, mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_icon_jump.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_icon_jump_left.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_bottom_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_center_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_top_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bg_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bubble_02_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_dim_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_normal_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_press_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/default/00_popup_title_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/default/00_progress_bar_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/default/00_progress_ef_bg.#.png
res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_h.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_h_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_v.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_v_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef.png
res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef_dim.png
res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef_press.png
res/common/usr/share/osp/bitmaps/480x800/white/00_button_radio_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_button_radio_press_bg.png
res/common/usr/share/osp/bitmaps/480x800/white/00_check_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_check_press_bg.png
res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left.png [deleted file]
res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png [deleted file]
res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_bottom_ef.#.png [moved from res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_tab_bg_ef.#.png with 87% similarity]
res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_handler.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_handler_h.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_popup_bg.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_popup_bg_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_rollover_bg_line_focus.#.png [moved from res/common/usr/share/osp/bitmaps/480x800/00_tab_press_ef.#.png with 94% similarity, mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_icon_jump.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_icon_jump_left.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_bottom_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_center_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_top_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bg_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_02_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_dim_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_normal_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_press_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/480x800/white/00_popup_title_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/white/00_progress_bar_ef.#.png
res/common/usr/share/osp/bitmaps/480x800/white/00_progress_ef_bg.#.png
res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_h.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_h_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_v.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_v_ef.#.png [new file with mode: 0755]
res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef.png
res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef_dim.png
res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef_press.png
res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_tab_bg_focus_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/00_category_left_gradation.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/00_category_right_gradation.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_02.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_02.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_left.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_right.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_left.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_right.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png
res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png
res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_focus.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_top_focus.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/00_popup_bubble_02_bg.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/00_popup_title_bg.#__.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/black/00_button_radio_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_button_radio_press_bg.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_check_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_check_bg.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_check_bg_dim.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/black/00_check_dim_bg.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_check_press_bg.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_bottom_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_center_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_top_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_02_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_button_bg_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_title_bg_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_bg_focus_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_bg_line_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/default/00_button_radio_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_button_radio_press_bg.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_check_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_check_bg.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_check_bg_dim.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/default/00_check_dim_bg.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_check_press_bg.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_top_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_handler.#.png [moved from res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png with 70% similarity]
res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_handler_h.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_popup_bg.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_popup_bg_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_rollover_bg_line_focus.#.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_ef.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_left.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_left_ef.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_bottom_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_center_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_top_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bubble_02_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_button_bg_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_scroll.#.png [changed mode: 0755->0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_title_bg_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_h.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_h_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_v.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_v_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/default/00_tab_bg_focus_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/default/00_tab_bg_line_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_bg_dim.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_press_bg.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_category_button.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_category_button_focus.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_category_left_gradation.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_category_panel_bg.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_category_panel_bg_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_category_right_gradation.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_check_activated_press.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_check_press_bg.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_bottom_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_center_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_top_ef.#.png [moved from res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_top_ef.#.png with 87% similarity]
res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_bottom_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_center_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_top_ef.#.png
res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_02_ef.#.png [new file with mode: 0644]
res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_button_bg_ef.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_title_bg.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_bg.#.png [deleted file]
res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_ef_press.#.png [deleted file]
src/graphics/FGrp_FontFt2.cpp
src/graphics/FGrp_TextElementImpl.cpp
src/ui/FUiUiConfiguration.cpp
src/ui/FUi_Control.cpp
src/ui/FUi_EflUiEventManager.cpp
src/ui/FUi_FocusManagerImpl.cpp
src/ui/FUi_NativeObjectHandler.cpp
src/ui/FUi_SystemUtilImpl.cpp
src/ui/FUi_TouchGestureTimerManager.cpp
src/ui/FUi_Window.cpp
src/ui/controls/FUiCtrl_ButtonPresenter.cpp
src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
src/ui/controls/FUiCtrl_EditAreaImpl.cpp
src/ui/controls/FUiCtrl_EditDatePresenter.cpp
src/ui/controls/FUiCtrl_EditFieldImpl.cpp
src/ui/controls/FUiCtrl_EditPresenter.cpp
src/ui/controls/FUiCtrl_FastScroll.cpp
src/ui/controls/FUiCtrl_FastScrollPresenter.cpp
src/ui/controls/FUiCtrl_Form.cpp
src/ui/controls/FUiCtrl_FormImpl.cpp
src/ui/controls/FUiCtrl_Frame.cpp
src/ui/controls/FUiCtrl_GalleryCanvas.cpp
src/ui/controls/FUiCtrl_GalleryPresenter.cpp
src/ui/controls/FUiCtrl_GalleryViewEventHandler.cpp
src/ui/controls/FUiCtrl_HeaderImpl.cpp
src/ui/controls/FUiCtrl_Keypad.cpp
src/ui/controls/FUiCtrl_MessageBox.cpp
src/ui/controls/FUiCtrl_MessageBoxPresenter.cpp
src/ui/controls/FUiCtrl_OptionMenu.cpp
src/ui/controls/FUiCtrl_OptionMenuImpl.cpp
src/ui/controls/FUiCtrl_OptionMenuItem.cpp
src/ui/controls/FUiCtrl_OptionMenuModel.cpp
src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
src/ui/controls/FUiCtrl_Scroll.cpp
src/ui/controls/FUiCtrl_SearchBar.cpp
src/ui/controls/FUiCtrl_SliderOverlay.cpp
src/ui/controls/FUiCtrl_TableViewItem.cpp
src/ui/controls/FUiCtrl_Toolbar.cpp
src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
src/ui/inc/FUiCtrl_EditPresenter.h
src/ui/inc/FUiCtrl_FastScrollPresenter.h
src/ui/inc/FUiCtrl_Frame.h
src/ui/inc/FUiCtrl_GalleryCanvas.h
src/ui/inc/FUiCtrl_Keypad.h
src/ui/inc/FUiCtrl_OptionMenu.h
src/ui/inc/FUiCtrl_OptionMenuPresenter.h
src/ui/inc/FUiCtrl_TableViewItem.h
src/ui/inc/FUiCtrl_ToolbarPresenter.h
src/ui/inc/FUi_Control.h
src/ui/inc/FUi_FocusManagerImpl.h
src/ui/inc/FUi_ResourceContextMenuConfig.h
src/ui/inc/FUi_ResourceEditDateConfig.h
src/ui/inc/FUi_ResourceFastScrollConfig.h
src/ui/inc/FUi_ResourceHeaderConfig.h
src/ui/inc/FUi_ResourceInputPadConfig.h
src/ui/inc/FUi_ResourceOptionMenuConfig.h
src/ui/inc/FUi_ResourceSliderConfig.h
src/ui/inc/FUi_ResourceSplitPanelConfig.h
src/ui/inc/FUi_ResourceTabBarConfig.h
src/ui/inc/FUi_ResourceTableViewConfig.h
src/ui/inc/FUi_Window.h
src/ui/layout/FUi_LayoutRelativeLayout.cpp
src/ui/resource/FUi_ResourceCheckButtonConfig.cpp
src/ui/resource/FUi_ResourceConfigParser.cpp
src/ui/resource/FUi_ResourceContextMenuConfig.cpp
src/ui/resource/FUi_ResourceEditDateConfig.cpp
src/ui/resource/FUi_ResourceFastScrollConfig.cpp
src/ui/resource/FUi_ResourceHeaderConfig.cpp
src/ui/resource/FUi_ResourceInputPadConfig.cpp
src/ui/resource/FUi_ResourceOptionMenuConfig.cpp
src/ui/resource/FUi_ResourceScrollConfig.cpp
src/ui/resource/FUi_ResourceSliderConfig.cpp
src/ui/resource/FUi_ResourceSplitPanelConfig.cpp
src/ui/resource/FUi_ResourceTabBarConfig.cpp
src/ui/resource/FUi_ResourceTableViewConfig.cpp

index 23e30ec..5865844 100644 (file)
@@ -2039,7 +2039,7 @@ public:
         *
         * @param[in]   enable                  Set to @c true to enable effect sound, @n
         *                                                              else @c false
-        * @remarks     If the effect sound is disabled for a container, then all of its child controls have the effect sound disabled as well.
+        * @remarks If the effect sound is disabled for a container, then all of its child controls also will have the effect sound disabled.
        */
        void SetEffectSoundEnabled (bool enable);
 
index adcba1d..a4951cb 100755 (executable)
@@ -1471,12 +1471,13 @@ public:
        void SendOpaqueCommand (const Tizen::Base::String& command);
 
        /**
-         * Makes password text visible even when %EditField is in password-related styles
+         * Sets the password text as visible when %EditField is in password-related styles.
          *
          * @since               2.2
          *
          * @return  An error code
-         * @param[in]  visible         Set to @c true to show password as plain text, @n else @c false.
+         * @param[in] visible  Set to @c true to show password is visible as plain text, @n
+         *                     else @c false
          * @exception E_SUCCESS        The method is successful.
          * @exception E_INVALID_OPERATION The current state of the instance prohibits the execution of the specified operation. @n
          *             This operation is supported when the EditFieldStyle is ::EDIT_FIELD_STYLE_PASSWORD, @n ::EDIT_FIELD_STYLE_PASSWORD_SMALL, ::EDIT_FIELD_STYLE_PASSWORD_NUMBER, or ::EDIT_FIELD_STYLE_PASSWORD_NUMBER_SMALL.
index 5e619b2..17ff3c3 100644 (file)
@@ -392,6 +392,13 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int ITEM_BG_HIGHLIGHTED;
 
                /**
+               * The property key to get the disabled background color of the item of context menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_BG_DISABLED;
+
+               /**
                * The property key to get the color of grid type divider 01 of context menu.
                *
                * @since                2.1
@@ -425,6 +432,13 @@ struct _OSP_EXPORT_ ColorKey
                * @since                2.1
                */
                _OSP_EXPORT_ static const int ITEM_TEXT_HIGHLIGHTED;
+
+               /**
+               * The property key to get the diabled text color of the item of context menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_TEXT_DISABLED;
        };
 
        struct _OSP_EXPORT_ DateTimeBar
@@ -2344,13 +2358,27 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int TEXT_DISABLED;
 
                /**
-               * The property key to get the guide text color of input pad.
+               * The property key to get the normal guide text color of input pad.
                *
                * @since                2.1
                */
                _OSP_EXPORT_ static const int GUIDE_TEXT_NORMAL;
 
                /**
+               * The property key to get the pressed guide text color of input pad.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GUIDE_TEXT_PRESSED;
+
+               /**
+               * The property key to get the disabled guide text color of input pad.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GUIDE_TEXT_DISABLED;
+
+               /**
                * The property key to get the normal background color of the button of input pad.
                *
                * @since                2.1
@@ -2483,6 +2511,114 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int BOTTOM_BUTTON_TEXT_HIGHLIGHTED;
        };
 
+       struct _OSP_EXPORT_ OptionMenu
+       {
+               /**
+               * The property key to get the normal background color of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int BG_NORMAL;
+
+               /**
+               * The property key to get the normal text color of the item of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_TEXT_NORMAL;
+
+               /**
+               * The property key to get the pressed text color of the item of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_TEXT_PRESSED;
+
+               /**
+               * The property key to get the disabled text color of the item of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_TEXT_DISABLED;
+
+               /**
+               * The property key to get the highlighted text color of the item of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_TEXT_HIGHLIGHTED;
+
+               /**
+               * The property key to get the normal background color of the item of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_BG_NORMAL;
+
+               /**
+               * The property key to get the pressed background color of the item of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_BG_PRESSED;
+
+               /**
+               * The property key to get the disabled background color of the item of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_BG_DISABLED;
+
+               /**
+               * The property key to get the highlighted background color of the item of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_BG_HIGHLIGHTED;
+
+               /**
+               * The property key to get the normal color of the arrow of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int CONTEXTUAL_POPUP_ARROW_NORMAL;
+
+               /**
+               * The property key to get the pressed color of the arrow of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int CONTEXTUAL_POPUP_ARROW_PRESSED;
+
+               /**
+               * The property key to get the disabled color of the arrow of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int CONTEXTUAL_POPUP_ARROW_DISABLED;
+
+               /**
+               * The property key to get the highlighted color of the arrow of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int CONTEXTUAL_POPUP_ARROW_HIGHLIGHTED;
+
+               /**
+               * The property key to get the color of list type divider 01 of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int LIST_ITEM_DIVIDER_01_NORMAL;
+
+               /**
+               * The property key to get the color of list type divider 02 of option menu.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int LIST_ITEM_DIVIDER_02_NORMAL;
+       };
+
        struct _OSP_EXPORT_ Panel
        {
                /**
@@ -2645,6 +2781,34 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int EDIT_BG_DISABLED;
 
                /**
+               * The property key to get the pressed background color of the edit of search bar.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int EDIT_BG_PRESSED;
+
+               /**
+               * The property key to get the highlighted background color of the edit of search bar.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int EDIT_BG_HIGHLIGHTED;
+
+               /**
+               * The property key to get the normal guide text color of the edit of search bar.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GUIDE_TEXT_NORMAL;
+
+               /**
+               * The property key to get the disabled guide text color of the edit of search bar.
+               *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GUIDE_TEXT_DISABLED;
+
+               /**
                * The property key to get the normal text color of the edit of search bar.
                *
                * @since                2.1
@@ -2824,6 +2988,13 @@ struct _OSP_EXPORT_ ColorKey
                * @since                2.1
                */
                _OSP_EXPORT_ static const int DIVIDER_BG_PRESSED;
+
+               /**
+                * The property key to get the disabled color of the divider of split panel.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int DIVIDER_BG_DISABLED;
        };
 
        struct _OSP_EXPORT_ TabBar
@@ -2857,6 +3028,13 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int ITEM_BG_SELECTED;
 
                /**
+                * The property key to get the disabled background color of the item of tab bar.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_BG_DISABLED;
+
+               /**
                 * The property key to get the normal text color of the item of tab bar.
                 *
                * @since                2.1
@@ -2878,6 +3056,13 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int ITEM_TEXT_SELECTED;
 
                /**
+                * The property key to get the disabled text color of the item of tab bar.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_TEXT_DISABLED;
+
+               /**
                 * The property key to get the background color of the arrow of tab bar.
                 *
                * @since                2.1
@@ -3094,6 +3279,27 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int GROUP_ITEM_BG_NORMAL;
 
                /**
+                * The property key to get the pressed background color of the group item of table view.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GROUP_ITEM_BG_PRESSED;
+
+               /**
+                * The property key to get the highlighted background color of the group item of table view.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GROUP_ITEM_BG_HIGHLIGHTED;
+
+               /**
+                * The property key to get the disabled background color of the group item of table view.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GROUP_ITEM_BG_DISABLED;
+
+               /**
                 * The property key to get the normal text color of the group item of table view.
                 *
                * @since                2.1
@@ -3115,6 +3321,13 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int GROUP_ITEM_TEXT_HIGHLIGHTED;
 
                /**
+                * The property key to get the disabled text color of the group item of table view.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GROUP_ITEM_TEXT_DISABLED;
+
+               /**
                 * The property key to get the normal color of the index bar of the group item of table view.
                 *
                * @since                2.1
@@ -3129,6 +3342,13 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int GROUP_ITEM_INDEX_BAR_PRESSED;
 
                /**
+                * The property key to get the disabled color of the index bar of the group item of table view.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GROUP_ITEM_INDEX_BAR_DISABLED;
+
+               /**
                 * The property key to get the highlighted color of the index bar of the group item of table view.
                 *
                * @since                2.1
@@ -3157,6 +3377,13 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int GROUP_ITEM_BAR_HIGHLIGHTED;
 
                /**
+                * The property key to get the disabled color of the bar of the group item of table view.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int GROUP_ITEM_BAR_DISABLED;
+
+               /**
                 * The property key to get the background color of the section item of table view.
                 *
                * @since                2.1
@@ -3176,6 +3403,20 @@ struct _OSP_EXPORT_ ColorKey
                * @since                2.1
                */
                _OSP_EXPORT_ static const int EMPTY_TEXT_NORMAL;
+
+               /**
+                * The property key to get the normal color of Left Divider of table view.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_ANNEX_DIVIDER_LEFT_BG_NORMAL;
+
+               /**
+                * The property key to get the normal color of Right Divider of table view.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int ITEM_ANNEX_DIVIDER_RIGHT_BG_NORMAL;
        };
 
        struct _OSP_EXPORT_ TokenEdit
@@ -3223,6 +3464,20 @@ struct _OSP_EXPORT_ ColorKey
                _OSP_EXPORT_ static const int TEXT_SELECTED;
 
                /**
+                * The property key to get the highlighted text color of token edit.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int TEXT_HIGHLIGHTED;
+
+               /**
+                * The property key to get the disabled text color of token edit.
+                *
+               * @since                2.2
+               */
+               _OSP_EXPORT_ static const int TEXT_DISABLED;
+
+               /**
                 * The property key to get the normal title text color of token edit.
                 *
                * @since                2.2
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_category_panel_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_category_panel_bg_ef.#.png
new file mode 100755 (executable)
index 0000000..9124567
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_category_panel_bg_ef.#.png differ
similarity index 60%
rename from res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png
index 94ac13c..bd86919 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_02.png
new file mode 100644 (file)
index 0000000..1f94bc7
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_02.png differ
index 3713091..9fe938b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png differ
similarity index 60%
rename from res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png
index b53c29d..ed23f1f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png differ
similarity index 52%
rename from res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png
index 94ac13c..c686ada 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png differ
index 05301f6..f40a826 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png differ
similarity index 93%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_center_focus.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_left.#.png
index 408f81c..d947162 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_center_focus.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_left.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_right.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_right.#.png
new file mode 100644 (file)
index 0000000..a6ee545
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_text_dim_right.#.png differ
index 889e352..e1b9b72 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png differ
index 3ab0ee3..9919627 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_left.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_left.#.png
new file mode 100644 (file)
index 0000000..3f95312
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_left.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_right.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_right.#.png
new file mode 100644 (file)
index 0000000..20cb7ab
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_text_dim_right.#.png differ
index a2e0161..f970f09 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png differ
index a5f423f..f65a982 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png differ
index 04086cd..d7d0bc4 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png differ
index 7de9f46..1c099ab 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png and b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg.#.png
new file mode 100644 (file)
index 0000000..5379c96
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_bottom.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_bottom.#.png
new file mode 100644 (file)
index 0000000..039b1e4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_bottom.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_center.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_center.#.png
new file mode 100644 (file)
index 0000000..a0cdf4f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_center.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_top.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_top.#.png
new file mode 100644 (file)
index 0000000..d3a14fa
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_list_group_press_bg_top.#.png differ
index a84ae44..207f968 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg_ef.#.png
deleted file mode 100644 (file)
index 7a393e1..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bg_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_02_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_02_bg.#.png
new file mode 100644 (file)
index 0000000..7aa4bed
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_02_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_bottom.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_bottom.png
new file mode 100755 (executable)
index 0000000..1e05607
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_bottom.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_left.png
new file mode 100755 (executable)
index 0000000..cf1f668
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_left.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_right.png
new file mode 100755 (executable)
index 0000000..4732066
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_right.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_top.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_top.png
new file mode 100755 (executable)
index 0000000..90177c8
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_bubble_tail_top.png differ
index 395405e..656891d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_focus.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_focus.#.png
new file mode 100644 (file)
index 0000000..2f95ee1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_focus.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_normal.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_normal.#.png
new file mode 100644 (file)
index 0000000..bffa46b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_normal.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_normal_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_normal_bg.#.png
new file mode 100755 (executable)
index 0000000..bffa46b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_button_normal_bg.#.png differ
index 9759f8e..bedc765 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_popup_title_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_popup_title_bg.#.png differ
index cc8df06..69eec17 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_progress_bar.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_progress_bar.#.png differ
index b5e838e..ee47a48 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_progress_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_progress_bg.#.png differ
index bed9374..f25f167 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_slider_handle.png and b/res/common/usr/share/osp/bitmaps/480x800/00_slider_handle.png differ
index 95bd5fd..686795d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_slider_handle_focus.png and b/res/common/usr/share/osp/bitmaps/480x800/00_slider_handle_focus.png differ
index 77ef1f4..4950a3e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/00_slider_popup_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_radio_activated_press.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..f2fa9e5
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_radio_activated_press.png differ
index dc7cd53..36aca5e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_button_radio_press_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_button_radio_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_check_activated_press.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_check_activated_press.png
new file mode 100644 (file)
index 0000000..8612b5a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_check_activated_press.png differ
index 6477eee..da62f44 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_check_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_check_bg.png differ
index 24c1dbf..a505b20 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_check_dim_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_check_dim_bg.png differ
index 0aeb583..de33ecd 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_check_press_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_check_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..5b6173d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..d257387
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..4c84a6f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_expandable_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_handler.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_handler.#.png
new file mode 100755 (executable)
index 0000000..f458c63
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_handler.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_handler_h.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_handler_h.#.png
new file mode 100755 (executable)
index 0000000..b36da5b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_handler_h.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_popup_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_popup_bg.#.png
new file mode 100755 (executable)
index 0000000..2640614
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_popup_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_popup_bg_ef.#.png
new file mode 100755 (executable)
index 0000000..40f2e87
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_fast_scroll_popup_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_jump.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_jump.png
new file mode 100755 (executable)
index 0000000..1c59c6f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_jump.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_jump_left.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_jump_left.png
new file mode 100755 (executable)
index 0000000..e20f58d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_icon_jump_left.png differ
index 55c633b..c939fcb 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_bottom_ef.#.png differ
index 1db7fba..6d14a96 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_center_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_center_ef.#.png differ
index 98dbb9f..eef6dda 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_list_group_bg_top_ef.#.png differ
index 0db8c5e..f252a9d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_02_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_02_ef.#.png
new file mode 100644 (file)
index 0000000..e725513
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_bubble_02_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_dim_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_dim_ef.#.png
new file mode 100644 (file)
index 0000000..d4c017b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_dim_ef.#.png differ
index 607e0cc..2652a06 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_normal_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_normal_ef.#.png
new file mode 100644 (file)
index 0000000..5ff7987
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_normal_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_press_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_press_ef.#.png
new file mode 100644 (file)
index 0000000..4719b18
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_button_press_ef.#.png differ
index 8324192..1ec81d5 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_popup_title_ef.#.png differ
index ccbadf9..75f8757 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_progress_bar_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_progress_bar_ef.#.png differ
index 7d9c7c4..b134170 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_progress_ef_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_progress_ef_bg.#.png differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 91%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_bottom_focus.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_h.#.png
index 19b00a3..de18575
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_bottom_focus.#.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_h.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_h_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_h_ef.#.png
new file mode 100755 (executable)
index 0000000..baad743
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_h_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_v.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_v.#.png
new file mode 100755 (executable)
index 0000000..08f12eb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_v.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_v_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_v_ef.#.png
new file mode 100755 (executable)
index 0000000..a7d58f1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_scroll_bar_v_ef.#.png differ
index 3f302e4..be8e801 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef.png differ
index 393ad17..1134197 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef_dim.png differ
index 541588f..3d3bb80 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef_press.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_slider_handle_ef_press.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_radio_activated_press.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..f2fa9e5
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_radio_activated_press.png differ
index dc7cd53..36aca5e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_button_radio_press_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_button_radio_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_check_activated_press.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_check_activated_press.png
new file mode 100644 (file)
index 0000000..8612b5a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_check_activated_press.png differ
index 6477eee..da62f44 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_check_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_check_bg.png differ
index 24c1dbf..a505b20 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_check_dim_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_check_dim_bg.png differ
index 0aeb583..de33ecd 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_check_press_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_check_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..5b6173d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..d257387
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..4c84a6f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_expandable_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_handler.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_handler.#.png
new file mode 100755 (executable)
index 0000000..f458c63
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_handler.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_handler_h.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_handler_h.#.png
new file mode 100755 (executable)
index 0000000..b36da5b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_handler_h.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_popup_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_popup_bg.#.png
new file mode 100755 (executable)
index 0000000..2640614
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_popup_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_popup_bg_ef.#.png
new file mode 100755 (executable)
index 0000000..40f2e87
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_popup_bg_ef.#.png differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 94%
rename from res/common/usr/share/osp/bitmaps/480x800/00_progress_ef.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_rollover_bg_line_focus.#.png
index 1df40c8..95d97b7
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_progress_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_fast_scroll_rollover_bg_line_focus.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_icon_jump.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_icon_jump.png
new file mode 100755 (executable)
index 0000000..1c59c6f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_icon_jump.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_icon_jump_left.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_icon_jump_left.png
new file mode 100755 (executable)
index 0000000..e20f58d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_icon_jump_left.png differ
index 55c633b..c939fcb 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_bottom_ef.#.png differ
index 1db7fba..6d14a96 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_center_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_center_ef.#.png differ
index 98dbb9f..eef6dda 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_list_group_bg_top_ef.#.png differ
index 0db8c5e..f252a9d 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bubble_02_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bubble_02_ef.#.png
new file mode 100644 (file)
index 0000000..e725513
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_bubble_02_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_dim_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_dim_ef.#.png
new file mode 100644 (file)
index 0000000..d4c017b
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_dim_ef.#.png differ
index 607e0cc..2652a06 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_normal_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_normal_ef.#.png
new file mode 100644 (file)
index 0000000..5ff7987
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_normal_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_press_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_press_ef.#.png
new file mode 100644 (file)
index 0000000..4719b18
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_button_press_ef.#.png differ
index 8324192..1ec81d5 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_popup_title_ef.#.png differ
index ccbadf9..75f8757 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_progress_bar_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_progress_bar_ef.#.png differ
index 7d9c7c4..b134170 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_progress_ef_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_progress_ef_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_h.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_h.#.png
new file mode 100755 (executable)
index 0000000..de18575
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_h.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_h_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_h_ef.#.png
new file mode 100755 (executable)
index 0000000..baad743
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_h_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_v.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_v.#.png
new file mode 100755 (executable)
index 0000000..08f12eb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_v.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_v_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_v_ef.#.png
new file mode 100755 (executable)
index 0000000..a7d58f1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_scroll_bar_v_ef.#.png differ
index 3f302e4..be8e801 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef.png differ
index 393ad17..1134197 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef_dim.png differ
index 541588f..3d3bb80 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef_press.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_slider_handle_ef_press.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_radio_activated_press.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..de84ff0
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_radio_activated_press.png differ
index 9670099..4d6f842 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_radio_press_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_radio_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_check_activated_press.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_check_activated_press.png
new file mode 100644 (file)
index 0000000..88b3373
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_check_activated_press.png differ
index bdada2e..b64acb4 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_check_press_bg.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_check_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left.png
deleted file mode 100644 (file)
index 6fc3cde..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png
deleted file mode 100644 (file)
index eb016e0..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png and /dev/null differ
similarity index 87%
rename from res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_tab_bg_ef.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_bottom_ef.#.png
index ec0e890..25925af 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_tab_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..848df07
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..ddbfbbc
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_expandable_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_handler.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_handler.#.png
new file mode 100755 (executable)
index 0000000..78022d5
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_handler.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_handler_h.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_handler_h.#.png
new file mode 100755 (executable)
index 0000000..5b16a18
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_handler_h.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_popup_bg.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_popup_bg.#.png
new file mode 100755 (executable)
index 0000000..2640614
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_popup_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_popup_bg_ef.#.png
new file mode 100755 (executable)
index 0000000..40f2e87
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_popup_bg_ef.#.png differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 94%
rename from res/common/usr/share/osp/bitmaps/480x800/00_tab_press_ef.#.png
rename to res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_rollover_bg_line_focus.#.png
index 0398c09..95d97b7
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_tab_press_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_fast_scroll_rollover_bg_line_focus.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_jump.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_jump.png
new file mode 100755 (executable)
index 0000000..518aa05
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_jump.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_jump_left.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_jump_left.png
new file mode 100755 (executable)
index 0000000..83f603f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_icon_jump_left.png differ
index b6c2535..25925af 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_bottom_ef.#.png differ
index 0224e47..204ffa8 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_center_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_center_ef.#.png differ
index 4c4bd37..78f0a77 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_list_group_bg_top_ef.#.png differ
index 6803486..d602077 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bg_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bg_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_02_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_02_ef.#.png
new file mode 100644 (file)
index 0000000..7fc04f4
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_bubble_02_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_dim_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_dim_ef.#.png
new file mode 100644 (file)
index 0000000..c927672
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_dim_ef.#.png differ
index 7649449..ba92c63 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_normal_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_normal_ef.#.png
new file mode 100755 (executable)
index 0000000..3bb89e1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_normal_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_press_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_press_ef.#.png
new file mode 100644 (file)
index 0000000..2f4db9f
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_button_press_ef.#.png differ
index e23d37a..41ca8ff 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_title_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_popup_title_ef.#.png differ
index aa8d943..e7e4a12 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_progress_bar_ef.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_progress_bar_ef.#.png differ
index 4d049ad..3bc3eae 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_progress_ef_bg.#.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_progress_ef_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_h.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_h.#.png
new file mode 100755 (executable)
index 0000000..de18575
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_h.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_h_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_h_ef.#.png
new file mode 100755 (executable)
index 0000000..baad743
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_h_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_v.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_v.#.png
new file mode 100755 (executable)
index 0000000..08f12eb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_v.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_v_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_v_ef.#.png
new file mode 100755 (executable)
index 0000000..a7d58f1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_scroll_bar_v_ef.#.png differ
index d902fe5..50e723e 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef.png differ
index 8285673..8a57372 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef_dim.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef_dim.png differ
index 1956e61..d90eb05 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef_press.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_slider_handle_ef_press.png differ
diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_tab_bg_focus_ef.#.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_tab_bg_focus_ef.#.png
deleted file mode 100644 (file)
index 8c0593e..0000000
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_toolbar_tab_bg_focus_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_category_left_gradation.png b/res/common/usr/share/osp/bitmaps/720x1280/00_category_left_gradation.png
deleted file mode 100644 (file)
index d496f39..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_category_left_gradation.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_category_right_gradation.png b/res/common/usr/share/osp/bitmaps/720x1280/00_category_right_gradation.png
deleted file mode 100644 (file)
index bee349d..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_category_right_gradation.png and /dev/null differ
index c1e3afb..3ed41f3 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_02.png
new file mode 100644 (file)
index 0000000..7f42e2a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_02.png differ
index f8a0fea..5050480 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png differ
index 691ec73..a0e812f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_02.png
new file mode 100644 (file)
index 0000000..2e3215e
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_02.png differ
index a34588e..eeac0e9 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_left.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_left.#.png
new file mode 100644 (file)
index 0000000..bab5be3
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_left.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_right.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_right.#.png
new file mode 100644 (file)
index 0000000..33c27bb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_text_dim_right.#.png differ
index a737958..e359b16 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png differ
index e2161de..c45b135 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_left.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_left.#.png
new file mode 100644 (file)
index 0000000..67408d2
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_left.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_right.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_right.#.png
new file mode 100644 (file)
index 0000000..e5c12c0
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_text_dim_right.#.png differ
index 638a25d..39581c7 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png differ
index 07b32ea..5930089 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png differ
index 501d0cc..5879997 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png differ
index 6657de8..edcc904 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png and b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_focus.#.png
deleted file mode 100644 (file)
index 4b7603a..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_focus.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_top_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_top_focus.#.png
deleted file mode 100644 (file)
index 20595d4..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_top_focus.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bubble_02_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bubble_02_bg.#.png
new file mode 100644 (file)
index 0000000..3ff72ef
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_bubble_02_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_title_bg.#__.png b/res/common/usr/share/osp/bitmaps/720x1280/00_popup_title_bg.#__.png
deleted file mode 100644 (file)
index 101e777..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_popup_title_bg.#__.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_radio_activated_press.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..11fa3b0
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_radio_activated_press.png differ
index eeecb77..405592b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_radio_press_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_button_radio_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_activated_press.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_activated_press.png
new file mode 100644 (file)
index 0000000..44b86f1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_activated_press.png differ
index efda6ba..80d1dc9 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_bg_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_bg_dim.png
deleted file mode 100644 (file)
index 6d192cc..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_bg_dim.png and /dev/null differ
index ab7ff05..87f589a 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_dim_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_dim_bg.png differ
index 08be949..b268899 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_press_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_check_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..14ff7eb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..70df863
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..3e6f861
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_expandable_bg_top_ef.#.png differ
index 2c920f6..cf28be8 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_bottom_ef.#.png differ
index e4cd0c9..65e4170 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_center_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_center_ef.#.png differ
index 9b6580f..56d8bfe 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_list_group_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_02_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_02_ef.#.png
new file mode 100644 (file)
index 0000000..13c6003
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_bubble_02_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_button_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_button_bg_ef.#.png
deleted file mode 100644 (file)
index 271032a..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_button_bg_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_title_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_title_bg_ef.#.png
deleted file mode 100644 (file)
index 194b81b..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_popup_title_bg_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_bg_focus_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_bg_focus_ef.#.png
deleted file mode 100644 (file)
index ca3c5fd..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_bg_focus_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_bg_line_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_bg_line_ef.#.png
deleted file mode 100644 (file)
index c7e4078..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/black/00_tab_bg_line_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_radio_activated_press.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..11fa3b0
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_radio_activated_press.png differ
index eeecb77..405592b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_radio_press_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_button_radio_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_activated_press.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_activated_press.png
new file mode 100644 (file)
index 0000000..44b86f1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_activated_press.png differ
index efda6ba..80d1dc9 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_bg_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_bg_dim.png
deleted file mode 100644 (file)
index 6d192cc..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_bg_dim.png and /dev/null differ
index ab7ff05..87f589a 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_dim_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_dim_bg.png differ
index 08be949..b268899 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_press_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_check_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right.png
deleted file mode 100644 (file)
index 691ec73..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..14ff7eb
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..70df863
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_center_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_top_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_top_ef.#.png
new file mode 100644 (file)
index 0000000..3e6f861
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_expandable_bg_top_ef.#.png differ
similarity index 70%
rename from res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png
rename to res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_handler.#.png
index b53c29d..8accb2b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_handler.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_handler_h.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_handler_h.#.png
new file mode 100644 (file)
index 0000000..2461659
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_handler_h.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_popup_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_popup_bg.#.png
new file mode 100644 (file)
index 0000000..d124431
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_popup_bg.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_popup_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_popup_bg_ef.#.png
new file mode 100644 (file)
index 0000000..6d503d5
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_popup_bg_ef.#.png differ
index 7b3ad4a..94a1da0 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_rollover_bg_line_focus.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_fast_scroll_rollover_bg_line_focus.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump.png
new file mode 100644 (file)
index 0000000..fe9b4b0
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump.png differ
index bec4176..42458d9 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_ef.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_left.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_left.png
new file mode 100644 (file)
index 0000000..13d4593
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_left.png differ
index e3ad15e..72267ba 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_left_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_icon_jump_left_ef.png differ
index 2c920f6..cf28be8 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_bottom_ef.#.png differ
index e4cd0c9..65e4170 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_center_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_center_ef.#.png differ
index 9b6580f..56d8bfe 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_list_group_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bubble_02_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bubble_02_ef.#.png
new file mode 100644 (file)
index 0000000..13c6003
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bubble_02_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_button_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_button_bg_ef.#.png
deleted file mode 100644 (file)
index 271032a..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_button_bg_ef.#.png and /dev/null differ
old mode 100755 (executable)
new mode 100644 (file)
index 6f567d3..e0ac310
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_scroll.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_scroll.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_title_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_title_bg_ef.#.png
deleted file mode 100644 (file)
index 194b81b..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_title_bg_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_h.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_h.#.png
new file mode 100644 (file)
index 0000000..f91aa29
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_h.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_h_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_h_ef.#.png
new file mode 100644 (file)
index 0000000..2a15e4d
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_h_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_v.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_v.#.png
new file mode 100644 (file)
index 0000000..a5e9875
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_v.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_v_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_v_ef.#.png
new file mode 100644 (file)
index 0000000..52eac0a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_scroll_bar_v_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_tab_bg_focus_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_tab_bg_focus_ef.#.png
deleted file mode 100644 (file)
index ca3c5fd..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_tab_bg_focus_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_tab_bg_line_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_tab_bg_line_ef.#.png
deleted file mode 100644 (file)
index c7e4078..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/default/00_tab_bg_line_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_activated_press.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_activated_press.png
new file mode 100644 (file)
index 0000000..47a5f30
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_activated_press.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_bg_dim.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_bg_dim.png
deleted file mode 100644 (file)
index dd08796..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_bg_dim.png and /dev/null differ
index 97f83a0..6be258a 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_press_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_radio_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_button.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_button.#.png
deleted file mode 100644 (file)
index e0bd3ec..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_button.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_button_focus.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_button_focus.#.png
deleted file mode 100644 (file)
index 85db6ed..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_button_focus.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_left_gradation.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_left_gradation.png
deleted file mode 100644 (file)
index d496f39..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_left_gradation.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_panel_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_panel_bg.#.png
deleted file mode 100644 (file)
index b625d06..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_panel_bg.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_panel_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_panel_bg_ef.#.png
deleted file mode 100644 (file)
index d08343a..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_panel_bg_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_right_gradation.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_right_gradation.png
deleted file mode 100644 (file)
index bee349d..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_category_right_gradation.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_activated_press.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_activated_press.png
new file mode 100644 (file)
index 0000000..166ab4a
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_activated_press.png differ
index 2eb42b1..cda624f 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_press_bg.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_check_press_bg.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_bottom_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_bottom_ef.#.png
new file mode 100644 (file)
index 0000000..55557c1
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_bottom_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_center_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_center_ef.#.png
new file mode 100644 (file)
index 0000000..f35286c
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_center_ef.#.png differ
similarity index 87%
rename from res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_top_ef.#.png
rename to res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_top_ef.#.png
index 8d15a94..e1e07e9 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_expandable_bg_top_ef.#.png differ
index 2dddb07..55557c1 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_bottom_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_bottom_ef.#.png differ
index 78087e8..552ab74 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_center_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_center_ef.#.png differ
index 15d4091..0006a81 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_top_ef.#.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_list_group_bg_top_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_02_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_02_ef.#.png
new file mode 100644 (file)
index 0000000..0fa4a92
Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_bubble_02_ef.#.png differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_button_bg_ef.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_button_bg_ef.#.png
deleted file mode 100644 (file)
index bff4668..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_button_bg_ef.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_title_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_title_bg.#.png
deleted file mode 100644 (file)
index 9759f8e..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_popup_title_bg.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_bg.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_bg.#.png
deleted file mode 100644 (file)
index ed8a75b..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_slider_bg.#.png and /dev/null differ
diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_ef_press.#.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_ef_press.#.png
deleted file mode 100644 (file)
index b28acd9..0000000
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_toolbar_ef_press.#.png and /dev/null differ
index d6728d2..5e24d24 100644 (file)
@@ -928,8 +928,8 @@ _FontFt2::GetGlyphList(const _Util::String& reorderedText, Tizen::Base::Collecti
 
                // bidi cache underdevelop
                _IFont::Glyph* pFontGlyphData;
-
-               bool rtn = false;//FindCache(glyphIndex, __fontAttrib.size, __fontAttrib.style, &pFontGlyphData);
+/*
+               bool rtn = FindCache(glyphIndex, __fontAttrib.size, __fontAttrib.style, &pFontGlyphData);
 
                if (rtn)
                {
@@ -963,7 +963,7 @@ _FontFt2::GetGlyphList(const _Util::String& reorderedText, Tizen::Base::Collecti
 
                        continue;
                }
-
+*/
                if (isSynthetic)
                {
                        error = FT_Load_Glyph(pFace, glyphIndex, FT_LOAD_DEFAULT | FT_LOAD_NO_BITMAP);
index 2c0124c..d1bd72a 100644 (file)
@@ -63,6 +63,8 @@ _TextElementImpl::_TextElementImpl(void)
        __count = 0;
        __linkOffset = 0;
        __pTextComponent = null;
+       __foregroundColor = Color::GetColor(COLOR_ID_BLACK);
+       __backgroundColor = Color::GetColor(COLOR_ID_WHITE);
 }
 
 _TextElementImpl::~_TextElementImpl(void)
index 3ec1448..5e0ebe4 100644 (file)
@@ -82,11 +82,13 @@ const int ColorKey::ContextMenu::LIST_ITEM_DIVIDER_02_NORMAL = _CONTEXTMENU::LIS
 const int ColorKey::ContextMenu::ITEM_BG_NORMAL = _CONTEXTMENU::ITEM_BG_NORMAL_COLOR;
 const int ColorKey::ContextMenu::ITEM_BG_PRESSED = _CONTEXTMENU::ITEM_BG_PRESSED_COLOR;
 const int ColorKey::ContextMenu::ITEM_BG_HIGHLIGHTED = _CONTEXTMENU::ITEM_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::ContextMenu::ITEM_BG_DISABLED = _CONTEXTMENU::ITEM_BG_DISABLED_COLOR;
 const int ColorKey::ContextMenu::GRID_ITEM_DIVIDER_01_NORMAL = _CONTEXTMENU::GRID_ITEM_DIVIDER_01_NORMAL_COLOR;
 const int ColorKey::ContextMenu::GRID_ITEM_DIVIDER_02_NORMAL = _CONTEXTMENU::GRID_ITEM_DIVIDER_02_NORMAL_COLOR;
 const int ColorKey::ContextMenu::ITEM_TEXT_NORMAL = _CONTEXTMENU::ITEM_TEXT_NORMAL_COLOR;
 const int ColorKey::ContextMenu::ITEM_TEXT_PRESSED = _CONTEXTMENU::ITEM_TEXT_PRESSED_COLOR;
 const int ColorKey::ContextMenu::ITEM_TEXT_HIGHLIGHTED = _CONTEXTMENU::ITEM_TEXT_HIGHLIGHTED_COLOR;
+const int ColorKey::ContextMenu::ITEM_TEXT_DISABLED = _CONTEXTMENU::ITEM_TEXT_DISABLED_COLOR;
 const int ColorKey::DateTimeBar::BG_NORMAL = _DATETIMEBAR::BG_NORMAL_COLOR;
 const int ColorKey::DateTimeBar::TEXT_NORMAL = _DATETIMEBAR::TEXT_NORMAL_COLOR;
 const int ColorKey::DateTimeBar::TEXT_PRESSED = _DATETIMEBAR::TEXT_PRESSED_COLOR;
@@ -351,6 +353,8 @@ const int ColorKey::InputPad::TEXT_PRESSED = _INPUTPAD::TEXT_PRESSED_COLOR;
 const int ColorKey::InputPad::TEXT_HIGHLIGHTED = _INPUTPAD::TEXT_NORMAL_COLOR;
 const int ColorKey::InputPad::TEXT_DISABLED = _INPUTPAD::TEXT_NORMAL_COLOR;
 const int ColorKey::InputPad::GUIDE_TEXT_NORMAL = _INPUTPAD::GUIDE_TEXT_NORMAL_COLOR;
+const int ColorKey::InputPad::GUIDE_TEXT_PRESSED = _INPUTPAD::GUIDE_TEXT_PRESSED_COLOR;
+const int ColorKey::InputPad::GUIDE_TEXT_DISABLED = _INPUTPAD::GUIDE_TEXT_DISABLED_COLOR;
 const int ColorKey::InputPad::BUTTON_BG_NORMAL = _INPUTPAD::BUTTON_BG_NORMAL_COLOR;
 const int ColorKey::InputPad::BUTTON_BG_PRESSED = _INPUTPAD::BUTTON_BG_PRESSED_COLOR;
 const int ColorKey::InputPad::BUTTON_BG_HIGHLIGHTED = _INPUTPAD::BUTTON_BG_NORMAL_COLOR;
@@ -369,6 +373,21 @@ const int ColorKey::MessageBox::BOTTOM_BUTTON_TEXT_NORMAL = _MESSAGEBOX::BOTTOM_
 const int ColorKey::MessageBox::BOTTOM_BUTTON_TEXT_PRESSED = _MESSAGEBOX::BOTTOM_BUTTON_TEXT_PRESSED_COLOR;
 const int ColorKey::MessageBox::BOTTOM_BUTTON_TEXT_DISABLED = _MESSAGEBOX::BOTTOM_BUTTON_TEXT_DISABLED_COLOR;
 const int ColorKey::MessageBox::BOTTOM_BUTTON_TEXT_HIGHLIGHTED = _MESSAGEBOX::BOTTOM_BUTTON_TEXT_HIGHLIGHTED_COLOR;
+const int ColorKey::OptionMenu::BG_NORMAL = _OPTIONMENU::BG_NORMAL_COLOR;
+const int ColorKey::OptionMenu::ITEM_TEXT_NORMAL = _OPTIONMENU::ITEM_TEXT_NORMAL_COLOR;
+const int ColorKey::OptionMenu::ITEM_TEXT_PRESSED = _OPTIONMENU::ITEM_TEXT_PRESSED_COLOR;
+const int ColorKey::OptionMenu::ITEM_TEXT_DISABLED = _OPTIONMENU::ITEM_TEXT_DISABLED_COLOR;
+const int ColorKey::OptionMenu::ITEM_TEXT_HIGHLIGHTED = _OPTIONMENU::ITEM_TEXT_HIGHLIGHTED_COLOR;
+const int ColorKey::OptionMenu::ITEM_BG_NORMAL = _OPTIONMENU::ITEM_BG_NORMAL_COLOR;
+const int ColorKey::OptionMenu::ITEM_BG_PRESSED = _OPTIONMENU::ITEM_BG_PRESSED_COLOR;
+const int ColorKey::OptionMenu::ITEM_BG_DISABLED = _OPTIONMENU::ITEM_BG_DISABLED_COLOR;
+const int ColorKey::OptionMenu::ITEM_BG_HIGHLIGHTED = _OPTIONMENU::ITEM_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::OptionMenu::CONTEXTUAL_POPUP_ARROW_NORMAL = _OPTIONMENU::CONTEXTUAL_POPUP_ARROW_NORMAL_COLOR;
+const int ColorKey::OptionMenu::CONTEXTUAL_POPUP_ARROW_PRESSED = _OPTIONMENU::CONTEXTUAL_POPUP_ARROW_PRESSED_COLOR;
+const int ColorKey::OptionMenu::CONTEXTUAL_POPUP_ARROW_DISABLED = _OPTIONMENU::CONTEXTUAL_POPUP_ARROW_DISABLED_COLOR;
+const int ColorKey::OptionMenu::CONTEXTUAL_POPUP_ARROW_HIGHLIGHTED = _OPTIONMENU::CONTEXTUAL_POPUP_ARROW_HIGHLIGHTED_COLOR;
+const int ColorKey::OptionMenu::LIST_ITEM_DIVIDER_01_NORMAL = _OPTIONMENU::LIST_ITEM_DIVIDER_01_NORMAL_COLOR;
+const int ColorKey::OptionMenu::LIST_ITEM_DIVIDER_02_NORMAL = _OPTIONMENU::LIST_ITEM_DIVIDER_02_NORMAL_COLOR;
 const int ColorKey::Panel::GROUPED_STYLE_BG_NORMAL = _PANEL::GROUPED_STYLE_BG_NORMAL_COLOR;
 const int ColorKey::Popup::BG_NORMAL = _POPUP::BG_NORMAL_COLOR;
 const int ColorKey::Popup::TITLE_TEXT_NORMAL = _POPUP::TITLE_TEXT_NORMAL_COLOR;
@@ -390,6 +409,10 @@ const int ColorKey::SearchBar::BUTTON_TEXT_DISABLED = _SEARCHBAR::BUTTON_TEXT_DI
 const int ColorKey::SearchBar::BUTTON_TEXT_HIGHLIGHTED = _SEARCHBAR::BUTTON_TEXT_HIGHLIGHTED_COLOR;
 const int ColorKey::SearchBar::EDIT_BG_NORMAL = _SEARCHBAR::EDIT_BG_NORMAL_COLOR;
 const int ColorKey::SearchBar::EDIT_BG_DISABLED = _SEARCHBAR::EDIT_BG_DISABLED_COLOR;
+const int ColorKey::SearchBar::EDIT_BG_PRESSED = _SEARCHBAR::EDIT_BG_PRESSED_COLOR;
+const int ColorKey::SearchBar::EDIT_BG_HIGHLIGHTED = _SEARCHBAR::EDIT_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::SearchBar::GUIDE_TEXT_NORMAL = _SEARCHBAR::GUIDE_TEXT_NORMAL_COLOR;
+const int ColorKey::SearchBar::GUIDE_TEXT_DISABLED = _SEARCHBAR::GUIDE_TEXT_DISABLED_COLOR;
 const int ColorKey::SearchBar::EDIT_TEXT_NORMAL = _SEARCHBAR::EDIT_TEXT_NORMAL_COLOR;
 const int ColorKey::SearchBar::EDIT_TEXT_DISABLED = _SEARCHBAR::EDIT_TEXT_DISABLED_COLOR;
 const int ColorKey::SearchBar::EDIT_TEXT_HIGHLIGHTED = _SEARCHBAR::EDIT_TEXT_HIGHLIGHTED_COLOR;
@@ -415,13 +438,16 @@ const int ColorKey::Slider::OVERLAY_BG_NORMAL = _SLIDER::OVERLAY_BG_NORMAL_COLOR
 const int ColorKey::Slider::OVERLAY_TEXT_NORMAL = _SLIDER::OVERLAY_TEXT_NORMAL_COLOR;
 const int ColorKey::SplitPanel::DIVIDER_BG_NORMAL = _SPLITPANEL::DIVIDER_BG_NORMAL_COLOR;
 const int ColorKey::SplitPanel::DIVIDER_BG_PRESSED = _SPLITPANEL::DIVIDER_BG_PRESSED_COLOR;
+const int ColorKey::SplitPanel::DIVIDER_BG_DISABLED = _SPLITPANEL::DIVIDER_BG_DISABLED_COLOR;
 const int ColorKey::TabBar::BG_NORMAL = _TABBAR::BG_NORMAL_COLOR;
 const int ColorKey::TabBar::ITEM_BG_NORMAL = _TABBAR::ITEM_BG_NORMAL_COLOR;
 const int ColorKey::TabBar::ITEM_BG_PRESSED = _TABBAR::ITEM_BG_PRESSED_COLOR;
 const int ColorKey::TabBar::ITEM_BG_SELECTED = _TABBAR::ITEM_BG_SELECTED_COLOR;
+const int ColorKey::TabBar::ITEM_BG_DISABLED = _TABBAR::ITEM_BG_DISABLED_COLOR;
 const int ColorKey::TabBar::ITEM_TEXT_NORMAL = _TABBAR::ITEM_TEXT_NORMAL_COLOR;
 const int ColorKey::TabBar::ITEM_TEXT_PRESSED = _TABBAR::ITEM_TEXT_PRESSED_COLOR;
 const int ColorKey::TabBar::ITEM_TEXT_SELECTED = _TABBAR::ITEM_TEXT_SELECTED_COLOR;
+const int ColorKey::TabBar::ITEM_TEXT_DISABLED = _TABBAR::ITEM_TEXT_DISABLED_COLOR;
 const int ColorKey::TabBar::ARROW_BG_NORMAL = _TABBAR::ARROW_BG_NORMAL_COLOR;
 const int ColorKey::Tab::ITEM_BG_NORMAL = _TAB::ITEM_BG_NORMAL_COLOR;
 const int ColorKey::Tab::ITEM_BG_PRESSED = _TAB::ITEM_BG_PRESSED_COLOR;
@@ -452,24 +478,34 @@ const int ColorKey::TableView::ITEM_ANNEX_DETAIL_BG_NORMAL = _TABLEVIEW::ITEM_AN
 const int ColorKey::TableView::ITEM_ANNEX_DETAIL_BG_PRESSED = _TABLEVIEW::ITEM_ANNEX_DETAIL_BG_PRESSED_COLOR;
 const int ColorKey::TableView::ITEM_ANNEX_DETAIL_BG_HIGHLIGHTED = _TABLEVIEW::ITEM_ANNEX_DETAIL_BG_HIGHLIGHTED_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_BG_NORMAL = _TABLEVIEW::GROUPITEM_BG_NORMAL_COLOR;
+const int ColorKey::TableView::GROUP_ITEM_BG_PRESSED = _TABLEVIEW::GROUPITEM_BG_PRESSED_COLOR;
+const int ColorKey::TableView::GROUP_ITEM_BG_HIGHLIGHTED = _TABLEVIEW::GROUPITEM_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::TableView::GROUP_ITEM_BG_DISABLED = _TABLEVIEW::GROUPITEM_BG_DISABLED_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_TEXT_NORMAL = _TABLEVIEW::GROUPITEM_TEXT_NORMAL_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_TEXT_PRESSED = _TABLEVIEW::GROUPITEM_TEXT_PRESSED_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_TEXT_HIGHLIGHTED = _TABLEVIEW::GROUPITEM_TEXT_HIGHLIGHTED_COLOR;
+const int ColorKey::TableView::GROUP_ITEM_TEXT_DISABLED = _TABLEVIEW::GROUPITEM_TEXT_DISABLED_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_INDEX_BAR_NORMAL = _TABLEVIEW::GROUPITEM_INDEX_BAR_NORMAL_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_INDEX_BAR_PRESSED = _TABLEVIEW::GROUPITEM_INDEX_BAR_PRESSED_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_INDEX_BAR_HIGHLIGHTED = _TABLEVIEW::GROUPITEM_INDEX_BAR_HIGHLIGHTED_COLOR;
+const int ColorKey::TableView::GROUP_ITEM_INDEX_BAR_DISABLED = _TABLEVIEW::GROUPITEM_INDEX_BAR_DISABLED_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_BAR_NORMAL = _TABLEVIEW::GROUPITEM_BAR_NORMAL_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_BAR_PRESSED = _TABLEVIEW::GROUPITEM_BAR_PRESSED_COLOR;
 const int ColorKey::TableView::GROUP_ITEM_BAR_HIGHLIGHTED = _TABLEVIEW::GROUPITEM_BAR_HIGHLIGHTED_COLOR;
+const int ColorKey::TableView::GROUP_ITEM_BAR_DISABLED = _TABLEVIEW::GROUPITEM_BAR_DISABLED_COLOR;
 const int ColorKey::TableView::SECTION_ITEM_BG_NORMAL = _TABLEVIEW::SECTIONITEM_BG_NORMAL_COLOR;
 const int ColorKey::TableView::CONTEXT_ITEM_BG_NORMAL = _TABLEVIEW::CONTEXTITEM_BG_NORMAL_COLOR;
 const int ColorKey::TableView::EMPTY_TEXT_NORMAL = _TABLEVIEW::EMPTY_CONTENTS_TEXT_NORMAL_COLOR;
+const int ColorKey::TableView::ITEM_ANNEX_DIVIDER_LEFT_BG_NORMAL = _TABLEVIEW::ITEM_ANNEX_DIVIDER_LEFT_BG_NORMAL_COLOR;
+const int ColorKey::TableView::ITEM_ANNEX_DIVIDER_RIGHT_BG_NORMAL = _TABLEVIEW::ITEM_ANNEX_DIVIDER_RIGHT_BG_NORMAL_COLOR;
 const int ColorKey::TokenEdit::BG_NORMAL = _TOKENEDIT::BG_NORMAL_COLOR;
 const int ColorKey::TokenEdit::BG_SELECTED = _TOKENEDIT::BG_SELECTED_COLOR;
 const int ColorKey::TokenEdit::BG_HIGHLIGHTED = _TOKENEDIT::BG_HIGHLIGHTED_COLOR;
 const int ColorKey::TokenEdit::BG_DISABLED = _TOKENEDIT::BG_DISABLED_COLOR;
 const int ColorKey::TokenEdit::TEXT_NORMAL = _TOKENEDIT::TEXT_NORMAL_COLOR;
 const int ColorKey::TokenEdit::TEXT_SELECTED = _TOKENEDIT::TEXT_SELECTED_COLOR;
+const int ColorKey::TokenEdit::TEXT_HIGHLIGHTED = _TOKENEDIT::TEXT_HIGHLIGHTED_COLOR;
+const int ColorKey::TokenEdit::TEXT_DISABLED = _TOKENEDIT::TEXT_DISABLED_COLOR;
 const int ColorKey::TokenEdit::TITLE_TEXT_NORMAL = _TOKENEDIT::TITLE_TEXT_NORMAL_COLOR;
 const int ColorKey::TokenEdit::TITLE_TEXT_PRESSED = _TOKENEDIT::TITLE_TEXT_PRESSED_COLOR;
 const int ColorKey::TokenEdit::TITLE_TEXT_HIGHLIGHTED = _TOKENEDIT::TITLE_TEXT_HIGHLIGHTED_COLOR;
index a7ad337..0830a1f 100644 (file)
@@ -33,6 +33,7 @@
 #include <FSys_SystemInfoImpl.h>
 #include "FUi_Control.h"
 #include "FUi_ControlManager.h"
+#include "FUi_FocusManagerImpl.h"
 #include "FUi_CoordinateSystemUtils.h"
 #include "FUi_Window.h"
 #include "FUi_EcoreEvasMgr.h"
@@ -1868,6 +1869,18 @@ _Control::HasFocusRing(void)
 }
 
 void
+_Control::SetFocusNavigateEnabled(bool enable)
+{
+       __isNavigatable = enable;       
+}
+
+bool
+_Control::IsFocusNavigateEnabled(void) const
+{
+       return __isNavigatable;
+}
+
+void
 _Control::SetFocusModeStateEnabled(bool enable)
 {
        __isFocusMode = enable;
@@ -1880,7 +1893,7 @@ _Control::SetFocusModeStateEnabled(bool enable)
 bool
 _Control::IsFocusModeStateEnabled(void) const
 {
-       return __isFocusMode;
+       return _FocusManagerImpl::GetInstance()->IsFocusModeStateEnabled();
 }
 
 // E_INVALID_ARG
@@ -3808,6 +3821,17 @@ _Control::~_Control(void)
                __pFont = null;
        }
 
+       _Window* pWindow = GetRootWindow();
+
+       if (pWindow)
+       {
+               _Control* pFocusTraversalControl = pWindow->GetFocusTraversalControl(this);
+               if (pFocusTraversalControl == this)
+               {
+                       pWindow->SetFocusTraversalControl(null);
+               }
+       }
+
 //     Dangerous: it clears last result and log in catch block.
 //     ClearLastResult();
 }
@@ -3897,6 +3921,7 @@ _Control::_Control(void)
        , __isSetClientBounds(false)
        , __isCalledGetCanvasN(false)
        , __isFocusMode(false)
+       , __isNavigatable(true)
        , __pVisualElementContentProvider(null)
        , __pVisualElement(null)
        , __pVisualElementEventListener(null)
index 808b106..ebc0468 100644 (file)
@@ -257,22 +257,22 @@ const _EvasConvertKeys keyTable[] =
        { _KEY_DOWN, "Down" },
        { _KEY_RIGHT, "Right" },
        { _KEY_CONTEXT_MENU, "Menu" },
-       { _KEY_CONTEXT_MENU, "XF86Send" },
+       { _KEY_MENU, "XF86Send" },
 
        { _KEY_COMMA, "less" }, /*virtual keypad <*/
        { _KEY_9, "parenleft" }, /*virtual keypad (*/
        { _KEY_0, "parenright" }, /*virtual keypad )*/
 
        { _KEY_BACK, "XF86Stop" },
-       { _KEY_HOME, "XF86Phone" },
+//     { _KEY_HOME, "XF86Phone" },
        { _KEY_WEB_PAGE, "XF86WWW" },
        { _KEY_MAIL, "XF86Mail" },
        { _KEY_SCREEN_SAVER, "XF86ScreenSaver" },
        { _KEY_BRIGHTNESS_DOWN, "XF86MonBrightnessDown" },
        { _KEY_BRIGHTNESS_UP, "XF86MonBrightnessUp" },
        { _KEY_MUTE, "XF86AudioMute" },
-       { _KEY_VOLUME_DOWN, "XF86AudioLowerVolume" },
-       { _KEY_VOLUME_UP, "XF86AudioRaiseVolume" },
+//     { _KEY_VOLUME_DOWN, "XF86AudioLowerVolume" },
+//     { _KEY_VOLUME_UP, "XF86AudioRaiseVolume" },
        { _KEY_PLAY_PAUSE, "XF86AudioPlay" },
        { _KEY_NEXT_SONG, "XF86AudioNext" },
        { _KEY_PREVIOUS_SONG, "XF86AudioPrev" },
index b95376b..922ff9f 100644 (file)
@@ -48,6 +48,7 @@ _FocusManagerImpl* _FocusManagerImpl::__pInstance = null;
 
 _FocusManagerImpl::_FocusManagerImpl(void)
        : __pCurrentFocusUiControl(null)
+       , __isFocusMode(false)
 {
        result r = _UiEventManager::GetInstance()->AddPostKeyEventListener(*this);
        SysTryReturnVoidResult(NID_UI,  r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -137,6 +138,12 @@ _FocusManagerImpl::GetCurrentFocusedWindow(void) const
        return pWindowImpl;
 }
 
+bool
+_FocusManagerImpl::IsFocusModeStateEnabled(void) const
+{
+       return __isFocusMode;
+}
+
 int
 _FocusManagerImpl::GetNextIndex(int currentIndex, FocusDirection focusDirection, const IListT<_Control*>* pFocusControlList) const
 {
@@ -166,9 +173,10 @@ bool
 _FocusManagerImpl::IsFocusable(_Control* pControl) const
 {
        bool isFocusalbe = pControl->IsFocusable();
-       bool enableState = pControl->GetEnableState();
-       bool visibleState = pControl->GetVisibleState();
-       if (enableState  && visibleState  && isFocusalbe)
+       bool enableState = pControl->IsEnabled();
+       bool visibleState = pControl->IsVisible();
+       bool isNavigatable = pControl->IsFocusNavigateEnabled();
+       if (enableState  && visibleState  && isFocusalbe && isNavigatable)
        {
                return true;
        }
@@ -256,7 +264,7 @@ _FocusManagerImpl::StartFocusTraversal(_Control* pControl, FocusDirection focusD
        _Window* pTop = pControl->GetRootWindow();
        if (pTop)
        {
-               _Control* pFocusTraversalControl = pTop->GetFocusTraversalControl();
+               _Control* pFocusTraversalControl = pTop->GetFocusTraversalControl(pControl);
                if (pFocusTraversalControl)
                {
                        pControl = pFocusTraversalControl;
@@ -279,7 +287,7 @@ _FocusManagerImpl::StartFocusTraversal(_Control* pControl, FocusDirection focusD
                                pTop->SetFocusTraversalControl(pControl);
                        }
                        pControl->DrawFocus();
-                       pControl->SetFocusModeStateEnabled(true);
+                       __isFocusMode = true;
                        return;
                }
        }
@@ -336,8 +344,6 @@ _FocusManagerImpl::StartFocusTraversal(_Control* pControl, FocusDirection focusD
                                        {
                                                if (pNextFocusControl != pControl)
                                                {
-                                                   pNextFocusControl->SetFocusModeStateEnabled(true);
-                                                   pControl->SetFocusModeStateEnabled(false);
                                                    pNextFocusControl->SetFocused();
                                                }
                                                findNextFocusControl = true;
@@ -375,7 +381,6 @@ bool
 _FocusManagerImpl::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
 {
        _KeyCode keyCode = keyInfo.GetKeyCode();
-
        if(keyCode == _KEY_TAB)
        {
                FocusDirection focusDirection = FOCUS_DIRECTION_DOWNWARD;
@@ -399,20 +404,16 @@ bool
 _FocusManagerImpl::OnTouchPressed(const _Control& source, const _TouchInfo& touchinfo)
 {
        _Control* pSourceControl = const_cast<_Control*>(&source);
-       bool isFocusMode = pSourceControl->IsFocusModeStateEnabled();
-       if (isFocusMode)
-       {
-               pSourceControl->SetFocusModeStateEnabled(false);
-       }
+       __isFocusMode = false;
 
        _Window* pTop = source.GetRootWindow();
        if (pTop)
        {
-               _Control* pFocusTraversalControl = pTop->GetFocusTraversalControl();
+               _Control* pFocusTraversalControl = pTop->GetFocusTraversalControl(pSourceControl);
                if (pFocusTraversalControl)
                {
+                       pFocusTraversalControl->OnFocusModeStateChanged();
                        pFocusTraversalControl->RemoveFocusRing();
-                       pFocusTraversalControl->SetFocusModeStateEnabled(false);
                        pTop->SetFocusTraversalControl(null);
                }
        }
index bc6cd50..8e68c01 100644 (file)
 #include <FUiControl.h>
 #include "FUi_ControlImpl.h"
 
-#define STO_API
-
-#ifdef STO_API
-// for sto
-#include "FUiAnimVisualElementSurface.h"
-#include "FUiAnim_VisualElementSurfaceImpl.h"
-
-#endif
 
 
 
 using namespace Tizen::Ui::Animations;
 
-#ifdef STO_API
-extern "C" _OSP_EXPORT_ void*
-STO_GetNativeHandle(void* pControl)
-{
-       Handle nativeHandle = 0;
-       Tizen::Ui::Control* pControlPointer = (Tizen::Ui::Control*)pControl;
-
-       if (pControlPointer)
-       {
-               Tizen::Ui::_ControlImpl* pControlImpl = Tizen::Ui::_ControlImpl::GetInstance(*pControlPointer);
-
-               if (pControlImpl)
-               {
-                       VisualElement *pVisualElement = pControlImpl->GetVisualElement();
-
-                       if (pVisualElement)
-                       {
-                               VisualElementSurface* pSurface = pVisualElement->GetSurfaceN();
-
-                               if (pSurface)
-                               {
-                                       _VisualElementSurfaceImpl* pSurfaceImpl = _VisualElementSurfaceImpl::GetInstance(*pSurface);
-                                       if (pSurfaceImpl)
-                                               nativeHandle = pSurfaceImpl->GetNativeHandle();
-
-                                       delete pSurface;
-                               }
-                       }
-               }
-       }
-
-       return (void*)nativeHandle;
-}
-
-extern "C" _OSP_EXPORT_ void
-STO_NativeHandleSetShowState(void* pNative, bool show)
-{
-       if(show)
-               evas_object_show((Evas_Object*)pNative);
-       else
-               evas_object_hide((Evas_Object*)pNative);
-}
-
-extern "C" _OSP_EXPORT_ void*
-STO_GetVisualElement(void* pControl)
-{
-       Tizen::Ui::Control* pControlPointer = (Tizen::Ui::Control*)pControl;
-       Tizen::Ui::_ControlImpl* pControlImpl = Tizen::Ui::_ControlImpl::GetInstance(*pControlPointer);
-
-       return (void *)pControlImpl->GetVisualElement();
-}
-
-extern "C" _OSP_EXPORT_
-void STO_NativeHandleDataSet(void* pEvasObject, void* pData, int width, int height)
-{
-       evas_object_image_size_set((Evas_Object*)pEvasObject, width, height);
-       evas_object_image_data_set((Evas_Object*)pEvasObject, pData);
-}
-
-
-
-extern "C" _OSP_EXPORT_ void
-STO_SetVisualElementNativeObject(void* pVisualElement, void* pNativeObject)
-{
-       VisualElement* pVE = (VisualElement* )pVisualElement;
-       Evas_Object* pEO = (Evas_Object*)pNativeObject;
-
-       _VisualElementImpl* pVEImpl = _VisualElementImpl::GetInstance(*pVE);
-
-       _EflNode* pNode = (_EflNode*)pVEImpl->GetNativeNode();
-       pNode->AddNativeSmartObject(*pVE, pEO);
-
-       const char* pName = null;
-       evas_object_image_file_get(pEO, &pName, null);
-       if (!pName)
-       {
-               int imageWidth = 0;
-               int imageHeight = 0;
-
-               evas_object_image_size_get(pEO, &imageWidth, &imageHeight);
-               evas_object_image_data_update_add(pEO, 0, 0, imageWidth, imageHeight);
-       }
-}
-
-extern "C" _OSP_EXPORT_
-void* STO_CreateNativeImageObject(void* pDisplayContext, int width, int height)
-{
-
-       if(!pDisplayContext)
-       {
-               return null;
-       }
-
-       _DisplayContextImpl* pDispImpl =  _DisplayContextImpl::GetInstance(*(DisplayContext*)pDisplayContext);
-
-       if(!pDispImpl->GetNativeLayer())
-       {
-               return null;
-       }
-       Evas* pEvas = ((_EflLayer*)pDispImpl->GetNativeLayer())->GetEvas();
-
-       if(!pEvas)
-       {
-               return null;
-       }
-
-       Evas_Object* pImage = evas_object_image_filled_add(pEvas);
-       evas_object_resize(pImage, width, height);
-       evas_object_move(pImage, 0, 0);
-//     evas_object_show(pImage);
-
-       return pImage;
-
-}
-
-extern "C" _OSP_EXPORT_ void
-STO_FillSet(void* pVisualElement, int x, int y, int w, int h)
-{
-                  VisualElement* pVE = (VisualElement*)pVisualElement;
-
-                  _VisualElementImpl* pVEImpl = _VisualElementImpl::GetInstance(*pVE);
-
-                  _EflNode* pNode = (_EflNode*)pVEImpl->GetNativeNode();
-                  Evas_Object* pEvasObject = pNode->GetNativeObject();
-                  if (pEvasObject)
-                  {
-                                        evas_object_image_fill_set(pEvasObject, x, y, w, h);
-                  }
-}
-
-extern "C" _OSP_EXPORT_ void
-STO_Destroy(void* pVisualElement, void* pEvasObject)
-{
-       VisualElement* pVE = (VisualElement* )pVisualElement;
-
-       _VisualElementImpl* pVEImpl = _VisualElementImpl::GetInstance(*pVE);
-
-       _EflNode* pNode = (_EflNode*)pVEImpl->GetNativeNode();
-       pNode->AddNativeSmartObject(*pVE, null);
-
-       evas_object_del((Evas_Object*)pEvasObject);
-}
-
-#endif //STO_API
 namespace Tizen { namespace Ui {
 
 Handle
index 1a6a1c1..8945ee1 100644 (file)
@@ -174,17 +174,18 @@ const ConvertKeys KeyCodeMap[] = {
        { _KEY_DOWN, "Down" },
        { _KEY_RIGHT, "Right" },
        { _KEY_CONTEXT_MENU, "Menu" },
+       { _KEY_MENU, "XF86Send" },
 
        { _KEY_BACK, "XF86Stop" },
-       { _KEY_HOME, "XF86Phone" },
+//     { _KEY_HOME, "XF86Phone" },
        { _KEY_WEB_PAGE, "XF86WWW" },
        { _KEY_MAIL, "XF86Mail" },
        { _KEY_SCREEN_SAVER, "XF86ScreenSaver" },
        { _KEY_BRIGHTNESS_DOWN, "XF86MonBrightnessDown" },
        { _KEY_BRIGHTNESS_UP, "XF86MonBrightnessUp" },
        { _KEY_MUTE, "XF86AudioMute" },
-       { _KEY_VOLUME_DOWN, "XF86AudioLowerVolume" },
-       { _KEY_VOLUME_UP, "XF86AudioRaiseVolume" },
+//     { _KEY_VOLUME_DOWN, "XF86AudioLowerVolume" },
+//     { _KEY_VOLUME_UP, "XF86AudioRaiseVolume" },
        { _KEY_PLAY_PAUSE, "XF86AudioPlay" },
        { _KEY_NEXT_SONG, "XF86AudioNext" },
        { _KEY_PREVIOUS_SONG, "XF86AudioPrev" },
index 6a44708..812603e 100644 (file)
@@ -57,6 +57,38 @@ public:
 
                if (pGestureDetector)
                {
+                       _Control* pControl = pGestureDetector->GetControl();
+                       SysTryReturnVoidResult(NID_UI, pControl, E_SYSTEM, "[E_SYSTEM] System error occurred.");
+
+                       Tizen::Base::Collection::IListT<_TouchGestureDetector*>* pGestureList = pControl->GetGestureDetectorList();
+                       if (!pGestureList || (pGestureList && (pGestureList->GetCount() <= 0)))
+                       {
+                               return;
+                       }
+
+                       IEnumeratorT<_TouchGestureDetector*>* pEnumerator = pGestureList->GetEnumeratorN();
+                       SysTryReturnVoidResult(NID_UI, pEnumerator, E_SYSTEM, "[E_SYSTEM] System error occurred.");
+
+                       bool gestureExist = false;
+
+                       while (pEnumerator->MoveNext() == E_SUCCESS)
+                       {
+                               _TouchGestureDetector* pTempGestureDetector = null;
+                               pEnumerator->GetCurrent(pTempGestureDetector);
+
+                               if (pGestureDetector == pTempGestureDetector)
+                               {
+                                       gestureExist = true;
+                               }
+                       }
+
+                       delete pEnumerator;
+
+                       if (gestureExist == false)
+                       {
+                               return;
+                       }
+
                        switch(pGestureDetector->GetDetectorType())
                        {
                        case _TOUCH_GESTURE_DETECTOR_TYPE_TAP:
index 6840484..88af29a 100644 (file)
@@ -951,7 +951,7 @@ _Window::IsOrientationCallbackModeEnabled(void) const
 }
 
 _Control*
-_Window::GetFocusTraversalControl(void) const
+_Window::GetFocusTraversalControl(_Control* pControl) const
 {
        return __pFocusTraversalControl;
 }
index 5ea4178..3e65fc2 100644 (file)
@@ -1115,7 +1115,10 @@ _ButtonPresenter::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 
        if (__pButton->IsFocusModeStateEnabled() == true && keyCode == _KEY_ENTER)
        {
-               __pButton->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
+               if (__pButton->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+               {
+                       __pButton->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED);
+               }
        }
 
        return false;
@@ -1143,8 +1146,11 @@ _ButtonPresenter::OnDrawFocus(void)
 {
        if (__pButton->IsFocusModeStateEnabled() == false)
        {
-               __pButton->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-               __pButton->Invalidate();
+               if (__pButton->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+               {
+                       __pButton->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                       __pButton->Invalidate();
+               }
        }
 
        return;
@@ -1171,8 +1177,11 @@ _ButtonPresenter::OnFocusableStateChanged(bool focusalbeState)
 void
 _ButtonPresenter::OnFocusModeStateChanged(void)
 {
-       __pButton->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-       __pButton->Invalidate();
+       if (__pButton->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+       {
+               __pButton->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+               __pButton->Invalidate();
+       }
 
        return;
 }
@@ -1182,8 +1191,11 @@ _ButtonPresenter::OnFocusGained(const _Control& source)
 {
        if (__pButton->IsFocusModeStateEnabled() == true)
        {
-               __pButton->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-               __pButton->Invalidate();
+               if (__pButton->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+               {
+                       __pButton->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                       __pButton->Invalidate();
+               }
        }
 
        return true;
@@ -1192,8 +1204,11 @@ _ButtonPresenter::OnFocusGained(const _Control& source)
 bool
 _ButtonPresenter::OnFocusLost(const _Control& source)
 {
-       __pButton->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-       __pButton->Invalidate();
+       if (__pButton->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+       {
+               __pButton->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+               __pButton->Invalidate();
+       }
 
        return true;
 }
index de82d85..a28b2ee 100644 (file)
@@ -2407,8 +2407,12 @@ _CheckButtonPresenter::OnDrawFocus(void)
        if (__pCheckButton->IsFocusModeStateEnabled() == false)
        {
                __focusPrevStatus = __pCheckButton->GetCheckButtonStatus();
-               __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
-               __pCheckButton->Invalidate();
+
+               if (__pCheckButton->GetCheckButtonStatus() != _CHECK_BUTTON_STATUS_DISABLED)
+               {
+                       __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
+                       __pCheckButton->Invalidate();
+               }
        }
 
        return;
@@ -2435,8 +2439,11 @@ _CheckButtonPresenter::OnFocusableStateChanged(bool focusalbeState)
 void
 _CheckButtonPresenter::OnFocusModeStateChanged(void)
 {
-       __pCheckButton->SetCheckButtonStatus(__focusPrevStatus);
-       __pCheckButton->Invalidate();
+       if (__pCheckButton->GetCheckButtonStatus() != _CHECK_BUTTON_STATUS_DISABLED)
+       {
+               __pCheckButton->SetCheckButtonStatus(__focusPrevStatus);
+               __pCheckButton->Invalidate();
+       }
 
        return;
 }
@@ -2447,8 +2454,12 @@ _CheckButtonPresenter::OnFocusGained(const _Control& source)
        if (__pCheckButton->IsFocusModeStateEnabled() == true)
        {
                __focusPrevStatus = __pCheckButton->GetCheckButtonStatus();
-               __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
-               __pCheckButton->Invalidate();
+
+               if (__pCheckButton->GetCheckButtonStatus() != _CHECK_BUTTON_STATUS_DISABLED)
+               {
+                       __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
+                       __pCheckButton->Invalidate();
+               }
        }
 
        return true;
@@ -2457,8 +2468,11 @@ _CheckButtonPresenter::OnFocusGained(const _Control& source)
 bool
 _CheckButtonPresenter::OnFocusLost(const _Control& source)
 {
-       __pCheckButton->SetCheckButtonStatus(__focusPrevStatus);
-       __pCheckButton->Invalidate();
+       if (__pCheckButton->GetCheckButtonStatus() != _CHECK_BUTTON_STATUS_DISABLED)
+       {
+               __pCheckButton->SetCheckButtonStatus(__focusPrevStatus);
+               __pCheckButton->Invalidate();
+       }
 
        return true;
 }
index 67f410b..ee49d46 100644 (file)
@@ -104,8 +104,11 @@ _EditAreaImpl::~_EditAreaImpl(void)
                __pEdit->RemoveKeypadEventListener(*this);
                __pEdit->RemoveTextBlockEventListener(*this);
                __pEdit->RemoveTextEventListener(*this);
-               __pEdit->RemoveScrollPanelEventListener(*this);
                __pEdit->RemoveUiLinkEventListener(*this);
+               if (__pEdit->GetInputStyle() == INPUT_STYLE_OVERLAY)
+               {
+                       __pEdit->RemoveScrollPanelEventListener(*this);
+               }
        }
 
        if (__pPublicActionEvent)
index bd40ac4..09b2d37 100644 (file)
@@ -724,6 +724,9 @@ result
 _EditDatePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const String& text, _DateTimeId boxId)
 {
        Color textColor;
+       float contentTextMargin;
+
+       GET_SHAPE_CONFIG(EDITDATE::CONTENT_TEXT_MARGIN, __pEditDate->GetOrientation(), contentTextMargin);
 
        if (!__pEditDate->IsEnabled())
        {
@@ -745,10 +748,10 @@ _EditDatePresenter::DrawText(Canvas& canvas, const FloatRectangle& bounds, const
        DrawContentBitmap(canvas, bounds, boxId);
 
        FloatRectangle drawAreaBounds(0.0f, 0.0f, 0.0f, 0.0f);
-       drawAreaBounds.x = bounds.x + 2.0f;
-       drawAreaBounds.y = bounds.y + 2.0f;
-       drawAreaBounds.width = bounds.width - 4.0f;
-       drawAreaBounds.height = bounds.height - 4.0f;
+       drawAreaBounds.x = bounds.x + contentTextMargin;
+       drawAreaBounds.y = bounds.y + contentTextMargin;
+       drawAreaBounds.width = bounds.width - (contentTextMargin * 2.0f);
+       drawAreaBounds.height = bounds.height - (contentTextMargin * 2.0f);
 
        TextSimple* pSimpleText = null;
        pSimpleText = new (std::nothrow)TextSimple((const_cast <wchar_t*>(text.GetPointer())), text.GetLength(), TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
@@ -1321,6 +1324,7 @@ _EditDatePresenter::Animate(void)
        String yearString;
        String dayString;
        String newValue;
+       FloatPoint textPoint;
        TextSimple* pOldSimpleText = null;
        TextSimple* pNewSimpleText = null;
 
@@ -1353,7 +1357,6 @@ _EditDatePresenter::Animate(void)
 
        FloatDimension newTextDim;
        FloatDimension oldTextDim;
-       FloatPoint textPoint;
        VisualElement* pNewVisualElement = null;
        VisualElement* pOldVisualElement = null;
        VisualElement* pEditDateElement = null;
@@ -1362,9 +1365,11 @@ _EditDatePresenter::Animate(void)
        Canvas *pCanvas = null;
        Color contentBgColor;
        Color textPressedColor;
+       float contentTextMargin;
 
        GET_COLOR_CONFIG(EDITTIME::CONTENT_BG_PRESSED, contentBgColor);
        GET_COLOR_CONFIG(EDITTIME::TEXT_PRESSED, textPressedColor);
+       GET_SHAPE_CONFIG(EDITDATE::CONTENT_TEXT_MARGIN, __pEditDate->GetOrientation(), contentTextMargin);
 
        __pFont->GetTextExtent(newValue, newValue.GetLength(), newTextDim);
        __pFont->GetTextExtent(__lastSelectedValue, __lastSelectedValue.GetLength(), oldTextDim);
@@ -1428,37 +1433,10 @@ _EditDatePresenter::Animate(void)
        pNewVisualElement->SetShowState(true);
        pOldVisualElement->SetShowState(true);
 
-       __pContentProvider->SetBounds(FloatRectangle((rect.x + 2.0f), (rect.y + 2.0f), (rect.width - 4.0f), (rect.height - 4.0f)));
-       textPoint.x = (__pContentProvider->GetBounds().width - newTextDim.width) / 2.0f;
-       textPoint.y = (__pContentProvider->GetBounds().height - newTextDim.height) / 2.0f;
-
-       if (textPoint.x < 0)
-       {
-               textPoint.x = 0.0f;
-               newTextDim.width = __pContentProvider->GetBounds().width;
-       }
-
-       if (textPoint.y < 0)
-       {
-               textPoint.y = 0.0f;
-       }
+       __pContentProvider->SetBounds(FloatRectangle((rect.x + contentTextMargin), (rect.y + contentTextMargin), (rect.width - (contentTextMargin * 2.0f)), (rect.height - (contentTextMargin * 2.0f))));
 
-       pNewVisualElement->SetBounds(FloatRectangle(textPoint.x, oldTextDim.height, newTextDim.width, newTextDim.height));
-       textPoint.x = (__pContentProvider->GetBounds().width - oldTextDim.width) / 2.0f;
-       textPoint.y = (__pContentProvider->GetBounds().height - oldTextDim.height) / 2.0f;
-
-       if (textPoint.x < 0)
-       {
-               textPoint.x = 0.0f;
-               oldTextDim.width = __pContentProvider->GetBounds().width;
-       }
-
-       if (textPoint.y < 0)
-       {
-               textPoint.y = 0.0f;
-       }
-
-       pOldVisualElement->SetBounds(FloatRectangle(textPoint.x, textPoint.y, oldTextDim.width, oldTextDim.height));
+       pNewVisualElement->SetBounds(FloatRectangle(0, 0, __pContentProvider->GetBounds().width, __pContentProvider->GetBounds().height));
+       pOldVisualElement->SetBounds(FloatRectangle(0, 0, __pContentProvider->GetBounds().width, __pContentProvider->GetBounds().height));
 
        pCanvas = pEditDateElement->GetCanvasN(__pContentProvider->GetBounds());
        pCanvas->SetBackgroundColor(contentBgColor);
@@ -1467,7 +1445,6 @@ _EditDatePresenter::Animate(void)
        pCanvas = null;
 
        pEditDateElement->AttachChild(*__pContentProvider);
-
        __pContentProvider->AttachChild(*pOldVisualElement);
        __pContentProvider->AttachChild(*pNewVisualElement);
 
@@ -1476,8 +1453,8 @@ _EditDatePresenter::Animate(void)
 
        pNewBoundsAnimation->SetDuration(300);
        pNewBoundsAnimation->SetPropertyName("bounds.position");
-       pNewBoundsAnimation->SetStartValue(Variant(FloatPoint(pNewVisualElement->GetBounds().x * 1.0f, oldTextDim.height * 1.0f)));
-       pNewBoundsAnimation->SetEndValue(Variant(FloatPoint(pNewVisualElement->GetBounds().x * 1.0f, 0.0f)));
+       pNewBoundsAnimation->SetStartValue(Variant(FloatPoint(pNewVisualElement->GetBounds().x, oldTextDim.height)));
+       pNewBoundsAnimation->SetEndValue(Variant(FloatPoint(pNewVisualElement->GetBounds().x, 0.0f)));
        pNewBoundsAnimation->SetVisualElementAnimationStatusEventListener(this);
 
        pOldBoundsAnimation = new (std::nothrow) VisualElementPropertyAnimation();
@@ -1485,8 +1462,8 @@ _EditDatePresenter::Animate(void)
 
        pOldBoundsAnimation->SetDuration(300);
        pOldBoundsAnimation->SetPropertyName("bounds.position");
-       pOldBoundsAnimation->SetStartValue(Variant(FloatPoint(pOldVisualElement->GetBounds().x * 1.0f, 0.0f)));
-       pOldBoundsAnimation->SetEndValue(Variant(FloatPoint(pOldVisualElement->GetBounds().x * 1.0f, oldTextDim.height * -1.0f)));
+       pOldBoundsAnimation->SetStartValue(Variant(FloatPoint(pOldVisualElement->GetBounds().x, 0.0f)));
+       pOldBoundsAnimation->SetEndValue(Variant(FloatPoint(pOldVisualElement->GetBounds().x, oldTextDim.height * -1.0f)));
        pOldBoundsAnimation->SetVisualElementAnimationStatusEventListener(this);
 
        pOldSimpleText = new (std::nothrow)TextSimple((const_cast <wchar_t*>(__lastSelectedValue.GetPointer())), __lastSelectedValue.GetLength(), TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL);
@@ -1507,7 +1484,7 @@ _EditDatePresenter::Animate(void)
 
        __textObject.SetFont(__pFont, 0, __textObject.GetTextLength());
        __textObject.SetForegroundColor(textPressedColor, 0, __textObject.GetTextLength());
-       __textObject.SetBounds(pCanvas->GetBounds());
+       __textObject.SetBounds(FloatRectangle(0, 0, pCanvas->GetBounds().width, pCanvas->GetBounds().height));
        __textObject.Draw(*_CanvasImpl::GetInstance(*pCanvas));
 
        delete pCanvas;
@@ -1531,7 +1508,7 @@ _EditDatePresenter::Animate(void)
 
        __textObject.SetFont(__pFont, 0, __textObject.GetTextLength());
        __textObject.SetForegroundColor(textPressedColor, 0, __textObject.GetTextLength());
-       __textObject.SetBounds(pCanvas->GetBounds());
+       __textObject.SetBounds(FloatRectangle(0, 0, pCanvas->GetBounds().width, pCanvas->GetBounds().height));
        __textObject.Draw(*_CanvasImpl::GetInstance(*pCanvas));
 
        delete pCanvas;
index 2727df8..5074148 100755 (executable)
@@ -165,7 +165,10 @@ _EditFieldImpl::~_EditFieldImpl(void)
                __pEdit->RemoveUiLinkEventListener(*this);
                __pEdit->RemoveKeypadEventListener(*this);
                __pEdit->RemoveActionEventListener(*this);
-               __pEdit->RemoveScrollPanelEventListener(*this);
+               if (__pEdit->GetInputStyle() == INPUT_STYLE_OVERLAY)
+               {
+                       __pEdit->RemoveScrollPanelEventListener(*this);
+               }
        }
 
        if (__pPublicTextEvent)
index 6959241..544ff9c 100755 (executable)
@@ -236,6 +236,7 @@ _EditPresenter::_EditPresenter(void)
        , __columnCursorIndex(-1)
        , __isPasswordVisible(false)
        , __needToCreateCopyPastePopup(false)
+       , __calculatedCursorBounds(FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f))
 {
 }
 
@@ -275,11 +276,6 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                {
                        if (__pParentForm)
                        {
-                               if (!__isUSBKeyboardConnected)
-                               {
-                                       __pParentForm->SetKeypadShowState(true);
-                               }
-
                                __pParentForm->Draw();
                        }
                }
@@ -342,7 +338,6 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                        {
                                if (__pParentForm)
                                {
-                                       __pParentForm->SetKeypadShowState(false);
                                        __pParentForm->Draw();
                                }
                        }
@@ -376,7 +371,6 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                                {
                                        if (__pParentForm)
                                        {
-                                               __pParentForm->SetKeypadShowState(false);
                                                __pParentForm->Draw();
                                        }
                                }
@@ -405,7 +399,6 @@ _EditPresenter::OnInputConnectionPanelShowStateChanged(InputConnection& source,
                                {
                                        if (__pParentForm)
                                        {
-                                               __pParentForm->SetKeypadShowState(false);
                                                __pParentForm->Draw();
                                        }
                                }
@@ -896,19 +889,11 @@ _EditPresenter::OnClipboardPopupOpened(Tizen::Graphics::Dimension& clipboardPopu
 
                                if (__pParentForm)
                                {
-                                       __pParentForm->SetClipboardShowState(true);
                                        __pParentForm->Draw();
                                }
 
                                __pEdit->SendKeypadEvent(GetKeypadAction(), CORE_KEYPAD_EVENT_STATUS_BOUNDS_CHANGED);
                        }
-                       else
-                       {
-                               if (__pParentForm)
-                               {
-                                       __pParentForm->SetClipboardShowState(true);
-                               }
-                       }
                }
                else
                {
@@ -922,7 +907,6 @@ _EditPresenter::OnClipboardPopupOpened(Tizen::Graphics::Dimension& clipboardPopu
 
                                if (__pParentForm)
                                {
-                                       __pParentForm->SetClipboardShowState(true);
                                        __pParentForm->Draw();
                                }
 
@@ -936,7 +920,6 @@ _EditPresenter::OnClipboardPopupOpened(Tizen::Graphics::Dimension& clipboardPopu
 
                                if (__pParentForm)
                                {
-                                       __pParentForm->SetClipboardShowState(true);
                                        __pParentForm->Draw();
                                }
 
@@ -1049,7 +1032,6 @@ _EditPresenter::OnClipboardPopupClosed(void)
 
                        if (__pParentForm)
                        {
-                               __pParentForm->SetClipboardShowState(false);
                                __pParentForm->Draw();
                        }
 
@@ -1067,7 +1049,6 @@ _EditPresenter::OnClipboardPopupClosed(void)
                        {
                                SysLog(NID_UI_CTRL, "Form deflate RESET!!!!!!!!!!");
                                __pParentForm->DeflateClientRectHeight(0.0f);
-                               __pParentForm->SetClipboardShowState(false);
                                __pParentForm->Draw();
                        }
 
@@ -1130,16 +1111,6 @@ _EditPresenter::Dispose(void)
                {
                        SysLog(NID_UI_CTRL, "Form deflate RESET!!!!!!!!!!");
                        __pParentForm->DeflateClientRectHeight(0.0f);
-
-                       if (__clipboardConnected)
-                       {
-                               __pParentForm->SetClipboardShowState(false);
-                       }
-
-                       if (__isInputConnectionBound || __isKeypadHiding)
-                       {
-                               __pParentForm->SetKeypadShowState(false);
-                       }
                }
 
                AdjustParentPanelHeight(true);
@@ -2790,7 +2761,14 @@ _EditPresenter::CalculateCursorBounds(const FloatRectangle& textBounds, FloatRec
                (cursorBounds.y < textBounds.y + textBounds.height))
        {
                float cursorHeightDiff = cursorBounds.y + cursorBounds.height - textBounds.y - textBounds.height - 1.0f;
-               cursorBounds.height -= cursorHeightDiff;
+               if (cursorHeightDiff > 0.0f)
+               {
+                       cursorBounds.height -= cursorHeightDiff;
+               }
+               else
+               {
+                       cursorBounds.height += cursorHeightDiff;
+               }
        }
 
        if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE)
@@ -2845,7 +2823,7 @@ _EditPresenter::CalculateCursorBounds(const FloatRectangle& textBounds, FloatRec
                        }
                }
        }
-
+       __calculatedCursorBounds = cursorBounds;
        return E_SUCCESS;
 }
 
@@ -2899,7 +2877,14 @@ _EditPresenter::CalculateCursorBounds(const FloatRectangle& textBounds, FloatRec
                (cursorBounds.y < textBounds.y + textBounds.height))
        {
                float cursorHeightDiff = cursorBounds.y + cursorBounds.height - textBounds.y - textBounds.height - 1.0f;
-               cursorBounds.height -= cursorHeightDiff;
+               if (cursorHeightDiff > 0.0f)
+               {
+                       cursorBounds.height -= cursorHeightDiff;
+               }
+               else
+               {
+                       cursorBounds.height += cursorHeightDiff;
+               }
        }
 
        if (__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE)
@@ -2954,7 +2939,7 @@ _EditPresenter::CalculateCursorBounds(const FloatRectangle& textBounds, FloatRec
                        }
                }
        }
-
+       __calculatedCursorBounds = cursorBounds;
        return E_SUCCESS;
 }
 
@@ -3929,6 +3914,10 @@ _EditPresenter::OnKeyPressed(const _Control& source, const _KeyInfo& keyInfo)
                {
                        if (__isCopyPasteManagerExist)
                        {
+                               if (IsBlocked())
+                               {
+                                       __pCopyPasteManager->SetTextBlockReleaseFlag(false);
+                               }
                                InitializeCopyPasteManager();
                        }
 
@@ -6482,7 +6471,14 @@ _EditPresenter::CalculateAbsoluteCursorBounds(int index, FloatRectangle& absCurs
 
        if (cursorHeight > 0.0f)
        {
-               absCursorBounds.height = cursorHeight;
+               if (cursorHeight <= __calculatedCursorBounds.height)
+               {
+                       absCursorBounds.height = cursorHeight;
+               }
+               else
+               {
+                       absCursorBounds.height = __calculatedCursorBounds.height;
+               }
        }
        else
        {
@@ -6528,7 +6524,14 @@ _EditPresenter::CalculateAbsoluteCursorBounds(int rowIndex, int columnIndex, Flo
 
        if (cursorHeight > 0.0f)
        {
-               absCursorBounds.height = cursorHeight;
+               if (cursorHeight <= __calculatedCursorBounds.height)
+               {
+                       absCursorBounds.height = cursorHeight;
+               }
+               else
+               {
+                       absCursorBounds.height = __calculatedCursorBounds.height;
+               }
        }
        else
        {
@@ -7126,7 +7129,6 @@ _EditPresenter::ShowKeypad(bool focus)
                        ScrollPanelToCursorPosition();
                        if (__pParentForm)
                        {
-                               __pParentForm->SetKeypadShowState(true);//First show keypad after dispose
                                __pParentForm->Draw();
                        }
                        __isKeypadShowing = false;
index d56c8b6..a7dbe49 100644 (file)
@@ -143,6 +143,7 @@ _FastScroll::EnableFadeEffect(bool enable)
                return;
        }
 
+       GetPresenter().EnableFadeEffect(enable);
        if (enable)
        {
                _AccessibilityContainer* pAccessibilityContainer = GetAccessibilityContainer();
@@ -159,7 +160,6 @@ _FastScroll::EnableFadeEffect(bool enable)
                InitializeAccessibility();
        }
 
-       GetPresenter().EnableFadeEffect(enable);
 }
 
 bool
index e48bfa7..a30345c 100644 (file)
@@ -74,6 +74,7 @@ namespace Tizen { namespace Ui { namespace Controls
 _FastScrollViewConfig::_FastScrollViewConfig(void)
        : __indexBgColor(Color::GetColor(COLOR_ID_BLACK))
        , __indexHighlightColor(Color::GetColor(COLOR_ID_BLACK))
+       , __indexLineColor(Color::GetColor(COLOR_ID_BLACK))
        , __indexSelectedLineColor(Color::GetColor(COLOR_ID_BLACK))
        , __indexTextColor(Color::GetColor(COLOR_ID_BLACK))
        , __indexDividerColor(Color::GetColor(COLOR_ID_BLACK))
@@ -204,6 +205,9 @@ _FastScrollViewConfig::ReloadConfig(_ControlOrientation orientation)
        r = GET_COLOR_CONFIG(FASTSCROLL::INDEX_BG_NORMAL, __indexBgColor);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] Failed to get resource.");
 
+       r = GET_COLOR_CONFIG(FASTSCROLL::INDEX_LINE_NORMAL, __indexLineColor);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] Failed to get resource.");
+
        r = GET_COLOR_CONFIG(FASTSCROLL::INDEX_LINE_PRESSED, __indexSelectedLineColor);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] Failed to get resource.");
 
@@ -230,6 +234,7 @@ _FastScrollViewConfig::ReloadConfig(_ControlOrientation orientation)
 CATCH:
        __indexBgColor = Color::GetColor(COLOR_ID_BLACK);
        __indexHighlightColor = Color::GetColor(COLOR_ID_BLACK);
+       __indexLineColor= Color::GetColor(COLOR_ID_BLACK);
        __indexSelectedLineColor= Color::GetColor(COLOR_ID_BLACK);
        __indexTextColor = Color::GetColor(COLOR_ID_BLACK);
        __indexDividerColor= Color::GetColor(COLOR_ID_BLACK);
@@ -927,6 +932,8 @@ _FastScrollIndexView::DrawBaseIndex()
        pCanvas->Clear();
 
        pCanvas->SetLineWidth(__viewConfig.__indexSeparatorThickness);
+       pCanvas->SetForegroundColor(__viewConfig.__indexLineColor);
+
 
        FloatRectangle bounds = __pBaseIndexVe->GetBounds();
        float indexHeight = GetIndexHeight();
@@ -941,6 +948,7 @@ _FastScrollIndexView::DrawBaseIndex()
 
                delete pReplacementColorBackgroundBitmap;
        }
+       pCanvas->DrawLine(FloatPoint(1.0f, 0.0f), FloatPoint(1.0f, bounds.height));
 
        FloatRectangle indexRect(0.0f, __viewConfig.__indexMarginTop, bounds.width, indexHeight);
        Bitmap* pReplacementColorBitmap = null;
index 6fc21ad..4ecdfdf 100644 (file)
@@ -145,6 +145,7 @@ _Form::_Form(void)
 
        ClearLastResult();
        GetAccessibilityContainer()->Activate(true);
+       SetFocusNavigateEnabled(false);
        return;
 
 CATCH:
@@ -2570,7 +2571,7 @@ _Form::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 
                return true;
        }
-       if (keyInfo.GetKeyCode() == _KEY_CONTEXT_MENU)
+       if (keyInfo.GetKeyCode() == _KEY_CONTEXT_MENU || keyInfo.GetKeyCode() == _KEY_MENU)
        {
 //             _Toolbar* pToolbar = GetFooter();
 //             if (pToolbar == null)
index 1c84459..4428b27 100644 (file)
@@ -868,15 +868,6 @@ _FormImpl::TranslateFromClientAreaPosition(const FloatPoint& clientPosition) con
 void
 _FormImpl::SetFormBackEventListener(const IFormBackEventListener* pFormBackEventListener)
 {
-       bool isBackButton = false;
-
-       Tizen::System::SystemInfo::GetValue(L"http://tizen.org/feature/input.keys.back", isBackButton);
-
-       if(!isBackButton)
-       {
-               SysTryReturnVoidResult(NID_UI_CTRL, GetFooter() || GetHeader(), E_INVALID_STATE, "[E_INVALID_STATE] Footer isn't constructed.");
-       }
-
        __pFormBackEventListener = const_cast <IFormBackEventListener*>(pFormBackEventListener);
        GetCore().SetFormBackEventListener(this);
        result r = GetLastResult();
@@ -886,14 +877,6 @@ _FormImpl::SetFormBackEventListener(const IFormBackEventListener* pFormBackEvent
 void
 _FormImpl::SetFormMenuEventListener(const IFormMenuEventListener* pFormMenuEventListener)
 {
-       bool isMenuButton = false;
-
-       Tizen::System::SystemInfo::GetValue(L"http://tizen.org/feature/input.keys.menu", isMenuButton);
-
-       if(!isMenuButton)
-       {
-               SysTryReturnVoidResult(NID_UI_CTRL, GetFooter() || GetHeader(), E_INVALID_STATE, "[E_INVALID_STATE] Footer isn't constructed.");
-       }
        __pFormMenuEventListener = const_cast <IFormMenuEventListener*>(pFormMenuEventListener);
        GetCore().SetFormMenuEventListener(this);
        result r = GetLastResult();
index e2257e6..89d7376 100644 (file)
@@ -345,11 +345,6 @@ _Frame::SetCurrentForm(const _Form* pForm)
        {
                if (pCurrentForm != pForm)
                {
-                       _Control* pFocusTraversalControl = pCurrentForm->GetFocusTraversalControl();
-                       if (pFocusTraversalControl)
-                       {
-                               pFocusTraversalControl->SetFocusModeStateEnabled(false) ;
-                       }
                        // Change order
                        r = MoveChildToTop(*pForm);
                        SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -606,15 +601,6 @@ _Frame::OnChildAttached(const _Control& child)
                        _Control* pOldCurrentForm = GetChild(controlCount - 2);
                        SysTryReturnVoidResult(NID_UI_CTRL, pOldCurrentForm != null, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
                        pOldCurrentForm->SetVisibleState(false);
-                       _Form* pOldForm = static_cast<_Form*>(pOldCurrentForm);
-                       if (pOldForm)
-                       {
-                               _Control* pFocusTraversalControl = pOldForm->GetFocusTraversalControl();
-                               if (pFocusTraversalControl)
-                               {
-                                       pFocusTraversalControl->SetFocusModeStateEnabled(false) ;
-                               }
-                       }
                }
        }
 }
@@ -888,9 +874,23 @@ _Frame::GetFocusList(void) const
 }
 
 _Control*
-_Frame::GetFocusTraversalControl(void) const
+_Frame::GetFocusTraversalControl(_Control* pControl) const
 {
-       _Form* pForm = GetCurrentForm();
+       _Form* pForm = null;
+       while(pControl)
+       {
+               pForm = dynamic_cast<_Form*>(const_cast<_Control*>(pControl));
+
+               if (pForm)
+               {
+                       break;
+               }
+               else
+               {
+                       pControl = pControl->GetParent();
+               }
+       }
+       
        if (pForm)
        {
                return pForm->GetFocusTraversalControl();
@@ -901,7 +901,22 @@ _Frame::GetFocusTraversalControl(void) const
 void
 _Frame::SetFocusTraversalControl(_Control* pControl)
 {
-       _Form* pForm = GetCurrentForm();
+       _Form* pForm = null;
+       _Control* pTempControl = pControl;
+       while(pTempControl)
+       {
+               pForm = dynamic_cast<_Form*>(const_cast<_Control*>(pTempControl));
+
+               if (pForm)
+               {
+                       break;
+               }
+               else
+               {
+                       pTempControl = pTempControl->GetParent();
+               }
+       }
+
        if (pForm)
        {
                pForm->SetFocusTraversalControl(pControl);
index bc28487..160be62 100644 (file)
@@ -252,6 +252,7 @@ _GalleryCanvas::LoadImage(void)
 {
        Canvas* pCanvas = null;
        result r = E_SUCCESS;
+       Bitmap* pScaledImage = null;
 
        if (IsNeedUpdateImage() == true)
        {
@@ -269,12 +270,17 @@ _GalleryCanvas::LoadImage(void)
                        r = pCanvas->Clear();
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-                       r = pCanvas->DrawBitmap(rect, *pImage->GetInternalBitmap());
+                       pScaledImage = ScaledBitmapN(pImage->GetInternalBitmap(), Dimension(rect.width, rect.height));
+                       r = GetLastResult();
+                       SysTryCatch(NID_UI_CTRL, pScaledImage != null, , r, "[%s] Propagating.", GetErrorMessage(r));
+
+                       r = pCanvas->DrawBitmap(Point(0,0), *pScaledImage);
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
                        r = GetImageVisualElement().SetFlushNeeded();
                        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
+                       delete pScaledImage;
                        delete pCanvas;
                }
                SetNeedUpdateImage(false);
@@ -283,6 +289,7 @@ _GalleryCanvas::LoadImage(void)
        return E_SUCCESS;
 
 CATCH:
+       delete pScaledImage;
        delete pCanvas;
        return r;
 }
@@ -638,6 +645,57 @@ _GalleryCanvas::GetScaledBitmapSize(_GalleryBitmap& galleryBitmap, const FloatDi
        return scaledSize;
 }
 
+Bitmap*
+_GalleryCanvas::ScaledBitmapN(Bitmap* pSourceBitmap, Dimension scaledSize)
+{
+       Bitmap* pScaledBitmap = new (std::nothrow) Bitmap();
+       SysTryReturn(NID_UI_CTRL, pScaledBitmap != null, null, E_OUT_OF_MEMORY,
+                                       "[E_OUT_OF_MEMORY] Failed to allocate the memory for the Bitmap.");
+
+       FloatRectangle rect(0, 0, pSourceBitmap->GetWidthF(), pSourceBitmap->GetHeightF());
+       int share = 1;
+       int widthShare = rect.width / scaledSize.width;
+       int heightShare = rect.height / scaledSize.height;
+       int power = 0;
+       Dimension realScaleSize = scaledSize;
+
+       result r = pScaledBitmap->Construct(*pSourceBitmap, rect);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+
+       if (widthShare > heightShare)
+       {
+               share = widthShare;
+       }
+       else
+       {
+               share = heightShare;
+       }
+
+
+       while (share > pow(2, (power + 1)))
+       {
+               power++;
+       }
+
+       r = pScaledBitmap->SetScalingQuality(BITMAP_SCALING_QUALITY_HIGH);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+
+       for (; power >= 0; power--)
+       {
+               realScaleSize.width = scaledSize.width * pow(2, power);
+               realScaleSize.height = scaledSize.height * pow(2, power);
+               r = pScaledBitmap->Scale(realScaleSize);
+               SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
+       }
+
+       return pScaledBitmap;
+
+CATCH:
+       delete pScaledBitmap;
+
+       return null;
+}
+
 
 // _GalleryRootCanvas
 _GalleryRootCanvas*
index 5b7c42b..38a09f5 100644 (file)
@@ -98,8 +98,13 @@ _GalleryPresenter::~_GalleryPresenter(void)
        delete __pGalleryCoreEvent;
        delete __pEmptyGalleryImage;
        delete[] __pItemToCanvas;
-       delete __pSlideShowTimer;
-       __pSlideShowTimer = null;
+
+       if (__pSlideShowTimer != null)
+       {
+               __pSlideShowTimer->Cancel();
+               delete __pSlideShowTimer;
+               __pSlideShowTimer = null;
+       }
 }
 
 _GalleryPresenter*
@@ -1134,6 +1139,7 @@ _GalleryPresenter::StartSlideShowTimer(int duration)
        result r = E_SUCCESS;
        if (__pSlideShowTimer != null)
        {
+               __pSlideShowTimer->Cancel();
                delete __pSlideShowTimer;
                __pSlideShowTimer = null;
        }
@@ -1150,8 +1156,12 @@ _GalleryPresenter::StartSlideShowTimer(int duration)
        return E_SUCCESS;
 
 CATCH:
-       delete __pSlideShowTimer;
-       __pSlideShowTimer = null;
+       if (__pSlideShowTimer != null)
+       {
+               __pSlideShowTimer->Cancel();
+               delete __pSlideShowTimer;
+               __pSlideShowTimer = null;
+       }
 
        return GetLastResult();
 }
@@ -1159,8 +1169,12 @@ CATCH:
 void
 _GalleryPresenter::StopSlideShowTimer(void)
 {
-       delete __pSlideShowTimer;
-       __pSlideShowTimer = null;
+       if (__pSlideShowTimer != null)
+       {
+               __pSlideShowTimer->Cancel();
+               delete __pSlideShowTimer;
+               __pSlideShowTimer = null;
+       }
 
        __slideShowRepeat = false;
        __slideShowPlayCount = 0;
index 915f0e0..9f58879 100644 (file)
@@ -322,6 +322,8 @@ _GalleryViewEventHandler::OnTouchPinchZoom(_GalleryViewEventInfo& eventInfo)
 bool
 _GalleryViewEventHandler::OnTouchFlicked(_GalleryViewEventInfo& eventInfo)
 {
+       SysTryReturn(NID_UI_CTRL, __pressed == true, E_INVALID_STATE, E_INVALID_STATE, "[E_INVALID_STATE] not pressed state.");
+
        if (__pinchMode == true)
        {
                return true;
index 0ea81fd..f2338c4 100644 (file)
@@ -168,7 +168,7 @@ _HeaderImpl::AddItem(const HeaderItem& item)
        {
                pButton->SetButtonStyle(_BUTTON_STYLE_SEGMENT);
 
-               if (__style == HEADER_STYLE_TAB_LARGE)
+               if (__style == HEADER_STYLE_TAB_LARGE || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE || __style == HEADER_STYLE_TAB_WITH_TITLE)
                {
                        pButton->SetTabTextSlide(true);
                }
@@ -1997,7 +1997,7 @@ protected:
                                        headerItem.SetText(headerItemString);
                                }
 
-                               if (HEADER_STYLE_TITLE_BUTTON == hstyle)
+                               if (HEADER_STYLE_TITLE_BUTTON == hstyle || HEADER_STYLE_TAB_LARGE == hstyle)
                                {
                                        // headeritem icon bitmap setting
                                        // normal
index 7ae64cf..8de4f56 100755 (executable)
@@ -174,6 +174,7 @@ _Keypad::Initialize(int editStyle, _KeypadStyleInfo keypadStyleInfo, int limitLe
                String doneText;
                String cancelText;
                _AccessibilityContainer* pAccessibilityContainer = null;
+               Variant variantKeypadStyle = (int)keypadStyleInfo.keypadStyle;
 
                GET_STRING_CONFIG(IDS_TPLATFORM_BUTTON_DONE, doneText);
                GET_STRING_CONFIG(IDS_TPLATFORM_BUTTON_CANCEL_ABB, cancelText);
@@ -185,7 +186,8 @@ _Keypad::Initialize(int editStyle, _KeypadStyleInfo keypadStyleInfo, int limitLe
 
                __pChildEdit->SetTextPredictionEnabled(keypadStyleInfo.textPredictionEnabled);
                __pChildEdit->SetKeypadNormalNumberStyle(keypadStyleInfo.isNormalNumberStyle);
-               __pChildEdit->SetKeypadStyle(keypadStyleInfo.keypadStyle);
+               __pChildEdit->SetPropertyKeypadStyle(variantKeypadStyle);
+
                if (!keypadStyleInfo.enterActionEnabled)//EditField Style
                {
                        __pChildEdit->SetKeypadActionEnabled(false);
@@ -368,15 +370,6 @@ _Keypad::CreateFooter(void)
 
                pFooter->AddActionEventListener(*this);
 
-               bool isHWBackButtonExist = false;
-
-               Tizen::System::SystemInfo::GetValue(L"http://tizen.org/feature/input.keys.back", isHWBackButtonExist);
-
-               if(!isHWBackButtonExist)
-               {
-                       pFooter->SetBackEventListener(*this, FOOTER_BACK_BUTTON_ID);
-               }
-
                r = AttachChild(*pFooter);
                SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
@@ -394,123 +387,6 @@ CATCH:
 }
 
 _Button*
-_Keypad::CreateFooterBackButton(_Toolbar* pFooter)
-{
-       _Button* pButton = _Button::CreateButtonN();
-
-       float buttonHeight = 0.0f;
-       float buttonWidth = 0.0f;
-       float iconSize = 0.0f;
-
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_HEIGHT, pFooter->GetOrientation(), buttonHeight);
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, pFooter->GetOrientation(), buttonWidth);
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, pFooter->GetOrientation(), iconSize);
-
-       pButton->SetSize(FloatDimension(buttonWidth, buttonHeight));
-
-       Bitmap* pBackgroundNormalBitmap = null;
-       Bitmap* pBackgroundPressedBitmap = null;
-       Bitmap* pColorReplacedBitmap = null;
-       Bitmap* pBackIconNormalBitmap = null;
-       Bitmap* pBackIconNormalEffectBitmap = null;
-
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundNormalBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pBackgroundPressedBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalBitmap);
-       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalEffectBitmap);
-
-       bool themeBackNormalBitmap = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_NORMAL);
-       if (!themeBackNormalBitmap)
-       {
-               GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBackIconNormalEffectBitmap);
-       }
-
-       if (pBackgroundNormalBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               pFooter->GetButtonColor(_BUTTON_STATUS_NORMAL));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_NORMAL, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               pFooter->GetButtonColor(_BUTTON_STATUS_HIGHLIGHTED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               pFooter->GetButtonColor(_BUTTON_STATUS_DISABLED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_DISABLED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundNormalBitmap;
-       }
-
-       if (pBackgroundPressedBitmap)
-       {
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               pFooter->GetButtonColor(_BUTTON_STATUS_PRESSED));
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
-               delete pColorReplacedBitmap;
-
-               delete pBackgroundPressedBitmap;
-       }
-
-       if (pBackIconNormalBitmap)
-       {
-               Color normalColor;
-               Color pressedColor;
-               Color disabledColor;
-
-               GET_COLOR_CONFIG(FOOTER::BACK_ICON_NORMAL, normalColor);
-               GET_COLOR_CONFIG(FOOTER::BACK_ICON_PRESSED, pressedColor);
-               GET_COLOR_CONFIG(FOOTER::BACK_ICON_DISABLED, disabledColor);
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-
-                       pButton->SetBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-
-                       delete pColorReplacedBitmap;
-               }
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-
-                       pButton->SetBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-                       delete pColorReplacedBitmap;
-               }
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
-               if (pColorReplacedBitmap)
-               {
-                       pColorReplacedBitmap->Scale(FloatDimension(iconSize, iconSize));
-
-                       pButton->SetBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pColorReplacedBitmap);
-                       delete pColorReplacedBitmap;
-               }
-
-               delete pBackIconNormalBitmap;
-       }
-
-       if (pBackIconNormalEffectBitmap)
-       {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pBackIconNormalEffectBitmap);
-               pButton->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pBackIconNormalEffectBitmap);
-               pButton->SetEffectBitmap(_BUTTON_STATUS_SELECTED, FloatPoint(0.0f, 0.0f), *pBackIconNormalEffectBitmap);
-               pButton->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pBackIconNormalEffectBitmap);
-               pButton->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pBackIconNormalEffectBitmap);
-
-               delete pBackIconNormalEffectBitmap;
-       }
-
-       return pButton;
-}
-
-_Button*
 _Keypad::CreateButtonItemN(int actionId, const String& text)
 {
        result r = E_SUCCESS;
index 21986a9..26f3201 100644 (file)
@@ -155,6 +155,10 @@ _MessageBox::Initialize(const String& title, const String& text, MessageBoxStyle
        r = GetLastResult();
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] failed to load MessageBox BG Image.");
 
+       _pComposedBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*_pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), _bgColor);
+       r = GetLastResult();
+       SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
        if (style != MSGBOX_STYLE_NONE)
        {
                // MsgBox-BottomBitmap
@@ -184,10 +188,6 @@ _MessageBox::Initialize(const String& title, const String& text, MessageBoxStyle
                r = GetLastResult();
                SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
-               _pComposedBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*_pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), _bgColor);
-               r = GetLastResult();
-               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
-
                __pComposedTitleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*titleBgBitmap, Color::GetColor(COLOR_ID_MAGENTA), titleBgColor);
                r = GetLastResult();
                SysTryCatch(NID_UI_CTRL, (__pComposedTitleBitmap != null), , r, "[%s] Propagating.", GetErrorMessage(r));
index e2b151b..c90e50d 100644 (file)
@@ -1525,6 +1525,9 @@ _MessageBoxPresenter::_MessageBoxButtonListener::OnKeyReleased(const Tizen::Ui::
                        __buttonHandle = _ControlImpl::GetInstance(source)->GetCore().GetHandle();
                        SysTryReturnVoidResult(NID_UI_CTRL, __buttonHandle.IsValid() == true, E_SYSTEM, "[E_SYSTEM] Button's Handle is invalid");
 
+                       __buttonPressFlag = false;
+                       __buttonReleaseState = true;
+
                        if (__beginModal == true)
                        {
                                _ModalLoopManager::GetInstance()->EndMainLoop(MSGBOX_BUTTON_CLICKED, false);
@@ -1568,9 +1571,6 @@ _MessageBoxPresenter::_MessageBoxButtonListener::OnKeyPressed(const Tizen::Ui::C
                {
                        _Button* pPreviousControl = const_cast<_Button*> (pControl);
 
-                       pFocusControl->SetFocusModeStateEnabled(true);
-                       pPreviousControl->SetFocusModeStateEnabled(false);
-
                        pTop->SetFocusTraversalControl(pFocusControl);
                        _Control* pParentControl =  pFocusControl->GetParent();
 
index d5e7da1..b7f78ba 100755 (executable)
@@ -82,7 +82,6 @@ _OptionMenu::_OptionMenu(void)
        __itemColor[OPTION_MENU_CORE_ITEM_STATUS_NORMAL] = Color(255, 255, 255, 255);
        __itemColor[OPTION_MENU_CORE_ITEM_STATUS_PRESSED] = Color(255, 255, 255, 255);
        __itemColor[OPTION_MENU_CORE_ITEM_STATUS_HIGHLIGHTED] = Color(255, 255, 255, 255);
-
 }
 
 _OptionMenu::~_OptionMenu(void)
@@ -136,10 +135,18 @@ _OptionMenu::~_OptionMenu(void)
 _OptionMenu*
 _OptionMenu::CreateOptionMenuN(void)
 {
-       _OptionMenu* pOptionMenu = new (std::nothrow) _OptionMenu();
-       SysTryReturn(NID_UI_CTRL, pOptionMenu != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
-
        result r = E_SUCCESS;
+       float minWidth = 0.0f;
+       float minHeight = 0.0f;
+       _OptionMenu* pOptionMenu = null;
+       _ScrollPanel* pScrollPanel = null;
+       _Scroll* pScroll = null;
+
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_MIN_WIDTH,   _CONTROL_ORIENTATION_PORTRAIT, minWidth);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, minHeight);
+
+       pOptionMenu = new (std::nothrow) _OptionMenu();
+    SysTryReturn(NID_UI_CTRL, pOptionMenu != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        r = pOptionMenu->CreateRootVisualElement();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
@@ -164,24 +171,22 @@ _OptionMenu::CreateOptionMenuN(void)
                pOptionMenu->GetAccessibilityContainer()->AddListener(*pOptionMenu);
        }
 
-       {
-               float minWidth, minHeight;      // for visible scrollbar when scrollable
-               GET_SHAPE_CONFIG(CONTEXTMENU::LIST_MIN_WIDTH,   _CONTROL_ORIENTATION_PORTRAIT, minWidth);
-               GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, minHeight);
-               pOptionMenu->__pScrollPanel = _ScrollPanel::CreateScrollPanelN(FloatRectangle(0.0f, 0.0f, minWidth, minHeight), SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL, false, false);
-               pOptionMenu->__pScrollPanel->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
+       pScrollPanel = _ScrollPanel::CreateScrollPanelN(FloatRectangle(0.0f, 0.0f, minWidth, minHeight), SCROLL_PANEL_SCROLL_DIRECTION_VERTICAL, false, false);
+       pScrollPanel->SetTouchPressThreshold(TOUCH_PRESS_THRESHOLD_INSENSITIVE);
 
-               _Scroll* pScroll = pOptionMenu->__pScrollPanel->GetScrollBar();
-               SysTryCatch(NID_UI_CTRL, pScroll, , E_INVALID_STATE, "[E_INVALID_STATE] _Scroll isn't constructed");
-               pScroll->SetContextMenuScrollType(true);
+       pScroll = pScrollPanel->GetScrollBar();
+       SysTryCatch(NID_UI_CTRL, pScroll, , E_INVALID_STATE, "[E_INVALID_STATE] _Scroll isn't constructed");
+       pScroll->SetContextMenuScrollType(true);
 
-               pOptionMenu->AttachChild(*(pOptionMenu->__pScrollPanel));
-       }
+       pOptionMenu->AttachChild(*(pScrollPanel));
+
+       pOptionMenu->__pScrollPanel = pScrollPanel;
 
        return pOptionMenu;
 
 CATCH:
        delete pOptionMenu;
+       delete pScrollPanel;
 
        return null;
 }
@@ -197,6 +202,7 @@ _OptionMenu::OnFocusGained(const _Control &source)
 {
        __currentFocusedIndex = 0;
        __isFocused = false;
+
        return true;
 }
 
@@ -204,6 +210,7 @@ bool
 _OptionMenu::OnFocusLost(const _Control &source)
 {
        __isFocused = false;
+
        return true;
 }
 
@@ -217,6 +224,7 @@ _OptionMenu::OnDrawFocus(void)
                __currentFocusedIndex = 0;
                __pOptionMenuPresenter->DrawFocus(__currentFocusedIndex);
        }
+
        return;
 }
 
@@ -225,6 +233,8 @@ _OptionMenu::OnFocusModeStateChanged(void)
 {
        __isFocused = false;
        Invalidate(true);
+
+       return;
 }
 
 bool
@@ -237,13 +247,13 @@ _OptionMenu::OnKeyPressed(const _Control &source, const _KeyInfo &keyInfo)
 
        _KeyCode keyCode = keyInfo.GetKeyCode();
 
+       int height = 0;
+       int dividerHeight = 0;
        int count = GetMaximumVisibleItemsCount();
        int totalItemCount = GetItemCount();
-       int height;
-       int dividerHeight;
 
        GET_SHAPE_CONFIG(OPTIONMENU::ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, height);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, dividerHeight);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, dividerHeight);
 
        if (!__isFocused)
        {
@@ -296,9 +306,10 @@ _OptionMenu::OnKeyPressed(const _Control &source, const _KeyInfo &keyInfo)
                __pOptionMenuPresenter->OnEnterKeyPressed(__currentFocusedIndex);
                return true;
 
-       default :
+       default:
                return true;
        }
+
        __pOptionMenuPresenter->DrawFocus(__currentFocusedIndex);
 
        return true;
@@ -315,7 +326,7 @@ _OptionMenu::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                return true;
        }
 
-       if (keyCode == _KEY_CONTEXT_MENU)
+       if (keyCode == _KEY_CONTEXT_MENU || keyCode == _KEY_MENU)
        {
                if (__isAttachedToMainTree)
                {
@@ -323,6 +334,7 @@ _OptionMenu::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                }
                else
                {
+
                }
 
                return true;
@@ -344,7 +356,7 @@ _OptionMenu::Install(void)
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "Failed to construct arraylist.");
 
        _OptionMenuPresenter* pPresenter = new (std::nothrow) _OptionMenuPresenter(this);
-       SysTryReturnResult(NID_UI_CTRL, pPresenter != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
+    SysTryReturnResult(NID_UI_CTRL, pPresenter != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        SetPresenter(*pPresenter);
 
@@ -356,13 +368,14 @@ _OptionMenu::Install(void)
 result
 _OptionMenu::Initialize(void)
 {
-       FloatDimension screen = _ControlManager::GetInstance()->GetScreenSizeF();
        result r = E_SUCCESS;
+       FloatDimension screen(0.0f, 0.0f);
+       Color backgroundColor(0, 0, 0, 0);
+       Color backgroundSelectedColor(0, 0, 0, 0);
+       Color itemTextColor(0, 0, 0, 0);
+       Color itemTextSelectedColor(0, 0, 0, 0);
 
-       Color backgroundColor;
-       Color backgroundSelectedColor;
-       Color itemTextColor;
-       Color itemTextSelectedColor;
+       screen = _ControlManager::GetInstance()->GetScreenSizeF();
 
        r = SetBounds(FloatRectangle(0.0f, 0.0f, screen.width, screen.height));
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "SetBounds failed.");
@@ -370,7 +383,7 @@ _OptionMenu::Initialize(void)
        SetMovable(false);
        SetResizable(false);
 
-       GET_COLOR_CONFIG(OPTIONMENU::BG_NORMAL, backgroundColor);
+       GET_COLOR_CONFIG(OPTIONMENU::ITEM_BG_NORMAL, backgroundColor);
        GET_COLOR_CONFIG(OPTIONMENU::ITEM_BG_PRESSED, backgroundSelectedColor);
        GET_COLOR_CONFIG(OPTIONMENU::ITEM_TEXT_NORMAL, itemTextColor);
        GET_COLOR_CONFIG(OPTIONMENU::ITEM_TEXT_PRESSED, itemTextSelectedColor);
@@ -387,7 +400,6 @@ _OptionMenu::Initialize(void)
        }
 
        return r;
-
 }
 
 result
@@ -407,6 +419,8 @@ _OptionMenu::OnDraw(void)
        {
                _AccessibilityManager::GetInstance()->RequestAutoReading(_ACCESSIBILITY_AUTO_READING_MODE_FIRST_ITEM);
        }
+
+       return;
 }
 
 result
@@ -424,18 +438,12 @@ _OptionMenu::OnAttachedToMainTree(void)
 
                _Form* pForm = pFrame->GetCurrentForm();
                pForm != null ? SetOwner(pForm) : SetOwner(pFrame);
-
        }
        else
        {
                pOwner->LockInputEvent();
        }
 
-       if (GetItemCount() <= 0)
-       {
-               __pOptionMenuPresenter->CalculateShowItemCount();
-       }
-
        r = __pOptionMenuPresenter->CalculateWindowRect();
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, E_SYSTEM, E_SYSTEM, "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
@@ -445,11 +453,6 @@ _OptionMenu::OnAttachedToMainTree(void)
        FloatRectangle pBounds = pVisualElement->GetBounds();
        float oldBoundsX = pBounds.x;
        float oldBoundsY = pBounds.y;
-       float distanceX = 0.0f;
-       float distanceY = 0.0f;
-
-       GET_SHAPE_CONFIG(CONTEXTMENU::APPEARING_ANIMATION_DISTANCE_X, __layout, distanceX);
-       GET_SHAPE_CONFIG(CONTEXTMENU::APPEARING_ANIMATION_DISTANCE_Y, __layout, distanceY);
 
        pVisualElement->SetBounds(pBounds);
        pVisualElement->SetOpacity(0.0f);
@@ -490,6 +493,7 @@ void
 _OptionMenu::OnActivated(void)
 {
        SetTouchCapture(false, false);
+
        return _Window::OnActivated();
 }
 
@@ -500,8 +504,7 @@ _OptionMenu::OnDeactivated(void)
 }
 
 result
-_OptionMenu::AddItem(const String& text, int actionId, const Bitmap* pNormalBitmap,
-               const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
+_OptionMenu::AddItem(const String& text, int actionId, const Bitmap* pNormalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
 {
        result r = E_SUCCESS;
 
@@ -513,7 +516,6 @@ _OptionMenu::AddItem(const String& text, int actionId, const Bitmap* pNormalBitm
 
        __actionId.Add(actionId);
 
-       __pOptionMenuPresenter->CalculateShowItemCount();
        __pOptionMenuPresenter->CalculateWindowRect();
 
        return r;
@@ -532,7 +534,6 @@ _OptionMenu::InsertItemAt(int mainIndex, const String& text, int actionId, const
 
        __actionId.InsertAt(actionId, mainIndex);
 
-       __pOptionMenuPresenter->CalculateShowItemCount();
        __pOptionMenuPresenter->CalculateWindowRect();
 
        return r;
@@ -569,6 +570,7 @@ _OptionMenu::AddSubItem(int mainIndex, const String& text, int actionId)
        {
                __pSubMenu->AddItem(text, actionId, null, null, null);
        }
+
        return E_SUCCESS;
 }
 
@@ -643,22 +645,29 @@ _OptionMenu::ShowSubMenu(int mainIndex, _OptionMenuItem& item)
 
        float textSize = 0.0f;
        float itemHeight = 0.0f;
-       //        Font* pFont = __pOptionMenuPresenter->GetFont();
-       GET_SHAPE_CONFIG(OPTIONMENU::TEXT_SIZE, GetOrientation(), textSize);
 
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, itemHeight);
-       //        FloatRectangle itemBounds = __pOptionMenuPresenter->GetItemBounds(mainIndex);
+       GET_SHAPE_CONFIG(OPTIONMENU::TEXT_SIZE, GetOrientation(), textSize);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, itemHeight);
 
-       //_OptionMenuItem* pMainItem = __pOptionMenuPresenter->GetItemFromPosition(touchPosition).pOptionMenuItem;
        FloatRectangle itemBounds = item.GetBoundsF();
        itemBounds.height = itemHeight;
        float scrollPosition = __pScrollPanel->GetScrollPosition();
-       FloatPoint anchorPosition(GetBoundsF().x + itemBounds.x + itemBounds.width,
-                       GetBoundsF().y + itemBounds.y + itemBounds.height / 2.0f - scrollPosition);
+    FloatPoint anchorPosition(0.0f, 0.0f);
+    _ControlRotation rotation = _ControlManager::GetInstance()->GetScreenRotation();
+    ContextMenuCoreAlign alignment = CONTEXT_MENU_CORE_ALIGN_RIGHT;
+
+    if (rotation == _CONTROL_ROTATION_270 && __layout == _CONTROL_ORIENTATION_LANDSCAPE)
+    {
+        alignment = CONTEXT_MENU_CORE_ALIGN_LEFT;
+    }
+    else
+    {
+        alignment = CONTEXT_MENU_CORE_ALIGN_RIGHT;
+    }
 
-       //        FloatPoint anchorPosition = touchPosition;
+    anchorPosition = FloatPoint(GetBoundsF().x + itemBounds.x + itemBounds.width / 2.0f, GetBoundsF().y + itemBounds.y + itemBounds.height / 2.0f - scrollPosition);
 
-       __pSubMenu = _ContextMenu::CreateContextMenuN(anchorPosition, CONTEXT_MENU_CORE_STYLE_LIST, CONTEXT_MENU_CORE_ALIGN_RIGHT);
+    __pSubMenu = _ContextMenu::CreateContextMenuN(anchorPosition, CONTEXT_MENU_CORE_STYLE_LIST, alignment);
 
        if (__pSubMenu == null)
        {
@@ -698,11 +707,6 @@ _OptionMenu::ShowSubMenu(int mainIndex, _OptionMenuItem& item)
                }
        }
 
-       //        if (pFont != null)
-       //        {
-       //                __pSubMenu->SetFont(pFont->GetFaceName());
-       //        }
-
        __pSubMenu->Open();
        __subMenuIndex = mainIndex;
 
@@ -726,14 +730,14 @@ _OptionMenu::DestroySubMenu(void)
        __pSubMenu->Close();
        delete __pSubMenu;
        __pSubMenu = null;
+
        __subMenuIndex = -1;
 
        return E_SUCCESS;
 }
 
 result
-_OptionMenu::InsertItem(int index, const String& text, int actionId, const Bitmap* pNormalBitmap,
-               const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
+_OptionMenu::InsertItem(int index, const String& text, int actionId, const Bitmap* pNormalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
 {
        result r = E_SUCCESS;
 
@@ -742,15 +746,13 @@ _OptionMenu::InsertItem(int index, const String& text, int actionId, const Bitma
 
        __actionId.InsertAt(actionId, index);
 
-       __pOptionMenuPresenter->CalculateShowItemCount();
        __pOptionMenuPresenter->CalculateWindowRect();
 
        return r;
 }
 
 result
-_OptionMenu::SetItem(int index, const String& text, int actionId, const Bitmap* pNormalBitmap,
-               const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
+_OptionMenu::SetItem(int index, const String& text, int actionId, const Bitmap* pNormalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
 {
        result r = E_SUCCESS;
 
@@ -774,7 +776,6 @@ _OptionMenu::RemoveItemAt(int index)
 
        __actionId.RemoveAt(index);
 
-       __pOptionMenuPresenter->CalculateShowItemCount();
        __pOptionMenuPresenter->CalculateWindowRect();
 
        return r;
@@ -790,7 +791,6 @@ _OptionMenu::RemoveAllItems(void)
 
        __actionId.RemoveAll();
 
-       __pOptionMenuPresenter->CalculateShowItemCount();
        __pOptionMenuPresenter->CalculateWindowRect();
 
        SetLastResult(r);
@@ -962,7 +962,6 @@ _OptionMenu::SetMaxVisibleItemsCount(int maxItemsCount)
 
        __isMaxVisibleCountSet = true;
 
-       __pOptionMenuPresenter->CalculateShowItemCount();
        __pOptionMenuPresenter->CalculateWindowRect();
 
        return E_SUCCESS;
@@ -1055,7 +1054,6 @@ _OptionMenu::GetItemColor(enum OptionMenuCoreItemStatus status) const
        }
 
        return itemColor;
-
 }
 
 result
@@ -1155,8 +1153,7 @@ _OptionMenu::AddActionEventListener(const _IActionEventListener& listener)
        if (__pActionEvent == null)
        {
                __pActionEvent = _ActionEvent::CreateInstanceN(*this);
-               SysTryReturn(NID_UI_CTRL, __pActionEvent != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
-                               "[E_OUT_OF_MEMORY] The memory is insufficient.");
+        SysTryReturn(NID_UI_CTRL, __pActionEvent != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
                r = __pActionEvent->AddListener(listener);
                SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to remove an action event listener.");
@@ -1205,19 +1202,14 @@ _OptionMenu::GetActionEvent(void) const
 result
 _OptionMenu::LoadBitmap(void)
 {
+       result r = E_SUCCESS;
        Color backgroundColor;
 
-       // Delete old bitmap
-       if (__pBackgroundEffectBitmap != null)
-       {
-               delete __pBackgroundEffectBitmap;
-               __pBackgroundEffectBitmap = null;
-       }
+       r = GET_BITMAP_CONFIG_N(OPTIONMENU::BG_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundEffectBitmap);
+       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap.");
 
        backgroundColor = GetColor();
 
-
-       result r;
        r = LoadColorReplacedBitmap(backgroundColor);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap.");
 
@@ -1233,6 +1225,7 @@ CATCH:
 result
 _OptionMenu::LoadColorReplacedBitmap(const Color& color)
 {
+       result r = E_SUCCESS;
        Bitmap* ptempNormalBitmap = null;
 
        // Delete old bitmap
@@ -1242,10 +1235,9 @@ _OptionMenu::LoadColorReplacedBitmap(const Color& color)
                __pBackgroundNormalBitmap = null;
        }
 
-       result r;
-
-       r = GET_BITMAP_CONFIG_N(CONTEXTMENU::BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, ptempNormalBitmap);
+       r = GET_BITMAP_CONFIG_N(OPTIONMENU::BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, ptempNormalBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap.");
+
        __pBackgroundNormalBitmap = _BitmapImpl::GetColorReplacedBitmapN(*ptempNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), color);
        SysTryCatch(NID_UI_CTRL, __pBackgroundNormalBitmap != null, , GetLastResult(), "[%s] Propagating.",
                        GetErrorMessage(GetLastResult()));
@@ -1339,24 +1331,22 @@ _OptionMenu::OnFontInfoRequested(unsigned long& style, float& size)
 }
 
 void
-_OptionMenu::OnChangeLayout(_ControlOrientation orientation)
+_OptionMenu::OnChangeLayout(_ControlRotation rotation)
 {
-       if (!__isMaxVisibleCountSet)
+       if (rotation == _CONTROL_ROTATION_0 || rotation == _CONTROL_ROTATION_180)
        {
-               GET_SHAPE_CONFIG(OPTIONMENU::MAX_VISIBLE_ITEM_COUNT, orientation, __showItemCount);
+               __layout = _CONTROL_ORIENTATION_PORTRAIT;
        }
-
-       if (__isAttachedToMainTree == true)
+       else
        {
-               if (__layout != orientation)
-               {
-                       SetVisibleState(false);
-               }
+               __layout = _CONTROL_ORIENTATION_LANDSCAPE;
        }
 
-       __layout = orientation;
+       if (!__isMaxVisibleCountSet)
+       {
+               GET_SHAPE_CONFIG(OPTIONMENU::MAX_VISIBLE_ITEM_COUNT, __layout, __showItemCount);
+       }
 
-       __pOptionMenuPresenter->CalculateShowItemCount();
        __pOptionMenuPresenter->CalculateWindowRect();
 }
 
@@ -1473,6 +1463,8 @@ _OptionMenu::RemoveAllAccessibilityElement(void)
        {
                pAccessibilityContainer->RemoveAllElement();
        }
+
+       return;
 }
 
 _OptionMenuItemInfo
index 07a6804..042ef47 100755 (executable)
@@ -63,7 +63,7 @@ _OptionMenuImpl::CreateOptionMenuImplN(OptionMenu& control)
        SysTryReturn(NID_UI_CTRL, (pCore != null), null, r, "[%s] Propagating.", GetErrorMessage(r));
 
        int itemMaxCount = 0;
-       GET_SHAPE_CONFIG(CONTEXTMENU::ITEM_MAX_COUNT, _CONTROL_ORIENTATION_PORTRAIT, itemMaxCount);
+       GET_SHAPE_CONFIG(OPTIONMENU::ITEM_MAX_COUNT, _CONTROL_ORIENTATION_PORTRAIT, itemMaxCount);
        pCore->SetShowItemCount(itemMaxCount);
 
        _OptionMenuImpl* pImpl = new (std::nothrow) _OptionMenuImpl(&control, pCore);
@@ -315,7 +315,7 @@ _OptionMenuImpl::GetItemTextColor(OptionMenuItemStatus status) const
                break;
 
        default:
-               SysLogException(NID_UI_CTRL, E_SYSTEM, "Invalid argument at ContextMenuItemStatus.");
+               SysLogException(NID_UI_CTRL, E_SYSTEM, "Invalid argument at OptionMenuItemStatus.");
                break;
        }
 
@@ -373,7 +373,7 @@ _OptionMenuImpl::GetItemColor(OptionMenuItemStatus status) const
                break;
 
        default:
-               SysLogException(NID_UI_CTRL, E_SYSTEM, "Invalid argument at ContextMenuItemStatus.");
+               SysLogException(NID_UI_CTRL, E_SYSTEM, "Invalid argument at OptionMenuItemStatus.");
                break;
        }
 
index bc51fb2..bd162bf 100755 (executable)
@@ -82,10 +82,10 @@ _OptionMenuItem::_OptionMenuItem(void)
        __pBitmap[OPTION_MENU_ITEM_DRAWING_STATUS_PRESSED] = null;
        __pBitmap[OPTION_MENU_ITEM_DRAWING_STATUS_HIGHLIGHTED] = null;
 
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_LEFT_MARGIN,  _CONTROL_ORIENTATION_PORTRAIT, __leftMargin);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __rightMargin);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __dividerHeight);
-       GET_SHAPE_CONFIG(CONTEXTMENU::ITEM_BG_PRESSED_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __bgPressedMargin);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_LEFT_MARGIN,  _CONTROL_ORIENTATION_PORTRAIT, __leftMargin);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __rightMargin);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __dividerHeight);
+       GET_SHAPE_CONFIG(OPTIONMENU::ITEM_BG_PRESSED_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __bgPressedMargin);
 
        GET_SHAPE_CONFIG(OPTIONMENU::TEXT_LEFT_MARGIN, orientation, __textLeftMargin);
        GET_SHAPE_CONFIG(OPTIONMENU::TEXT_RIGHT_MARGIN, orientation, __textRightMargin);
@@ -96,10 +96,10 @@ _OptionMenuItem::_OptionMenuItem(void)
        GET_SHAPE_CONFIG(OPTIONMENU::ARROW_MARGIN, orientation, __arrowMargin);
        GET_SHAPE_CONFIG(OPTIONMENU::ITEM_HEIGHT, orientation, __itemHeight);
 
-       GET_COLOR_CONFIG(CONTEXTMENU::ITEM_BG_PRESSED, __selectedBgColor);
-       GET_COLOR_CONFIG(CONTEXTMENU::LIST_ITEM_DIVIDER_01_NORMAL, __lowerDividerLineColor);    // lower divider of item n and
-       GET_COLOR_CONFIG(CONTEXTMENU::LIST_ITEM_DIVIDER_02_NORMAL, __upperDividerLineColor);    // upper divider of item n+1 are bonded together.
-       GET_BITMAP_CONFIG_N(CONTEXTMENU::ITEM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMagentaBgBitmap);
+       GET_COLOR_CONFIG(OPTIONMENU::ITEM_BG_PRESSED, __selectedBgColor);
+       GET_COLOR_CONFIG(OPTIONMENU::LIST_ITEM_DIVIDER_01_NORMAL, __lowerDividerLineColor);     // lower divider of item n and
+       GET_COLOR_CONFIG(OPTIONMENU::LIST_ITEM_DIVIDER_02_NORMAL, __upperDividerLineColor);     // upper divider of item n+1 are bonded together.
+       GET_BITMAP_CONFIG_N(OPTIONMENU::ITEM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMagentaBgBitmap);
 
        InitializeAccessibilityElement();
 }
@@ -156,9 +156,9 @@ _OptionMenuItem::~_OptionMenuItem(void)
 
        if (__pArrowLabel != null)
        {
-                       DetachChild(*__pArrowLabel);
-                       delete __pArrowLabel;
-                       __pArrowLabel = null;
+               DetachChild(*__pArrowLabel);
+               delete __pArrowLabel;
+               __pArrowLabel = null;
        }
 
        if (__pSubItems != null)
@@ -201,8 +201,7 @@ _OptionMenuItem::InsertSubItemAt(_OptionMenuItem& subItem, int index)
        if (__pSubItems == null)
        {
                __pSubItems = new (std::nothrow) ArrayList;
-               SysTryReturn(NID_UI_CTRL, (__pSubItems != null), E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
-                               "[E_OUT_OF_MEMORY] Memory allocation failed.");
+        SysTryReturn(NID_UI_CTRL, (__pSubItems != null), E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
                result r = __pSubItems->Construct();
                if (r != E_SUCCESS)
@@ -280,7 +279,7 @@ _OptionMenuItem::InitializeAccessibilityElement(void)
        {
                pContainer->Activate(true);
                _AccessibilityElement* pElement = new (std::nothrow) _AccessibilityElement(true);
-               SysTryReturnVoidResult(NID_UI_CTRL, pElement, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
+        SysTryReturnVoidResult(NID_UI_CTRL, pElement, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
                pElement->SetTrait(L"Optionual popup");
                pElement->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width, GetBoundsF().height));
@@ -444,7 +443,6 @@ void
 _OptionMenuItem::SetDrawRect(Tizen::Graphics::FloatRectangle rect)
 {
        __drawRect = rect;
-
 }
 
 FloatRectangle
@@ -457,7 +455,6 @@ void
 _OptionMenuItem::SetPressedDrawRect(Tizen::Graphics::FloatRectangle rect)
 {
        __pressedDrawRect = rect;
-
 }
 
 FloatRectangle
@@ -563,17 +560,18 @@ _OptionMenuItem::DrawArrow(void)
 
        Color arrowColor;
        Bitmap *pArrowBitmap = null;
-       result r;
+       result r = E_SUCCESS;
+       FloatRectangle arrowbounds(0.0f, 0.0f, 0.0f, 0.0f);
 
        if (__pArrowBitmap == null)
        {
                // Load Contextual Popup Arrow Bitmap
                r = GET_BITMAP_CONFIG_N(OPTIONMENU::CONTEXTUAL_POPUP_ARROW, BITMAP_PIXEL_FORMAT_ARGB8888, pArrowBitmap);
-               //SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS), r, "[%s] Propagating.", GetErrorMessage(r));
 
                GET_COLOR_CONFIG(OPTIONMENU::CONTEXTUAL_POPUP_ARROW_NORMAL, arrowColor);
                __pArrowBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pArrowBitmap, Color::GetColor(COLOR_ID_MAGENTA), arrowColor);
-               //SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                delete pArrowBitmap;
                pArrowBitmap = null;
@@ -583,23 +581,23 @@ _OptionMenuItem::DrawArrow(void)
        {
                // Load Contextual Popup Arrow Pressed Bitmap
                r = GET_BITMAP_CONFIG_N(OPTIONMENU::CONTEXTUAL_POPUP_ARROW, BITMAP_PIXEL_FORMAT_ARGB8888, pArrowBitmap);
-               //SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                GET_COLOR_CONFIG(OPTIONMENU::CONTEXTUAL_POPUP_ARROW_PRESSED, arrowColor);
                __pArrowPressedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pArrowBitmap, Color::GetColor(COLOR_ID_MAGENTA), arrowColor);
-               //SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
+               SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                delete pArrowBitmap;
                pArrowBitmap = null;
        }
 
-       FloatRectangle arrowbounds(bounds.x + bounds.width - __arrowMargin - __rightMargin,
+       arrowbounds = FloatRectangle(bounds.x + bounds.width - __arrowMargin - __rightMargin,
                        (__itemHeight - __pArrowBitmap->GetHeight())/2.0f, __pArrowBitmap->GetWidth(), __pArrowBitmap->GetHeight());
 
        if (__pArrowLabel == null)
        {
                __pArrowLabel = _Label::CreateLabelN();
-               SysTryReturnVoidResult(NID_UI_CTRL, __pArrowLabel, E_OUT_OF_MEMORY, "[%s] Propagating.", GetErrorMessage(GetLastResult()));
+        SysTryCatch(NID_UI_CTRL, (__pArrowLabel != null), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                __pArrowLabel->SetBounds(FloatRectangle(arrowbounds));
 
@@ -628,6 +626,20 @@ _OptionMenuItem::DrawArrow(void)
        }
 
        __pArrowLabel->Invalidate();
+
+       return;
+
+CATCH:
+       delete pArrowBitmap;
+
+       delete __pArrowBitmap;
+       __pArrowBitmap = null;
+
+       delete __pArrowPressedBitmap;
+       __pArrowPressedBitmap = null;
+
+       delete __pArrowLabel;
+       __pArrowLabel = null;
 }
 
 void
index b0b10d8..1c4e0f3 100755 (executable)
@@ -81,7 +81,6 @@ _OptionMenuModel::IsValidItem(_OptionMenuItem *pItem)
 int
 _OptionMenuModel::GetItemCount(void) const
 {
-
        return __items.GetCount();
 }
 
index be7b605..5f7908e 100755 (executable)
@@ -96,10 +96,10 @@ _OptionMenuPresenter::Install(void)
        LoadShape();
 
        __pModel = new (std::nothrow) _OptionMenuModel;
-       SysTryCatch(NID_UI_CTRL, __pModel != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
+    SysTryCatch(NID_UI_CTRL, __pModel != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        r = __pModel->Construct();
-       SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Unable to create data instance.");
+    SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        __pFont = __pOptionMenu->GetFallbackFont();
        r = GetLastResult();
@@ -116,35 +116,33 @@ CATCH:
        return r;
 }
 
-
 void
 _OptionMenuPresenter::LoadShape(void)
 {
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_MIN_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemMinWidth);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_MIN_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemMinWidth);
        GET_SHAPE_CONFIG(OPTIONMENU::LIST_MAX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemMaxWidth);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __itemHeight);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ITEM_GAP, _CONTROL_ORIENTATION_PORTRAIT, __itemGap);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __itemHeight);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_ITEM_GAP, _CONTROL_ORIENTATION_PORTRAIT, __itemGap);
 
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __topMargin);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_BOTTOM_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __bottomMargin);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __leftMargin);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __rightMargin);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_TOP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __topMargin);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_BOTTOM_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __bottomMargin);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_LEFT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __leftMargin);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_RIGHT_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, __rightMargin);
 
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ICON_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemBitmapWidth);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ICON_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __itemBitmapHeight);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_ICON_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, __itemBitmapWidth);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_ICON_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __itemBitmapHeight);
 
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_ITEM_FONT_SIZE, _CONTROL_ORIENTATION_PORTRAIT, __itemFontSize);
-       GET_SHAPE_CONFIG(CONTEXTMENU::LIST_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __dividerHeight);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_ITEM_FONT_SIZE, _CONTROL_ORIENTATION_PORTRAIT, __itemFontSize);
+       GET_SHAPE_CONFIG(OPTIONMENU::LIST_DIVIDER_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, __dividerHeight);
 
        __itemWidth = __itemMinWidth;
 }
 
 _OptionMenuItem*
-_OptionMenuPresenter::CreateItem(const String& text, int actionId, const Bitmap* pNormalBitmap,
-                                                                       const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
+_OptionMenuPresenter::CreateItem(const String& text, int actionId, const Bitmap* pNormalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
 {
        _OptionMenuItem* pItem = _OptionMenuItem::CreateOptionMenuItemN();
-       SysTryReturn(NID_UI_CTRL, pItem != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
+    SysTryReturn(NID_UI_CTRL, pItem != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        OptionMenuItemDrawingType itemType = OPTION_MENU_ITEM_DRAWING_TYPE_TEXT;
        _Label* pLabel = null;
@@ -157,7 +155,6 @@ _OptionMenuPresenter::CreateItem(const String& text, int actionId, const Bitmap*
                delete pItem;
                return null;
        }
-       //SysTryReturn(NID_UI_CTRL, pLabel != null, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
        pLabel->SetBackgroundBitmap(*pNormalBitmap);
        pLabel->SetBackgroundColor(Color(0, 0, 0, 0));
@@ -281,11 +278,10 @@ _OptionMenuPresenter::CreateItem(const String& text, int actionId, const Bitmap*
 }
 
 result
-_OptionMenuPresenter::AddItem(const String& text, int actionId, const Bitmap* normalBitmap,
-               const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
+_OptionMenuPresenter::AddItem(const String& text, int actionId, const Bitmap* normalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
 {
        _OptionMenuItem* pItem = CreateItem(text, actionId, normalBitmap, pPressedBitmap, pHighlightedBitmap);
-       SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "The memory is insufficient.");
+    SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        result r = __pModel->AddItem(pItem);
 
@@ -304,7 +300,7 @@ _OptionMenuPresenter::AddSubItem(int mainIndex, const String& text, int actionId
        SysTryReturn(NID_UI_CTRL, mainIndex >=0 && mainIndex < __pModel->GetItemCount(), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid mainIndex %d.", mainIndex);
 
        _OptionMenuItem* pItem = CreateItem(text, actionId, null, null, null);
-       SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "The memory is insufficient.");
+    SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        result r = __pModel->AddItem(pItem, mainIndex);
 
@@ -340,7 +336,7 @@ _OptionMenuPresenter::InsertItem(int mainIndex, const String& text, int actionId
                const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
 {
        _OptionMenuItem* pItem = CreateItem(text, actionId, normalBitmap, pPressedBitmap, pHighlightedBitmap);
-       SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "The memory is insufficient.");
+    SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        result r = __pModel->InsertItemAt(pItem, mainIndex);
        if (r != E_SUCCESS)
@@ -359,7 +355,7 @@ _OptionMenuPresenter::InsertSubItemAt(int mainIndex, int subIndex, const String&
        SysTryReturn(NID_UI_CTRL, subIndex >=0 && subIndex <= __pModel->GetSubItemCount(mainIndex), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid subIndex %d.", subIndex);
 
        _OptionMenuItem* pItem = CreateItem(text, actionId, null, null, null);
-       SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "The memory is insufficient.");
+    SysTryReturn(NID_UI_CTRL, pItem != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        result r = __pModel->InsertItemAt(pItem, mainIndex, subIndex);
        SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS), r, r, "[%s] Propagating.", GetErrorMessage(r));
@@ -418,8 +414,7 @@ _OptionMenuPresenter::GetSubItemActionIdAt(int mainIndex, int subIndex) const
 }
 
 result
-_OptionMenuPresenter::SetItem(int index, const String& text, int actionId, const Bitmap* normalBitmap,
-               const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
+_OptionMenuPresenter::SetItem(int index, const String& text, int actionId, const Bitmap* normalBitmap, const Bitmap* pPressedBitmap, const Bitmap* pHighlightedBitmap)
 {
        SysTryReturn(NID_UI_CTRL, index >=0 && index < __pModel->GetItemCount(), E_INVALID_ARG, E_INVALID_ARG, "[E_INVALID_ARG] Invalid mainIndex %d.", index);
 
@@ -455,12 +450,6 @@ _OptionMenuPresenter::DeleteItemAll(void)
        return r;
 }
 
-int
-_OptionMenuPresenter::CalculateShowItemCount(void)
-{
-    return  __pOptionMenu->GetMaximumVisibleItemsCount();
-}
-
 result
 _OptionMenuPresenter::CalculateWindowRect(void)
 {
@@ -489,6 +478,7 @@ _OptionMenuPresenter::CalculateRect(void)
        float bodyRightMargin = __rightMargin;
 
        FloatDimension screen = _ControlManager::GetInstance()->GetScreenSizeF();
+       _ControlRotation rotation = _ControlManager::GetInstance()->GetScreenRotation();
 
        if (__pOptionMenu->GetLayout() == _CONTROL_ORIENTATION_LANDSCAPE)
        {
@@ -500,6 +490,11 @@ _OptionMenuPresenter::CalculateRect(void)
        bodyRect.width = __layoutSize.width + bodyLeftMargin + bodyRightMargin;
        bodyRect.height = __layoutSize.height + bodyTopMargin + bodyBottomMargin;
 
+       if (rotation == _CONTROL_ROTATION_270)
+       {
+               bodyRect.x = screen.width - bodyRect.width;
+       }
+
        bodyRect.y =  screen.height - bodyRect.height;
 
        windowRect.x = bodyRect.x ;
@@ -547,6 +542,7 @@ _OptionMenuPresenter::AdjustItemLayout(void)
        FloatDimension layoutSize(0.0f, 0.0f);
 
        int itemCount = __pModel->GetItemCount();
+
        if (itemCount <= 0)
        {
                __layoutSize.width = __itemWidth;
@@ -562,7 +558,7 @@ _OptionMenuPresenter::AdjustItemLayout(void)
                screen.SetSize(screen.height, screen.width);
        }
 
-       int maxHeight = screen.height;// - __screenTopMargin - __screenBottomMargin - __arrowHeight;
+       int maxHeight = screen.height;
        if (layoutSize.height > maxHeight)
        {
                layoutSize.height = maxHeight;
@@ -574,7 +570,7 @@ _OptionMenuPresenter::AdjustItemLayout(void)
 FloatDimension
 _OptionMenuPresenter::AdjustItemLayoutStyle(void)
 {
-       int itemMaxCount = CalculateShowItemCount();
+       int itemMaxCount = __pOptionMenu->GetMaximumVisibleItemsCount();
 
        int itemCount = __pModel->GetItemCount();
        float itemHeight = __itemHeight + (__dividerHeight * 2.0f);
@@ -683,7 +679,7 @@ _OptionMenuPresenter::Draw(void)
        result r = E_SUCCESS;
 
        Canvas* pCanvas = __pOptionMenu->GetCanvasN();
-       SysTryReturn(NID_UI_CTRL, pCanvas != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "The memory is insufficient.");
+    SysTryReturn(NID_UI_CTRL, pCanvas != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
        // Clear canvas for drawing area of the OptionMenu.
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
@@ -742,7 +738,7 @@ _OptionMenuPresenter::DrawFocus(int index)
 
        return r;
 
-       CATCH:
+CATCH:
        delete pCanvas;
        return r;
 }
@@ -774,7 +770,7 @@ _OptionMenuPresenter::OnEnterKeyPressed(int selectedIndex)
 result
 _OptionMenuPresenter::DrawBackground(Canvas* pCanvas)
 {
-       SysTryReturn(NID_UI_CTRL, pCanvas != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
+    SysTryReturn(NID_UI_CTRL, pCanvas != null, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
        result r = E_SUCCESS;
 
@@ -879,7 +875,7 @@ _OptionMenuPresenter::OnTouchReleased(const _Control& source, const _TouchInfo&
                        {
                                // Fire Action Event
                                __pOptionMenu->SetVisibleState(false);
-                               //PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP);
+                               PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP, __pOptionMenu);
                                __pOptionMenu->FireActionEvent(pItem->GetActionId());
                        }
                }
@@ -954,7 +950,7 @@ _OptionMenuPresenter::SetAllAccessibilityElement(void)
        if (pContainerOptionMenu != null)
        {
                _AccessibilityElement* pElementOptionMenu = new (std::nothrow) _AccessibilityElement(true);
-               SysTryReturnVoidResult(NID_UI_CTRL, pElementOptionMenu, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory shortage.");
+        SysTryReturnVoidResult(NID_UI_CTRL, pElementOptionMenu, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
                pElementOptionMenu->SetSupportOperatingGesture(false);
                pElementOptionMenu->SetTrait(L"Optionual popup");
index 86f3915..763bc6f 100644 (file)
@@ -102,6 +102,7 @@ _Scroll::Construct(Tizen::Ui::_Control& parentCtrl,
        SysTryReturnResult(NID_UI_CTRL, pPresenter, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        SetPresenter((_ScrollPresenter &)*pPresenter);
+       SetFocusable(false);
 
        AcquireHandle();
 
index a6c834b..36ba19d 100644 (file)
@@ -1806,7 +1806,6 @@ _SearchBar::OnFocusLost(const _Control &source)
 void
 _SearchBar::OnDrawFocus(void)
 {
-       __pCancelButton->SetFocusModeStateEnabled(true);
        __pEdit->SetSearchFieldFocus(true);
        _Control::OnDrawFocus();
 
index 68f1f6b..edb61f3 100644 (file)
@@ -108,7 +108,7 @@ _SliderOverlay::LoadBitmaps()
        Bitmap* pBitmap = null;
        Bitmap* pReplacementBitmap = null;
 
-       r = GET_BITMAP_CONFIG_N(SLIDER::UPWARD_OVERLAY_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::OVERLAY_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pBitmap);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.");
 
        pReplacementBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBitmap, Color::GetColor(COLOR_ID_MAGENTA), __overlayBgColor);
index 6f2a6c3..24a093a 100644 (file)
@@ -1100,6 +1100,31 @@ _TableViewItem::GetItemTapSoundEnabled(void)
        return __isItemTapSoundEnabled;
 }
 
+Tizen::Graphics::Canvas*
+_TableViewItem::OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds)
+{
+       Canvas* pCanvas = null;
+
+       if(__pBitmapVisualElement != null && __pBitmapVisualElement->GetImageSource().IsEmpty())
+       {
+               Bitmap* pDrawBitmap = __pItemBgBitmap[__drawingStatus];
+               if(pDrawBitmap != null)
+               {
+                       pCanvas = __pBitmapVisualElement->GetCanvasN();
+                       SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
+                       pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
+                       pCanvas->Clear();
+
+                       pDrawBitmap->IsNinePatchedBitmap();
+                       DrawBitmap(*pCanvas, FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pDrawBitmap);
+               }
+       }
+
+CATCH:
+
+       return pCanvas;
+}
+
 void
 _TableViewItem::FireItemEvent(bool selectedItem)
 {
@@ -2060,12 +2085,26 @@ _TableViewItem::DrawItemBackground(void)
                        return;
                }
 
-               pCanvas = __pBitmapVisualElement->GetCanvasN();
-               SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
-               pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
-               pCanvas->Clear();
+               String imagePath = null;
+               if(_BitmapImpl::CheckNinePatchedBitmapStrictly(*pDrawBitmap) == false)
+               {
+                       imagePath = _BitmapImpl::GetInstance(*pDrawBitmap)->GetFileName();
+               }
 
-               DrawBitmap(*pCanvas, FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pDrawBitmap);
+               if(imagePath.IsEmpty() == false)
+               {
+                       __pBitmapVisualElement->SetBackgroundColor(_Colorf((float)bgColor.GetRed() /255, (float)bgColor.GetGreen() / 255, (float)bgColor.GetBlue() / 255, (float)bgColor.GetAlpha() / 255));
+                       __pBitmapVisualElement->SetImageSource(imagePath);
+               }
+               else
+               {
+                       pCanvas = __pBitmapVisualElement->GetCanvasN();
+                       SysTryCatch(NID_UI_CTRL, pCanvas != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
+                       pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
+                       pCanvas->Clear();
+
+                       DrawBitmap(*pCanvas, FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pDrawBitmap);
+               }
        }
 
        if(IsContextItem())
index e6283b6..b7bcb05 100644 (file)
@@ -2323,6 +2323,7 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire, bool adjust)
                {
                        PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP, __pItems.at(itemIndex));
                }
+
                __pItems.at(itemIndex)->SetButtonStatus(_BUTTON_STATUS_SELECTED, fire);
 
                for (int i = 0; i < __itemCount; i++)
@@ -2331,7 +2332,6 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire, bool adjust)
                }
 
                __pItems.at(itemIndex)->ShowUnderlineBitmap(true);
-               __pItems.at(itemIndex)->Draw();
 
                _AccessibilityElement* pElement = __pItems.at(currentSelectedItemIndex)->GetAccessibilityContainer()->GetChildElement(0);
                if (pElement)
@@ -2375,7 +2375,6 @@ _Toolbar::SetItemSelected(int itemIndex, bool fire, bool adjust)
        if (currentSelectedItemIndex != -1 && __pItems.at(currentSelectedItemIndex) != null)
        {
                __pItems.at(currentSelectedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-               __pItems.at(currentSelectedItemIndex)->Draw();
                __pItems.at(currentSelectedItemIndex)->ShowUnderlineBitmap(false);
 
                _AccessibilityElement* pElement = __pItems.at(currentSelectedItemIndex)->GetAccessibilityContainer()->GetChildElement(0);
@@ -2413,6 +2412,7 @@ _Toolbar::SetItemHighlighted(int itemIndex, bool fire, bool adjust)
                {
                        PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP, __pItems.at(itemIndex));
                }
+
                __pItems.at(itemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, fire);
                __pItems.at(itemIndex)->ShowUnderlineBitmap(true);
 
@@ -2443,8 +2443,17 @@ _Toolbar::SetItemHighlighted(int itemIndex, bool fire, bool adjust)
                {
                        PLAY_FEEDBACK(_RESOURCE_FEEDBACK_PATTERN_TAP, __pItems.at(itemIndex));
                }
+
                __pItems.at(itemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, fire);
+               __pItems.at(itemIndex)->Draw();
+
+               for (int i = 0; i < __itemCount; i++)
+               {
+                       __pItems.at(i)->ShowUnderlineBitmap(false);
+               }
+
                __pItems.at(itemIndex)->ShowUnderlineBitmap(true);
+               __pItems.at(itemIndex)->Draw();
 
                __highlightedItemIndex = itemIndex;
                __lastHighlightedItemIndex = __highlightedItemIndex;
@@ -2466,8 +2475,8 @@ _Toolbar::SetItemHighlighted(int itemIndex, bool fire, bool adjust)
        if (currentSelectedItemIndex != -1 && __pItems.at(currentSelectedItemIndex) != null)
        {
                __pItems.at(currentSelectedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL);
-               __pItems.at(currentSelectedItemIndex)->Draw();
                __pItems.at(currentSelectedItemIndex)->ShowUnderlineBitmap(false);
+               __pItems.at(currentSelectedItemIndex)->Draw();
 
                _AccessibilityElement* pElement = __pItems.at(currentSelectedItemIndex)->GetAccessibilityContainer()->GetChildElement(0);
                if (pElement)
@@ -3091,18 +3100,27 @@ _Toolbar::OnDrawFocus(void)
                                {
                                        if (__highlightedItemIndex == __itemCount)
                                        {
-                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               }
                                        }
                                        else if (__highlightedItemIndex == __itemCount + 1)
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               }
                                        }
                                }
                                else
                                {
                                        if (__highlightedItemIndex == __itemCount)
                                        {
-                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               }
                                        }
                                }
                        }
@@ -3112,7 +3130,10 @@ _Toolbar::OnDrawFocus(void)
                                {
                                        if (__highlightedItemIndex == __itemCount)
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               }
                                        }
                                }
                        }
@@ -3123,7 +3144,10 @@ _Toolbar::OnDrawFocus(void)
                        {
                                if (__pItems.at(__highlightedItemIndex))
                                {
-                                       __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                       if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       {
+                                               __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                       }
                                }
                        }
                        else
@@ -3134,18 +3158,27 @@ _Toolbar::OnDrawFocus(void)
                                        {
                                                if (__highlightedItemIndex == __itemCount)
                                                {
-                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                       {
+                                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       }
                                                }
                                                else if (__highlightedItemIndex == __itemCount + 1)
                                                {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                       {
+                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       }
                                                }
                                        }
                                        else
                                        {
                                                if (__highlightedItemIndex == __itemCount)
                                                {
-                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                       {
+                                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       }
                                                }
                                        }
                                }
@@ -3155,7 +3188,10 @@ _Toolbar::OnDrawFocus(void)
                                        {
                                                if (__highlightedItemIndex == __itemCount)
                                                {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                                       {
+                                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       }
                                                }
                                        }
                                }
@@ -3203,18 +3239,27 @@ _Toolbar::OnFocusModeStateChanged(void)
                        {
                                if (__highlightedItemIndex == __itemCount)
                                {
-                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       {
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       }
                                }
                                else if (__highlightedItemIndex == __itemCount + 1)
                                {
-                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       {
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       }
                                }
                        }
                        else
                        {
                                if (__highlightedItemIndex == __itemCount)
                                {
-                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       {
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       }
                                }
                        }
                }
@@ -3224,7 +3269,10 @@ _Toolbar::OnFocusModeStateChanged(void)
                        {
                                if (__highlightedItemIndex == __itemCount)
                                {
-                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       {
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                       }
                                }
                        }
                }
@@ -3235,7 +3283,10 @@ _Toolbar::OnFocusModeStateChanged(void)
                {
                        if (__pItems.at(__highlightedItemIndex))
                        {
-                               __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                               if (__pItems.at(__highlightedItemIndex)->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                               {
+                                       __pItems.at(__highlightedItemIndex)->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                               }
                        }
                }
                else
@@ -3246,18 +3297,27 @@ _Toolbar::OnFocusModeStateChanged(void)
                                {
                                        if (__highlightedItemIndex == __itemCount)
                                        {
-                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               }
                                        }
                                        else if (__highlightedItemIndex == __itemCount + 1)
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               }
                                        }
                                }
                                else
                                {
                                        if (__highlightedItemIndex == __itemCount)
                                        {
-                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               if (__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               }
                                        }
                                }
                        }
@@ -3267,7 +3327,10 @@ _Toolbar::OnFocusModeStateChanged(void)
                                {
                                        if (__highlightedItemIndex == __itemCount)
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               if (__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_NORMAL);
+                                               }
                                        }
                                }
                        }
@@ -4387,9 +4450,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                }
                        }
                }
-       }
 
-       if (IsFocusModeStateEnabled() == true && keyCode == _KEY_LEFT)
+               Invalidate(true);
+       }
+       else if (IsFocusModeStateEnabled() == true && keyCode == _KEY_LEFT)
        {
                __highlighted = false;
 
@@ -4996,9 +5060,10 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                                }
                        }
                }
-       }
 
-       if (IsFocusModeStateEnabled() == true && keyCode == _KEY_ENTER)
+               Invalidate(true);
+       }
+       else if (IsFocusModeStateEnabled() == true && keyCode == _KEY_ENTER)
        {
                if (__itemCount != 0)
                {
@@ -5226,8 +5291,6 @@ _Toolbar::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
                }
        }
 
-       Invalidate(true);
-
        return false;
 } // OnKeyReleased
 
@@ -6337,6 +6400,12 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
                                pButton->SetUserDefinedTextArea(FloatRectangle(sideMargin, largeTabTopMargin + iconAreaWidth,
                                                buttonItemWidth - sideMargin * 2, largeTabTextHeight));
                        }
+                       else if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
+                       {
+                               pButton->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+                               pButton->SetUserDefinedTextArea(FloatRectangle((buttonItemWidth - contentLength) / 2 + iconAreaWidth + iconTextGap, (buttonItemHeight - largeTabTextHeight) / 2,
+                                               buttonItemWidth - iconAreaWidth - iconTextGap - sideMargin * 2, largeTabTextHeight));
+                       }
                        else
                        {
                                pButton->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -6854,7 +6923,7 @@ _Toolbar::RearrangeItems(void)
                                        __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
                                                        (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
 
-                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
+                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, (__itemArea.height - footerButtonItemHeight) / 2,
                                                        footerButtonItemWidth, footerButtonItemHeight));
 
                                        __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
@@ -6912,7 +6981,7 @@ _Toolbar::RearrangeItems(void)
                {
                        if (__style != TOOLBAR_SOFTKEY)
                        {
-                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
+                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, (__itemArea.height - footerButtonItemHeight) / 2,
                                                footerButtonItemWidth, footerButtonItemHeight));
 
                                __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
@@ -7197,7 +7266,28 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
 
                blockWidth[0] = __itemArea.width;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 6, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                       }
+               }
 
                for (int i = 0; i < __itemCount ; i++)
                {
@@ -7249,8 +7339,33 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
 
                blockWidth[0] = blockWidth[1] = (__itemArea.width - dividerWidth) / 2;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                       }
+               }
+
 
                for (int i = 0; i < __itemCount ; i++)
                {
@@ -7303,10 +7418,40 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
 
                blockWidth[0] = blockWidth[1] = blockWidth[2] = (__itemArea.width - dividerWidth * 2) / 3;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
-               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
-                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2], segmentedItemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - 3, segmentedItemHeight));
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2], segmentedItemHeight));
+                       }
+               }
 
                for (int i = 0; i < __itemCount ; i++)
                {
@@ -7567,7 +7712,28 @@ _Toolbar::RearrangeButtonItems(void)
 
                        blockWidth[0] = __itemArea.width;
 
-                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                       if (__pButtonItems[LEFT_BUTTON])
+                       {
+                               if (__pButtonItems[RIGHT_BUTTON])
+                               {
+                                       __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 6, itemHeight));
+                               }
+                               else
+                               {
+                                       __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               }
+                       }
+                       else
+                       {
+                               if (__pButtonItems[RIGHT_BUTTON])
+                               {
+                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               }
+                               else
+                               {
+                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               }
+                       }
                }
 
                for (int i = 0; i < __itemCount; i++)
@@ -7620,8 +7786,32 @@ _Toolbar::RearrangeButtonItems(void)
 
                blockWidth[0] = blockWidth[1] = (__itemArea.width - dividerWidth * 1) / 2;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - 3, itemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - 3, itemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                       }
+               }
 
                for (int i = 0; i < __itemCount; i++)
                {
@@ -7675,10 +7865,40 @@ _Toolbar::RearrangeButtonItems(void)
 
                blockWidth[0] = blockWidth[1] = blockWidth[2] = (__itemArea.width - dividerWidth * 2) / 3;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
-               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
-                               (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - itemHeight) / 2, blockWidth[2] - 3, itemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                                       (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - itemHeight) / 2, blockWidth[2] - 3, itemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
+                       }
+               }
 
                for (int i = 0; i < __itemCount; i++)
                {
index 763510b..606ae04 100644 (file)
@@ -228,7 +228,16 @@ _ToolbarPresenter::Draw(void)
        }
 
        GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, __pToolbar->GetOrientation(), buttonItemGap);
-       GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+
+       if (style == TOOLBAR_TAB_LARGE)
+       {
+               GET_SHAPE_CONFIG(HEADER::TAB_LARGE_DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       }
+       else
+       {
+               GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       }
+
        GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, __pToolbar->GetOrientation(), segmentedItemHeight);
 
        GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, __pToolbar->GetOrientation(), footerButtonItemWidth);
@@ -326,14 +335,14 @@ _ToolbarPresenter::Draw(void)
        {
                if (__pToolbar->GetButton(RIGHT_BUTTON))
                {
-                       //DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap,
-                       //              dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+                       DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap,
+                                       dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
                }
 
                if (__pToolbar->GetButton(LEFT_BUTTON))
                {
-                       //DrawDivider(FloatPoint(__pToolbar->GetButton(LEFT_BUTTON)->GetBoundsF().width + buttonItemGap,
-                       //              dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+                       DrawDivider(FloatPoint(__pToolbar->GetButton(LEFT_BUTTON)->GetBoundsF().width + buttonItemGap,
+                                       dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
                }
        }
 
@@ -571,22 +580,30 @@ _ToolbarPresenter::DrawDivider(const FloatPoint& point, Canvas* pCanvas)
        float dividerWidth = 0.0f;
        float dividerHeight = 0.0f;
        Color dividerLeftColor;
-       Color dividerRightColor;
+       //Color dividerRightColor;
 
        GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, __pToolbar->GetOrientation(), dividerWidth);
-       GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+
+       if (style == TOOLBAR_TAB_LARGE)
+       {
+               GET_SHAPE_CONFIG(HEADER::TAB_LARGE_DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       }
+       else
+       {
+               GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       }
 
        if (__pToolbar->IsHeader() == true)
        {
                if (!__pToolbar->IsTransparent())
                {
                        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);
                }
                else
                {
                        GET_COLOR_CONFIG(HEADER::DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, dividerLeftColor);
-                       GET_COLOR_CONFIG(HEADER::DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, dividerRightColor);
+                       //GET_COLOR_CONFIG(HEADER::DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, dividerRightColor);
                }
        }
        else
@@ -594,24 +611,24 @@ _ToolbarPresenter::DrawDivider(const FloatPoint& point, Canvas* pCanvas)
                if (!__pToolbar->IsTransparent())
                {
                        GET_COLOR_CONFIG(FOOTER::DIVIDER_LINE_LEFT_NORMAL, dividerLeftColor);
-                       GET_COLOR_CONFIG(FOOTER::DIVIDER_LINE_RIGHT_NORMAL, dividerRightColor);
+                       //GET_COLOR_CONFIG(FOOTER::DIVIDER_LINE_RIGHT_NORMAL, dividerRightColor);
                }
                else
                {
                        GET_COLOR_CONFIG(FOOTER::DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, dividerLeftColor);
-                       GET_COLOR_CONFIG(FOOTER::DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, dividerRightColor);
+                       //GET_COLOR_CONFIG(FOOTER::DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, dividerRightColor);
                }
        }
 
        pCanvas->SetForegroundColor(dividerLeftColor);
-       pCanvas->SetLineWidth(dividerWidth/2);
+       pCanvas->SetLineWidth(dividerWidth);
 
-       pCanvas->DrawLine(FloatPoint(point.x + dividerWidth/2, point.y), FloatPoint(point.x + dividerWidth/2, point.y + dividerHeight));
+       pCanvas->DrawLine(FloatPoint(point.x + dividerWidth, point.y), FloatPoint(point.x + dividerWidth, point.y + dividerHeight));
 
-       pCanvas->SetForegroundColor(dividerRightColor);
-       pCanvas->SetLineWidth(dividerWidth/2);
+       //pCanvas->SetForegroundColor(dividerRightColor);
+       //pCanvas->SetLineWidth(dividerWidth/2);
 
-       pCanvas->DrawLine(FloatPoint(point.x + dividerWidth, point.y), FloatPoint(point.x + dividerWidth, point.y + dividerHeight));
+       //pCanvas->DrawLine(FloatPoint(point.x + dividerWidth, point.y), FloatPoint(point.x + dividerWidth, point.y + dividerHeight));
 
        return;
 }
index 23c3672..6504935 100755 (executable)
@@ -383,7 +383,6 @@ private:
        virtual void OnClipboardPopupClosed(void);
        virtual void GetPreviousText(InputConnection& source, Tizen::Base::String& text, int& cursorPosition);
        void OnComposingTextChanged(const Tizen::Base::String& preeditText, int cursorPosition);
-       void OnKeypadStateChanged(void *data, InputPanelShowState showState);
        void OnLanguageStateChanged(void* data, Tizen::Locales::LanguageCode newLanguageCode);
        result InitializeFlickAnimation(void);
        void InitializeParentPanel(void);
@@ -583,6 +582,8 @@ private:
        int __columnCursorIndex;
        bool __isPasswordVisible;
        bool __needToCreateCopyPastePopup;
+       FloatRectangle __calculatedCursorBounds;
+
 }; // _EditPresenter
 
 }}} // Tizen::Ui::Controls
index 95a2a0e..4ff0999 100644 (file)
@@ -76,6 +76,7 @@ private:
 
        Tizen::Graphics::Color __indexBgColor;
        Tizen::Graphics::Color __indexHighlightColor;
+       Tizen::Graphics::Color __indexLineColor;
        Tizen::Graphics::Color __indexSelectedLineColor;
        Tizen::Graphics::Color __indexTextColor;
        Tizen::Graphics::Color __indexDividerColor;
index 2434d15..e1f1784 100644 (file)
@@ -88,7 +88,7 @@ public:
 // Focus Ui
        virtual void ResetFocusList(void);
        virtual Tizen::Base::Collection::IListT<_Control*>* GetFocusList(void) const;
-       virtual _Control* GetFocusTraversalControl(void) const;
+       virtual _Control* GetFocusTraversalControl(_Control* pControl) const;
        virtual void SetFocusTraversalControl(_Control* pControl);
 
 // Focus
index efd4d9c..91337f5 100644 (file)
@@ -121,6 +121,7 @@ private:
        void SetImageVisualElement(Tizen::Ui::Animations::_VisualElement& visualElement);
        void SetFrameVisualElement(Tizen::Ui::Animations::_VisualElement& visualElement);
        void SetAnimation(Tizen::Ui::Animations::VisualElementPropertyAnimation& animation);
+       Tizen::Graphics::Bitmap* ScaledBitmapN(Tizen::Graphics::Bitmap* pSourceBitmap, Tizen::Graphics::Dimension scaledSize);
 
 private:
        Tizen::Ui::Animations::_VisualElement* __pImageVisualElement;
index d1209e1..41ddf22 100644 (file)
@@ -120,7 +120,6 @@ private:
        result Dispose(void);
        result ChangeLayoutInternal(LayoutChangeState layoutChangeState);
        _Button* CreateButtonItemN(int actionId, const Tizen::Base::String& text);
-       _Button* CreateFooterBackButton(_Toolbar* pFooter);
        _Toolbar* CreateFooter(void);
 
 private:
index 8132629..c32c22c 100644 (file)
@@ -178,7 +178,7 @@ public:
        virtual void OnFontChanged(Tizen::Graphics::Font* pFont);
        virtual void OnFontInfoRequested(unsigned long& style, float& size);
 
-       virtual void OnChangeLayout(_ControlOrientation orientation);
+       virtual void OnChangeLayout(_ControlRotation rotation);
        virtual void OnOwnerChanged(_Control* pOldOwner);
        void OnActivated(void);
        void OnDeactivated(void);
index 9f8e5aa..1b4b98b 100644 (file)
@@ -85,7 +85,6 @@ public:
        virtual result SetItem(int index, const Tizen::Base::String& text, int actionId, const Tizen::Graphics::Bitmap* normalBitmap, const Tizen::Graphics::Bitmap* pPressedBitmap, const Tizen::Graphics::Bitmap* pHighlightedBitmap);
        virtual result DeleteItem(int index);
        virtual result DeleteItemAll(void);
-       virtual int CalculateShowItemCount(void);
        virtual result CalculateWindowRect(void);
        virtual result ApplyColorProperty(void);
        int GetSubItemIndexFromActionId(int actionId) const;
index 4f82c3e..6f1e03f 100644 (file)
@@ -299,6 +299,9 @@ public:
        bool SetItemTapSoundEnabled(bool tapSoundEnabled);
        bool GetItemTapSoundEnabled(void);
 
+       virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds);
+
+
 protected:
        _TableViewItem(float nItemHeight);
        result Initialize(void);
index 3d20c2f..28e4392 100644 (file)
@@ -148,8 +148,6 @@ protected:
        result _SetModel(const _ToolbarModel& toolbarModel);
 
 private:
-       void SetBouncingVisualElement(float startX, float startY);
-
        void StartFlickAnimation(void);
        result StartFlickAnimationTimer(void);
        result ResetFlickAnimationTimer(void);
index 9336260..ee5467f 100644 (file)
@@ -432,6 +432,8 @@ public:
        bool HasFocusRing(void);
        void SetFocusModeStateEnabled(bool enable);
        bool IsFocusModeStateEnabled(void) const;
+       void SetFocusNavigateEnabled(bool enable);
+       bool IsFocusNavigateEnabled(void) const;
 
 // Clipping
        bool IsClipToParent(void) const;
@@ -665,6 +667,7 @@ private:
        bool __isSetClientBounds;
        bool __isCalledGetCanvasN;
        bool __isFocusMode;
+       bool __isNavigatable;
 
        class ControlVisualElementContentProvider;
        ControlVisualElementContentProvider* __pVisualElementContentProvider;
index cd2de8a..46ca982 100644 (file)
@@ -95,6 +95,7 @@ public:
        static void Initialize(void);
 
        static void ReleaseInstance(void);
+       bool IsFocusModeStateEnabled(void) const;
 
 private:
        /**
@@ -135,6 +136,7 @@ private:
 private:
        static _FocusManagerImpl* __pInstance;
        Tizen::Ui::_Control* __pCurrentFocusUiControl;
+       bool __isFocusMode;
 }; // _FocusManagerImpl
 
 }}//Tizen::Ui
index 235d0b6..5edcb65 100644 (file)
@@ -27,11 +27,13 @@ DECLARE_UI_CONFIG(CONTEXTMENU);
        DECLARE_COLOR_CONFIG(ITEM_BG_NORMAL, 4);
        DECLARE_COLOR_CONFIG(ITEM_BG_PRESSED, 5);
        DECLARE_COLOR_CONFIG(ITEM_BG_HIGHLIGHTED, 6);
-       DECLARE_COLOR_CONFIG(GRID_ITEM_DIVIDER_01_NORMAL, 7);
-       DECLARE_COLOR_CONFIG(GRID_ITEM_DIVIDER_02_NORMAL, 8);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_NORMAL, 9);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_PRESSED, 10);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_HIGHLIGHTED, 11);
+       DECLARE_COLOR_CONFIG(ITEM_BG_DISABLED, 7);
+       DECLARE_COLOR_CONFIG(GRID_ITEM_DIVIDER_01_NORMAL, 8);
+       DECLARE_COLOR_CONFIG(GRID_ITEM_DIVIDER_02_NORMAL, 9);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_NORMAL, 10);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_PRESSED, 11);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_HIGHLIGHTED, 12);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_DISABLED, 13);
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(BG_OUTLINE_EFFECT_NORMAL, 2);
        DECLARE_IMAGE_CONFIG(ANCHOR_NORMAL_UP, 3);
index 252e2db..de1936e 100644 (file)
@@ -58,6 +58,7 @@ DECLARE_UI_CONFIG(EDITDATE);
        DECLARE_SHAPE_CONFIG(DAY_ELEMENT_WIDTH,14);
        DECLARE_SHAPE_CONFIG(DAY_ELEMENT_MIN_WIDTH,15);
        DECLARE_SHAPE_CONFIG(MONTH_YEAR_ELEMENT_MIN_WIDTH,16);
+       DECLARE_SHAPE_CONFIG(CONTENT_TEXT_MARGIN,17);
        DECLARE_DIMENSION_CONFIG(MIN_SIZE,1);
 DECLARE_END_UI_CONFIG(EDITDATE);
 
index cc73ea9..eb50453 100644 (file)
@@ -28,6 +28,7 @@ DECLARE_UI_CONFIG(FASTSCROLL);
        DECLARE_COLOR_CONFIG(INDEX_TEXT_PRESSED, 6);
        DECLARE_COLOR_CONFIG(POPUP_BG_NORMAL, 7);
        DECLARE_COLOR_CONFIG(POPUP_TEXT_NORMAL, 8);
+       DECLARE_COLOR_CONFIG(INDEX_LINE_NORMAL, 9);
        DECLARE_IMAGE_CONFIG(INDEX_BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(INDEX_BG_PRESSED, 2);
        DECLARE_IMAGE_CONFIG(INDEX_LINE_PRESSED, 3);
index ab4b161..215946b 100644 (file)
@@ -117,6 +117,8 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, 90);
        DECLARE_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, 91);
        DECLARE_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, 92);
+       DECLARE_COLOR_CONFIG(BOUNCING_EFFECT, 93);
+
 
        // BITMAP
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
@@ -197,6 +199,15 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, 72);
        DECLARE_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, 73);
 
+       DECLARE_IMAGE_CONFIG(TAB_LARGE_ITEM_BOUNCING_EFFECT_LEFT, 74);
+       DECLARE_IMAGE_CONFIG(TAB_LARGE_ITEM_BOUNCING_EFFECT_RIGHT, 75);
+
+       DECLARE_IMAGE_CONFIG(TITLE_TEXT_DIM_EFFECT_LEFT, 76);
+       DECLARE_IMAGE_CONFIG(TITLE_TEXT_DIM_EFFECT_RIGHT, 77);
+       DECLARE_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_LEFT, 78);
+       DECLARE_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_RIGHT, 79);
+
+
        DECLARE_ANIMATION_CONFIG(PROCESSING_ANIMATION, 1);
        DECLARE_SHAPE_CONFIG(HEIGHT, 1);
        DECLARE_SHAPE_CONFIG(WIDTH, 2);
@@ -272,6 +283,7 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 72);
        DECLARE_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 73);
        DECLARE_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 74);
+       DECLARE_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 75);
 
 DECLARE_END_UI_CONFIG(HEADER);
 
index fe47212..0a37078 100644 (file)
@@ -30,10 +30,12 @@ DECLARE_UI_CONFIG(INPUTPAD);
        DECLARE_COLOR_CONFIG(TEXT_HIGHLIGHTED, 3);
        DECLARE_COLOR_CONFIG(TEXT_DISABLED, 4);
        DECLARE_COLOR_CONFIG(GUIDE_TEXT_NORMAL, 5);
-       DECLARE_COLOR_CONFIG(BUTTON_BG_NORMAL, 6);
-       DECLARE_COLOR_CONFIG(BUTTON_BG_PRESSED, 7);
-       DECLARE_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, 8);
-       DECLARE_COLOR_CONFIG(BUTTON_BG_DISABLED, 9);
+       DECLARE_COLOR_CONFIG(GUIDE_TEXT_PRESSED, 6);
+       DECLARE_COLOR_CONFIG(GUIDE_TEXT_DISABLED, 7);
+       DECLARE_COLOR_CONFIG(BUTTON_BG_NORMAL, 8);
+       DECLARE_COLOR_CONFIG(BUTTON_BG_PRESSED, 9);
+       DECLARE_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, 10);
+       DECLARE_COLOR_CONFIG(BUTTON_BG_DISABLED, 11);
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(BUTTON_BG_NORMAL, 2);
        DECLARE_IMAGE_CONFIG(BUTTON_BG_PRESSED, 3);
index 6961654..9c259b5 100644 (file)
 
 DECLARE_UI_CONFIG(OPTIONMENU);
        DECLARE_COLOR_CONFIG(BG_NORMAL, 1);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_NORMAL, 2);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_PRESSED, 3);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_DISABLED, 4);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_HIGHLIGHTED, 5);
-       DECLARE_COLOR_CONFIG(ITEM_BG_NORMAL, 6);
-       DECLARE_COLOR_CONFIG(ITEM_BG_PRESSED, 7);
-       DECLARE_COLOR_CONFIG(HANDLE_BG_NORMAL, 8);
-       DECLARE_COLOR_CONFIG(HANDLE_BG_PRESSED, 9);
-       DECLARE_COLOR_CONFIG(HANDLE_BG_DISABLED, 10);
-       DECLARE_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_NORMAL, 11);
-       DECLARE_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_PRESSED, 12);
+       DECLARE_COLOR_CONFIG(ITEM_BG_NORMAL, 2);
+       DECLARE_COLOR_CONFIG(ITEM_BG_PRESSED, 3);
+       DECLARE_COLOR_CONFIG(ITEM_BG_HIGHLIGHTED, 4);
+       DECLARE_COLOR_CONFIG(ITEM_BG_DISABLED, 5);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_NORMAL, 6);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_PRESSED, 7);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_DISABLED, 8);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_HIGHLIGHTED, 9);
+       DECLARE_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_NORMAL, 10);
+       DECLARE_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_PRESSED, 11);
+       DECLARE_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_HIGHLIGHTED, 12);
        DECLARE_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_DISABLED, 13);
-       DECLARE_COLOR_CONFIG(DIVIDER_TOP_HALF, 14);
-       DECLARE_COLOR_CONFIG(DIVIDER_BOTTOM_HALF, 15);
-       DECLARE_IMAGE_CONFIG(ITEM_BG_NORMAL, 1);
-       DECLARE_IMAGE_CONFIG(ITEM_BG_PRESSED, 2);
-       DECLARE_IMAGE_CONFIG(ITEM_BG_EFFECT_PRESSED, 3);
+       DECLARE_COLOR_CONFIG(LIST_ITEM_DIVIDER_01_NORMAL, 14);
+       DECLARE_COLOR_CONFIG(LIST_ITEM_DIVIDER_02_NORMAL, 15);
+
+       DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
+       DECLARE_IMAGE_CONFIG(BG_EFFECT, 2);
+       DECLARE_IMAGE_CONFIG(ITEM_BG_PRESSED, 3);
        DECLARE_IMAGE_CONFIG(CONTEXTUAL_POPUP_ARROW, 4);
-       DECLARE_IMAGE_CONFIG(HANDLE_BG_NORMAL, 5);
-       DECLARE_IMAGE_CONFIG(HANDLE_BG_PRESSED, 6);
-       DECLARE_IMAGE_CONFIG(HANDLE_BG_DISABLED, 7);
-       DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_NORMAL, 8);
-       DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_PRESSED, 9);
-       DECLARE_IMAGE_CONFIG(HANDLE_ARROW_NORMAL, 10);
-       DECLARE_IMAGE_CONFIG(HANDLE_ARROW_PRESSED, 11);
-       DECLARE_IMAGE_CONFIG(HANDLE_ARROW_DISABLED, 12);
 
-       DECLARE_FIXED_VALUE_CONFIG(COLUMN_MAX, 1);
-       DECLARE_FIXED_VALUE_CONFIG(LINE_WIDTH, 2);
-       DECLARE_FIXED_VALUE_CONFIG(ITEM_PRESS_EDGE_MARGIN, 3);
-       DECLARE_SHAPE_CONFIG(HANDLE_HEIGHT, 1);
-       DECLARE_SHAPE_CONFIG(HANDLE_ARROW_Y_POSITION, 2);
-       DECLARE_SHAPE_CONFIG(ITEM_HEIGHT, 3);
-       DECLARE_SHAPE_CONFIG(LEFT_MARGIN, 4);
-       DECLARE_SHAPE_CONFIG(RIGHT_MARGIN, 5);
-       DECLARE_SHAPE_CONFIG(TEXT_SIZE, 6);
-       DECLARE_SHAPE_CONFIG(TEXT_LEFT_MARGIN, 7);
-       DECLARE_SHAPE_CONFIG(TEXT_RIGHT_MARGIN, 8);
-       DECLARE_SHAPE_CONFIG(TEXT_TOP_MARGIN, 9);
-       DECLARE_SHAPE_CONFIG(TEXT_BOTTOM_MARGIN, 10);
-       DECLARE_SHAPE_CONFIG(ARROW_MARGIN, 11);
-       DECLARE_SHAPE_CONFIG(ITEM_PRESS_LEFT_MARGIN, 12);
-       DECLARE_SHAPE_CONFIG(ITEM_PRESS_RIGHT_MARGIN, 13);
-       DECLARE_SHAPE_CONFIG(ITEM_PRESS_TOP_MARGIN, 14);
-       DECLARE_SHAPE_CONFIG(ITEM_PRESS_BOTTOM_MARGIN, 15);
-       DECLARE_SHAPE_CONFIG(LIST_MAX_WIDTH, 16);
-       DECLARE_SHAPE_CONFIG(MAX_VISIBLE_ITEM_COUNT, 17);
+       DECLARE_SHAPE_CONFIG(MAX_VISIBLE_ITEM_COUNT, 1);
+       DECLARE_SHAPE_CONFIG(TEXT_SIZE, 2);
+       DECLARE_SHAPE_CONFIG(TEXT_LEFT_MARGIN, 3);
+       DECLARE_SHAPE_CONFIG(TEXT_RIGHT_MARGIN, 4);
+       DECLARE_SHAPE_CONFIG(TEXT_TOP_MARGIN, 5);
+       DECLARE_SHAPE_CONFIG(TEXT_BOTTOM_MARGIN, 6);
+       DECLARE_SHAPE_CONFIG(LEFT_MARGIN, 7);
+       DECLARE_SHAPE_CONFIG(RIGHT_MARGIN, 8);
+       DECLARE_SHAPE_CONFIG(ARROW_MARGIN, 9);
+       DECLARE_SHAPE_CONFIG(ITEM_HEIGHT, 10);
+       DECLARE_SHAPE_CONFIG(LIST_MAX_WIDTH, 11);
+       DECLARE_SHAPE_CONFIG(ITEM_MAX_COUNT, 12);
+       DECLARE_SHAPE_CONFIG(LIST_MIN_WIDTH, 13);
+       DECLARE_SHAPE_CONFIG(LIST_ITEM_HEIGHT, 14);
+       DECLARE_SHAPE_CONFIG(LIST_DIVIDER_HEIGHT, 15);
+       DECLARE_SHAPE_CONFIG(ITEM_BG_PRESSED_MARGIN, 16);
+       DECLARE_SHAPE_CONFIG(LIST_ITEM_GAP, 17);
+       DECLARE_SHAPE_CONFIG(LIST_LEFT_MARGIN, 18);
+       DECLARE_SHAPE_CONFIG(LIST_RIGHT_MARGIN, 19);
+       DECLARE_SHAPE_CONFIG(LIST_TOP_MARGIN, 20);
+       DECLARE_SHAPE_CONFIG(LIST_BOTTOM_MARGIN, 21);
+       DECLARE_SHAPE_CONFIG(LIST_ICON_WIDTH, 22);
+       DECLARE_SHAPE_CONFIG(LIST_ICON_HEIGHT, 23);
+       DECLARE_SHAPE_CONFIG(LIST_ITEM_FONT_SIZE, 24);
 DECLARE_END_UI_CONFIG(OPTIONMENU);
 
 #endif //_FUI_RESOURCE_OPTION_MENU_CONFIG_H_
index b5a822e..4506f17 100644 (file)
@@ -51,16 +51,15 @@ DECLARE_UI_CONFIG(SLIDER);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_PRESSED, 10);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_DISABLED, 11);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_HIGHLIGHTED, 12);
-       DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, 13);
-       DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, 14);
-       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 15);
-       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 16);
-       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 17);
-       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 18);
-       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 19);
-       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 20);
-       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 21);
-       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 22);
+       DECLARE_IMAGE_CONFIG(OVERLAY_BG_NORMAL, 13);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 14);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 15);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 16);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 17);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 18);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 19);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 20);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 21);
        DECLARE_SHAPE_CONFIG(HANDLE_WIDTH, 1);
        DECLARE_SHAPE_CONFIG(HANDLE_HEIGHT, 2);
        DECLARE_SHAPE_CONFIG(HANDLE_OFFSET, 3);
index 467294b..107a6c1 100644 (file)
@@ -27,6 +27,7 @@
 DECLARE_UI_CONFIG(SPLITPANEL);
        DECLARE_COLOR_CONFIG(DIVIDER_BG_NORMAL, 1);
        DECLARE_COLOR_CONFIG(DIVIDER_BG_PRESSED, 2);
+       DECLARE_COLOR_CONFIG(DIVIDER_BG_DISABLED, 3);
        DECLARE_IMAGE_CONFIG(DIVIDER_BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(VERTICAL_DIVIDER_BG_EFFECT, 2);
        DECLARE_IMAGE_CONFIG(VERTICAL_DIVIDER_BG_NORMAL, 3);
@@ -37,4 +38,4 @@ DECLARE_UI_CONFIG(SPLITPANEL);
        DECLARE_SHAPE_CONFIG(EXTENDED_MOVABLE_DIVIDER_TOUCH_MARGIN, 3);
 DECLARE_END_UI_CONFIG(SPLITPANEL);
 
-#endif //_FUI_RESOURCE_SPLIT_PANEL_CONFIG_H_
\ No newline at end of file
+#endif //_FUI_RESOURCE_SPLIT_PANEL_CONFIG_H_
index 6a63194..1bd852a 100644 (file)
@@ -28,10 +28,12 @@ DECLARE_UI_CONFIG(TABBAR);
        DECLARE_COLOR_CONFIG(ITEM_BG_NORMAL, 2);
        DECLARE_COLOR_CONFIG(ITEM_BG_PRESSED, 3);
        DECLARE_COLOR_CONFIG(ITEM_BG_SELECTED, 4);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_NORMAL, 5);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_PRESSED, 6);
-       DECLARE_COLOR_CONFIG(ITEM_TEXT_SELECTED, 7);
-       DECLARE_COLOR_CONFIG(ARROW_BG_NORMAL, 8);
+       DECLARE_COLOR_CONFIG(ITEM_BG_DISABLED, 5);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_NORMAL, 6);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_PRESSED, 7);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_SELECTED, 8);
+       DECLARE_COLOR_CONFIG(ITEM_TEXT_DISABLED, 9);
+       DECLARE_COLOR_CONFIG(ARROW_BG_NORMAL, 10);
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(BG_OUTLINE_EFFECT_NORMAL, 2);
        DECLARE_IMAGE_CONFIG(LEFT_ARROW_NORMAL, 3);
@@ -52,4 +54,4 @@ DECLARE_UI_CONFIG(TABBAR);
        DECLARE_SHAPE_CONFIG(ARROW_MARGIN, 11);
 DECLARE_END_UI_CONFIG(TABBAR);
 
-#endif //_FUI_RESOURCE_TAB_BAR_CONFIG_H_
\ No newline at end of file
+#endif //_FUI_RESOURCE_TAB_BAR_CONFIG_H_
index ed1955d..e376be8 100644 (file)
@@ -63,6 +63,11 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_COLOR_CONFIG(ITEM_ANNEX_DIVIDER_LEFT_BG_NORMAL, 36);
        DECLARE_COLOR_CONFIG(ITEM_ANNEX_DIVIDER_RIGHT_BG_NORMAL, 37);
        DECLARE_COLOR_CONFIG(GROUPITEM_BG_PRESSED, 38);
+       DECLARE_COLOR_CONFIG(GROUPITEM_BG_HIGHLIGHTED, 39);
+       DECLARE_COLOR_CONFIG(GROUPITEM_BG_DISABLED, 40);
+       DECLARE_COLOR_CONFIG(GROUPITEM_TEXT_DISABLED, 41);
+       DECLARE_COLOR_CONFIG(GROUPITEM_INDEX_BAR_DISABLED, 42);
+       DECLARE_COLOR_CONFIG(GROUPITEM_BAR_DISABLED, 43);
        DECLARE_IMAGE_CONFIG(GROUPITEM_BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(GROUPITEM_BG_EFFECT, 2);
        DECLARE_IMAGE_CONFIG(SECTIONITEM_SINGLE_BG_NORMAL, 3);
index 51df77a..5da6520 100644 (file)
@@ -121,7 +121,7 @@ public:
        // Focus UI
        virtual Tizen::Base::Collection::IListT<_Control*>* GetFocusList(void) const;
        virtual void ResetFocusList(void);
-       virtual _Control* GetFocusTraversalControl(void) const;
+       virtual _Control* GetFocusTraversalControl(_Control* pControl) const;
        virtual void SetFocusTraversalControl(_Control* pControl);
 
        // Dimming
index cedfb4b..533b177 100755 (executable)
@@ -549,8 +549,6 @@ RelativeLayout::CalculatePosition(ProxyListNode& curNode)
        }
        pCurProxy->GetMeasuredSize(curItemRect.w, curItemRect.h);
 
-       AlignToDevice(curItemRect, curItemRect);
-
        if (pCurItemInfo->__pTarget[EDGE_LEFT] != null)
        {
                r = GetTargetPosition(pCurItemInfo->__pTarget[EDGE_LEFT], pCurItemInfo->__targetEdge[EDGE_LEFT], targetPosition);
@@ -568,6 +566,9 @@ RelativeLayout::CalculatePosition(ProxyListNode& curNode)
                {
                        return r;
                }
+               LayoutRect alignedRect;
+               AlignToDevice(curItemRect, alignedRect);
+               curItemRect.h = alignedRect.h;
                curItemRect.y = targetPosition.y + curItemMargin.top;
        }
 
@@ -594,6 +595,9 @@ RelativeLayout::CalculatePosition(ProxyListNode& curNode)
                        return r;
                }
 
+               LayoutRect alignedRect;
+               AlignToDevice(curItemRect, alignedRect);
+               curItemRect.h = alignedRect.h;
                if (pCurItemInfo->__pTarget[EDGE_TOP] != null)
                {
                        curItemRect.h = targetPosition.y - curItemRect.y - curItemMargin.bottom;
index 618a3b3..56988ec 100644 (file)
@@ -65,7 +65,7 @@ START_UI_CONFIG(CHECKBUTTON);
 
        ADD_IMAGE_CONFIG(MARK_ICON_NORMAL, #00_check_activated.png);
        ADD_IMAGE_CONFIG(MARK_ICON_DISABLED, #00_check_activated_dim.png);
-       ADD_IMAGE_CONFIG(MARK_ICON_PRESSED, #00_check_press.png);
+       ADD_IMAGE_CONFIG(MARK_ICON_PRESSED, #00_check_activated_press.png);
        ADD_IMAGE_CONFIG(MARK_ICON_HIGHLIGHTED, #00_check_activated.png);
        ADD_IMAGE_CONFIG(MARK_ICON_SELECTED, #00_check_activated.png);
 
@@ -77,7 +77,7 @@ START_UI_CONFIG(CHECKBUTTON);
 
        ADD_IMAGE_CONFIG(ONOFF_ICON_NORMAL, #00_button_radio_activated.png);
        ADD_IMAGE_CONFIG(ONOFF_ICON_DISABLED, #00_button_radio_activated_dim.png);
-       ADD_IMAGE_CONFIG(ONOFF_ICON_PRESSED, #00_button_radio_press.png);
+       ADD_IMAGE_CONFIG(ONOFF_ICON_PRESSED, #00_button_radio_activated_press.png);
        ADD_IMAGE_CONFIG(ONOFF_ICON_HIGHLIGHTED, #00_button_radio_activated.png);
        ADD_IMAGE_CONFIG(ONOFF_ICON_SELECTED, #00_button_radio_activated.png);
 
index 5765a0c..38be261 100644 (file)
@@ -1932,14 +1932,6 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _SLIDER::HANDLE_BG_HIGHLIGHTED_IMAGE);
                }
                {
-                       const char* key ="SLIDER::UPWARD_OVERLAY_BG_NORMAL";
-                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::UPWARD_OVERLAY_BG_NORMAL_IMAGE);
-               }
-               {
-                       const char* key ="SLIDER::UPWARD_OVERLAY_BG_NORMAL";
-                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::UPWARD_OVERLAY_BG_NORMAL_IMAGE);
-               }
-               {
                        const char* key ="SLIDER::GROUPED_TOP_BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_TOP_BG_NORMAL_IMAGE);
                }
@@ -2467,6 +2459,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _CONTEXTMENU::ITEM_BG_HIGHLIGHTED_COLOR);
                }
                {
+                       const char* key ="CONTEXTMENU::ITEM_BG_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _CONTEXTMENU::ITEM_BG_DISABLED_COLOR);
+               }
+               {
                        const char* key ="CONTEXTMENU::GRID_ITEM_DIVIDER_01_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _CONTEXTMENU::GRID_ITEM_DIVIDER_01_NORMAL_COLOR);
                }
@@ -2487,6 +2483,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _CONTEXTMENU::ITEM_TEXT_HIGHLIGHTED_COLOR);
                }
                {
+                       const char* key ="CONTEXTMENU::ITEM_TEXT_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _CONTEXTMENU::ITEM_TEXT_DISABLED_COLOR);
+               }
+               {
                        const char* key ="DATETIMEBAR::BG_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _DATETIMEBAR::BG_NORMAL_COLOR);
                }
@@ -3588,6 +3588,14 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _INPUTPAD::GUIDE_TEXT_NORMAL_COLOR);
                }
                {
+                       const char* key ="INPUTPAD::GUIDE_TEXT_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _INPUTPAD::GUIDE_TEXT_PRESSED_COLOR);
+               }
+               {
+                       const char* key ="INPUTPAD::GUIDE_TEXT_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _INPUTPAD::GUIDE_TEXT_DISABLED_COLOR);
+               }
+               {
                        const char* key ="INPUTPAD::BUTTON_BG_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _INPUTPAD::BUTTON_BG_NORMAL_COLOR);
                }
@@ -3668,6 +3676,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _MESSAGEBOX::BOTTOM_BUTTON_TEXT_HIGHLIGHTED_COLOR);
                }
                {
+                       const char* key ="OPTIONMENU::BG_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::BG_NORMAL_COLOR);
+               }
+               {
                        const char* key ="OPTIONMENU::ITEM_TEXT_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_TEXT_NORMAL_COLOR);
                }
@@ -3680,20 +3692,24 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_TEXT_DISABLED_COLOR);
                }
                {
-                       const char* key ="OPTIONMENU::ITEM_BG_PRESSED";
-                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_BG_PRESSED_COLOR);
+                       const char* key ="OPTIONMENU::ITEM_TEXT_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_TEXT_HIGHLIGHTED_COLOR);
                }
                {
-                       const char* key ="OPTIONMENU::HANDLE_BG_NORMAL";
-                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::HANDLE_BG_NORMAL_COLOR);
+                       const char* key ="OPTIONMENU::ITEM_BG_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_BG_NORMAL_COLOR);
                }
                {
-                       const char* key ="OPTIONMENU::HANDLE_BG_PRESSED";
-                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::HANDLE_BG_PRESSED_COLOR);
+                       const char* key ="OPTIONMENU::ITEM_BG_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_BG_PRESSED_COLOR);
                }
                {
-                       const char* key ="OPTIONMENU::HANDLE_BG_DISABLED";
-                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::HANDLE_BG_DISABLED_COLOR);
+                       const char* key ="OPTIONMENU::ITEM_BG_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_BG_DISABLED_COLOR);
+               }
+               {
+                       const char* key ="OPTIONMENU::ITEM_BG_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_BG_HIGHLIGHTED_COLOR);
                }
                {
                        const char* key ="OPTIONMENU::CONTEXTUAL_POPUP_ARROW_NORMAL";
@@ -3708,20 +3724,16 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::CONTEXTUAL_POPUP_ARROW_DISABLED_COLOR);
                }
                {
-                       const char* key ="OPTIONMENU::ITEM_TEXT_NORMAL";
-                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_TEXT_NORMAL_COLOR);
-               }
-               {
-                       const char* key ="OPTIONMENU::ITEM_TEXT_NORMAL";
-                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_TEXT_NORMAL_COLOR);
+                       const char* key ="OPTIONMENU::CONTEXTUAL_POPUP_ARROW_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::CONTEXTUAL_POPUP_ARROW_HIGHLIGHTED_COLOR);
                }
                {
-                       const char* key ="OPTIONMENU::ITEM_TEXT_NORMAL";
-                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_TEXT_NORMAL_COLOR);
+                       const char* key ="OPTIONMENU::LIST_ITEM_DIVIDER_01_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::LIST_ITEM_DIVIDER_01_NORMAL_COLOR);
                }
                {
-                       const char* key ="OPTIONMENU::ITEM_TEXT_NORMAL";
-                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::ITEM_TEXT_NORMAL_COLOR);
+                       const char* key ="OPTIONMENU::LIST_ITEM_DIVIDER_02_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _OPTIONMENU::LIST_ITEM_DIVIDER_02_NORMAL_COLOR);
                }
                {
                        const char* key ="PANEL::GROUPED_STYLE_BG_NORMAL";
@@ -3812,6 +3824,14 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_DISABLED_COLOR);
                }
                {
+                       const char* key ="SEARCHBAR::EDIT_BG_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_PRESSED_COLOR);
+               }
+               {
+                       const char* key ="SEARCHBAR::EDIT_BG_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_HIGHLIGHTED_COLOR);
+               }
+               {
                        const char* key ="SEARCHBAR::GUIDE_TEXT_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _SEARCHBAR::GUIDE_TEXT_NORMAL_COLOR);
                }
@@ -3920,6 +3940,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _SPLITPANEL::DIVIDER_BG_PRESSED_COLOR);
                }
                {
+                       const char* key ="SPLITPANEL::DIVIDER_BG_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _SPLITPANEL::DIVIDER_BG_DISABLED_COLOR);
+               }
+               {
                        const char* key ="TABBAR::BG_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _TABBAR::BG_NORMAL_COLOR);
                }
@@ -3936,6 +3960,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _TABBAR::ITEM_BG_SELECTED_COLOR);
                }
                {
+                       const char* key ="TABBAR::ITEM_BG_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABBAR::ITEM_BG_DISABLED_COLOR);
+               }
+               {
                        const char* key ="TABBAR::ITEM_TEXT_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _TABBAR::ITEM_TEXT_NORMAL_COLOR);
                }
@@ -3948,6 +3976,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _TABBAR::ITEM_TEXT_SELECTED_COLOR);
                }
                {
+                       const char* key ="TABBAR::ITEM_TEXT_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABBAR::ITEM_TEXT_DISABLED_COLOR);
+               }
+               {
                        const char* key ="TABBAR::ARROW_BG_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _TABBAR::ARROW_BG_NORMAL_COLOR);
                }
@@ -4080,6 +4112,18 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_BG_NORMAL_COLOR);
                }
                {
+                       const char* key ="TABLEVIEW::GROUPITEM_BG_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_BG_PRESSED_COLOR);
+               }
+               {
+                       const char* key ="TABLEVIEW::GROUPITEM_BG_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_BG_HIGHLIGHTED_COLOR);
+               }
+               {
+                       const char* key ="TABLEVIEW::GROUPITEM_BG_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_BG_DISABLED_COLOR);
+               }
+               {
                        const char* key ="TABLEVIEW::GROUPITEM_TEXT_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_TEXT_NORMAL_COLOR);
                }
@@ -4092,6 +4136,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_TEXT_HIGHLIGHTED_COLOR);
                }
                {
+                       const char* key ="TABLEVIEW::GROUPITEM_TEXT_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_TEXT_DISABLED_COLOR);
+               }
+               {
                        const char* key ="TABLEVIEW::GROUPITEM_INDEX_BAR_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_INDEX_BAR_NORMAL_COLOR);
                }
@@ -4104,6 +4152,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_INDEX_BAR_HIGHLIGHTED_COLOR);
                }
                {
+                       const char* key ="TABLEVIEW::GROUPITEM_INDEX_BAR_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_INDEX_BAR_DISABLED_COLOR);
+               }
+               {
                        const char* key ="TABLEVIEW::GROUPITEM_BAR_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_BAR_NORMAL_COLOR);
                }
@@ -4116,6 +4168,10 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_BAR_HIGHLIGHTED_COLOR);
                }
                {
+                       const char* key ="TABLEVIEW::GROUPITEM_BAR_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::GROUPITEM_BAR_DISABLED_COLOR);
+               }
+               {
                        const char* key ="TABLEVIEW::SECTIONITEM_BG_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::SECTIONITEM_BG_NORMAL_COLOR);
                }
@@ -4128,6 +4184,14 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::EMPTY_CONTENTS_TEXT_NORMAL_COLOR);
                }
                {
+                       const char* key ="TABLEVIEW::ITEM_ANNEX_DIVIDER_LEFT_BG_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::ITEM_ANNEX_DIVIDER_LEFT_BG_NORMAL_COLOR);
+               }
+               {
+                       const char* key ="TABLEVIEW::ITEM_ANNEX_DIVIDER_RIGHT_BG_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _TABLEVIEW::ITEM_ANNEX_DIVIDER_RIGHT_BG_NORMAL_COLOR);
+               }
+               {
                        const char* key ="TOKENEDIT::BG_NORMAL";
                        __pColorKeyTable->Add(ResourceKey(key), _TOKENEDIT::BG_NORMAL_COLOR);
                }
index d0dafe0..7c30bf9 100644 (file)
@@ -29,11 +29,13 @@ START_UI_CONFIG(CONTEXTMENU);
        ADD_COLOR_CONFIG(ITEM_BG_NORMAL, $B061L4);
        ADD_COLOR_CONFIG(ITEM_BG_PRESSED, $B044);
        ADD_COLOR_CONFIG(ITEM_BG_HIGHLIGHTED, $B044);
+       ADD_COLOR_CONFIG(ITEM_BG_DISABLED, $B061L4);
        ADD_COLOR_CONFIG(GRID_ITEM_DIVIDER_01_NORMAL, $B0623L1);
        ADD_COLOR_CONFIG(GRID_ITEM_DIVIDER_02_NORMAL, $B0623L2);
        ADD_COLOR_CONFIG(ITEM_TEXT_NORMAL, $B063L5);
        ADD_COLOR_CONFIG(ITEM_TEXT_PRESSED, $B063L5);
        ADD_COLOR_CONFIG(ITEM_TEXT_HIGHLIGHTED, $B063L5);
+       ADD_COLOR_CONFIG(ITEM_TEXT_DISABLED, $B063L5D);
 
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_popup_bubble_bg.#.png);
        ADD_IMAGE_CONFIG(BG_OUTLINE_EFFECT_NORMAL, #00_popup_bubble_bg_ef.#.png);
index a66186f..ba2a0e1 100644 (file)
@@ -61,7 +61,7 @@ START_UI_CONFIG(EDITDATE);
                ADD_SHAPE_CONFIG(ELEMENT_MARGIN, 17);
                ADD_SHAPE_CONFIG(DAY_ELEMENT_WIDTH, 69);
                ADD_SHAPE_CONFIG(DAY_ELEMENT_MIN_WIDTH, 69);
-
+               ADD_SHAPE_CONFIG(CONTENT_TEXT_MARGIN, 2);
                ADD_DIMENSION_CONFIG(MIN_SIZE, 345, 112);
        }
        END_UI_CONFIG_MODE(720x1280);
index 8c97752..37e440b 100644 (file)
@@ -29,6 +29,7 @@ START_UI_CONFIG(FASTSCROLL);
 
        ADD_COLOR_CONFIG(POPUP_BG_NORMAL, $B0731);
        ADD_COLOR_CONFIG(POPUP_TEXT_NORMAL, $B0732);
+       ADD_COLOR_CONFIG(INDEX_LINE_NORMAL, $B0724);
 
        ADD_IMAGE_CONFIG(INDEX_BG_NORMAL, #00_fast_scroll_rollover_bg.#.png);
        ADD_IMAGE_CONFIG(INDEX_BG_PRESSED, #00_fast_scroll_rollover_bg_focus.#.png);
index ce1c022..a7b3ad1 100644 (file)
@@ -134,6 +134,8 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L6P);
        ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L6P);
 
+       ADD_COLOR_CONFIG(BOUNCING_EFFECT, $B018);
+
        // BITMAP
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_title_bg.#.png);
        ADD_IMAGE_CONFIG(TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png);
@@ -212,12 +214,20 @@ START_UI_CONFIG(HEADER);
        ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, #00_title_bg_ef.#.png); //not supported by theme
        ADD_IMAGE_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, #00_title_press_ef.#.png); //not supported by theme
 
-       ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL,   #00_effect_tab_bounce_left.png);//117
-       ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL,  #00_effect_tab_bounce_right.png);//117
+       ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL,   #00_effect_tab_bounce_left.png);//96
+       ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL,  #00_effect_tab_bounce_right.png);//96
        ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_tab_bounce_left_h.png);//91
        ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL,#00_effect_tab_bounce_right_h.png);//91
-       ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_LEFT,      #00_effect_title_tab_bounce_left.png);//64
-       ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_RIGHT,     #00_effect_title_tab_bounce_right.png);//64
+       ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_LEFT,      #00_effect_title_tab_bounce_left.png);//75
+       ADD_IMAGE_CONFIG(TITLE_TAB_ITEM_BOUNCING_EFFECT_RIGHT,     #00_effect_title_tab_bounce_right.png);//75
+       ADD_IMAGE_CONFIG(TAB_LARGE_ITEM_BOUNCING_EFFECT_LEFT,   #00_effect_tab_bounce_left_02.png);//126
+       ADD_IMAGE_CONFIG(TAB_LARGE_ITEM_BOUNCING_EFFECT_RIGHT,  #00_effect_tab_bounce_right_02.png);//126
+
+       ADD_IMAGE_CONFIG(TITLE_TEXT_DIM_EFFECT_LEFT,      #00_effect_title_text_dim_left.#.png);
+       ADD_IMAGE_CONFIG(TITLE_TEXT_DIM_EFFECT_RIGHT,     #00_effect_title_text_dim_right.#.png);
+       ADD_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_LEFT,   #00_effect_tab_text_dim_left.#.png);
+       ADD_IMAGE_CONFIG(TAB_TEXT_DIM_EFFECT_RIGHT,  #00_effect_tab_text_dim_right.#.png);
+
 
        START_ANIMATION_CONFIG(PROCESSING_ANIMATION);
        ADD_ANIMATION_FRAME(#00_header_process_01.png, 16);
@@ -346,6 +356,7 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
                ADD_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 15);
                ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 34);
+               ADD_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 88);
 
        END_UI_CONFIG_MODE(720x1280);
 
@@ -439,6 +450,7 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
                ADD_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 15);
                ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 34);
+               ADD_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 88);
 
        END_UI_CONFIG_MODE(1280x720);
 }
index 1153267..1ac2264 100644 (file)
@@ -30,6 +30,8 @@ START_UI_CONFIG(INPUTPAD);
        ADD_COLOR_CONFIG(TEXT_DISABLED, $F031L1);
 
        ADD_COLOR_CONFIG(GUIDE_TEXT_NORMAL, $F031L1);
+       ADD_COLOR_CONFIG(GUIDE_TEXT_PRESSED, $F031L1P);
+       ADD_COLOR_CONFIG(GUIDE_TEXT_DISABLED, $F031L1D);
 
        ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $W011);
        ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B042);
index f87d581..8a5d74a 100644 (file)
 START_UI_CONFIG(OPTIONMENU);
 {
        ADD_COLOR_CONFIG(BG_NORMAL, $B061L4);
+       ADD_COLOR_CONFIG(ITEM_BG_NORMAL, $B061L4);
+       ADD_COLOR_CONFIG(ITEM_BG_PRESSED, $B044);
+       ADD_COLOR_CONFIG(ITEM_BG_HIGHLIGHTED, $B044);
+       ADD_COLOR_CONFIG(ITEM_BG_DISABLED, $B044);
+
        ADD_COLOR_CONFIG(ITEM_TEXT_NORMAL, $B063L5);
        ADD_COLOR_CONFIG(ITEM_TEXT_PRESSED, $B063L5);
        ADD_COLOR_CONFIG(ITEM_TEXT_DISABLED, $B063L5);
        ADD_COLOR_CONFIG(ITEM_TEXT_HIGHLIGHTED, $B063L5);
-       ADD_COLOR_CONFIG(ITEM_BG_NORMAL, $B061L4);
-       ADD_COLOR_CONFIG(ITEM_BG_PRESSED, $B044);
-       ADD_COLOR_CONFIG(HANDLE_BG_NORMAL, $B0520);
-       ADD_COLOR_CONFIG(HANDLE_BG_PRESSED, $B0520P);
-       ADD_COLOR_CONFIG(HANDLE_BG_DISABLED, $B0520);
+
        ADD_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_NORMAL, $W1121);
        ADD_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_PRESSED, $W1122);
+       ADD_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_HIGHLIGHTED, $W1122);
        ADD_COLOR_CONFIG(CONTEXTUAL_POPUP_ARROW_DISABLED, $W1121);
-       ADD_COLOR_CONFIG(DIVIDER_TOP_HALF, $W112L1);
-       ADD_COLOR_CONFIG(DIVIDER_BOTTOM_HALF, $W112L2);
-       ADD_IMAGE_CONFIG(ITEM_BG_NORMAL, #00_panel_bg.#.png);
-       ADD_IMAGE_CONFIG(ITEM_BG_PRESSED, #00_panel_list_bg_press.#.png);
-       ADD_IMAGE_CONFIG(ITEM_BG_EFFECT_PRESSED, #00_panel_list_bg_ef_press.#.png);
+
+       ADD_COLOR_CONFIG(LIST_ITEM_DIVIDER_01_NORMAL, $B0622L1);
+       ADD_COLOR_CONFIG(LIST_ITEM_DIVIDER_02_NORMAL, $B0622L2);
+
+       ADD_IMAGE_CONFIG(BG_NORMAL, #00_popup_bubble_02_bg.#.png);
+       ADD_IMAGE_CONFIG(BG_EFFECT, #00_popup_bubble_02_ef.#.png);
+       ADD_IMAGE_CONFIG(ITEM_BG_PRESSED, #00_more_popup_press.#.png);
        ADD_IMAGE_CONFIG(CONTEXTUAL_POPUP_ARROW, #00_option_panel_contextual_popup_arrow.png);
-       ADD_IMAGE_CONFIG(HANDLE_BG_NORMAL, #00_panel_handle_bg.#.png);
-       ADD_IMAGE_CONFIG(HANDLE_BG_PRESSED, #00_panel_handle_bg.#.png);
-       ADD_IMAGE_CONFIG(HANDLE_BG_DISABLED, #00_panel_handle_bg.#.png);
-       ADD_IMAGE_CONFIG(HANDLE_BG_EFFECT_NORMAL, #00_panel_handle_bg_ef.#.png);
-       ADD_IMAGE_CONFIG(HANDLE_BG_EFFECT_PRESSED, #00_panel_handle_bg_ef_press.#.png);
-       ADD_IMAGE_CONFIG(HANDLE_ARROW_NORMAL, #00_panel_handle_arrow.png);
-       ADD_IMAGE_CONFIG(HANDLE_ARROW_PRESSED, #00_panel_handle_arrow.png);
-       ADD_IMAGE_CONFIG(HANDLE_ARROW_DISABLED, #00_panel_handle_arrow.png);
 
        START_UI_CONFIG_MODE(720x1280);
        {
-               ADD_FIXED_VALUE_CONFIG(COLUMN_MAX, 2);
-               ADD_SHAPE_CONFIG(HANDLE_HEIGHT, 108);
-               ADD_SHAPE_CONFIG(HANDLE_ARROW_Y_POSITION, 25);
-               ADD_SHAPE_CONFIG(ITEM_HEIGHT, 112);
-               ADD_FIXED_VALUE_CONFIG(LINE_WIDTH, 2);
-               ADD_SHAPE_CONFIG(LEFT_MARGIN, 16);
-               ADD_SHAPE_CONFIG(RIGHT_MARGIN, 16);
+               ADD_SHAPE_CONFIG(MAX_VISIBLE_ITEM_COUNT, 7);
                ADD_SHAPE_CONFIG(TEXT_SIZE, 42);
+
                ADD_SHAPE_CONFIG(TEXT_LEFT_MARGIN, 8);
                ADD_SHAPE_CONFIG(TEXT_RIGHT_MARGIN, 8);
                ADD_SHAPE_CONFIG(TEXT_TOP_MARGIN, 8);
                ADD_SHAPE_CONFIG(TEXT_BOTTOM_MARGIN, 8);
+
+               ADD_SHAPE_CONFIG(LEFT_MARGIN, 16);
+               ADD_SHAPE_CONFIG(RIGHT_MARGIN, 16);
                ADD_SHAPE_CONFIG(ARROW_MARGIN, 36);
-               ADD_SHAPE_CONFIG(ITEM_PRESS_LEFT_MARGIN, 3);
-               ADD_SHAPE_CONFIG(ITEM_PRESS_RIGHT_MARGIN, 5);
-               ADD_SHAPE_CONFIG(ITEM_PRESS_TOP_MARGIN, 3);
-               ADD_SHAPE_CONFIG(ITEM_PRESS_BOTTOM_MARGIN, 3);
+
+               ADD_SHAPE_CONFIG(ITEM_HEIGHT, 112);
                ADD_SHAPE_CONFIG(LIST_MAX_WIDTH, 500);
-               ADD_SHAPE_CONFIG(MAX_VISIBLE_ITEM_COUNT, 7);
-               ADD_FIXED_VALUE_CONFIG(ITEM_PRESS_EDGE_MARGIN, 2);
+               ADD_SHAPE_CONFIG(ITEM_MAX_COUNT, 7);
+               ADD_SHAPE_CONFIG(LIST_MIN_WIDTH, 386);
+               ADD_SHAPE_CONFIG(LIST_ITEM_HEIGHT, 112);
+
+               ADD_SHAPE_CONFIG(LIST_DIVIDER_HEIGHT, 1);
+               ADD_SHAPE_CONFIG(ITEM_BG_PRESSED_MARGIN, 4);
+               ADD_SHAPE_CONFIG(LIST_ITEM_GAP, 16);
+
+               ADD_SHAPE_CONFIG(LIST_LEFT_MARGIN, 10);
+               ADD_SHAPE_CONFIG(LIST_RIGHT_MARGIN, 10);
+               ADD_SHAPE_CONFIG(LIST_TOP_MARGIN, 14);
+               ADD_SHAPE_CONFIG(LIST_BOTTOM_MARGIN, 16);
+
+               ADD_SHAPE_CONFIG(LIST_ICON_WIDTH, 45);
+               ADD_SHAPE_CONFIG(LIST_ICON_HEIGHT, 45);
+
+               ADD_SHAPE_CONFIG(LIST_ITEM_FONT_SIZE, 40);
+               ADD_SHAPE_CONFIG(LIST_DIVIDER_HEIGHT, 1);
        }
        END_UI_CONFIG_MODE(720x1280);
 
        START_UI_CONFIG_MODE(1280x720);
        {
-               ADD_FIXED_VALUE_CONFIG(COLUMN_MAX, 4);
                ADD_SHAPE_CONFIG(MAX_VISIBLE_ITEM_COUNT, 5);
        }
        END_UI_CONFIG_MODE(1280x720);
index 8a17c74..2793fcc 100644 (file)
@@ -39,7 +39,7 @@ START_UI_CONFIG(SCROLL);
        ADD_IMAGE_CONFIG(BUTTON_BG_NORMAL, #00_button_01.#.png);
        ADD_IMAGE_CONFIG(BUTTON_BG_NORMAL_EFFECT, #00_button_01_ef.#.png);
        ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED, #00_button_01.#.png);
-       ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED_EFFECT, #00_button_01_ef_press.#.png);
+       ADD_IMAGE_CONFIG(BUTTON_BG_PRESSED_EFFECT, #00_button_01_press_ef.#.png);
        ADD_IMAGE_CONFIG(HANDLER_HORIZONTAL, #00_fast_scroll_handler_h.#.png);
        ADD_IMAGE_CONFIG(HANDLER_VERTICAL, #00_fast_scroll_handler.#.png);
 
index f8c68a5..05428b0 100644 (file)
@@ -60,8 +60,7 @@ START_UI_CONFIG(SLIDER);
        ADD_IMAGE_CONFIG(HANDLE_BG_EFFECT_DISABLED, #00_slider_handle_ef_dim.png);
        ADD_IMAGE_CONFIG(HANDLE_BG_EFFECT_HIGHLIGHTED, #00_slider_handle_ef.png);
 
-       ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, #00_slider_popup_bg.#.png);
-       ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, #00_slider_popup_bg_ef.#.png);
+       ADD_IMAGE_CONFIG(OVERLAY_BG_NORMAL, #00_slider_popup_bg.#.png);
 
        ADD_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, #00_list_group_bg_top.#.png);
        ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, #00_list_group_bg_center.#.png);
index cea49ed..1f79708 100644 (file)
@@ -26,6 +26,7 @@ START_UI_CONFIG(SPLITPANEL);
 {
        ADD_COLOR_CONFIG(DIVIDER_BG_NORMAL, $W131);
        ADD_COLOR_CONFIG(DIVIDER_BG_PRESSED, $W132);
+       ADD_COLOR_CONFIG(DIVIDER_BG_DISABLED, $W132);
 
        ADD_IMAGE_CONFIG(DIVIDER_BG_NORMAL, #00_split_handler_bg.#.png);
        ADD_IMAGE_CONFIG(VERTICAL_DIVIDER_BG_EFFECT, #00_split_handler_bg_ef_v.#.png);
index a614216..d532a33 100644 (file)
@@ -27,9 +27,11 @@ START_UI_CONFIG(TABBAR);
        ADD_COLOR_CONFIG(ITEM_BG_NORMAL, $W0813);
        ADD_COLOR_CONFIG(ITEM_BG_PRESSED, $W101);
        ADD_COLOR_CONFIG(ITEM_BG_SELECTED, $W101);
+       ADD_COLOR_CONFIG(ITEM_BG_DISABLED, $W0813);
        ADD_COLOR_CONFIG(ITEM_TEXT_NORMAL, $F031L3);
        ADD_COLOR_CONFIG(ITEM_TEXT_PRESSED, $F031L3P);
        ADD_COLOR_CONFIG(ITEM_TEXT_SELECTED, $F031L3P);
+       ADD_COLOR_CONFIG(ITEM_TEXT_DISABLED, $F031L3D);
        ADD_COLOR_CONFIG(ARROW_BG_NORMAL, $F031L3);
 
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_category_panel_bg.#.png)
index afa3f2c..87f68fa 100644 (file)
@@ -44,21 +44,27 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_COLOR_CONFIG(ITEM_ANNEX_DETAIL_BG_PRESSED, $B042);
        ADD_COLOR_CONFIG(ITEM_ANNEX_DETAIL_BG_HIGHLIGHTED, $B042);
        ADD_COLOR_CONFIG(GROUPITEM_BG_NORMAL, $W021L1);
+       ADD_COLOR_CONFIG(GROUPITEM_BG_PRESSED, $W021L1P);
+       ADD_COLOR_CONFIG(GROUPITEM_BG_HIGHLIGHTED, $W021L1P);
+       ADD_COLOR_CONFIG(GROUPITEM_BG_DISABLED, $W021L1P);
        ADD_COLOR_CONFIG(GROUPITEM_TEXT_NORMAL, $W021L3);
        ADD_COLOR_CONFIG(GROUPITEM_TEXT_PRESSED, $W021L3P);
        ADD_COLOR_CONFIG(GROUPITEM_TEXT_HIGHLIGHTED, $W021L3P);
+       ADD_COLOR_CONFIG(GROUPITEM_TEXT_DISABLED, $W021L3);
        ADD_COLOR_CONFIG(GROUPITEM_INDEX_BAR_NORMAL, $W021L2);
        ADD_COLOR_CONFIG(GROUPITEM_INDEX_BAR_PRESSED, $W021L2P);
        ADD_COLOR_CONFIG(GROUPITEM_INDEX_BAR_HIGHLIGHTED, $W021L2P);
+       ADD_COLOR_CONFIG(GROUPITEM_INDEX_BAR_DISABLED, $W021L2);
        ADD_COLOR_CONFIG(GROUPITEM_BAR_NORMAL, $B0232);
        ADD_COLOR_CONFIG(GROUPITEM_BAR_PRESSED, $B0232);
        ADD_COLOR_CONFIG(GROUPITEM_BAR_HIGHLIGHTED, $B0232);
+       ADD_COLOR_CONFIG(GROUPITEM_BAR_DISABLED, $B0232);
        ADD_COLOR_CONFIG(SECTIONITEM_BG_NORMAL, $B0217);
        ADD_COLOR_CONFIG(CONTEXTITEM_BG_NORMAL, $B0212);
        ADD_COLOR_CONFIG(EMPTY_CONTENTS_TEXT_NORMAL, $F011L21);
        ADD_COLOR_CONFIG(ITEM_ANNEX_DIVIDER_LEFT_BG_NORMAL, $B0221);
        ADD_COLOR_CONFIG(ITEM_ANNEX_DIVIDER_RIGHT_BG_NORMAL, $B0222);
-       ADD_COLOR_CONFIG(GROUPITEM_BG_PRESSED, $W021L1P);
+
        ADD_IMAGE_CONFIG(GROUPITEM_BG_NORMAL, #00_indexlist_bg.#.png);
        ADD_IMAGE_CONFIG(GROUPITEM_BG_EFFECT, #00_indexlist_bg_ef.#.png);
        ADD_IMAGE_CONFIG(SECTIONITEM_SINGLE_BG_NORMAL, #00_list_group_bg.#.png);
@@ -88,7 +94,7 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, #00_button_radio_dim_bg.png);
        ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_NORMAL, #00_button_radio_activated.png);
        ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DISABLED, #00_button_radio_activated_dim.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_PRESSED, #00_button_radio_press.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_PRESSED, #00_button_radio_activated_press.png);
        ADD_IMAGE_CONFIG(ONOFFBUTTON_ON_HANDLER, #00_button_on_handler.png);
        ADD_IMAGE_CONFIG(ONOFFBUTTON_ON_HANDLER_DISABLED, #00_button_on_handler_dim.png);
        ADD_IMAGE_CONFIG(ONOFFBUTTON_OFF_HANDLER, #00_button_off_handler.png);
@@ -102,7 +108,7 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_IMAGE_CONFIG(CIRCLE_BUTTON_BG_EFFECT_DISABLED, #00_circle_bg_ef_dim.png);
        ADD_IMAGE_CONFIG(CIRCLE_BUTTON_REVEAL_NORMAL, #00_button_right.png);
        ADD_IMAGE_CONFIG(SEARCH_ICON_NORMAL, #00_search_icon.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_PRESSED, #00_check_press.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_PRESSED, #00_check_activated_press.png);
        ADD_IMAGE_CONFIG(CIRCLE_BUTTON_REVEAL_PRESSED, #00_button_right.png);
        ADD_IMAGE_CONFIG(CIRCLE_BUTTON_REVEAL_HIGHLIGHTED, #00_button_right.png);
        ADD_IMAGE_CONFIG(CIRCLE_BUTTON_REVEAL_DISABLED, #00_button_right.png);