projects
/
apps
/
home
/
volume-app.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
24caf00
)
Fix N_SE-5897 : Task bar is disappeared when volume setting UG shows.
author
hongkwon
<hhh.kwon@samsung.com>
Wed, 22 Aug 2012 04:23:20 +0000
(13:23 +0900)
committer
hongkwon
<hhh.kwon@samsung.com>
Wed, 22 Aug 2012 04:23:20 +0000
(13:23 +0900)
src/_button.c
patch
|
blob
|
history
src/_logic.c
patch
|
blob
|
history
diff --git
a/src/_button.c
b/src/_button.c
index
47853a9
..
6275934
100755
(executable)
--- a/
src/_button.c
+++ b/
src/_button.c
@@
-53,13
+53,14
@@
static void button_ug_destroy_cb(ui_gadget_h ug, void *priv)
ug_destroy(ug);
ad->ug = NULL;
ug_destroy(ug);
ad->ug = NULL;
+ ecore_x_netwm_window_type_set(elm_win_xwindow_get(ad->win), ECORE_X_WINDOW_TYPE_NOTIFICATION);
utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_OFF);
_close_volume(ad);
}
ui_gadget_h create_button_ug(void *data)
{
utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_OFF);
_close_volume(ad);
}
ui_gadget_h create_button_ug(void *data)
{
- ui_gadget_h ug;
+ ui_gadget_h ug
= NULL
;
struct ug_cbs cbs = {0};
struct appdata *ad = (struct appdata *)data;
retvm_if(ad == NULL, 0, "Invalid argument:appdata is NULL\n");
struct ug_cbs cbs = {0};
struct appdata *ad = (struct appdata *)data;
retvm_if(ad == NULL, 0, "Invalid argument:appdata is NULL\n");
@@
-68,6
+69,7
@@
ui_gadget_h create_button_ug(void *data)
cbs.destroy_cb = button_ug_destroy_cb;
cbs.priv = (void *)data;
cbs.destroy_cb = button_ug_destroy_cb;
cbs.priv = (void *)data;
+ ecore_x_netwm_window_type_set(elm_win_xwindow_get(ad->win), ECORE_X_WINDOW_TYPE_NORMAL);
utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_ON);
ug = ug_create(NULL, "setting-profile-efl", UG_MODE_FULLVIEW, NULL, &cbs);
utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_ON);
ug = ug_create(NULL, "setting-profile-efl", UG_MODE_FULLVIEW, NULL, &cbs);
diff --git
a/src/_logic.c
b/src/_logic.c
index
e8753fa
..
e6c8fe5
100755
(executable)
--- a/
src/_logic.c
+++ b/
src/_logic.c
@@
-587,9
+587,9
@@
int _app_reset(bundle *b, void *data)
_set_level(type);
win = _add_window(PACKAGE);
_set_level(type);
win = _add_window(PACKAGE);
- elm_win_alpha_set(win, EINA_TRUE);
retvm_if(win == NULL, -1, "Failed add window\n");
ad->win = win;
retvm_if(win == NULL, -1, "Failed add window\n");
ad->win = win;
+
_grab_key(ad);
pu = _add_popup(win, "volumebarstyle");
_grab_key(ad);
pu = _add_popup(win, "volumebarstyle");
@@
-647,11
+647,12
@@
int _app_reset(bundle *b, void *data)
int _app_pause(struct appdata *ad)
{
_D("%s\n", __func__);
int _app_pause(struct appdata *ad)
{
_D("%s\n", __func__);
- ug_destroy_all();
if(ad->ug){
if(ad->ug){
+ ug_destroy_all();
ad->ug = NULL;
ad->ug = NULL;
-
_close_volume(ad
);
+
ecore_x_netwm_window_type_set(elm_win_xwindow_get(ad->win), ECORE_X_WINDOW_TYPE_NOTIFICATION
);
utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_OFF);
}
utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_OFF);
}
+ _close_volume(ad);
return 0;
}
return 0;
}