Modify svace issues

Signed-off-by: Hyerim Kim <rimi.kim@samsung.com>
Change-Id: I73ed260373a36494edb01ca1e55aec0047c5b076

diff --git a/data/view/notification_view.edc b/data/view/notification_view.edc
index bf425db..6ced3d9 100755 (executable)
--- a/data/view/notification_view.edc
+++ b/data/view/notification_view.edc
@@ -15,6 +15,7 @@
  */
 
 #include "../../include/define.h"
+#include "../../include/strings.h"
 
 group {
        data.item: "focus_highlight" "on";
@@ -374,7 +375,6 @@ group {
                                fixed: 0 0;
                                color: 0 0 0 100;
                                visible: 1;
-                               min: 1920 1080;
                        }
                }
                part {
@@ -534,7 +534,6 @@ group {
                                        font: FONT_LIGHT;
                                        text: STR_DEFAULT_USER_MESSAGE;
                                        size: 32;
-                                       align: 0.0 0.0;
                                        min: 1 1;
                                        ellipsis: -1;
                                }

diff --git a/src/util.c b/src/util.c
index 0c85c5b..91f6bd7 100755 (executable)
--- a/src/util.c
+++ b/src/util.c
@@ -75,6 +75,7 @@ static void _clicked(int id, void *data, Evas_Object *obj)
                noti = evas_object_data_get(data, KEY_NOTI);
                if (noti)
                        notification_delete(noti);
+               break;
        case BUTTON_OK:
                evas_object_del(data);
                break;
@@ -113,14 +114,13 @@ Evas_Object *util_show_notification_popup(
        char *temp_content = NULL;
        char *content = NULL;
 
-       char *start_tag = "<font=BreezeSans:style=Light align=left size=32><linesize=46>";
-       char *end_tag = "</linesize></font>";
+       char *start_tag = "<font=BreezeSans:style=Light color=#686868 align=left linesize=46 font_size=32>";
+       char *end_tag = "</font>";
 
        Evas_Object *notification_popup;
        Evas_Object *window_layout = NULL;
        Evas_Object *up_btn, *down_btn, *ok_btn;
-       Evas_Object *scroller = NULL;
-       Evas_Object *scroller_label = NULL;
+       Evas_Object *scroller, *scroller_label;
 
        Evas *e = NULL;
        Ecore_Evas *ee = NULL;
@@ -130,16 +130,15 @@ Evas_Object *util_show_notification_popup(
        notification_get_text(noti, NOTIFICATION_TEXT_TYPE_TITLE, &title);
        notification_get_text(noti, NOTIFICATION_TEXT_TYPE_CONTENT, &temp_content);
 
-       content = calloc(strlen(start_tag)+strlen(temp_content)+strlen(end_tag)+1, sizeof(char*));
-       strcpy(content, start_tag);
-       strcat(content, temp_content);
-       strcat(content, end_tag);
+       content = (char *)calloc(strlen(start_tag)+strlen(temp_content)+strlen(end_tag), sizeof(char));
+       snprintf(content, strlen(start_tag)+strlen(temp_content)+strlen(end_tag), "%s%s%s", start_tag, temp_content, end_tag);
 
        /* Creating a Notification Window */
        notification_popup = elm_win_add(NULL, "notification_popup", ELM_WIN_BASIC);
 
        if (notification_popup == NULL) {
                _ERR("elm_win_add failed");
+               free(content);
                goto out;
        }
 
@@ -148,6 +147,7 @@ Evas_Object *util_show_notification_popup(
                _ERR("evas_object_evas_get failed");
                evas_object_del(notification_popup);
                notification_popup = NULL;
+               free(content);
                goto out;
        }
 
@@ -156,6 +156,7 @@ Evas_Object *util_show_notification_popup(
                _ERR("ecore_evas_ecore_evas_get failed");
                evas_object_del(notification_popup);
                notification_popup = NULL;
+               free(content);
                goto out;
        }
 
@@ -173,7 +174,7 @@ Evas_Object *util_show_notification_popup(
        evas_object_resize(window_layout, screen_w, screen_h);
        evas_object_show(window_layout);
 
-       /* up, down icons */
+       /* up, down btns */
        up_btn = elm_button_add(window_layout);
        elm_object_style_set(up_btn, STYLE_POPUP_UP_BTN);
        elm_object_focus_allow_set(up_btn, EINA_TRUE);
@@ -193,15 +194,14 @@ Evas_Object *util_show_notification_popup(
        scroller = elm_scroller_add(window_layout);
        elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
        elm_object_part_content_set(window_layout, "part_content_swallow", scroller);
+       elm_object_scale_set(scroller, 1/edje_scale_get());
        evas_object_show(scroller);
 
        /* content - label in scroller */
        scroller_label = elm_label_add(scroller);
        elm_label_line_wrap_set(scroller_label, ELM_WRAP_WORD);
        elm_label_wrap_width_set(scroller_label, 563);
-       evas_object_size_hint_align_set(scroller_label, 0.0, 0.0);
        elm_object_text_set(scroller_label, content);
-       evas_object_color_set(scroller_label, 104, 104, 104, 255);
        evas_object_show(scroller_label);
 
        elm_object_content_set(scroller, scroller_label);