From: Jihoon Kim Date: Tue, 8 Oct 2013 01:51:02 +0000 (+0000) Subject: Revert "fix bug the font of candidate word isn't changed according to the change... X-Git-Tag: submit/tizen/20140310.020845~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3ffed3b4ee37171a0024050a1ef5de0befa27aa;p=platform%2Fcore%2Fuifw%2Fisf.git Revert "fix bug the font of candidate word isn't changed according to the change of system font" This reverts commit fbdd41a0a7e672f1b5b8832bb8c28d02891c279b. Change-Id: I076375ac9ce9bf605edd2365b0161f7af799143e --- diff --git a/ism/data/pixmaps/isf_candidate.edc b/ism/data/pixmaps/isf_candidate.edc index 7982179b..fe9d5bdf 100755 --- a/ism/data/pixmaps/isf_candidate.edc +++ b/ism/data/pixmaps/isf_candidate.edc @@ -1,8 +1,8 @@ -#define FONT_NAME "Tizen:style=Regular" +#define FONT_NAME "Tizen" #define FONT_SIZE 38 -#define AUX_FONT_NAME "Tizen:style=Regular" +#define AUX_FONT_NAME "Tizen" #define AUX_FONT_SIZE 38 #define COLOR_NORMAL_BUTTON 0 0 0 0 @@ -119,12 +119,11 @@ collections { color: COLOR_NORMAL_TEXT; color_class: "text_color"; text { - text_class: "tizen"; + text_class: "preedit_text_class"; text: ""; font: FONT_NAME; size: FONT_SIZE; align: 0 0.5; - min: 1 0; } rel1.to: "bg"; rel1.relative: 0.0 0.0; @@ -167,12 +166,11 @@ collections { color: COLOR_NORMAL_TEXT; color_class: "text_color"; text { - text_class: "tizen"; + text_class: "candidate_text_class"; text: "Test"; font: FONT_NAME; size: FONT_SIZE; align: 0.5 0.5; - min: 1 0; } rel1.to: "bg"; rel1.relative: 0.0 0.0; @@ -250,12 +248,11 @@ collections { color: COLOR_NORMAL_TEXT; color_class: "text_color"; text { - text_class: "tizen"; + text_class: "candidate_text_class"; text: "Test"; font: FONT_NAME; size: FONT_SIZE; align: 0.5 0.5; - min: 1 0; } rel1.to: "bg"; rel1.relative: 0.0 0.0; @@ -508,11 +505,10 @@ collections { color_class: "text_color"; text { text: "aux"; - text_class: "tizen"; + text_class: "aux_text_class"; font: AUX_FONT_NAME; size: AUX_FONT_SIZE; align: 0.5 0.5; - min: 1 0; } rel1.to: "bg"; rel1.relative: 0.0 0.0; diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index 5f92bb4b..b0fb6076 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -1781,6 +1781,7 @@ static void ui_create_preedit_window (void) _preedit_text = edje_object_add (evas_object_evas_get (_preedit_window)); edje_object_file_set (_preedit_text, _candidate_edje_file.c_str (), "preedit_text"); + edje_object_text_class_set (_preedit_text, "preedit_text_class", _candidate_font_name.c_str (), preedit_font_size); evas_object_size_hint_fill_set (_preedit_text, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set (_preedit_text, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add (_preedit_window, _preedit_text); @@ -3041,6 +3042,7 @@ static void slot_update_aux_string (const String &str, const AttributeList &attr count++; aux_edje = edje_object_add (evas); edje_object_file_set (aux_edje, _candidate_edje_file.c_str (), "aux"); + edje_object_text_class_set (aux_edje, "aux_text_class", _candidate_font_name.c_str (), _aux_font_size); edje_object_part_text_set (aux_edje, "aux", aux_list [i].c_str ()); elm_table_pack (_aux_table, aux_edje, 2 * i, 0, 1, 1); evas_object_event_callback_add (aux_edje, EVAS_CALLBACK_MOUSE_DOWN, ui_mouse_button_pressed_cb, GINT_TO_POINTER ((i << 8) + ISF_EFL_AUX)); @@ -3177,6 +3179,7 @@ static void update_table (int table_type, const LookupTable &table) if (!_candidate_0 [i] && total_width <= scroll_0_width) { _candidate_0 [i] = edje_object_add (evas); edje_object_file_set (_candidate_0 [i], _candidate_edje_file.c_str (), _candidate_name.c_str ()); + edje_object_text_class_set (_candidate_0 [i], "candidate_text_class", _candidate_font_name.c_str (), _candidate_font_size); evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_DOWN, ui_mouse_button_pressed_cb, GINT_TO_POINTER ((i << 8) + ISF_EFL_CANDIDATE_0)); evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_UP, ui_mouse_button_released_cb, GINT_TO_POINTER (i)); evas_object_event_callback_add (_candidate_0 [i], EVAS_CALLBACK_MOUSE_MOVE, ui_mouse_moved_cb, GINT_TO_POINTER (ISF_EFL_CANDIDATE_0)); @@ -3244,6 +3247,7 @@ static void update_table (int table_type, const LookupTable &table) if (!_candidate_items [i]) { _candidate_items [i] = edje_object_add (evas); edje_object_file_set (_candidate_items [i], _candidate_edje_file.c_str (), _candidate_name.c_str ()); + edje_object_text_class_set (_candidate_items [i], "candidate_text_class", _candidate_font_name.c_str (), _candidate_font_size); evas_object_event_callback_add (_candidate_items [i], EVAS_CALLBACK_MOUSE_DOWN, ui_mouse_button_pressed_cb, GINT_TO_POINTER ((i << 8) + ISF_EFL_CANDIDATE_ITEMS)); evas_object_event_callback_add (_candidate_items [i], EVAS_CALLBACK_MOUSE_UP, ui_mouse_button_released_cb, GINT_TO_POINTER (i)); evas_object_event_callback_add (_candidate_items [i], EVAS_CALLBACK_MOUSE_MOVE, ui_mouse_moved_cb, GINT_TO_POINTER (ISF_EFL_CANDIDATE_ITEMS));