[Tizen-submit] 19813: Changes to Tizen:Mobile/elementary

noreply at tizen.org noreply at tizen.org
Thu Jan 23 06:08:35 GMT 2014


Hi,
Juan Zhao have made the following changes to elementary in project Tizen:Mobile. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #19813

  submit:       Tizen:Mobile:build/elementary(cleanup) -> Tizen:Mobile


Message:
Submitter: Juan Zhao <juan.j.zhao at intel.com>
Comments: backport frame handling patch from upstream
Git project: profile/mobile/elementary
Tag: submit/tizen/20140123.062249
Commit: 9119f4656b026ed3b673de84c7141c971b671ff3 get framespace size from the EDC file

State:   new        2014-01-23T06:10:35 tizenrobot
Comment: <no comment>
changes files:
--------------

spec files:
-----------
--- elementary.spec
+++ elementary.spec
@@ -1,7 +1,7 @@
 %bcond_with wayland
 
 Name:       elementary
-VCS:        profile/mobile/elementary#02d5ec32c8cb939184d65fd3940b340a786ef71f
+VCS:        profile/mobile/elementary#9119f4656b026ed3b673de84c7141c971b671ff3
 Summary:    EFL toolkit for small touchscreens
 Version:    1.7.1+svn.77535+build141r12
 Release:    1

other changes:
--------------

++++++ elementary-1.7.1+svn.77535+build141r12.tar.gz
--- data/themes/widgets/border.edc
+++ data/themes/widgets/border.edc
@@ -24,7 +24,10 @@
 
 group {
    name: "elm/border/base/default";
-   data.item: "focus_highlight" "off";
+   data {
+      item: "focus_highlight" "off";
+      item: "framespace" "0 22 0 26";
+   }
    images {
       image: "bd_top.png" COMP;
       image: "bd_top_hilight.png" COMP;
--- src/lib/elm_win.c
+++ src/lib/elm_win.c
@@ -2471,11 +2471,22 @@
 _elm_win_frame_add(Elm_Win_Smart_Data *sd,
                    const char *style)
 {
-   evas_output_framespace_set(sd->evas, 0, 22, 0, 26);
+   const char *framespacestr;
+   int fx = 0, fy = 0, fw = 0, fh = 0;
 
    sd->frame_obj = edje_object_add(sd->evas);
-   elm_widget_theme_object_set
-     (ELM_WIDGET_DATA(sd)->obj, sd->frame_obj, "border", "base", style);
+   if (!elm_widget_theme_object_set
+        (ELM_WIDGET_DATA(sd)->obj, sd->frame_obj, "border", "base", style))
+   {
+       evas_object_del(sd->frame_obj);
+       sd->frame_obj = NULL;
+       return;
+   }
+
+   framespacestr = edje_object_data_get(sd->frame_obj, "framespace");
+   if (framespacestr)
+        sscanf(framespacestr, "%d %d %d %d", &fx, &fy, &fw, &fh);
+   evas_output_framespace_set(sd->evas, fx, fy, fw, fh);
 
    evas_object_is_frame_object_set(sd->frame_obj, EINA_TRUE);
    evas_object_move(sd->frame_obj, 0, 0);


More information about the Tizen-submit mailing list