Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas
Modified Files:
Etk_Engine_Ecore_Evas.h ecore_evas.c
Log Message:
* Add a FB engine for ETK. It's disabled in the configure.in for now
because it uses for now Ecore_LI which is not on the CVS (should be
merged with Ecore_FB). The engine is far from being complete
* Fix a bug with etk_embed widgets that have menu bars or combobox.
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/Etk_Engine_Ecore_Evas.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Etk_Engine_Ecore_Evas.h 28 Jul 2006 00:57:05 -0000 1.2
+++ Etk_Engine_Ecore_Evas.h 30 Jul 2006 21:09:32 -0000 1.3
@@ -1,6 +1,8 @@
#ifndef _ETK_ENGINE_ECORE_EVAS_H
#define _ETK_ENGINE_ECORE_EVAS_H
+#include <Ecore_Evas.h>
+
#define ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(data)
((Etk_Engine_Ecore_Evas_Window_Data*)data)
/* Engine specific data for Etk_Window */
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_evas.c 28 Jul 2006 02:13:06 -0000 1.7
+++ ecore_evas.c 30 Jul 2006 21:09:32 -0000 1.8
@@ -27,7 +27,9 @@
static void _window_move(Etk_Window *window, int x, int y);
static void _window_resize(Etk_Window *window, int w, int h);
static void _window_size_min_set(Etk_Window *window, int w, int h);
-static void _window_geometry_get(Etk_Window *window, int *x, int *y, int *w,
int *h);
+static void _window_evas_position_get(Etk_Window *window, int *x, int *y);
+static void _window_screen_position_get(Etk_Window *window, int *x, int *y);
+static void _window_size_get(Etk_Window *window, int *w, int *h);
static void _window_iconified_set(Etk_Window *window, Etk_Bool iconified);
static Etk_Bool _window_iconified_get(Etk_Window *window);
static void _window_maximized_set(Etk_Window *windo, Etk_Bool maximized);
@@ -74,7 +76,9 @@
_window_move,
_window_resize,
_window_size_min_set,
- _window_geometry_get,
+ _window_evas_position_get,
+ _window_screen_position_get,
+ _window_size_get,
NULL, /* window_center_on_window */
NULL, /* window_move_to_mouse */
NULL, /* window_modal_for_window */
@@ -258,16 +262,24 @@
ecore_evas_size_min_set(engine_data->ecore_evas, w, h);
}
-static void _window_geometry_get(Etk_Window *window, int *x, int *y, int *w,
int *h)
-{
+static void _window_evas_position_get(Etk_Window *window, int *x, int *y)
+{
+ if (x) *x = 0;
+ if (y) *y = 0;
+}
+
+static void _window_screen_position_get(Etk_Window *window, int *x, int *y)
+{
Etk_Engine_Window_Data *engine_data;
engine_data = window->engine_data;
ecore_evas_geometry_get(engine_data->ecore_evas, x, y, NULL, NULL);
- if (w)
- *w = window->width;
- if (h)
- *h = window->height;
+}
+
+static void _window_size_get(Etk_Window *window, int *w, int *h)
+{
+ if (w) *w = window->width;
+ if (h) *h = window->height;
}
static void _window_iconified_set(Etk_Window *window, Etk_Bool iconified)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
