This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository entice.
View the commit online.
commit e9a2e3cae3f460602753589ec216e5cd2b99af93
Author: Vincent Torri <[email protected]>
AuthorDate: Wed Dec 24 09:36:05 2025 +0100
improve a bit the theme,
---
data/themes/default.edc | 11 ++++-------
src/bin/entice_config.c | 2 ++
src/bin/entice_config.h | 1 +
src/bin/entice_main.c | 2 +-
src/bin/entice_win.c | 19 +++++++++++--------
src/bin/meson.build | 1 +
6 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 588687b..e142778 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -485,10 +485,6 @@ collections
align: 1.0 0.0;
offscale;
}
- description { state: "disable" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
}
STOP_FADE("fullscreen")
@@ -511,9 +507,10 @@ collections
rel2.offset: -GB_PAD GB_PAD;
min: ICON_SIZE ICON_SIZE;
align: 1.0 0.0;
+ visible: 1;
offscale;
}
- description { state: "disable" 0.0;
+ description { state: "fullscreen" 0.0;
inherit: "default" 0.0;
rel1.offset: 2*GB_PAD GB_PAD;
rel2.offset: 2*GB_PAD GB_PAD;
@@ -521,10 +518,10 @@ collections
}
}
program { signal: "state,win,fullscreen"; source: "entice";
- action: STATE_SET "disable" 0.0;
+ action: STATE_SET "fullscreen" 0.0;
target: "entice.close";
}
- program { signal: "state,win,unfullscreen"; source: "entice";
+ program { signal: "state,win,windowed"; source: "entice";
action: STATE_SET "default" 0.0;
target: "entice.close";
}
diff --git a/src/bin/entice_config.c b/src/bin/entice_config.c
index 78ed18f..11091ef 100644
--- a/src/bin/entice_config.c
+++ b/src/bin/entice_config.c
@@ -51,6 +51,7 @@ _entice_config_new(void)
return NULL;
config->theme = eina_stringshare_add("default.edj");
+ config->tab_zoom = 0.5;
config->cg_width = 960;
config->cg_height = 540;
config->duration_controls = 10;
@@ -114,6 +115,7 @@ entice_config_init(void)
ENTICE_CONFIG_EDD_KEY_ADD("cb", cb, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "theme", theme, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "tab_zoom", tab_zoom, EET_T_DOUBLE);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Entice_Config, "cg_width", cg_width, EET_T_INT);
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, "duration_controls", duration_controls, EET_T_INT);
diff --git a/src/bin/entice_config.h b/src/bin/entice_config.h
index a8f590c..5ba565e 100644
--- a/src/bin/entice_config.h
+++ b/src/bin/entice_config.h
@@ -24,6 +24,7 @@ struct Entice_Config_Keys_
struct Entice_Config_
{
const char *theme;
+ double tab_zoom;
int cg_width;
int cg_height;
int duration_controls;
diff --git a/src/bin/entice_main.c b/src/bin/entice_main.c
index 1efb1d4..657982c 100644
--- a/src/bin/entice_main.c
+++ b/src/bin/entice_main.c
@@ -472,7 +472,7 @@ elm_main(int argc, char **argv)
*/
entice_win_images_set(win, list, first);
- if (fullscreen) elm_win_fullscreen_set(win, EINA_TRUE);
+ if (fullscreen) entice_win_fullscreen_toggle(win);
evas_object_show(win);
diff --git a/src/bin/entice_win.c b/src/bin/entice_win.c
index 8abdc08..e62e3f6 100644
--- a/src/bin/entice_win.c
+++ b/src/bin/entice_win.c
@@ -87,6 +87,7 @@ _cb_fullscreen(void *data EINA_UNUSED, Evas_Object *win, void *event EINA_UNUSED
{
Entice *entice;
+ ERR("_cb_fullscreen");
entice = evas_object_data_get(win, "entice");
elm_layout_signal_emit(entice->layout, "state,win,fullscreen", "entice");
elm_win_noblank_set(win, EINA_TRUE);
@@ -97,12 +98,10 @@ _cb_unfullscreen(void *data EINA_UNUSED, Evas_Object *win, void *event EINA_UNUS
{
Entice *entice;
+ ERR("_cb_unfullscreen");
entice = evas_object_data_get(win, "entice");
- if (!elm_win_fullscreen_get(win))
- {
- elm_layout_signal_emit(entice->layout, "state,win,unfullscreen", "entice");
- elm_win_noblank_set(win, EINA_FALSE);
- }
+ elm_layout_signal_emit(entice->layout, "state,win,windowed", "entice");
+ elm_win_noblank_set(win, EINA_FALSE);
}
static void
@@ -364,20 +363,24 @@ void
entice_win_fullscreen_toggle(Evas_Object *win)
{
Entice *entice;
+ Eina_Bool flag;
entice = evas_object_data_get(win, "entice");
- elm_win_fullscreen_set(win, !elm_win_fullscreen_get(win));
+ flag = elm_win_fullscreen_get(win);
+ printf(" * 1 : %d %d \n", flag, !flag);
+ elm_win_fullscreen_set(win, !flag);
+ printf(" * 2 : %d\n", elm_win_fullscreen_get(win));
if (elm_win_fullscreen_get(win))
{
elm_icon_standard_set(entice->fullscreen, "view-fullscreen");
elm_object_signal_emit(entice->layout,
- "state,title,hide", "entice");
+ "state,win,fullscreen", "entice");
}
else
{
elm_icon_standard_set(entice->fullscreen, "view-restore");
elm_object_signal_emit(entice->layout,
- "state,title,show", "entice");
+ "state,win,windowed", "entice");
}
}
diff --git a/src/bin/meson.build b/src/bin/meson.build
index d0c23fa..a120892 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -33,6 +33,7 @@ entice_bin_src = [
'entice_image.c',
'entice_key.c',
'entice_main.c',
+# 'entice_selection.c',
'entice_settings.c',
'entice_theme.c',
'entice_thumb_common.c',
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
