Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_intl.c e_pan.c e_pan.h e_test.c
Added Files:
e_scrollframe.c e_scrollframe.h
Log Message:
a scrollview smart plus gfx for it.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- Makefile.am 28 Oct 2005 13:44:41 -0000 1.71
+++ Makefile.am 29 Oct 2005 11:51:19 -0000 1.72
@@ -106,6 +106,7 @@
e_eap_editor.h \
e_widget_iconsel.h \
e_widget_fileman.h \
+e_scrollframe.h \
e_file_selector.h \
e_file_dialog.h
@@ -194,6 +195,7 @@
e_eap_editor.c \
e_widget_iconsel.c \
e_widget_fileman.c \
+e_scrollframe.c \
e_file_selector.c \
e_file_dialog.c \
$(ENLIGHTENMENTHEADERS)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- e_includes.h 28 Oct 2005 23:37:14 -0000 1.56
+++ e_includes.h 29 Oct 2005 11:51:19 -0000 1.57
@@ -84,6 +84,7 @@
#include "e_thumb.h"
#include "e_int_border_remember.h"
#include "e_eap_editor.h"
+#include "e_scrollframe.h"
#include "e_file_selector.h"
#include "e_file_dialog.h"
#include "e_widget_fileman.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- e_intl.c 23 Oct 2005 12:05:55 -0000 1.50
+++ e_intl.c 29 Oct 2005 11:51:19 -0000 1.51
@@ -85,6 +85,7 @@
ADD_LANG("sk_SK.UTF-8");
ADD_LANG("sv_SV.UTF-8");
ADD_LANG("nb_NO.UTF-8");
+ ADD_LANG("nl_NL.UTF-8");
_e_intl_input_method_config_edd = E_CONFIG_DD_NEW("input_method_config",
E_Input_Method_Config);
E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config,
version, INT);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_pan.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_pan.c 27 Oct 2005 02:44:36 -0000 1.3
+++ e_pan.c 29 Oct 2005 11:51:19 -0000 1.4
@@ -89,13 +89,13 @@
e_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
API_ENTRY return;
- sd->px = x;
- sd->py = y;
- if (x > (sd->w - sd->child_w)) x = sd->w - sd->child_w;
- if (y > (sd->h - sd->child_h)) y = sd->h - sd->child_h;
+ if (x > (sd->child_w - sd->w)) x = sd->child_w - sd->w;
+ if (y > (sd->child_h - sd->h)) y = sd->child_h - sd->h;
if (x < 0) x = 0;
if (y < 0) y = 0;
if ((x == sd->px) && (y == sd->py)) return;
+ sd->px = x;
+ sd->py = y;
_e_smart_reconfigure(sd);
evas_object_smart_callback_call(sd->smart_obj, "changed", NULL);
}
@@ -114,12 +114,12 @@
API_ENTRY return;
if (x)
{
- if (sd->w > sd->child_w) *x = sd->w - sd->child_w;
+ if (sd->w < sd->child_w) *x = sd->child_w - sd->w;
else *x = 0;
}
if (y)
{
- if (sd->h > sd->child_h) *y = sd->h - sd->child_h;
+ if (sd->h < sd->child_h) *y = sd->child_h - sd->h;
else *y = 0;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_pan.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_pan.h 11 Jul 2005 12:31:44 -0000 1.1
+++ e_pan.h 29 Oct 2005 11:51:19 -0000 1.2
@@ -6,15 +6,13 @@
#ifndef E_PAN_H
#define E_PAN_H
-EAPI Evas_Object *e_pan_add(Evas *evas);
-void e_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-void e_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-void e_pan_child_set(Evas_Object *obj, Evas_Object *child);
-Evas_Object *e_pan_child_get(Evas_Object *obj);
-void e_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-void e_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-void e_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
-void e_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+EAPI Evas_Object *e_pan_add (Evas *evas);
+EAPI void e_pan_child_set (Evas_Object *obj, Evas_Object *child);
+EAPI Evas_Object *e_pan_child_get (Evas_Object *obj);
+EAPI void e_pan_set (Evas_Object *obj, Evas_Coord x,
Evas_Coord y);
+EAPI void e_pan_get (Evas_Object *obj, Evas_Coord *x,
Evas_Coord *y);
+EAPI void e_pan_max_get (Evas_Object *obj, Evas_Coord *x,
Evas_Coord *y);
+EAPI void e_pan_child_size_get (Evas_Object *obj, Evas_Coord *w,
Evas_Coord *h);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_test.c 27 Oct 2005 03:31:57 -0000 1.27
+++ e_test.c 29 Oct 2005 11:51:19 -0000 1.28
@@ -307,6 +307,31 @@
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
}
+#elif 0
+static void
+_e_test_internal(E_Container *con)
+{
+ E_Dialog *dia;
+ Evas_Object *o, *o2;
+
+ dia = e_dialog_new(con);
+ e_dialog_title_set(dia, "A Test Dialog");
+
+ o = e_icon_add(dia->win->evas);
+ e_icon_file_set(o, "/home/raster/t.png");
+ evas_object_resize(o, 1024, 768);
+ evas_object_show(o);
+
+ o2 = e_scrollframe_add(dia->win->evas);
+ evas_object_resize(o2, 200, 300);
+ evas_object_show(o2);
+ e_scrollframe_child_set(o2, o);
+
+ e_dialog_content_set(dia, o2, 500, 300);
+ e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+}
#else
static void
_e_test_internal(E_Container *con)
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
