summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Willmann <d.willmann@samsung.com>2013-06-11 11:18:25 +0100
committerDaniel Willmann <d.willmann@samsung.com>2013-06-11 14:33:27 +0100
commitaf23236795cbd01d6a36856a526a85a7fdf201f5 (patch)
tree6a5c5d8306fc3b46d1dd74fa65baf10a3257e2f7
parent4bce980afffd7f274c7ce5551fa547a2ed57587e (diff)
els_tooltip: Don't expect to have X running if support is compiled in
Refactor the code so common code is not duplicated inside the if (transparent) and else blocks Backport 3112de826b33ffb847c8df827f172772f2f0ef96 Signed-off-by: Daniel Willmann <d.willmann@samsung.com>
-rw-r--r--src/lib/els_tooltip.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index 2e86a2589..4c28b28d9 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -302,20 +302,19 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
302 { 302 {
303 evas_object_hide(tt->tt_win); 303 evas_object_hide(tt->tt_win);
304 elm_win_alpha_set(tt->tt_win, EINA_TRUE); 304 elm_win_alpha_set(tt->tt_win, EINA_TRUE);
305#ifdef HAVE_ELEMENTARY_X
306 ecore_x_window_shape_input_rectangle_set(elm_win_xwindow_get(tt->tt_win), 0, 0, 0, 0);
307#endif
308 evas_object_show(tt->tt_win);
309 } 305 }
310 else 306 else
311 { 307 {
312 evas_object_hide(tt->tt_win); 308 evas_object_hide(tt->tt_win);
313 elm_win_alpha_set(tt->tt_win, EINA_FALSE); 309 elm_win_alpha_set(tt->tt_win, EINA_FALSE);
310 }
314#ifdef HAVE_ELEMENTARY_X 311#ifdef HAVE_ELEMENTARY_X
315 ecore_x_window_shape_input_rectangle_set(elm_win_xwindow_get(tt->tt_win), 0, 0, 0, 0); 312 Ecore_X_Window win;
313 win = elm_win_xwindow_get(tt->tt_win);
314 if (win)
315 ecore_x_window_shape_input_rectangle_set(win, 0, 0, 0, 0);
316#endif 316#endif
317 evas_object_show(tt->tt_win); 317 evas_object_show(tt->tt_win);
318 }
319 } 318 }
320 319
321 str = edje_object_data_get(tt->tooltip, "pad_x"); 320 str = edje_object_data_get(tt->tooltip, "pad_x");