toggling pager's 'show desktop names' now properly toggles constant display of desktop names
SVN revision: 73563
This commit is contained in:
parent
d2254253be
commit
a883c59c02
|
@ -10585,6 +10585,8 @@ collections {
|
||||||
}
|
}
|
||||||
script {
|
script {
|
||||||
public disable_live_preview = 0;
|
public disable_live_preview = 0;
|
||||||
|
public show_desk_names = 0;
|
||||||
|
public mouse_in = 0;
|
||||||
}
|
}
|
||||||
parts {
|
parts {
|
||||||
part {
|
part {
|
||||||
|
@ -10942,21 +10944,47 @@ collections {
|
||||||
action: STATE_SET "default" 0.0;
|
action: STATE_SET "default" 0.0;
|
||||||
target: "zoom";
|
target: "zoom";
|
||||||
}
|
}
|
||||||
|
program {
|
||||||
|
name: "name_enable";
|
||||||
|
signal: "e,name,show";
|
||||||
|
source: "e";
|
||||||
|
script {
|
||||||
|
set_int(show_desk_names, 1);
|
||||||
|
set_state(PART:"e.text.label", "active", 0.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
program {
|
||||||
|
name: "name_disable";
|
||||||
|
signal: "e,name,hide";
|
||||||
|
source: "e";
|
||||||
|
script {
|
||||||
|
set_int(show_desk_names, 0);
|
||||||
|
if (!get_int(mouse_in))
|
||||||
|
set_state(PART:"e.text.label", "default", 0.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
program {
|
program {
|
||||||
name: "name_show";
|
name: "name_show";
|
||||||
signal: "mouse,in";
|
signal: "mouse,in";
|
||||||
source: "e.eventarea";
|
source: "e.eventarea";
|
||||||
action: STATE_SET "active" 0.0;
|
script {
|
||||||
|
if (get_int(show_desk_names) != 1)
|
||||||
|
set_state(PART:"e.text.label", "active", 0.0);
|
||||||
|
set_int(mouse_in, 1);
|
||||||
|
}
|
||||||
transition: SINUSOIDAL 0.1;
|
transition: SINUSOIDAL 0.1;
|
||||||
target: "e.text.label";
|
|
||||||
}
|
}
|
||||||
program {
|
program {
|
||||||
name: "name_hide";
|
name: "name_hide";
|
||||||
signal: "mouse,out";
|
signal: "mouse,out";
|
||||||
source: "e.eventarea";
|
source: "e.eventarea";
|
||||||
action: STATE_SET "default" 0.0;
|
script {
|
||||||
|
if (get_int(show_desk_names) != 1)
|
||||||
|
set_state(PART:"e.text.label", "default", 0.0);
|
||||||
|
set_int(mouse_in, 0);
|
||||||
|
}
|
||||||
|
|
||||||
transition: SINUSOIDAL 0.2;
|
transition: SINUSOIDAL 0.2;
|
||||||
target: "e.text.label";
|
|
||||||
}
|
}
|
||||||
// don't have any states/anim for urgent windows on a desktop
|
// don't have any states/anim for urgent windows on a desktop
|
||||||
// program { name: "xx";
|
// program { name: "xx";
|
||||||
|
|
|
@ -366,10 +366,9 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos)
|
||||||
pd->o_desk = o;
|
pd->o_desk = o;
|
||||||
e_theme_edje_object_set(o, "base/theme/modules/pager",
|
e_theme_edje_object_set(o, "base/theme/modules/pager",
|
||||||
"e/modules/pager/desk");
|
"e/modules/pager/desk");
|
||||||
if (pager_config->show_desk_names)
|
|
||||||
edje_object_part_text_set(o, "e.text.label", desk->name);
|
edje_object_part_text_set(o, "e.text.label", desk->name);
|
||||||
else
|
if (pager_config->show_desk_names)
|
||||||
edje_object_part_text_set(o, "e.text.label", "");
|
edje_object_signal_emit(o, "e,name,show", "e");
|
||||||
|
|
||||||
if (pager_config->disable_live_preview)
|
if (pager_config->disable_live_preview)
|
||||||
edje_object_signal_emit(o, "e,preview,off", "e");
|
edje_object_signal_emit(o, "e,preview,off", "e");
|
||||||
|
@ -894,6 +893,10 @@ _pager_cb_config_updated(void)
|
||||||
edje_object_signal_emit(pd->o_desk, "e,state,selected", "e");
|
edje_object_signal_emit(pd->o_desk, "e,state,selected", "e");
|
||||||
else
|
else
|
||||||
edje_object_signal_emit(pd->o_desk, "e,state,unselected", "e");
|
edje_object_signal_emit(pd->o_desk, "e,state,unselected", "e");
|
||||||
|
if (pager_config->show_desk_names)
|
||||||
|
edje_object_signal_emit(pd->o_desk, "e,name,show", "e");
|
||||||
|
else
|
||||||
|
edje_object_signal_emit(pd->o_desk, "e,name,hide", "e");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue