From c8429c7f9794bd9459417359501f8f24519e1b49 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Tue, 23 Apr 2013 18:41:05 +0900 Subject: [PATCH] 1.[E_BORDER] Change code to hide the client window in _e_border_cb_window_hide(). 2.[E_HINTS] Change code not to iconic when the window is first shown Change-Id: I2f0ba6a309ba8837d3051d127eaf6b9239592e35 --- packaging/e17.spec | 2 +- src/bin/e_border.c | 11 +++++++++++ src/bin/e_hints.c | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/packaging/e17.spec b/packaging/e17.spec index 11fcde3..a47ebfb 100644 --- a/packaging/e17.spec +++ b/packaging/e17.spec @@ -1,6 +1,6 @@ Name: e17 Summary: The Enlightenment window manager -Version: 1.0.0.001+svn.76808slp2+build31 +Version: 1.0.0.001+svn.76808slp2+build32 Release: 1 Group: System/GUI/Other License: BSD diff --git a/src/bin/e_border.c b/src/bin/e_border.c index f45c3b8..2f06f71 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -5771,7 +5771,11 @@ _e_border_cb_window_hide(void *data __UNUSED__, return ECORE_CALLBACK_PASS_ON; } /* Don't delete hidden or iconified windows */ +#ifdef _F_USE_EXTENDED_ICONIFY_ + if (bd->await_hide_event > 0) +#else if ((bd->iconic) || (bd->await_hide_event > 0)) +#endif { // printf(" Don't delete hidden or iconified windows\n"); // printf(" bd->iconic = %i, bd->visible = %i, bd->new_client = %i, bd->await_hide_event = %i\n", @@ -5790,6 +5794,13 @@ _e_border_cb_window_hide(void *data __UNUSED__, else { // printf(" hide2\n"); +#ifdef _F_USE_EXTENDED_ICONIFY_ + if (bd->iconic) + { + bd->iconic = 0; + bd->visible = 1; + } +#endif e_border_hide(bd, 0); e_object_del(E_OBJECT(bd)); } diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 427806f..9d6af8b 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -576,8 +576,10 @@ e_hints_window_init(E_Border *bd) else e_hints_window_visible_set(bd); } +#ifndef _F_USE_EXTENDED_ICONIFY_ else if ((bd->parent) && (e_config->transient.iconify) && (bd->parent->iconic)) e_border_iconify(bd); +#endif /* If a window isn't iconic, and is one the current desk, * show it! */ else if (bd->desk == e_desk_current_get(bd->zone)) -- 2.7.4