From: Myung Jin Kim Date: Tue, 16 Jul 2013 03:48:39 +0000 (+0900) Subject: apply v5.0 gui and fix N_SE-46379,46416 X-Git-Tag: submit/tizen_2.2/20130716.173726~13^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dff568198af24b4690656db387615adc31dada4f;p=framework%2Fosp%2Fuifw.git apply v5.0 gui and fix N_SE-46379,46416 Change-Id: Ibaa7c6e0c134a274d892b4e1be76c3a38a9f170e --- 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 deleted file mode 100644 index 1f94bc7..0000000 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_02.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png deleted file mode 100644 index f970f09..0000000 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png deleted file mode 100644 index f65a982..0000000 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_left_h.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png deleted file mode 100644 index d7d0bc4..0000000 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_left.png new file mode 100644 index 0000000..506abb8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_left_h.png similarity index 62% rename from res/common/usr/share/osp/bitmaps/480x800/00_effect_toolbar_tab_bounce_right_h.png rename to res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_left_h.png index 1c099ab..c9d9858 100644 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/black/00_effect_footer_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_right.png new file mode 100644 index 0000000..a6dceda Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_right_h.png new file mode 100644 index 0000000..e396bb7 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_footer_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png new file mode 100644 index 0000000..759e57a Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left_02.png new file mode 100644 index 0000000..3864245 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left_h.png new file mode 100644 index 0000000..ad30f89 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png similarity index 61% rename from res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png rename to res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png index ed23f1f..69d8d1c 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right.png and b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right_02.png new file mode 100644 index 0000000..bbe9a34 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right_h.png similarity index 61% rename from res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_h.png rename to res/common/usr/share/osp/bitmaps/480x800/black/00_effect_tab_bounce_right_h.png index f40a826..c43caa2 100644 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/black/00_effect_tab_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_title_tab_bounce_left.png similarity index 65% rename from res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_left.png rename to res/common/usr/share/osp/bitmaps/480x800/black/00_effect_title_tab_bounce_left.png index e1b9b72..189c69a 100644 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/black/00_effect_title_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/black/00_effect_title_tab_bounce_right.png similarity index 66% rename from res/common/usr/share/osp/bitmaps/480x800/00_effect_title_tab_bounce_right.png rename to res/common/usr/share/osp/bitmaps/480x800/black/00_effect_title_tab_bounce_right.png index 9919627..ebdad5b 100644 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/black/00_effect_title_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_left.png new file mode 100644 index 0000000..506abb8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_left_h.png new file mode 100644 index 0000000..c9d9858 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_right.png new file mode 100644 index 0000000..a6dceda Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_right_h.png new file mode 100644 index 0000000..e396bb7 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_footer_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png new file mode 100644 index 0000000..759e57a Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left_02.png new file mode 100644 index 0000000..3864245 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left_h.png new file mode 100644 index 0000000..ad30f89 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png similarity index 61% rename from res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png rename to res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png index bd86919..69d8d1c 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left.png and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right_02.png new file mode 100644 index 0000000..bbe9a34 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right_h.png new file mode 100644 index 0000000..c43caa2 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_tab_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_title_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_title_tab_bounce_left.png new file mode 100644 index 0000000..189c69a Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_title_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_title_tab_bounce_right.png new file mode 100644 index 0000000..ebdad5b Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/default/00_effect_title_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_left.png new file mode 100644 index 0000000..506abb8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_left_h.png new file mode 100644 index 0000000..c9d9858 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_right.png new file mode 100644 index 0000000..a6dceda Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_right_h.png new file mode 100644 index 0000000..e396bb7 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_footer_bounce_right_h.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 new file mode 100644 index 0000000..759e57a Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left_02.png new file mode 100644 index 0000000..3864245 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left_h.png new file mode 100644 index 0000000..ad30f89 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png similarity index 60% rename from res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_left_h.png rename to res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right.png index 9fe938b..69d8d1c 100644 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/white/00_effect_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right_02.png new file mode 100644 index 0000000..bbe9a34 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right_h.png new file mode 100644 index 0000000..c43caa2 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_tab_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_title_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_title_tab_bounce_left.png new file mode 100644 index 0000000..189c69a Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_title_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_title_tab_bounce_right.png new file mode 100644 index 0000000..ebdad5b Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/480x800/white/00_effect_title_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png deleted file mode 100644 index 3ed41f3..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left.png and /dev/null 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 deleted file mode 100644 index 7f42e2a..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_02.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png deleted file mode 100644 index 5050480..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_left_h.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png deleted file mode 100644 index a0e812f..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right.png and /dev/null 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 deleted file mode 100644 index 2e3215e..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_02.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png deleted file mode 100644 index eeac0e9..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_tab_bounce_right_h.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png deleted file mode 100644 index e359b16..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_left.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png deleted file mode 100644 index c45b135..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_title_tab_bounce_right.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png deleted file mode 100644 index 39581c7..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png deleted file mode 100644 index 5930089..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_left_h.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png deleted file mode 100644 index 5879997..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png deleted file mode 100644 index edcc904..0000000 Binary files a/res/common/usr/share/osp/bitmaps/720x1280/00_effect_toolbar_tab_bounce_right_h.png and /dev/null differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_left.png new file mode 100644 index 0000000..a7e11eb Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_left_h.png new file mode 100644 index 0000000..3ea167b Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_right.png new file mode 100644 index 0000000..1275d34 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_right_h.png new file mode 100644 index 0000000..a3a00e8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_footer_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left.png new file mode 100644 index 0000000..4218838 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left_02.png new file mode 100644 index 0000000..af654e8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left_h.png new file mode 100644 index 0000000..88aad57 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right.png new file mode 100644 index 0000000..4f00c40 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right_02.png new file mode 100644 index 0000000..3a24521 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right_h.png new file mode 100644 index 0000000..d23e249 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_tab_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_title_tab_bounce_left.png similarity index 52% rename from res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png rename to res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_title_tab_bounce_left.png index c686ada..ee65cf4 100644 Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_effect_tab_bounce_right_02.png and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_title_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_title_tab_bounce_right.png new file mode 100644 index 0000000..55066a5 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/black/00_effect_title_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_left.png new file mode 100644 index 0000000..a7e11eb Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_left_h.png new file mode 100644 index 0000000..3ea167b Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_right.png new file mode 100644 index 0000000..1275d34 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_right_h.png new file mode 100644 index 0000000..a3a00e8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_footer_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left.png new file mode 100644 index 0000000..4218838 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left_02.png new file mode 100644 index 0000000..af654e8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left_h.png new file mode 100644 index 0000000..88aad57 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_left_h.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 new file mode 100644 index 0000000..4f00c40 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right_02.png new file mode 100644 index 0000000..3a24521 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right_h.png new file mode 100644 index 0000000..d23e249 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_tab_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_title_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_title_tab_bounce_left.png new file mode 100644 index 0000000..ee65cf4 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_title_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_title_tab_bounce_right.png new file mode 100644 index 0000000..55066a5 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/default/00_effect_title_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_left.png new file mode 100644 index 0000000..a7e11eb Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_left_h.png new file mode 100644 index 0000000..3ea167b Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_right.png new file mode 100644 index 0000000..1275d34 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_right_h.png new file mode 100644 index 0000000..a3a00e8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_footer_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left.png new file mode 100644 index 0000000..4218838 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left_02.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left_02.png new file mode 100644 index 0000000..af654e8 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left_h.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left_h.png new file mode 100644 index 0000000..88aad57 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_left_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right.png new file mode 100644 index 0000000..4f00c40 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right_02.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right_02.png new file mode 100644 index 0000000..3a24521 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right_02.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right_h.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right_h.png new file mode 100644 index 0000000..d23e249 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_tab_bounce_right_h.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_title_tab_bounce_left.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_title_tab_bounce_left.png new file mode 100644 index 0000000..ee65cf4 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_title_tab_bounce_left.png differ diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_title_tab_bounce_right.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_title_tab_bounce_right.png new file mode 100644 index 0000000..55066a5 Binary files /dev/null and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_effect_title_tab_bounce_right.png differ diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp index 414d249..3b904a6 100644 --- a/src/ui/controls/FUiCtrl_Button.cpp +++ b/src/ui/controls/FUiCtrl_Button.cpp @@ -1519,6 +1519,7 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const FloatRectangle contentRect(0.0f, 0.0f, 0.0f, 0.0f); TextObject* pTextObject = __pButtonPresenter->GetTextObject(); + Font* pFont = __pButtonPresenter->GetFont(); FloatRectangle previousRect = pTextObject->GetBoundsF(); @@ -1542,6 +1543,7 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const FloatRectangle bounds(0.0f, 0.0f, contentRect.width - GetBoundsF().x - __leftMargin, dimension.height); pTextObject->SetBounds(bounds); pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE); + pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength()); pTextObject->Compose(); textSize = pTextObject->GetTextExtentF(); @@ -1554,6 +1556,7 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const FloatRectangle bounds(0.0f, 0.0f, dimension.width, dimension.height); pTextObject->SetBounds(bounds); pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE); + pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength()); pTextObject->Compose(); textSize = pTextObject->GetTextExtentF(); diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp index 5a52827..a375d82 100644 --- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp +++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp @@ -934,7 +934,7 @@ _ButtonPresenter::DrawUnderlineBitmap(void) FloatRectangle bounds(selectedBitmapMargin + leftTouchMargin, __pButton->GetBoundsF().height - bottomTouchMargin - selectedBitmapHeight, - __pButton->GetBoundsF().width - selectedBitmapMargin * 2 - (leftTouchMargin + rightTouchMargin), selectedBitmapHeight); + __pButton->GetBoundsF().width - selectedBitmapMargin * 2 - (leftTouchMargin + rightTouchMargin), selectedBitmapHeight + 1); if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pUnderlineBitmap)) { diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp index afa898c..50b7d54 100644 --- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp +++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp @@ -448,6 +448,24 @@ _CheckButtonPresenter::DrawBackground(void) { pCanvas->SetBackgroundColor(Color(0, 0, 0, 0)); pCanvas->Clear(); + + pHighlightedBgBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_HIGHLIGHTED); + + pHighlightedReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pHighlightedBgBitmap, + Color::GetColor(COLOR_ID_MAGENTA), __pCheckButton->GetColor(_CHECK_BUTTON_STATUS_HIGHLIGHTED)); + + if (pHighlightedReColorBgBitmap && __highlightedIndex == 0) + { + if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHighlightedReColorBgBitmap)) + { + pCanvas->DrawNinePatchedBitmap(bounds, *pHighlightedReColorBgBitmap); + } + else + { + pCanvas->DrawBitmap(bounds, *pHighlightedReColorBgBitmap, + FloatRectangle(0.0f, 0.0f, pHighlightedReColorBgBitmap->GetWidthF(), pHighlightedReColorBgBitmap->GetHeightF())); + } + } } else { diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp index cddd5d6..51031cd 100644 --- a/src/ui/controls/FUiCtrl_FooterImpl.cpp +++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp @@ -995,7 +995,7 @@ _FooterImpl::ConvertFooterItem(const FooterItem& footerItem) { r = GET_SHAPE_CONFIG(FOOTER::SEGMENTED_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize); - if (footerItem.GetText() != L"" && __style != FOOTER_STYLE_TAB_LARGE) + if (footerItem.GetText() != L"" && __style != FOOTER_STYLE_TAB_LARGE && __style != FOOTER_STYLE_SEGMENTED_ICON) { GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45 } @@ -1053,7 +1053,7 @@ _FooterImpl::ConvertFooterItem(const FooterItem& footerItem) { r = GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize); - if (footerItem.GetText() != L"") + if (footerItem.GetText() != L"" && __style != FOOTER_STYLE_BUTTON_ICON) { GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45 } diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp index 2227b11..6b298a6 100644 --- a/src/ui/controls/FUiCtrl_Toolbar.cpp +++ b/src/ui/controls/FUiCtrl_Toolbar.cpp @@ -3712,6 +3712,16 @@ _Toolbar::OnHeaderFocusGained(const _Control& source) __lastHighlightedItemIndex = __highlightedItemIndex; __highlighted = true; } + else + { + if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED) + { + __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false); + __highlightedItemIndex++; + __lastHighlightedItemIndex = __highlightedItemIndex; + __highlighted = true; + } + } } else if (__highlightedItemIndex == __itemCount + 1) { diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp index 2b42e0f..02da9b7 100644 --- a/src/ui/resource/FUi_ResourceFooterConfig.cpp +++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp @@ -319,10 +319,10 @@ START_UI_CONFIG(FOOTER); ADD_IMAGE_CONFIG(OPTIONKEY_BG_EFFECT_NORMAL, #00_option_panel_handle_bg_ef.png); //not supported by theme ADD_IMAGE_CONFIG(OPTIONKEY_BG_EFFECT_PRESSED, #00_option_panel_handle_bg_ef_press.png); //not supported by theme - ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL, #00_effect_toolbar_tab_bounce_left.png);//98 - ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL, #00_effect_toolbar_tab_bounce_right.png);//98 - ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_toolbar_tab_bounce_left_h.png);//85 - ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL, #00_effect_toolbar_tab_bounce_right_h.png);//85 + ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_VERTICAL, #00_effect_footer_bounce_left.png);//98 + ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_VERTICAL, #00_effect_footer_bounce_right.png);//98 + ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_LEFT_HORIZONTAL, #00_effect_footer_bounce_left_h.png);//85 + ADD_IMAGE_CONFIG(TAB_ITEM_BOUNCING_EFFECT_RIGHT_HORIZONTAL, #00_effect_footer_bounce_right_h.png);//85 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); diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp index bf41f6a..1700203 100644 --- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp +++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp @@ -365,7 +365,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_TEXT_HEIGHT, 38); ADD_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 88); ADD_SHAPE_CONFIG(TAB_TEXT_DIM_WIDTH, 45); @@ -463,7 +463,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_TEXT_HEIGHT, 38); ADD_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 88); ADD_SHAPE_CONFIG(TAB_TEXT_DIM_WIDTH, 45);