summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-12-09 14:46:49 +0000
committerTom Hacohen <tom@stosb.com>2015-01-14 08:45:41 +0000
commita2b1ca9b23ff4e7bb578f466e188098c76ae84c8 (patch)
treea87c6759ff5e69cc4aa09f37f53e4a0d3ac89771
parente516526dcd74024ea4ae84ba1ac50e6cfafecfe9 (diff)
downloadefl-a2b1ca9b23ff4e7bb578f466e188098c76ae84c8.tar.gz
Remove redundant code.
-rw-r--r--src/lib/evas/canvas/evas_textblock2.c47
1 files changed, 7 insertions, 40 deletions
diff --git a/src/lib/evas/canvas/evas_textblock2.c b/src/lib/evas/canvas/evas_textblock2.c
index f81a94dffd..518f5ceba4 100644
--- a/src/lib/evas/canvas/evas_textblock2.c
+++ b/src/lib/evas/canvas/evas_textblock2.c
@@ -3545,32 +3545,6 @@ _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock2_Format *fmt)
if (of) evas_font_free(obj->layer->evas->evas, of);
}
-/**
- * @internal
- * Returns true if the item is a tab
- * @def _IS_TAB(item)
- */
-#define _IS_TAB(item) 0
-/**
- * @internal
- * Returns true if the item is a line spearator, false otherwise
- * @def _IS_LINE_SEPARATOR(item)
- */
-#define _IS_LINE_SEPARATOR(item) 0
-/**
- * @internal
- * Returns true if the item is a paragraph separator, false otherwise
- * @def _IS_PARAGRAPH_SEPARATOR(item)
- */
-#define _IS_PARAGRAPH_SEPARATOR_SIMPLE(item) 0
-/**
- * @internal
- * Returns true if the item is a paragraph separator, false otherwise
- * takes legacy mode into account.
- * @def _IS_PARAGRAPH_SEPARATOR(item)
- */
-#define _IS_PARAGRAPH_SEPARATOR(o, item) 0
-
static void
_layout_update_par(Ctxt *c)
{
@@ -6226,25 +6200,18 @@ _evas_textblock2_cursor_char_pen_geometry_common_get(int (*query_func) (void *da
{
if (previous_format)
{
- if (_IS_LINE_SEPARATOR(fi->item))
+#ifdef BIDI_SUPPORT
+ if (ln->par->direction == EVAS_BIDI_DIRECTION_RTL)
{
- x = 0;
- y = ln->par->y + ln->y + ln->h;
+ x = ln->x;
}
else
- {
-#ifdef BIDI_SUPPORT
- if (ln->par->direction == EVAS_BIDI_DIRECTION_RTL)
- {
- x = ln->x;
- }
- else
#endif
- {
- x = ln->x + ln->w;
- }
- y = ln->par->y + ln->y;
+ {
+ x = ln->x + ln->w;
}
+ y = ln->par->y + ln->y;
+
w = 0;
h = ln->h;
}