From 1fe4d0312d3114d24b9de6f539881811e51a1096 Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Thu, 11 Mar 2021 20:41:47 +0000 Subject: [PATCH] alpha: transparent --- src/bin/evisum_config.c | 2 +- src/bin/evisum_config.h | 2 +- src/bin/ui/evisum_ui.c | 18 +++++++++--------- src/bin/ui/evisum_ui.h | 2 +- src/bin/ui/ui_process_list.c | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/bin/evisum_config.c b/src/bin/evisum_config.c index b4c9a9a..7b8f7ca 100644 --- a/src/bin/evisum_config.c +++ b/src/bin/evisum_config.c @@ -53,7 +53,7 @@ _config_init() cfg->version = CONFIG_VERSION; cfg->proc.poll_delay = 3; cfg->proc.show_kthreads = 1; - cfg->proc.transparant = 0; + cfg->proc.transparent = 0; cfg->proc.fields = 0xffffffff; cfg->proc.alpha = 100; diff --git a/src/bin/evisum_config.h b/src/bin/evisum_config.h index 9a35feb..d11a404 100644 --- a/src/bin/evisum_config.h +++ b/src/bin/evisum_config.h @@ -28,7 +28,7 @@ typedef struct _Evisum_Config unsigned int fields; Eina_Bool show_scroller; - Eina_Bool transparant; + Eina_Bool transparent; unsigned char alpha; } proc; diff --git a/src/bin/ui/evisum_ui.c b/src/bin/ui/evisum_ui.c index 338dd48..27dc128 100644 --- a/src/bin/ui/evisum_ui.c +++ b/src/bin/ui/evisum_ui.c @@ -35,7 +35,7 @@ evisum_ui_config_save(Evisum_Ui *ui) (_evisum_config->proc.show_kthreads != ui->proc.show_kthreads) || (_evisum_config->proc.show_user != ui->proc.show_user) || (_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) ) { @@ -53,7 +53,7 @@ evisum_ui_config_save(Evisum_Ui *ui) _evisum_config->proc.show_kthreads = ui->proc.show_kthreads; _evisum_config->proc.show_user = ui->proc.show_user; _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.fields = ui->proc.fields; 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); ui->proc.show_user = _evisum_config->proc.show_user; 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.width = _evisum_config->proc.width; @@ -309,15 +309,15 @@ _main_menu_slider_alpha_changed_cb(void *data EINA_UNUSED, Evas_Object *obj, } 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) { Evisum_Ui *ui = data; if (!ui->proc.alpha) return; - ui->proc.transparant = elm_check_state_get(obj); - elm_object_disabled_set(_slider_alpha, !ui->proc.transparant); + ui->proc.transparent = elm_check_state_get(obj); + elm_object_disabled_set(_slider_alpha, !ui->proc.transparent); 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_align_set(chk, FILL, FILL); 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_smart_callback_add(chk, "changed", - _main_menu_transparant_changed_cb, ui); + _main_menu_transparent_changed_cb, ui); elm_box_pack_end(hbx, chk); _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_value_set(sli, ui->proc.alpha); 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", _main_menu_slider_alpha_changed_cb, ui); evas_object_smart_callback_add(sli, "changed", diff --git a/src/bin/ui/evisum_ui.h b/src/bin/ui/evisum_ui.h index 7370c18..0ef567c 100644 --- a/src/bin/ui/evisum_ui.h +++ b/src/bin/ui/evisum_ui.h @@ -40,7 +40,7 @@ typedef struct _Evisum_Ui Eina_Bool show_user; unsigned char alpha; - Eina_Bool transparant; + Eina_Bool transparent; Eina_Bool show_scroller; } proc; diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c index 4b81107..e7d1d2f 100644 --- a/src/bin/ui/ui_process_list.c +++ b/src/bin/ui/ui_process_list.c @@ -38,7 +38,7 @@ typedef struct Evas_Object *main_menu; Ecore_Timer *main_menu_timer; Evas_Object *menu; - Eina_Bool transparant; + Eina_Bool transparent; struct { @@ -1984,7 +1984,7 @@ _win_alpha_set(Data *pd) fade = ui->proc.alpha / 100.0; // FIXME: Base window colour from theme. - if (ui->proc.transparant) + if (ui->proc.transparent) { r = b = g = 128; a = 255; 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); } - 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