forked from enlightenment/efl
efl_ui/text: handle disabled text
no idea what's going on here with new styling but this makes it look like it should ref T6649 Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D9502
This commit is contained in:
parent
8f8e19df20
commit
067d65361e
|
@ -522,6 +522,7 @@ group { "efl/text";
|
||||||
item: "font.name" "Sans";
|
item: "font.name" "Sans";
|
||||||
item: "font.size" "10";
|
item: "font.size" "10";
|
||||||
item: "style.color" "#fff";
|
item: "style.color" "#fff";
|
||||||
|
item: "style.color_disabled" "#151515";
|
||||||
|
|
||||||
item: "guide.font.name" "Sans";
|
item: "guide.font.name" "Sans";
|
||||||
item: "guide.font.size" "10";
|
item: "guide.font.size" "10";
|
||||||
|
|
|
@ -249,6 +249,7 @@ static void _clear_text_selection(Efl_Ui_Text_Data *sd);
|
||||||
static void _anchors_free(Efl_Ui_Text_Data *sd);
|
static void _anchors_free(Efl_Ui_Text_Data *sd);
|
||||||
static void _selection_defer(Eo *obj, Efl_Ui_Text_Data *sd);
|
static void _selection_defer(Eo *obj, Efl_Ui_Text_Data *sd);
|
||||||
static Eina_Position2D _decoration_calc_offset(Efl_Ui_Text_Data *sd);
|
static Eina_Position2D _decoration_calc_offset(Efl_Ui_Text_Data *sd);
|
||||||
|
static void _update_text_theme(Eo *obj, Efl_Ui_Text_Data *sd);
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
_file_load(Eo *obj)
|
_file_load(Eo *obj)
|
||||||
|
@ -729,6 +730,7 @@ _efl_ui_text_efl_ui_widget_disabled_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool
|
||||||
_dnd_pos_cb, NULL,
|
_dnd_pos_cb, NULL,
|
||||||
_dnd_drop_cb, NULL);
|
_dnd_drop_cb, NULL);
|
||||||
}
|
}
|
||||||
|
_update_text_theme(obj, sd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* we can't issue the layout's theming code here, cause it assumes an
|
/* we can't issue the layout's theming code here, cause it assumes an
|
||||||
|
@ -2054,12 +2056,14 @@ _update_text_theme(Eo *obj, Efl_Ui_Text_Data *sd)
|
||||||
{
|
{
|
||||||
const char *font_name;
|
const char *font_name;
|
||||||
const char *font_size;
|
const char *font_size;
|
||||||
const char *colorcode;
|
const char *colorcode = NULL;
|
||||||
|
Eina_Bool disabled;
|
||||||
|
|
||||||
int font_size_n;
|
int font_size_n;
|
||||||
unsigned char r, g, b, a;
|
unsigned char r, g, b, a;
|
||||||
|
|
||||||
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
|
||||||
|
disabled = efl_ui_widget_disabled_get(obj);
|
||||||
|
|
||||||
// Main Text
|
// Main Text
|
||||||
// font_set
|
// font_set
|
||||||
|
@ -2069,6 +2073,9 @@ _update_text_theme(Eo *obj, Efl_Ui_Text_Data *sd)
|
||||||
efl_text_font_set(sd->text_obj, font_name, font_size_n);
|
efl_text_font_set(sd->text_obj, font_name, font_size_n);
|
||||||
|
|
||||||
// color
|
// color
|
||||||
|
if (disabled)
|
||||||
|
colorcode = edje_object_data_get(wd->resize_obj, "style.color_disabled");
|
||||||
|
if (!colorcode)
|
||||||
colorcode = edje_object_data_get(wd->resize_obj, "style.color");
|
colorcode = edje_object_data_get(wd->resize_obj, "style.color");
|
||||||
if (colorcode && _format_color_parse(colorcode, strlen(colorcode), &r, &g, &b, &a))
|
if (colorcode && _format_color_parse(colorcode, strlen(colorcode), &r, &g, &b, &a))
|
||||||
{
|
{
|
||||||
|
@ -2081,7 +2088,11 @@ _update_text_theme(Eo *obj, Efl_Ui_Text_Data *sd)
|
||||||
font_size_n = font_size ? atoi(font_size) : 0;
|
font_size_n = font_size ? atoi(font_size) : 0;
|
||||||
efl_text_font_set(sd->text_guide_obj, font_name, font_size_n);
|
efl_text_font_set(sd->text_guide_obj, font_name, font_size_n);
|
||||||
|
|
||||||
|
colorcode = NULL;
|
||||||
// color
|
// color
|
||||||
|
if (disabled)
|
||||||
|
colorcode = edje_object_data_get(wd->resize_obj, "guide.style.color_disabled");
|
||||||
|
if (!colorcode)
|
||||||
colorcode = edje_object_data_get(wd->resize_obj, "guide.style.color");
|
colorcode = edje_object_data_get(wd->resize_obj, "guide.style.color");
|
||||||
if (colorcode && _format_color_parse(colorcode, strlen(colorcode), &r, &g, &b, &a))
|
if (colorcode && _format_color_parse(colorcode, strlen(colorcode), &r, &g, &b, &a))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue