wtf? stray escape chars! fix!

[framework/uifw/elementary.git] / src / lib / elm_win.c

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index d1cd8a6..1a52ce0 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -796,6 +796,8 @@ _elm_win_obj_callback_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
         evas_object_geometry_get(obj, &x, &y, NULL, NULL);
         win->screen.x = x;
         win->screen.y = y;
+
+        /* FIXME: We should update ecore_wl_window_location here !! */
      }
    else if (win->img_obj)
      {
@@ -1563,8 +1565,13 @@ _elm_win_frame_cb_move_start(void *data, Evas_Object *obj __UNUSED__, const char
    if (!(win = data)) return;
    /* FIXME: Change mouse pointer */
 
-   /* NB: 0,0 are dummy values. Wayland handles the move by itself */
-   ecore_evas_move(win->ee, 0, 0);
+   /* NB: Wayland handles moving surfaces by itself so we cannot 
+    * specify a specific x/y we want. Instead, we will pass in the 
+    * existing x/y values so they can be recorded as 'previous' position. 
+    * The new position will get updated automatically when the move is 
+    * finished */
+
+   ecore_evas_wayland_move(win->ee, win->screen.x, win->screen.y);
 }
 
 static void
@@ -2127,7 +2134,7 @@ elm_win_title_set(Evas_Object *obj, const char *title)
    eina_stringshare_replace(&(win->title), title);
    ecore_evas_title_set(win->ee, win->title);
    if (win->frame_obj)
-     edje_object_part_text_set(win->frame_obj, "elm.text.title", win->title);
+     edje_object_part_text_escaped_set(win->frame_obj, "elm.text.title", win->title);
 }
 
 EAPI const char *
@@ -3239,7 +3246,7 @@ _elm_inwin_text_set_hook(Evas_Object *obj, const char *item, const char *text)
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (!wd || !item) return;
-   edje_object_part_text_set(wd->frm, item, text);
+   edje_object_part_text_escaped_set(wd->frm, item, text);
    _sizing_eval(obj);
 }