netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=e1e7f92012f5343118d3bb9410e55848bc664bb9
commit e1e7f92012f5343118d3bb9410e55848bc664bb9
Author: Alastair Poole <nets...@gmail.com>
Date: Tue Feb 9 19:10:03 2021 +0000
alpha: Party like it's 2005 !
---
src/bin/evisum_config.c | 2 +
src/bin/evisum_config.h | 26 +++----
src/bin/ui/ui.c | 167 ++++++++++++++++++++++++++++++-------------
src/bin/ui/ui.h | 2 +
src/bin/ui/ui_process_list.c | 53 +++++++++++++-
src/bin/ui/ui_util.c | 8 +--
src/bin/ui/ui_util.h | 2 +-
7 files changed, 191 insertions(+), 69 deletions(-)
diff --git a/src/bin/evisum_config.c b/src/bin/evisum_config.c
index 15e97d1..070eb8b 100644
--- a/src/bin/evisum_config.c
+++ b/src/bin/evisum_config.c
@@ -53,6 +53,8 @@ _config_init()
cfg->version = CONFIG_VERSION;
cfg->proc.poll_delay = 3;
cfg->proc.show_kthreads = 1;
+ cfg->proc.transparant = 0;
+ cfg->proc.alpha = 100;
return cfg;
}
diff --git a/src/bin/evisum_config.h b/src/bin/evisum_config.h
index 897138f..e055779 100644
--- a/src/bin/evisum_config.h
+++ b/src/bin/evisum_config.h
@@ -3,7 +3,7 @@
#include "ui/ui.h"
-#define CONFIG_VERSION 0x000d
+#define CONFIG_VERSION 0x000e
typedef struct _Evisum_Config
{
@@ -14,19 +14,21 @@ typedef struct _Evisum_Config
struct
{
- Evas_Object *win;
- int width;
- int height;
- int x, y;
- Eina_Bool restart;
+ Evas_Object *win;
+ int width;
+ int height;
+ int x, y;
+ Eina_Bool restart;
- Eina_Bool show_kthreads;
- Eina_Bool show_user;
- int sort_type;
- Eina_Bool sort_reverse;
- int poll_delay;
+ Eina_Bool show_kthreads;
+ Eina_Bool show_user;
+ unsigned char sort_type;
+ Eina_Bool sort_reverse;
+ unsigned char poll_delay;
- int show_scroller;
+ Eina_Bool show_scroller;
+ Eina_Bool transparant;
+ unsigned char alpha;
} proc;
struct
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index a9e0c24..c1b66da 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -16,6 +16,8 @@
Evisum_Config *_evisum_config;
int EVISUM_EVENT_CONFIG_CHANGED;
+static Evas_Object *_slider_alpha = NULL;
+
void
evisum_ui_config_save(Ui *ui)
{
@@ -32,7 +34,9 @@ evisum_ui_config_save(Ui *ui)
if ((_evisum_config->proc.poll_delay != ui->proc.poll_delay) ||
(_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.show_scroller != ui->proc.show_scroller) ||
+ (_evisum_config->proc.transparant != ui->proc.transparant) ||
+ (_evisum_config->proc.alpha != ui->proc.alpha)
)
{
notify = 1;
@@ -49,6 +53,8 @@ evisum_ui_config_save(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.alpha = ui->proc.alpha;
proc_info_kthreads_show_set(ui->proc.show_kthreads);
}
@@ -114,6 +120,8 @@ evisum_ui_config_load(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.alpha = _evisum_config->proc.alpha;
ui->proc.width = _evisum_config->proc.width;
ui->proc.height = _evisum_config->proc.height;
@@ -240,13 +248,12 @@ _btn_create(Evas_Object *parent, const char *icon, const
char *text, void *cb,
Evas_Object *btn, *ic;
btn = elm_button_add(parent);
- evas_object_size_hint_weight_set(btn, 0, 0);
+ evas_object_size_hint_weight_set(btn, EXPAND, EXPAND);
evas_object_size_hint_align_set(btn, FILL, FILL);
evas_object_show(btn);
ic = elm_icon_add(btn);
elm_icon_standard_set(ic, evisum_icon_path_get(icon));
- evisum_ui_icon_size_set(ic, ELM_SCALE_SIZE(ICON_SIZE));
evas_object_show(ic);
elm_object_part_content_set(btn, "icon", ic);
@@ -272,6 +279,31 @@ _main_menu_slider_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
evisum_ui_config_save(ui);
}
+static void
+_main_menu_slider_alpha_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ Ui *ui = data;
+
+ ui->proc.alpha = elm_slider_value_get(obj) + 0.5;
+
+ evisum_ui_config_save(ui);
+}
+
+static void
+_main_menu_transparant_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
+ void *event_info EINA_UNUSED)
+{
+ 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);
+
+ evisum_ui_config_save(ui);
+}
+
static void
_main_menu_show_threads_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
@@ -335,7 +367,7 @@ _main_menu_focus_timer_cb(void *data)
Evas_Object *
evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent, Evas_Object *obj)
{
- Evas_Object *o, *bx, *bx2, *tb, *sep, *fr, *sli;
+ Evas_Object *o, *obx, *bx, *tb, *hbx, *sep, *fr, *sli;
Evas_Object *it_focus, *btn, *chk, *rec;
Evas_Coord ox, oy, ow, oh;
int i = 0;
@@ -346,10 +378,10 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
evas_object_size_hint_align_set(o, FILL, FILL);
elm_object_style_set(o, "noblock");
- bx = elm_box_add(o);
- evas_object_size_hint_weight_set(bx, EXPAND, EXPAND);
- evas_object_size_hint_align_set(bx, FILL, FILL);
- evas_object_show(bx);
+ obx = elm_box_add(o);
+ evas_object_size_hint_weight_set(obx, EXPAND, EXPAND);
+ evas_object_size_hint_align_set(obx, FILL, FILL);
+ evas_object_show(obx);
fr = elm_frame_add(o);
elm_object_text_set(fr, _("Actions"));
@@ -357,8 +389,7 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
evas_object_size_hint_align_set(fr, FILL, FILL);
evas_object_show(fr);
- evas_object_size_hint_min_set(fr, 100, 100);
- elm_object_content_set(fr, bx);
+ elm_object_content_set(fr, obx);
elm_object_content_set(o, fr);
tb = elm_table_add(o);
@@ -366,42 +397,42 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
evas_object_size_hint_weight_set(tb, EXPAND, EXPAND);
evas_object_show(tb);
- rec = evas_object_rectangle_add(evas_object_evas_get(bx));
- evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
+ rec = evas_object_rectangle_add(evas_object_evas_get(obx));
+ evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
elm_table_pack(tb, rec, i, 0, 1, 1);
it_focus = btn = _btn_create(tb, "proc", _("Processes"),
_menu_process_view_clicked_cb, ui);
- rec = evas_object_rectangle_add(evas_object_evas_get(bx));
- evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
+ rec = evas_object_rectangle_add(evas_object_evas_get(obx));
+ evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
elm_table_pack(tb, rec, i, 0, 1, 1);
elm_table_pack(tb, btn, i++, 0, 1, 1);
btn = _btn_create(tb, "cpu", _("CPU"),
_menu_cpu_activity_clicked_cb, ui);
- rec = evas_object_rectangle_add(evas_object_evas_get(bx));
- evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
+ rec = evas_object_rectangle_add(evas_object_evas_get(obx));
+ evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
elm_table_pack(tb, rec, i, 0, 1, 1);
elm_table_pack(tb, btn, i++, 0, 1, 1);
btn = _btn_create(tb, "memory", _("Memory"),
_menu_memory_activity_clicked_cb, ui);
- rec = evas_object_rectangle_add(evas_object_evas_get(bx));
- evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
+ rec = evas_object_rectangle_add(evas_object_evas_get(obx));
+ evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
elm_table_pack(tb, rec, i, 0, 1, 1);
elm_table_pack(tb, btn, i++, 0, 1, 1);
btn = _btn_create(tb, "storage", _("Storage"),
_menu_disk_activity_clicked_cb, ui);
- rec = evas_object_rectangle_add(evas_object_evas_get(bx));
- evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
+ rec = evas_object_rectangle_add(evas_object_evas_get(obx));
+ evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
elm_table_pack(tb, rec, i, 0, 1, 1);
elm_table_pack(tb, btn, i++, 0, 1, 1);
btn = _btn_create(tb, "sensor", _("Sensors"),
_menu_sensors_activity_clicked_cb, ui);
- rec = evas_object_rectangle_add(evas_object_evas_get(bx));
- evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
+ rec = evas_object_rectangle_add(evas_object_evas_get(obx));
+ evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
elm_table_pack(tb, rec, i, 0, 1, 1);
elm_table_pack(tb, btn, i++, 0, 1, 1);
@@ -414,8 +445,8 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
btn = _btn_create(tb, "effects", _("Effects"),
_menu_effects_clicked_cb, ui);
- rec = evas_object_rectangle_add(evas_object_evas_get(bx));
- evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
+ rec = evas_object_rectangle_add(evas_object_evas_get(obx));
+ evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
elm_table_pack(tb, rec, i, 0, 1, 1);
elm_table_pack(tb, btn, i++, 0, 1, 1);
@@ -427,12 +458,12 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
elm_table_pack(tb, sep, i++, 0, 1, 1);
btn = _btn_create(tb, "evisum", _("About"), _about_clicked_cb, ui);
- rec = evas_object_rectangle_add(evas_object_evas_get(bx));
- evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(24), ELM_SCALE_SIZE(24));
+ rec = evas_object_rectangle_add(evas_object_evas_get(obx));
+ evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(BTN_HEIGHT),
ELM_SCALE_SIZE(BTN_HEIGHT));
elm_table_pack(tb, rec, i, 0, 1, 1);
elm_table_pack(tb, btn, i++, 0, 1, 1);
- elm_box_pack_end(bx, tb);
+ elm_box_pack_end(obx, tb);
Menu_Inst *inst = calloc(1, sizeof(Menu_Inst));
if (!inst) return NULL;
@@ -456,10 +487,10 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
evas_object_size_hint_align_set(fr, FILL, FILL);
evas_object_show(fr);
- bx2 = elm_box_add(o);
- evas_object_size_hint_weight_set(bx2, EXPAND, EXPAND);
- evas_object_size_hint_align_set(bx2, FILL, FILL);
- evas_object_show(bx2);
+ bx = elm_box_add(o);
+ evas_object_size_hint_weight_set(bx, EXPAND, EXPAND);
+ evas_object_size_hint_align_set(bx, FILL, FILL);
+ evas_object_show(bx);
sli = elm_slider_add(o);
evas_object_size_hint_weight_set(sli, EXPAND, EXPAND);
@@ -477,18 +508,18 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
_main_menu_slider_changed_cb, ui);
evas_object_show(sli);
_main_menu_slider_changed_cb(ui, sli, NULL);
- elm_box_pack_end(bx2, sli);
+ elm_box_pack_end(bx, sli);
- sep = elm_separator_add(bx2);
+ sep = elm_separator_add(bx);
evas_object_size_hint_align_set(sep, FILL, FILL);
evas_object_size_hint_weight_set(sep, EXPAND, EXPAND);
elm_separator_horizontal_set(sep, 1);
evas_object_show(sep);
- elm_box_pack_end(bx2, sep);
+ elm_box_pack_end(bx, sep);
if (ui->proc.has_kthreads)
{
- chk = elm_check_add(bx2);
+ chk = elm_check_add(bx);
evas_object_size_hint_weight_set(chk, EXPAND, EXPAND);
evas_object_size_hint_align_set(chk, FILL, FILL);
elm_object_text_set(chk, _("Show kernel threads?"));
@@ -496,10 +527,10 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
evas_object_show(chk);
evas_object_smart_callback_add(chk, "changed",
_main_menu_show_threads_changed_cb, ui);
- elm_box_pack_end(bx2, chk);
+ elm_box_pack_end(bx, chk);
}
- chk = elm_check_add(bx2);
+ chk = elm_check_add(bx);
evas_object_size_hint_weight_set(chk, EXPAND, EXPAND);
evas_object_size_hint_align_set(chk, FILL, FILL);
elm_object_text_set(chk, _("User only?"));
@@ -507,16 +538,23 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
evas_object_show(chk);
evas_object_smart_callback_add(chk, "changed",
_main_menu_show_user_changed_cb, ui);
- elm_box_pack_end(bx2, chk);
+ elm_box_pack_end(bx, chk);
- sep = elm_separator_add(bx2);
- evas_object_size_hint_align_set(sep, FILL, FILL);
- evas_object_size_hint_weight_set(sep, EXPAND, EXPAND);
- elm_separator_horizontal_set(sep, 1);
- evas_object_show(sep);
- elm_box_pack_end(bx2, sep);
+ elm_object_content_set(fr, bx);
+ elm_box_pack_end(obx, fr);
+
+ fr = elm_frame_add(o);
+ elm_object_text_set(fr, _("Display"));
+ evas_object_size_hint_weight_set(fr, EXPAND, EXPAND);
+ evas_object_size_hint_align_set(fr, FILL, FILL);
+ evas_object_show(fr);
+
+ bx = elm_box_add(o);
+ evas_object_size_hint_weight_set(bx, EXPAND, EXPAND);
+ evas_object_size_hint_align_set(bx, FILL, FILL);
+ evas_object_show(bx);
- chk = elm_check_add(bx2);
+ chk = elm_check_add(bx);
evas_object_size_hint_weight_set(chk, EXPAND, EXPAND);
evas_object_size_hint_align_set(chk, FILL, FILL);
elm_object_text_set(chk, _("Display scroll bar?"));
@@ -524,10 +562,43 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent,
Evas_Object *obj)
evas_object_show(chk);
evas_object_smart_callback_add(chk, "changed",
_main_menu_show_scroller_changed_cb, ui);
- elm_box_pack_end(bx2, chk);
+ elm_box_pack_end(bx, chk);
+
+ hbx = elm_box_add(o);
+ evas_object_size_hint_weight_set(hbx, EXPAND, 0);
+ elm_box_horizontal_set(hbx, 1);
+ evas_object_show(hbx);
+
+ chk = elm_check_add(bx);
+ 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);
+ evas_object_show(chk);
+ evas_object_smart_callback_add(chk, "changed",
+ _main_menu_transparant_changed_cb, ui);
+ elm_box_pack_end(hbx, chk);
+
+ _slider_alpha = sli = elm_slider_add(o);
+ evas_object_size_hint_weight_set(sli, EXPAND, EXPAND);
+ elm_slider_min_max_set(sli, 25.0, 100.0);
+ elm_slider_span_size_set(sli, 100.0);
+ elm_slider_step_set(sli, 1 / 100.0);
+ elm_slider_unit_format_set(sli, _("%1.0f %%"));
+ 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);
+ evas_object_smart_callback_add(sli, "slider,drag,stop",
+ _main_menu_slider_alpha_changed_cb, ui);
+ evas_object_smart_callback_add(sli, "changed",
+ _main_menu_slider_alpha_changed_cb, ui);
+ evas_object_show(sli);
+ elm_box_pack_end(hbx, sli);
+ elm_box_pack_end(bx, hbx);
+ elm_object_content_set(fr, bx);
- elm_object_content_set(fr, bx2);
- elm_box_pack_end(bx, fr);
+ elm_box_pack_end(obx, fr);
return o;
}
diff --git a/src/bin/ui/ui.h b/src/bin/ui/ui.h
index 2d5585e..33d792d 100644
--- a/src/bin/ui/ui.h
+++ b/src/bin/ui/ui.h
@@ -38,6 +38,8 @@ typedef struct Ui
Eina_Bool show_kthreads;
Eina_Bool show_user;
+ unsigned char alpha;
+ Eina_Bool transparant;
Eina_Bool show_scroller;
} proc;
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index 4825c2e..f289049 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -40,6 +40,7 @@ typedef struct
Evas_Object *win;
Evas_Object *main_menu;
Evas_Object *menu;
+ Eina_Bool transparant;
struct
{
@@ -52,6 +53,8 @@ typedef struct
double keytime;
} search;
+ Evas_Object *content;
+
Evas_Object *genlist;
Elm_Genlist_Item_Class itc;
@@ -1436,6 +1439,7 @@ _search_empty_cb(void *data)
if (!pd->search.len)
{
evas_object_lower(pd->search.pop);
+ evas_object_hide(pd->search.pop);
elm_object_focus_allow_set(pd->search.entry, 0);
pd->search.visible = 0;
pd->search.timer = NULL;
@@ -1533,6 +1537,7 @@ _win_key_down_search(Ui_Data *pd, Evas_Event_Key_Down *ev)
pd->skip_wait = 0;
elm_object_focus_allow_set(pd->search.entry, 0);
evas_object_lower(pd->search.pop);
+ evas_object_hide(pd->search.pop);
pd->search.visible = 0;
}
else if (ev->string && strcmp(ev->keyname, "BackSpace"))
@@ -1623,6 +1628,45 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
&ui->proc.width, &ui->proc.height);
}
+static void
+_win_alpha_set(Ui_Data *pd)
+{
+ Evas_Object *bg, *win;
+ Ui *ui;
+ int r, g, b, a;
+ double fade;
+
+ win = pd->win;
+ ui = pd->ui;
+
+ bg = evas_object_data_get(win, "bg");
+ if (!bg) return;
+
+ fade = ui->proc.alpha / 100.0;
+
+ // FIXME: Base window colour from theme.
+ if (ui->proc.transparant)
+ {
+ r = b = g = 128; a = 255;
+ evas_object_color_set(bg, r * fade, g * fade, b * fade, fade * a);
+ r = b = g = a = 255;
+ evas_object_color_set(pd->content, r * fade, g * fade, b * fade, fade
* a);
+ }
+ else
+ {
+ r = b = g = a = 255;
+ evas_object_color_set(pd->content, r, g, b, a);
+ r = b = g = 128; a = 255;
+ evas_object_color_set(bg, r, g, b, a);
+ }
+
+ if (ui->proc.transparant != pd->transparant)
+ {
+ elm_win_alpha_set(win, ui->proc.transparant);
+ }
+ pd->transparant = ui->proc.transparant;
+}
+
static Eina_Bool
_evisum_config_changed_cb(void *data, int type EINA_UNUSED,
void *event EINA_UNUSED)
@@ -1648,6 +1692,8 @@ _evisum_config_changed_cb(void *data, int type
EINA_UNUSED,
ELM_SCROLLER_POLICY_OFF));
pd->skip_wait = 1;
+ _win_alpha_set(pd);
+
return 1;
}
@@ -1744,13 +1790,13 @@ ui_process_list_win_add(Ui *ui)
_evisum_config_changed_cb, pd);
_init(pd);
- ui->proc.win = pd->win = win = elm_win_util_standard_add("evisum",
"evisum");
+ ui->proc.win = pd->win = win = elm_win_add(NULL, "evisum", ELM_WIN_BASIC);
elm_win_autodel_set(win, 1);
elm_win_title_set(win, _("Process Explorer"));
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "evisum");
elm_win_icon_object_set(win, icon);
- evisum_ui_background_add(win, evisum_ui_backgrounds_enabled_get());
+ evisum_ui_background_add(win);
if (ui->proc.width > 1 && ui->proc.height > 1)
evas_object_resize(win, ui->proc.width, ui->proc.height);
@@ -1763,7 +1809,7 @@ ui_process_list_win_add(Ui *ui)
else
elm_win_center(win, 1, 1);
- obj = _ui_content_system_add(pd, win);
+ pd->content = obj = _ui_content_system_add(pd, win);
elm_object_content_set(win, obj);
_search_add(pd);
@@ -1778,6 +1824,7 @@ ui_process_list_win_add(Ui *ui)
_win_move_cb, pd);
evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN,
_win_key_down_cb, pd);
+ _win_alpha_set(pd);
evas_object_show(win);
_win_resize_cb(pd, NULL, win, NULL);
diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c
index e62519d..ccb0491 100644
--- a/src/bin/ui/ui_util.c
+++ b/src/bin/ui/ui_util.c
@@ -593,6 +593,7 @@ evisum_ui_background_random_add(Evas_Object *win, Eina_Bool
enabled)
elm_bg_file_set(bg, evisum_image_path_get(images[i]), NULL);
evas_object_size_hint_align_set(bg, FILL, FILL);
evas_object_size_hint_weight_set(bg, EXPAND, EXPAND);
+ evas_object_data_set(win, "bg", bg);
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
@@ -600,17 +601,14 @@ evisum_ui_background_random_add(Evas_Object *win,
Eina_Bool enabled)
}
Evas_Object *
-evisum_ui_background_add(Evas_Object *win, Eina_Bool enabled)
+evisum_ui_background_add(Evas_Object *win)
{
Evas_Object *bg;
- if (!enabled) return NULL;
-
bg = elm_bg_add(win);
- elm_bg_file_set(bg, evisum_image_path_get("sky_04"), NULL);
- evas_object_size_hint_align_set(bg, FILL, FILL);
evas_object_size_hint_weight_set(bg, EXPAND, EXPAND);
elm_win_resize_object_add(win, bg);
+ evas_object_data_set(win, "bg", bg);
evas_object_show(bg);
return bg;
diff --git a/src/bin/ui/ui_util.h b/src/bin/ui/ui_util.h
index d95c1c2..4281917 100644
--- a/src/bin/ui/ui_util.h
+++ b/src/bin/ui/ui_util.h
@@ -47,7 +47,7 @@ const char *
evisum_image_path_get(const char *name);
Evas_Object *
-evisum_ui_background_add(Evas_Object *win, Eina_Bool enabled);
+evisum_ui_background_add(Evas_Object *win);
Evas_Object *
evisum_ui_background_random_add(Evas_Object *win, Eina_Bool enabled);
--
