From 5a823bb202e2265e072cff995606986ebfde31b5 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 29 Mar 2021 10:20:27 +0200 Subject: [PATCH] add automatic orientation of images in settings --- src/bin/entice_config.c | 2 ++ src/bin/entice_config.h | 1 + src/bin/entice_image.c | 3 ++- src/bin/entice_settings.c | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/bin/entice_config.c b/src/bin/entice_config.c index c79acf8..e16ef2b 100644 --- a/src/bin/entice_config.c +++ b/src/bin/entice_config.c @@ -76,6 +76,7 @@ _entice_config_new(void) config->cg_height = 540; config->custom_geometry = EINA_FALSE; config->fullscreen_startup = EINA_FALSE; + config->automatic_orientation = EINA_TRUE; config->best_fit_startup = EINA_TRUE; config->play_animated = EINA_TRUE; config->duration_controls = 2; @@ -137,6 +138,7 @@ entice_config_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "cg_height", cg_height, EET_T_INT); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "custom_geometry", custom_geometry, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "fullscreen_startup", fullscreen_startup, EET_T_UCHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "automatic_orientation", best_fit_startup, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "best_fit_startup", best_fit_startup, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "play_animated", play_animated, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "duration_controls", duration_controls, EET_T_INT); diff --git a/src/bin/entice_config.h b/src/bin/entice_config.h index a931e03..d71f0a8 100644 --- a/src/bin/entice_config.h +++ b/src/bin/entice_config.h @@ -50,6 +50,7 @@ struct Entice_Config_ int duration_controls; Eina_Bool custom_geometry; Eina_Bool fullscreen_startup; + Eina_Bool automatic_orientation; Eina_Bool best_fit_startup; Eina_Bool play_animated; Eina_List *keys; diff --git a/src/bin/entice_image.c b/src/bin/entice_image.c index ad0ee2d..8049ec6 100644 --- a/src/bin/entice_image.c +++ b/src/bin/entice_image.c @@ -283,7 +283,8 @@ entice_image_set(Evas_Object *obj, Eina_List *image) entice->image_current = image; filename = eina_list_data_get(entice->image_current); - evas_object_image_load_orientation_set(sd->img, EINA_TRUE); + evas_object_image_load_orientation_set(sd->img, + entice->config->automatic_orientation); evas_object_image_file_set(sd->img, filename, NULL); err = evas_object_image_load_error_get(sd->img); diff --git a/src/bin/entice_settings.c b/src/bin/entice_settings.c index 92a3551..56c7309 100644 --- a/src/bin/entice_settings.c +++ b/src/bin/entice_settings.c @@ -219,6 +219,7 @@ _cb_op_behavior_duration_controls(void *data, } OPTIONS_CB(fullscreen_startup, 0); +OPTIONS_CB(automatic_orientation, 0); OPTIONS_CB(best_fit_startup, 0); OPTIONS_CB(play_animated, 0); @@ -342,6 +343,7 @@ entice_settings_init(Evas_Object *win) SETTINGS_SEPARATOR; + SETTINGS_CX("Automatic orientation of images", automatic_orientation, 0); SETTINGS_CX("Always best fit", best_fit_startup, 0); SETTINGS_CX("Play animated images", play_animated, 0);