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

Use proper icon 

Add icon to edj file

Correct icon

Enable sync for edje keyboard lock/unlock
Fix keyboard signals in icon
Using the correct part from the edje
This commit is contained in:
rafspiny 2024-02-04 13:02:05 +01:00 committed by Carsten Haitzler
parent 318de512f2
commit 3def50bd6a
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/convertible/e-gadget-convertible.c
View File

@ -17,9 +17,15 @@ _update_instances(const Instance *current_instance)
{
instance->locked_position = current_instance->locked_position;
if (instance->locked_position == EINA_TRUE)
edje_object_signal_emit(instance->o_button, "lock,rotation,icon", "convertible/tablet");
edje_object_signal_emit(instance->o_button, "e,lock,rotation,icon", "convertible/tablet");
else
edje_object_signal_emit(instance->o_button, "unlock,rotation,icon", "convertible/tablet");
edje_object_signal_emit(instance->o_button, "e,unlock,rotation,icon", "convertible/tablet");
instance->disabled_keyboard = current_instance->disabled_keyboard;
if (instance->disabled_keyboard == EINA_TRUE)
edje_object_signal_emit(instance->o_button, "e,disable,keyboard,icon", "convertible/input");
else
edje_object_signal_emit(instance->o_button, "e,enable,keyboard,icon", "convertible/input");
}
}
}
@ -28,11 +34,10 @@ void
_rotation_signal_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED,
const char *src EINA_UNUSED)
{
DBG("Rotation: Signal %s received from %s", sig, src);
Instance *inst = data;
if (eina_str_has_prefix(sig, "unlock"))
if (eina_str_has_prefix(sig, "e,unlock"))
inst->locked_position = EINA_FALSE;
if (eina_str_has_prefix(sig, "lock"))
if (eina_str_has_prefix(sig, "e,lock"))
inst->locked_position = EINA_TRUE;
_update_instances(inst);
}
@ -41,5 +46,11 @@ void
_keyboard_signal_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED,
const char *src EINA_UNUSED)
{
DBG("Keyboard: Signal %s received from %s", sig, src);
Instance *inst = data;
if (eina_str_has_prefix(sig, "e,enable,keyboard"))
inst->disabled_keyboard = EINA_FALSE;
if (eina_str_has_prefix(sig, "e,disable,keyboard"))
inst->disabled_keyboard = EINA_TRUE;
_update_instances(inst);
}

BIN
src/modules/convertible/e-module-convertible.edj Executable file → Normal file
View File

Binary file not shown.

4
src/modules/convertible/e_mod_main.c
View File

@ -85,8 +85,8 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
INF("Adding callback for creation and other events from EDJE");
edje_object_signal_callback_add(evas_object, "e,lock,rotation", "tablet", _rotation_signal_cb, instance);
edje_object_signal_callback_add(evas_object, "e,unlock,rotation", "tablet", _rotation_signal_cb, instance);
edje_object_signal_callback_add(evas_object, "e,enable,keyboard", "keyboard", _keyboard_signal_cb, instance);
edje_object_signal_callback_add(evas_object, "e,disable,keyboard", "keyboard", _keyboard_signal_cb, instance);
edje_object_signal_callback_add(evas_object, "e,enable,keyboard", "input", _keyboard_signal_cb, instance);
edje_object_signal_callback_add(evas_object, "e,disable,keyboard", "input", _keyboard_signal_cb, instance);
inst->o_button = evas_object;