diff options
| author | InBum Chang <ibchang@samsung.com> | 2012-09-06 15:12:51 +0900 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@localhost> | 2012-09-06 15:12:51 +0900 |
| commit | aee2371d21d1eed6b2b956399edeb9b7eed264e6 (patch) | |
| tree | 12af6001aa7771d8f48e69db7cf07cab21a4b4b7 | |
| parent | 446a5f44ca44f285ae814d98f82b56b622a60eb4 (diff) | |
| parent | 94cff4ae951c4ebb950da645d0bb761612bfce8e (diff) | |
| download | browser-aee2371d21d1eed6b2b956399edeb9b7eed264e6.tar.gz browser-aee2371d21d1eed6b2b956399edeb9b7eed264e6.tar.bz2 browser-aee2371d21d1eed6b2b956399edeb9b7eed264e6.zip | |
Merge "[Title] Fix crash issue when delete multi window rapidly on emulator." into 2.0_beta
| -rw-r--r--[-rwxr-xr-x] | edc/browser-multi-window.edc | 1 | ||||
| -rwxr-xr-x | src/browser-multi-window/browser-multi-window-view.cpp | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/edc/browser-multi-window.edc b/edc/browser-multi-window.edc index 47df52a3..84deb549 100755..100644 --- a/edc/browser-multi-window.edc +++ b/edc/browser-multi-window.edc @@ -468,6 +468,7 @@ collections { action: STATE_SET "grey" 0.0; transition: ACCELERATE 0.3; target: "rect.clipper"; + after: "hide,delete_window_icon"; } program { name: "non_grey,snapshot"; signal: "non_grey,snapshot,signal"; diff --git a/src/browser-multi-window/browser-multi-window-view.cpp b/src/browser-multi-window/browser-multi-window-view.cpp index 01783a49..48898485 100755 --- a/src/browser-multi-window/browser-multi-window-view.cpp +++ b/src/browser-multi-window/browser-multi-window-view.cpp @@ -749,12 +749,16 @@ void Browser_Multi_Window_View::_show_grey_effect(void) { BROWSER_LOGD("[%s]", __func__); for (int i = 0 ; i < m_item_list.size() ; i++) { - if (i == m_current_position_index) + if (i == m_current_position_index) { edje_object_signal_emit(elm_layout_edje_get(m_item_list[i]), "non_grey,snapshot,signal", ""); - else + if (m_item_list.size() > 1) + edje_object_signal_emit(elm_layout_edje_get(m_item_list[i]), + "show,delete_window_icon,signal", ""); + } else { edje_object_signal_emit(elm_layout_edje_get(m_item_list[i]), "grey,snapshot,signal", ""); + } } } |