enlightenment/evisum
enlightenment
/
evisum
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

alpha: transparent

This commit is contained in:
Alastair Poole 2021-03-11 20:41:47 +00:00
parent c9946b03d4
commit 1fe4d0312d
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/evisum_config.c
View File

@ -53,7 +53,7 @@ _config_init()
cfg->version = CONFIG_VERSION; cfg->version = CONFIG_VERSION;
cfg->proc.poll_delay = 3; cfg->proc.poll_delay = 3;
cfg->proc.show_kthreads = 1; cfg->proc.show_kthreads = 1;
cfg->proc.transparant = 0; cfg->proc.transparent = 0;
cfg->proc.fields = 0xffffffff; cfg->proc.fields = 0xffffffff;
cfg->proc.alpha = 100; cfg->proc.alpha = 100;

2
src/bin/evisum_config.h
View File

@ -28,7 +28,7 @@ typedef struct _Evisum_Config
unsigned int fields; unsigned int fields;
Eina_Bool show_scroller; Eina_Bool show_scroller;
Eina_Bool transparant; Eina_Bool transparent;
unsigned char alpha; unsigned char alpha;
} proc; } proc;

18
src/bin/ui/evisum_ui.c
View File

@ -35,7 +35,7 @@ evisum_ui_config_save(Evisum_Ui *ui)
(_evisum_config->proc.show_kthreads != ui->proc.show_kthreads) || (_evisum_config->proc.show_kthreads != ui->proc.show_kthreads) ||
(_evisum_config->proc.show_user != ui->proc.show_user) || (_evisum_config->proc.show_user != ui->proc.show_user) ||
(_evisum_config->proc.show_scroller != ui->proc.show_scroller) || (_evisum_config->proc.show_scroller != ui->proc.show_scroller) ||
(_evisum_config->proc.transparant != ui->proc.transparant) || (_evisum_config->proc.transparent != ui->proc.transparent) ||
(_evisum_config->proc.alpha != ui->proc.alpha) (_evisum_config->proc.alpha != ui->proc.alpha)
) )
{ {
@ -53,7 +53,7 @@ evisum_ui_config_save(Evisum_Ui *ui)
_evisum_config->proc.show_kthreads = ui->proc.show_kthreads; _evisum_config->proc.show_kthreads = ui->proc.show_kthreads;
_evisum_config->proc.show_user = ui->proc.show_user; _evisum_config->proc.show_user = ui->proc.show_user;
_evisum_config->proc.show_scroller = ui->proc.show_scroller; _evisum_config->proc.show_scroller = ui->proc.show_scroller;
_evisum_config->proc.transparant = ui->proc.transparant; _evisum_config->proc.transparent = ui->proc.transparent;
_evisum_config->proc.alpha = ui->proc.alpha; _evisum_config->proc.alpha = ui->proc.alpha;
_evisum_config->proc.fields = ui->proc.fields; _evisum_config->proc.fields = ui->proc.fields;
proc_info_kthreads_show_set(ui->proc.show_kthreads); proc_info_kthreads_show_set(ui->proc.show_kthreads);
@ -125,7 +125,7 @@ evisum_ui_config_load(Evisum_Ui *ui)
proc_info_kthreads_show_set(ui->proc.show_kthreads); proc_info_kthreads_show_set(ui->proc.show_kthreads);
ui->proc.show_user = _evisum_config->proc.show_user; ui->proc.show_user = _evisum_config->proc.show_user;
ui->proc.show_scroller = _evisum_config->proc.show_scroller; ui->proc.show_scroller = _evisum_config->proc.show_scroller;
ui->proc.transparant = _evisum_config->proc.transparant; ui->proc.transparent = _evisum_config->proc.transparent;
ui->proc.alpha = _evisum_config->proc.alpha; ui->proc.alpha = _evisum_config->proc.alpha;
ui->proc.width = _evisum_config->proc.width; ui->proc.width = _evisum_config->proc.width;
@ -309,15 +309,15 @@ _main_menu_slider_alpha_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
} }
static void static void
_main_menu_transparant_changed_cb(void *data EINA_UNUSED, Evas_Object *obj, _main_menu_transparent_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Evisum_Ui *ui = data; Evisum_Ui *ui = data;
if (!ui->proc.alpha) return; if (!ui->proc.alpha) return;
ui->proc.transparant = elm_check_state_get(obj); ui->proc.transparent = elm_check_state_get(obj);
elm_object_disabled_set(_slider_alpha, !ui->proc.transparant); elm_object_disabled_set(_slider_alpha, !ui->proc.transparent);
evisum_ui_config_save(ui); evisum_ui_config_save(ui);
} }
@ -599,10 +599,10 @@ evisum_ui_main_menu_create(Evisum_Ui *ui, Evas_Object *parent, Evas_Object *obj)
evas_object_size_hint_weight_set(chk, EXPAND, EXPAND); evas_object_size_hint_weight_set(chk, EXPAND, EXPAND);
evas_object_size_hint_align_set(chk, FILL, FILL); evas_object_size_hint_align_set(chk, FILL, FILL);
elm_object_text_set(chk, _("Alpha")); elm_object_text_set(chk, _("Alpha"));
elm_check_state_set(chk, ui->proc.transparant); elm_check_state_set(chk, ui->proc.transparent);
evas_object_show(chk); evas_object_show(chk);
evas_object_smart_callback_add(chk, "changed", evas_object_smart_callback_add(chk, "changed",
_main_menu_transparant_changed_cb, ui); _main_menu_transparent_changed_cb, ui);
elm_box_pack_end(hbx, chk); elm_box_pack_end(hbx, chk);
_slider_alpha = sli = elm_slider_add(o); _slider_alpha = sli = elm_slider_add(o);
@ -614,7 +614,7 @@ evisum_ui_main_menu_create(Evisum_Ui *ui, Evas_Object *parent, Evas_Object *obj)
elm_slider_indicator_visible_mode_set(sli, ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE); elm_slider_indicator_visible_mode_set(sli, ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE);
elm_slider_value_set(sli, ui->proc.alpha); elm_slider_value_set(sli, ui->proc.alpha);
evas_object_size_hint_align_set(sli, FILL, FILL); evas_object_size_hint_align_set(sli, FILL, FILL);
elm_object_disabled_set(sli, !ui->proc.transparant); elm_object_disabled_set(sli, !ui->proc.transparent);
evas_object_smart_callback_add(sli, "slider,drag,stop", evas_object_smart_callback_add(sli, "slider,drag,stop",
_main_menu_slider_alpha_changed_cb, ui); _main_menu_slider_alpha_changed_cb, ui);
evas_object_smart_callback_add(sli, "changed", evas_object_smart_callback_add(sli, "changed",

2
src/bin/ui/evisum_ui.h
View File

@ -40,7 +40,7 @@ typedef struct _Evisum_Ui
Eina_Bool show_user; Eina_Bool show_user;
unsigned char alpha; unsigned char alpha;
Eina_Bool transparant; Eina_Bool transparent;
Eina_Bool show_scroller; Eina_Bool show_scroller;
} proc; } proc;

