enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

font selector: use bg/fg for the preview from config/theme

This commit is contained in:
Boris Faure 2015-03-01 17:17:56 +01:00
parent 4d7708a0f1
commit 65d729ce32
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/themes/default.edc
View File

@ -4404,7 +4404,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
part { name: "base"; type: RECT;
mouse_events: 1;
description { state: "default" 0.0;
color: 255 255 255 255;
color: BG_COL;
rel1.offset: 2 2;
rel2.offset: -3 -3;
}
@ -4415,7 +4415,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
rel2.to: "base";
color: 255 255 255 255;
}
}
}
part { name: "terminology.text.preview"; type: SWALLOW;
clip_to: "clip";
description { state: "default" 0.0;

12
src/bin/options_font.c
View File

@ -204,9 +204,15 @@ _cb_op_font_preview_delayed_eval(void *data)
if (ELM_RECTS_INTERSECT(ox, oy, ow, oh, vx, vy, vw, vh))
{
char buf[4096];
o = evas_object_text_add(evas_object_evas_get(obj));
evas_object_color_set(o, 0, 0, 0, 255);
int r, g, b, a;
Evas *evas = evas_object_evas_get(obj);
Evas_Object *textgrid = termio_textgrid_get(f->term);
evas_object_textgrid_palette_get(textgrid, EVAS_TEXTGRID_PALETTE_STANDARD,
0, &r, &g, &b, &a);
o = evas_object_text_add(evas);
evas_object_color_set(o, r, g, b, a);
evas_object_text_text_set(o, TEST_STRING);
evas_object_scale_set(o, elm_config_scale_get());
if (f->bitmap)