summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-01-20 16:20:41 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:35:03 -0500
commit45d8cb6b5e1642b3f151596be78fb132c64290f5 (patch)
tree271b5ddac971466aadaec5e2bef5ffe9b4356804
parent47196af43a5fb7eddddede6f4a4a56f9a88405b8 (diff)
remove duplicate visibility setting blocks from wayland surface commit
this is already present (and identical) in state commit
-rw-r--r--src/bin/e_comp_wl.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index e4b97440e..12a072f08 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2736,44 +2736,10 @@ e_comp_wl_surface_create(struct wl_client *client, int version, uint32_t id)
2736EINTERN Eina_Bool 2736EINTERN Eina_Bool
2737e_comp_wl_surface_commit(E_Client *ec) 2737e_comp_wl_surface_commit(E_Client *ec)
2738{ 2738{
2739 Eina_Bool ignored;
2740
2741 _e_comp_wl_surface_state_commit(ec, &ec->comp_data->pending); 2739 _e_comp_wl_surface_state_commit(ec, &ec->comp_data->pending);
2742 if (!e_comp_object_damage_exists(ec->frame)) 2740 if (!e_comp_object_damage_exists(ec->frame))
2743 e_pixmap_image_clear(ec->pixmap, 1); 2741 e_pixmap_image_clear(ec->pixmap, 1);
2744 2742
2745 ignored = ec->ignored;
2746
2747 if (!e_pixmap_usable_get(ec->pixmap))
2748 {
2749 if (ec->comp_data->mapped)
2750 {
2751 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.unmap))
2752 ec->comp_data->shell.unmap(ec->comp_data->shell.surface);
2753 else if (ec->comp_data->cursor || e_client_has_xwindow(ec))
2754 {
2755 ec->visible = EINA_FALSE;
2756 evas_object_hide(ec->frame);
2757 ec->comp_data->mapped = 0;
2758 }
2759 }
2760 }
2761 else
2762 {
2763 if (!ec->comp_data->mapped)
2764 {
2765 if ((ec->comp_data->shell.surface) && (ec->comp_data->shell.map))
2766 ec->comp_data->shell.map(ec->comp_data->shell.surface);
2767 else if (ec->comp_data->cursor || e_client_has_xwindow(ec))
2768 {
2769 ec->visible = EINA_TRUE;
2770 ec->ignored = 0;
2771 evas_object_show(ec->frame);
2772 ec->comp_data->mapped = 1;
2773 }
2774 }
2775 }
2776 ec->ignored = ignored;
2777 return EINA_TRUE; 2743 return EINA_TRUE;
2778} 2744}
2779 2745