Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/elicit
Dir : e17/apps/elicit/src
Modified Files:
Elicit.h callbacks.c elicit.c
Log Message:
add draggies and support them in the themes.
update spring a tiny bit more (click the plus button).
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/Elicit.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Elicit.h 8 Feb 2004 09:25:59 -0000 1.5
+++ Elicit.h 9 Feb 2004 13:38:53 -0000 1.6
@@ -7,6 +7,7 @@
#include <Ecore_Evas.h>
#include <Ecore_Config.h>
#include <Edje.h>
+#include <Esmart/dragable.h>
#include <X11/Xlib.h>
#include <Imlib2.h>
#include <stdlib.h>
@@ -31,6 +32,7 @@
Evas *evas;
Evas_Object *gui;
+ Evas_Object *draggie;
Evas_Object *shot, *swatch;
struct {
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- callbacks.c 8 Feb 2004 18:25:09 -0000 1.7
+++ callbacks.c 9 Feb 2004 13:38:53 -0000 1.8
@@ -14,15 +14,17 @@
{
int w, h;
double sw, sh;
- Evas_Object *gui, *shot;
+ Evas_Object *gui, *shot, *draggie;
/* keep the gui the same size as the window */
ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
gui = evas_object_name_find(ecore_evas_get(ee), "gui");
shot = evas_object_name_find(ecore_evas_get(ee), "shot");
+ draggie = evas_object_name_find(ecore_evas_get(ee), "draggie");
evas_object_resize(gui, w, h);
+ evas_object_resize(draggie, w, h);
/* keep the shot filling its bounds */
evas_object_geometry_get(shot, NULL, NULL, &sw, &sh);
@@ -145,7 +147,7 @@
{
wstr = arg;
sub = strstr(arg, ",");
- printf("arg: %s :: sub: %s\n", arg, sub);
+ //printf("arg: %s :: sub: %s\n", arg, sub);
sub[0] = '\0';
hstr = sub + 1;
@@ -154,14 +156,14 @@
if (hstr[0] == '+') hoff = 1;
else if (hstr[0] == '-') hoff = -1;
- printf("h: %s, w: %s off:(%d,%d)\n", hstr, wstr, hoff, woff);
+ //printf("h: %s, w: %s off:(%d,%d)\n", hstr, wstr, hoff, woff);
if (woff != 0) wstr = wstr + 1;
if (hoff != 0) hstr = hstr + 1;
- printf("h: %s, w: %s off:(%d,%d)\n", hstr, wstr, hoff, woff);
+ //printf("h: %s, w: %s off:(%d,%d)\n", hstr, wstr, hoff, woff);
w = atoi(wstr);
h = atoi(hstr);
- printf("resize: (%d, %d) (%d, %d)\n", w, h, woff, hoff);
+ //printf("resize: (%d, %d) (%d, %d)\n", w, h, woff, hoff);
ecore_evas_resize(el->ee,
woff ? ow + w * woff : w,
hoff ? oh + h * hoff : h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/elicit.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- elicit.c 8 Feb 2004 09:25:59 -0000 1.8
+++ elicit.c 9 Feb 2004 13:38:53 -0000 1.9
@@ -45,7 +45,6 @@
edje_init();
edje_frametime_set(1.0 / 60.0);
-
/* get the evas from the Ecore_Evas) */
el->evas = ecore_evas_get(el->ee);
@@ -112,6 +111,13 @@
evas_object_name_set(el->swatch, "swatch");
evas_object_show(el->swatch);
+ el->draggie = esmart_draggies_new(el->ee);
+ esmart_draggies_button_set(el->draggie, 1);
+ evas_object_layer_set(el->draggie, -1);
+ evas_object_move(el->draggie, 0, 0);
+ evas_object_name_set(el->draggie, "draggie");
+ evas_object_show(el->draggie);
+
elicit_ui_theme_set(el, elicit_config_theme_get(el), "elicit");
elicit_ui_update_text(el);
return 0;
@@ -129,14 +135,11 @@
return;
}
- printf("theme set\n");
-
/* set the default window size */
edje_object_size_min_get(el->gui, &mw, &mh);
ecore_evas_size_min_set(el->ee, mw, mh);
if (mw != 0 && mh != 0)
{
- printf("resize to: %.2f x %.2f\n", mw, mh);
evas_object_resize(el->gui, mw, mh);
ecore_evas_resize(el->ee, mw, mh);
}
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs