summaryrefslogtreecommitdiff
path: root/src/bin/options_font.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-10-22 02:12:55 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-10-22 02:12:55 +0000
commit2c18ec8ba2c0543b9cf5d85e14861925545f2228 (patch)
tree1a40b1e396a95ed7d7d8c367551960a68f63a7a9 /src/bin/options_font.c
parent162d965bec4caefa3c80f0177f7e24c8777813f1 (diff)
revert! broke terminology build completely.
SVN revision: 78312
Diffstat (limited to 'src/bin/options_font.c')
-rw-r--r--src/bin/options_font.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/bin/options_font.c b/src/bin/options_font.c
index 908a7cc..af578a0 100644
--- a/src/bin/options_font.c
+++ b/src/bin/options_font.c
@@ -7,8 +7,6 @@
7#include "options_font.h" 7#include "options_font.h"
8#include "utils.h" 8#include "utils.h"
9 9
10#include "fontpreview_generated.h"
11
12#define TEST_STRING "oislOIS.015!|," 10#define TEST_STRING "oislOIS.015!|,"
13 11
14static Evas_Object *op_fontslider, *op_fontlist, *op_fsml, *op_fbig; 12static Evas_Object *op_fontslider, *op_fontlist, *op_fsml, *op_fbig;
@@ -86,7 +84,7 @@ static void
86_cb_op_font_preview_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__) 84_cb_op_font_preview_del(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event __UNUSED__)
87{ 85{
88 Evas_Object *o; 86 Evas_Object *o;
89 o = fontpreview_text_preview_get(obj); 87 o = edje_object_part_swallow_get(obj, "terminology.text.preview");
90 if (o) evas_object_del(o); 88 if (o) evas_object_del(o);
91} 89}
92 90
@@ -100,7 +98,7 @@ _cb_op_font_preview_eval(void *data, Evas *e __UNUSED__, Evas_Object *obj, void
100 char buf[4096]; 98 char buf[4096];
101 99
102 if (!evas_object_visible_get(obj)) return; 100 if (!evas_object_visible_get(obj)) return;
103 if (fontpreview_text_preview_get(obj)) return; 101 if (edje_object_part_swallow_get(obj, "terminology.text.preview")) return;
104 evas_object_geometry_get(obj, &ox, &oy, &ow, &oh); 102 evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
105 if ((ow < 2) || (oh < 2)) return; 103 if ((ow < 2) || (oh < 2)) return;
106 evas_output_viewport_get(evas_object_evas_get(obj), &vx, &vy, &vw, &vh); 104 evas_output_viewport_get(evas_object_evas_get(obj), &vx, &vy, &vw, &vh);
@@ -120,7 +118,7 @@ _cb_op_font_preview_eval(void *data, Evas *e __UNUSED__, Evas_Object *obj, void
120 evas_object_text_font_set(o, f->name, config->font.size); 118 evas_object_text_font_set(o, f->name, config->font.size);
121 evas_object_geometry_get(o, NULL, NULL, &ow, &oh); 119 evas_object_geometry_get(o, NULL, NULL, &ow, &oh);
122 evas_object_size_hint_min_set(o, ow, oh); 120 evas_object_size_hint_min_set(o, ow, oh);
123 fontpreview_text_preview_set(obj, o); 121 edje_object_part_swallow(obj, "terminology.text.preview", o);
124 } 122 }
125} 123}
126 124
@@ -191,6 +189,7 @@ _cb_font_del(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
191 evas_object_event_callback_del_full(term, EVAS_CALLBACK_RESIZE, 189 evas_object_event_callback_del_full(term, EVAS_CALLBACK_RESIZE,
192 _cb_term_resize, term); 190 _cb_term_resize, term);
193} 191}
192
194void 193void
195options_font_clear(void) 194options_font_clear(void)
196{ 195{