summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjin0.kim <jin0.kim@samsung.com>2015-11-18 18:40:30 +0830
committerjin0.kim <jin0.kim@samsung.com>2015-11-18 18:40:30 +0830
commit3c5f91918e8b72ceb9f93a128ae3dd5301b4df88 (patch)
tree9dd2adf640a362ee7c1fb710795ebae685ba7d6e
parent1543e8c05cf943f166d68f00f6d6a656b79a9061 (diff)
downloadquickpanel-3c5f91918e8b72ceb9f93a128ae3dd5301b4df88.tar.gz
quickpanel-3c5f91918e8b72ceb9f93a128ae3dd5301b4df88.tar.bz2
quickpanel-3c5f91918e8b72ceb9f93a128ae3dd5301b4df88.zip
Update tzsh_quickpanel_service_handler_region_setsubmit/tizen_mobile/20151124.051022accepted/tizen/mobile/20151124.084900
Change-Id: Ibb153130e73bc7dbbebb9ed694bd8751f19fe247
-rwxr-xr-xdaemon/quickpanel-ui.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/daemon/quickpanel-ui.c b/daemon/quickpanel-ui.c
index c277ae3..49dd5a9 100755
--- a/daemon/quickpanel-ui.c
+++ b/daemon/quickpanel-ui.c
@@ -138,6 +138,8 @@ static void _ui_handler_input_region_set(void *data, int contents_height)
#if defined(WINSYS_X11)
Ecore_X_Window xwin;
Ecore_X_Atom atom_window_input_region = 0;
+#else
+ tzsh_region_h region;
#endif
unsigned int window_input_region[4] = {0,};
@@ -146,6 +148,8 @@ static void _ui_handler_input_region_set(void *data, int contents_height)
#if defined(WINSYS_X11)
xwin = elm_win_xwindow_get(ad->win);
+#else
+ region = tzsh_region_create(ad->tzsh);
#endif
switch (ad->angle) {
@@ -182,10 +186,13 @@ static void _ui_handler_input_region_set(void *data, int contents_height)
,window_input_region[3]
);
-#if 0//defined(WINSYS_X11)
+#if defined(WINSYS_X11)
atom_window_input_region = ecore_x_atom_get(STR_ATOM_WINDOW_INPUT_REGION);
-
ecore_x_window_prop_card32_set(xwin, atom_window_input_region, window_input_region, 4);
+#else
+ tzsh_region_add(region, 0, contents_height, ad->win_width, ELM_SCALE_SIZE(QP_HANDLE_H));
+ tzsh_quickpanel_service_handler_region_set(ad->quickpanel_service, ad->angle, region);
+ tzsh_region_destroy(region);
#endif
}
@@ -196,6 +203,8 @@ static void _ui_handler_content_region_set(void *data, int contents_height)
#if defined(WINSYS_X11)
Ecore_X_Window xwin;
Ecore_X_Atom atom_window_contents_region = 0;
+#else
+ tzsh_region_h region;
#endif
unsigned int window_contents_region[4] = {0,};
@@ -204,6 +213,8 @@ static void _ui_handler_content_region_set(void *data, int contents_height)
#if defined(WINSYS_X11)
xwin = elm_win_xwindow_get(ad->win);
+#else
+ region = tzsh_region_create(ad->tzsh);
#endif
switch (ad->angle) {
@@ -240,9 +251,13 @@ static void _ui_handler_content_region_set(void *data, int contents_height)
,window_contents_region[3]
);
-#if 0//defined(WINSYS_X11)
+#if defined(WINSYS_X11)
atom_window_contents_region = ecore_x_atom_get(STR_ATOM_WINDOW_CONTENTS_REGION);
ecore_x_window_prop_card32_set(xwin, atom_window_contents_region, window_contents_region, 4);
+#else
+ tzsh_region_add(region, 0, contents_height, ad->win_width, ELM_SCALE_SIZE(QP_HANDLE_H));
+ tzsh_quickpanel_service_handler_region_set(ad->quickpanel_service, ad->angle, region);
+ tzsh_region_destroy(region);
#endif
}
@@ -437,11 +452,11 @@ static Evas_Object *_ui_window_add(const char *name, int prio)
elm_win_wm_rotation_available_rotations_set(eo, rots, 4);
}
+ evas_object_show(eo);
+
if( QP_OK != _tzsh_set(eo)) {
ERR("Failed to set tzsh");
}
-
- evas_object_show(eo);
}
return eo;