This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository enlightenment.
View the commit online.
commit c3912cdea2c27783d32ea0cdc34afe4e693dbcef
Author: Carsten Haitzler <ras...@rasterman.com>
AuthorDate: Thu Jan 9 17:05:22 2025 +0000
mods - make settings buttons in popups "standardized" for polish
---
src/modules/clock/e_mod_main.c | 17 +++++++++++++----
src/modules/cpufreq/e_mod_main.c | 11 ++++++++---
src/modules/mixer/e_mod_main.c | 38 ++++++++++++++++++++++----------------
3 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index d9906dde1..b724d322b 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -281,7 +281,7 @@ _clock_month_next_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emiss
}
static void
-_clock_settings_cb(void *d1, void *d2 EINA_UNUSED)
+_clock_settings_cb(void *d1, Evas_Object *obj EINA_UNUSED, void *info EINA_UNUSED)
{
Instance *inst = d1;
e_int_config_clock_module(NULL, inst->cfg);
@@ -304,7 +304,7 @@ static void
_clock_popup_new(Instance *inst)
{
Evas *evas;
- Evas_Object *o, *oi;
+ Evas_Object *o, *oi, *o_button;
char todaystr[128];
if (inst->popup) return;
@@ -356,11 +356,20 @@ _clock_popup_new(Instance *inst)
evas_object_size_hint_min_set(o, 80 * e_scale, 80 * e_scale);
elm_table_pack(inst->o_table, o, 0, 0, 1, 1);
- o = e_widget_button_add(evas, _("Settings"), "preferences-system",
- _clock_settings_cb, inst, NULL);
+ o_button = o = elm_button_add(e_comp->elm);
+ elm_object_text_set(o, _("Settings"));
+ evas_object_size_hint_align_set(o, 0.5, 0.5);
+ evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
elm_table_pack(inst->o_table, o, 0, 2, 1, 1);
evas_object_show(o);
+ evas_object_smart_callback_add(o, "clicked", _clock_settings_cb, inst);
+
+ o = elm_icon_add(e_comp->elm);
+ elm_icon_standard_set(o, "preferences-system");
+ elm_object_content_set(o_button, o);
+ evas_object_show(o);
+
oi = elm_layout_add(inst->o_table);
inst->o_cal = oi;
e_theme_edje_object_set(oi, "base/theme/modules/clock",
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index d3e57883e..816b8024d 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -388,7 +388,7 @@ _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED,
{
Instance *inst = data;
Evas_Event_Mouse_Down *ev = event_info;
- Evas_Object *o, *o_table, *o_lay;
+ Evas_Object *o, *o_table, *o_lay, *o_button;
int lv;
const char *f;
@@ -435,15 +435,20 @@ _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED,
evas_object_smart_callback_add(o, "changed", _cb_ac_power_slider, inst);
- o = elm_button_add(e_comp->elm);
+ o_button = o = elm_button_add(e_comp->elm);
elm_object_text_set(o, _("Settings"));
- evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
+ evas_object_size_hint_align_set(o, 0.5, 0.5);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
elm_table_pack(o_table, o, 0, 2, 10, 1);
evas_object_show(o);
evas_object_smart_callback_add(o, "clicked", _cb_settings, inst);
+ o = elm_icon_add(e_comp->elm);
+ elm_icon_standard_set(o, "preferences-system");
+ elm_object_content_set(o_button, o);
+ evas_object_show(o);
+
e_gadcon_popup_content_set(inst->popup, o_table);
e_gadcon_popup_show(inst->popup);
e_object_data_set(E_OBJECT(inst->popup), inst);
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index c86b650e7..1ea7d05ba 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -884,31 +884,37 @@ _popup_new(Instance *inst)
_popup_recording_fill(inst);
button = elm_button_add(e_comp->elm);
- evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_align_set(button, 0.5, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0.0);
elm_object_text_set(button, _("Mixer"));
evas_object_smart_callback_add(button, "clicked", _emixer_exec_cb, inst);
elm_box_pack_end(list, button);
evas_object_show(button);
+ ic = elm_icon_add(e_comp->elm);
+ elm_icon_standard_set(ic, "audio-volume");
+ elm_object_content_set(button, ic);
+ evas_object_show(ic);
+
EINA_LIST_FOREACH((Eina_List *)emix_sinks_get(), l, s)
- {
- Elm_Object_Item *it;
+ {
+ Elm_Object_Item *it;
- if (s->name) icname = _sink_icon_find(s->name);
- if (!icname) icname = strdup("audio-volume");
- ic = elm_icon_add(e_comp->elm);
- evas_object_size_hint_min_set(ic, 20 * e_scale, 20 * e_scale);
- elm_icon_standard_set(ic, icname);
- free(icname);
+ if (s->name) icname = _sink_icon_find(s->name);
+ if (!icname) icname = strdup("audio-volume");
+ ic = elm_icon_add(e_comp->elm);
+ evas_object_size_hint_min_set(ic, 20 * e_scale, 20 * e_scale);
+ elm_icon_standard_set(ic, icname);
+ free(icname);
- it = elm_list_item_append(inst->list, s->name, ic, NULL, _sink_selected_cb, s);
- if (backend_sink_default_get() == s)
- {
- default_it = it;
- _sink_monitor(inst, s);
- }
- }
+ it = elm_list_item_append(inst->list, s->name, ic, NULL, _sink_selected_cb,
+ s);
+ if (backend_sink_default_get() == s)
+ {
+ default_it = it;
+ _sink_monitor(inst, s);
+ }
+ }
elm_list_go(inst->list);
evas_object_size_hint_min_set(list, 240 * e_scale, 280 * e_scale);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
