fix quickpanel open problem

diff --git a/daemon/indicator_box_util.c b/daemon/indicator_box_util.c
index a859207..8851ca5 100755 (executable)
--- a/daemon/indicator_box_util.c
+++ b/daemon/indicator_box_util.c
@@ -782,24 +782,6 @@ void indicator_util_show_hide_icons(void* data,int bShow, int bEffect)
                indicator_util_icon_state(win->type,0);
        }
 
-       if(win->type == INDICATOR_WIN_LAND)
-       {
-               DBG("land = %d",bShow);
-               if(bShow==FALSE)
-               {
-                       indicator_send_evas_ecore_message(win,1,2);
-               }
-               else
-               {
-                       indicator_send_evas_ecore_message(win,0,1);
-               }
-       }
-       else
-       {
-               DBG("port = %d",bShow);
-               indicator_send_evas_ecore_message(win,0,1);
-       }
-
        if(bEffect)
        {
                if(bShow)

diff --git a/daemon/indicator_ui.c b/daemon/indicator_ui.c
index 76ff807..34d1615 100755 (executable)
--- a/daemon/indicator_ui.c
+++ b/daemon/indicator_ui.c
@@ -430,7 +430,13 @@ static void _rotate_window(void *data, int new_angle)
                                        hide_timer = NULL;
                                }
                                indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,0);
-                               indicator_send_evas_ecore_message(&(ad->win[INDICATOR_WIN_LAND]),0,1);
+
+                               if(is_quickpanel_opened == 1)
+                               {
+                                       indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_PORT]),1,0);
+                               }
+
+                               indicator_send_evas_ecore_message(&(ad->win[INDICATOR_WIN_PORT]),0,1);
                        }
                        break;
                case 90:
@@ -439,6 +445,7 @@ static void _rotate_window(void *data, int new_angle)
                        {
                                DBG("hide indicator = %d %d",is_quickpanel_opened,is_apptray_opened);
                                indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,0);
+                               indicator_send_evas_ecore_message(&(ad->win[INDICATOR_WIN_LAND]),1,2);
                                if (hide_timer != NULL)
                                {
                                        ecore_timer_del(hide_timer);
@@ -448,6 +455,7 @@ static void _rotate_window(void *data, int new_angle)
                        else
                        {
                                indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),1,0);
+                               indicator_send_evas_ecore_message(&(ad->win[INDICATOR_WIN_LAND]),0,1);
                        }
                        break;
                default:
@@ -517,7 +525,6 @@ static void _indicator_quickpanel_changed(void *data, int is_open)
                                {
                                        indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_PORT]),1,0);
                                }
-                               indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),1,0);
                        }
                        else
                        {
@@ -540,18 +547,18 @@ static void _indicator_quickpanel_changed(void *data, int is_open)
 
                        if( current_angle==0 || current_angle == 180)
                        {
+                               indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,0);
+
                                if(indicator_icon_backup_state[INDICATOR_WIN_PORT]==0)
                                        indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_PORT]),0,1);
                                else
                                        indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_PORT]),1,0);
-
-                               indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,0);
                        }
                        else
                        {
                                indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,1);
+                               indicator_send_evas_ecore_message(&(ad->win[INDICATOR_WIN_LAND]),1,2);
                        }
-
                }
        }
 }
@@ -1213,6 +1220,7 @@ static void __indicator_hide_icon_timer_cb(void* data)
        }
 
        indicator_util_show_hide_icons(data,0,1);
+       indicator_send_evas_ecore_message(data,1,2);
 
 }
 
@@ -1369,6 +1377,7 @@ static void _indicator_mouse_move_cb(void *data, Evas * e, Evas_Object * obj,
                                if(indicator_icon_show_state[win->type] == 0)
                                {
                                        indicator_util_show_hide_icons(win,1,1);
+                                       indicator_send_evas_ecore_message(win,0,1);
                                        if (hide_timer != NULL) {
                                                ecore_timer_del(hide_timer);
                                                hide_timer = NULL;

diff --git a/daemon/indicator_util.c b/daemon/indicator_util.c
index c0e5098..16a053e 100755 (executable)
--- a/daemon/indicator_util.c
+++ b/daemon/indicator_util.c
@@ -140,7 +140,7 @@ void indicator_send_evas_ecore_message(void* data, int bRepeat, int bType)
        win_info* win = (win_info*)data;
        retif(data == NULL, , "Invalid parameter!");
 
-       DBG("win(%d),bRepeat(%d),bType(%d)");
+       DBG("win(%d),bRepeat(%d),bType(%d)",win->type, bRepeat, bType);
        ee_port = ecore_evas_ecore_evas_get(evas_object_evas_get(win->win_main));
        ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_REPEAT_EVENT, &bRepeat, sizeof(int));
        ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_TYPE, &bType, sizeof(int));

diff --git a/data/indicator.xml.in b/data/indicator.xml.in
index 86aca75..5ac31d1 100755 (executable)
--- a/data/indicator.xml.in
+++ b/data/indicator.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="@PKGNAME@" version="0.1.71-1" install-location="internal-only">
+<manifest xmlns="http://tizen.org/ns/packages" package="@PKGNAME@" version="0.1.72-1" install-location="internal-only">
        <label>@PROJECT_NAME@</label>
        <author email="yjoo93.park@samsung.com" href="www.samsung.com">Youngjoo Park</author>
        <author email="seungtaek.chung@samsung.com" href="www.samsung.com">seungtaek chung</author>

diff --git a/packaging/org.tizen.indicator.spec b/packaging/org.tizen.indicator.spec
index 7fbba3d..be1f256 100755 (executable)
--- a/packaging/org.tizen.indicator.spec
+++ b/packaging/org.tizen.indicator.spec
@@ -4,7 +4,7 @@
 
 Name:       org.tizen.indicator
 Summary:    indicator window
-Version:    0.1.71
+Version:    0.1.72
 Release:    1
 Group:      utils
 License:    Flora Software License