Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_entry.c ewl_entry.h
Log Message:
A little more work on the entry code.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- ewl_entry.c 4 Jun 2003 01:46:44 -0000 1.57
+++ ewl_entry.c 7 Jun 2003 15:38:20 -0000 1.58
@@ -214,7 +214,8 @@
/*
* First position the text to a known base position.
*/
- ewl_object_request_geometry(EWL_OBJECT(e->text), xx, yy, ww, hh);
+ ewl_object_request_geometry(EWL_OBJECT(e->text), xx - e->offset, yy,
+ ww, hh);
str = ewl_text_get_text(EWL_TEXT(e->text));
c_spos = ewl_cursor_get_start_position(EWL_CURSOR(e->cursor));
@@ -237,30 +238,31 @@
ewl_text_get_letter_geometry(EWL_TEXT(e->text), --c_epos, &ex,
&ey, &ew, NULL);
base--;
-
- ew = (ex + ew);
}
/*
* Scroll the text to fit the contents.
*/
- if ((c_spos == base) && (ew > (int)(xx + ww))) {
- xx -= (ex + ew) - (xx + ww);
-
- ewl_object_request_geometry(EWL_OBJECT(e->text), xx,
- CURRENT_Y(e), CURRENT_W(e), hh);
- printf("Scrolling text to (%d, %d) dimensions %d x %d\n",
- CURRENT_X(e->text), CURRENT_Y(e->text),
- CURRENT_W(e->text), CURRENT_H(e->text));
+ if ((c_spos == base) && ((ex + ew) > (int)(xx + ww))) {
+ /*
+ * Calculation re-ordered to maintain precision
+ */
+ e->offset += (int)((ex + ew) - (xx + ww));
+ printf("Scrolling text by %d\n", e->offset);
}
else if ((c_epos == base) && (sx < xx)) {
- xx -= sx;
+ e->offset -= xx - sx;
+ }
+
+ if (e->offset < 0)
+ e->offset = 0;
- ewl_object_request_geometry(EWL_OBJECT(e->text), xx,
+ ew = (ex + ew);
+ ewl_object_request_geometry(EWL_OBJECT(e->text), xx - e->offset,
CURRENT_Y(e), CURRENT_W(e), hh);
- }
- ewl_object_request_geometry(EWL_OBJECT(e->cursor), sx, yy, ew - sx, hh);
+ ewl_object_request_geometry(EWL_OBJECT(e->cursor), sx, yy,
+ ew - sx, hh);
FREE(str);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_entry.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_entry.h 23 May 2003 22:10:15 -0000 1.20
+++ ewl_entry.h 7 Jun 2003 15:38:20 -0000 1.21
@@ -12,6 +12,7 @@
Ewl_Widget *text;
Ewl_Widget *cursor;
+ int offset;
int editable;
};
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The best
thread debugger on the planet. Designed with thread debugging features
you've never dreamed of, try TotalView 6 free at www.etnus.com.
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs