Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_text.c
Log Message:
- move the obscure check into the callback itself
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- ewl_text.c 24 Nov 2005 11:40:36 -0000 1.62
+++ ewl_text.c 24 Nov 2005 15:13:56 -0000 1.63
@@ -451,7 +451,7 @@
if (text) ewl_text_triggers_shift(t, idx, strlen(text));
else ewl_text_triggers_remove(t);
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
ewl_callback_call(EWL_WIDGET(t), EWL_CALLBACK_VALUE_CHANGED);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -512,7 +512,7 @@
if (t->cursor_position > t->length)
t->cursor_position = t->length;
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
ewl_callback_call(EWL_WIDGET(t), EWL_CALLBACK_VALUE_CHANGED);
@@ -856,8 +856,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_FONT,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -934,8 +933,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_SIZE,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1024,8 +1022,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_COLOR,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1110,8 +1107,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_ALIGN,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1183,8 +1179,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_STYLES,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1256,8 +1251,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_WRAP,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1346,8 +1340,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_BG_COLOR,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1449,8 +1442,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_GLOW_COLOR,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1552,8 +1544,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_OUTLINE_COLOR,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1655,8 +1646,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_SHADOW_COLOR,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1758,8 +1748,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_STRIKETHROUGH_COLOR,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1861,8 +1850,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_UNDERLINE_COLOR,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1964,8 +1952,7 @@
ewl_text_tree_context_apply(t->formatting, tx,
EWL_TEXT_CONTEXT_MASK_DOUBLE_UNDERLINE_COLOR,
t->cursor_position,
length);
ewl_text_context_release(tx);
-
- if (!OBSCURED(EWL_WIDGET(t))) ewl_widget_configure(EWL_WIDGET(t));
+ ewl_widget_configure(EWL_WIDGET(t));
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -2636,6 +2623,9 @@
DCHECK_PARAM_PTR("w", w);
DCHECK_TYPE("w", w, "widget");
+ /* don't do anything if we're obscured */
+ if (OBSCURED(w)) DRETURN(DLEVEL_STABLE);
+
t = EWL_TEXT(w);
xx = CURRENT_X(w);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
