Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/etox
Dir : e17/libs/etox/src/style
Modified Files:
etox_style_private.h etox_style_style.h
Log Message:
Fix up comparison for approving merger of styles on a line.
Change the initial length of the line to not include \n unless another line
follows.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/style/etox_style_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etox_style_private.h 6 May 2004 05:17:52 -0000 1.1
+++ etox_style_private.h 7 Oct 2004 17:48:03 -0000 1.2
@@ -16,7 +16,8 @@
#include <Edb.h>
typedef enum _etox_style_bit_flags Etox_Style_Bit_Flags;
-enum _etox_style_bit_flags {
+enum _etox_style_bit_flags
+{
ETOX_STYLE_BIT_FIXED = 1,
ETOX_STYLE_BIT_VISIBLE = 2,
};
@@ -25,14 +26,16 @@
void *event_info);
typedef struct _etox_style_callback Etox_Style_Callback;
-struct _etox_style_callback {
+struct _etox_style_callback
+{
Evas_Object *obj;
Evas_Callback_Type type;
void *data;
Etox_Style_Callback_Function callback;
};
-struct _etox_style {
+struct _etox_style
+{
/*
* Keep a pointer in the etox_style to the evas.
*/
@@ -102,7 +105,13 @@
#define D2I_ROUND(d) (int)(d + 0.5)
#define BIT_MERGEABLE(es1, es2) (es1 && es2 && \
!(es1->flags & ETOX_STYLE_BIT_FIXED) && \
- !(es2->flags & ETOX_STYLE_BIT_FIXED) && es1 != es2)
+ !(es2->flags & ETOX_STYLE_BIT_FIXED) && es1 != es2) && \
+ (es1->color->a == es2->color->a) && \
+ (es1->color->r == es2->color->r) && \
+ (es1->color->g == es2->color->g) && \
+ (es1->color->b == es2->color->b) && \
+ (es1->style) && (es2->style) && \
+ !(strcmp(es1->style->info->name, es2->style->info->name))
void etox_style_free(Evas_Object *obj);
void etox_style_show(Evas_Object *obj);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/style/etox_style_style.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etox_style_style.h 29 Jul 2004 19:46:40 -0000 1.2
+++ etox_style_style.h 7 Oct 2004 17:48:03 -0000 1.3
@@ -7,7 +7,8 @@
* of the bits appearance.
*/
typedef struct _etox_style_style_layer Etox_Style_Style_Layer;
-struct _etox_style_style_layer {
+struct _etox_style_style_layer
+{
int stack;
Evas_Coord x_offset, y_offset;
int size_change;
@@ -22,7 +23,8 @@
* the bits used to display the text.
*/
typedef struct _etox_style_style_info Etox_Style_Style_Info;
-struct _etox_style_style_info {
+struct _etox_style_style_info
+{
char *name;
E_DB_File *style_db;
Etox_Style_Heap *layers;
@@ -36,7 +38,8 @@
* alter the text, and a list of the bits that are created by the style.
*/
typedef struct _etox_style_style Etox_Style_Style;
-struct _etox_style_style {
+struct _etox_style_style
+{
Etox_Style_Style_Info *info;
Evas_List *bits;
};
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
