vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e17/illume: add option to resize app window before animating keyboard. send default keyboard layout on start (not alpha) 

SVN revision: 62937
This commit is contained in:
Hannes Janetzek 2011-08-29 09:28:40 +00:00
parent f6ce3f2b04
commit 495902f88b
4 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/illume2/e_illume.h
View File

@ -247,7 +247,8 @@ struct _E_Illume_Config
struct
{
int duration;
/**< integer specifying the amount of time it takes for an
int resize_before; /* resize app window before hide animation */
/**< integer specifying the amount of time it takes for an
* animation to complete. */
} vkbd, quickpanel;
} animation;

2
src/modules/illume2/e_mod_config.c
View File

@ -36,6 +36,7 @@ e_mod_illume_config_init(void)
#define D _il_conf_edd
E_CONFIG_VAL(D, T, version, INT);
E_CONFIG_VAL(D, T, animation.vkbd.duration, INT);
E_CONFIG_VAL(D, T, animation.vkbd.resize_before, INT);
E_CONFIG_VAL(D, T, animation.quickpanel.duration, INT);
E_CONFIG_VAL(D, T, policy.name, STR);
E_CONFIG_VAL(D, T, policy.vkbd.class, STR);
@ -197,6 +198,7 @@ _e_mod_illume_config_new(void)
_e_illume_cfg = E_NEW(E_Illume_Config, 1);
_e_illume_cfg->version = 0;
_e_illume_cfg->animation.vkbd.duration = 1000;
_e_illume_cfg->animation.vkbd.resize_before = 1;
_e_illume_cfg->animation.quickpanel.duration = 1000;
_e_illume_cfg->policy.name = eina_stringshare_add("illume");

11
src/modules/illume2/e_mod_config_animation.c
View File

@ -79,6 +79,11 @@ _e_mod_illume_config_animation_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E
_e_mod_illume_config_animation_change, NULL);
ow = e_widget_radio_add(evas, _("Off"), 0, rg);
e_widget_framelist_object_append(of, ow);
evas_object_smart_callback_add(ow, "changed",
_e_mod_illume_config_animation_change, NULL);
ow = e_widget_check_add(evas, _("Resize Window before Animation"),
&_e_illume_cfg->animation.vkbd.resize_before);
e_widget_framelist_object_append(of, ow);
evas_object_smart_callback_add(ow, "changed",
_e_mod_illume_config_animation_change, NULL);
e_widget_list_object_append(list, of, 1, 0, 0.0);
@ -105,6 +110,12 @@ _e_mod_illume_config_animation_ui(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E
e_widget_framelist_object_append(of, ow);
evas_object_smart_callback_add(ow, "changed",
_e_mod_illume_config_animation_change, NULL);
/* ow = e_widget_check_add(evas, _("Resize Window before Animation"),
* &_e_illume_cfg->animation.quickpanel.resize_before);
* e_widget_framelist_object_append(of, ow);
* evas_object_smart_callback_add(ow, "changed",
* _e_mod_illume_config_animation_change, NULL); */
e_widget_list_object_append(list, of, 1, 0, 0.0);
return list;

43
src/modules/illume2/e_mod_kbd.c
View File

@ -95,7 +95,7 @@ e_mod_kbd_new(void)
if (!kbd) return NULL;
/* set default layout on new keyboard */
kbd->layout = E_ILLUME_KEYBOARD_LAYOUT_ALPHA;
kbd->layout = E_ILLUME_KEYBOARD_LAYOUT_DEFAULT;
kbd->visible = 0;
return kbd;
@ -188,6 +188,10 @@ e_mod_kbd_hide(void)
// if (!_e_illume_kbd->visible) return;
/* create new hide timer if it doesn't exist */
if (_e_illume_kbd->disabled) return;
_e_illume_kbd->visible = 0;
if (!_e_illume_kbd->timer)
_e_illume_kbd->timer = ecore_timer_add(0.2, _e_mod_kbd_cb_delay_hide, NULL);
}
@ -293,8 +297,6 @@ _e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *
ev = event;
if (_e_mod_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
// printf("Kbd Focus in: %s\n", ev->border->client.icccm.name);
/* set focused border for kbd */
_focused_border = ev->border;
_focused_state = ev->border->client.vkbd.state;
@ -315,8 +317,6 @@ _e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void
ev = event;
if (_e_mod_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
// printf("Kbd Focus Out: %s\n", ev->border->client.icccm.name);
_prev_focused_border = _focused_border;
/* hide the keyboard */
@ -466,14 +466,15 @@ _e_mod_kbd_hide(void)
_e_illume_kbd->border->h);
e_border_hide(_e_illume_kbd->border, 2);
}
_e_illume_kbd->visible = 0;
_e_mod_kbd_geometry_send();
_e_mod_kbd_changes_send();
}
else
_e_mod_kbd_slide(0, (double)_e_illume_cfg->animation.vkbd.duration / 1000.0);
if (_e_illume_cfg->animation.vkbd.resize_before)
{
_e_mod_kbd_geometry_send();
_e_mod_kbd_changes_send();
}
}
static void
@ -528,7 +529,6 @@ _e_mod_kbd_cb_animate(void *data __UNUSED__)
_e_illume_kbd->visible = 1;
_e_mod_kbd_geometry_send();
_e_mod_kbd_changes_send();
return ECORE_CALLBACK_CANCEL;
@ -622,17 +622,26 @@ _e_mod_kbd_geometry_send(void)
/* make sure we have a keyboard border */
if (!_e_illume_kbd->border) return;
/* no need. we send geometry only when kbd is visible or invisible */
/* adjust Y for keyboard visibility */
if (_e_illume_kbd->border->fx.y <= 0)
y = _e_illume_kbd->border->y;
//if (_e_illume_kbd->border->fx.y <= 0)
y = _e_illume_kbd->border->y;
if (_focused_border) zone = _focused_border->zone;
else zone = _e_illume_kbd->border->zone;
ecore_x_e_illume_keyboard_geometry_set(zone->black_win,
_e_illume_kbd->border->x, y,
_e_illume_kbd->border->w,
_e_illume_kbd->border->h);
if (_e_illume_kbd->visible)
ecore_x_e_illume_keyboard_geometry_set(zone->black_win,
_e_illume_kbd->border->x,
y,
_e_illume_kbd->border->w,
_e_illume_kbd->border->h);
else
ecore_x_e_illume_keyboard_geometry_set(zone->black_win,
_e_illume_kbd->border->x,
_e_illume_kbd->border->h + y,
_e_illume_kbd->border->w,
_e_illume_kbd->border->h);
}
static void