10
src/bin/ui/ui_process_list.c
View File

@ -38,7 +38,7 @@ typedef struct
Evas_Object *main_menu; Evas_Object *main_menu;
Ecore_Timer *main_menu_timer; Ecore_Timer *main_menu_timer;
Evas_Object *menu; Evas_Object *menu;
Eina_Bool transparant; Eina_Bool transparent;
struct struct
{ {
@ -1984,7 +1984,7 @@ _win_alpha_set(Data *pd)
fade = ui->proc.alpha / 100.0; fade = ui->proc.alpha / 100.0;
// FIXME: Base window colour from theme. // FIXME: Base window colour from theme.
if (ui->proc.transparant) if (ui->proc.transparent)
{ {
r = b = g = 128; a = 255; r = b = g = 128; a = 255;
evas_object_color_set(bg, r * fade, g * fade, b * fade, fade * a); evas_object_color_set(bg, r * fade, g * fade, b * fade, fade * a);
@ -1999,11 +1999,11 @@ _win_alpha_set(Data *pd)
evas_object_color_set(bg, r, g, b, a); evas_object_color_set(bg, r, g, b, a);
} }
if (ui->proc.transparant != pd->transparant) if (ui->proc.transparent != pd->transparent)
{ {
elm_win_alpha_set(win, ui->proc.transparant); elm_win_alpha_set(win, ui->proc.transparent);
} }
pd->transparant = ui->proc.transparant; pd->transparent = ui->proc.transparent;
} }
static Eina_Bool static Eina_Bool