Enlightenment CVS committal
Author : pfritz
Project : e17
Module : apps/elitaire
Dir : e17/apps/elitaire/src
Modified Files:
edje_frontend_gui.cpp elitaire_card.cpp elitaire_card.h
elitaire_card_jobs.cpp
Log Message:
- finally, get rid of the annoying layer bug
- open the about window on F1 (for now)
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/edje_frontend_gui.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edje_frontend_gui.cpp 25 Jul 2007 17:00:52 -0000 1.9
+++ edje_frontend_gui.cpp 4 Aug 2007 00:43:18 -0000 1.10
@@ -196,9 +196,9 @@
edje_object_signal_callback_add(eef->gui, "new_game", "*",
_eli_edje_frontend_new_game_cb, eap);
evas_object_event_callback_add(eef->gui, EVAS_CALLBACK_KEY_DOWN,
- _key_down_cb, eef);
+ _key_down_cb, eap);
evas_object_event_callback_add(eef->gui, EVAS_CALLBACK_KEY_UP,
- _key_up_cb, eef);
+ _key_up_cb, eap);
evas_object_show(eef->gui);
}
else {
@@ -566,10 +566,12 @@
static void _key_down_cb(void * data, Evas * e, Evas_Object * obj, void *
event_info)
{
- Eli_Edje_Frontend *eef;
- Evas_Event_Key_Down *ev;
+ Eli_App * eap;
+ Eli_Edje_Frontend * eef;
+ Evas_Event_Key_Down * ev;
- eef = (Eli_Edje_Frontend *) data;
+ eap = (Eli_App *) data;
+ eef = eli_app_edje_frontend_get(eap);
ev = (Evas_Event_Key_Down *) event_info;
if (!strcmp(ev->key, "Control_L") || !strcmp(ev->key, "Control_R")) {
@@ -582,6 +584,8 @@
}
else if (!strcmp(ev->key, "F2"))
edje_object_signal_emit(eef->gui, "new_game", "");
+ else if (!strcmp(ev->key, "F1"))
+ eli_app_about_open(eap);
if (eef->key.ctrl_down && !eef->key.alt_down) {
if (!strcmp(ev->key, "z"))
@@ -606,10 +610,12 @@
static void _key_up_cb(void *data, Evas * e, Evas_Object * obj,
void *event_info)
{
+ Eli_App * eap;
Eli_Edje_Frontend * eef;
Evas_Event_Key_Up * ev;
- eef = (Eli_Edje_Frontend *) data;
+ eap = (Eli_App *) data;
+ eef = eli_app_edje_frontend_get(eap);
ev = (Evas_Event_Key_Up *) event_info;
if (!strcmp(ev->key, "Control_L")) eef->key.ctrl_down = false;
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/elitaire_card.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- elitaire_card.cpp 8 Jun 2007 17:32:49 -0000 1.1
+++ elitaire_card.cpp 4 Aug 2007 00:43:18 -0000 1.2
@@ -87,7 +87,7 @@
data = (Elitaire_Card *) evas_object_smart_data_get(card);
if (data) {
- return data->flying;
+ return data->flying || data->waiting;
}
return false;
}
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/elitaire_card.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- elitaire_card.h 8 Jun 2007 17:32:49 -0000 1.1
+++ elitaire_card.h 4 Aug 2007 00:43:18 -0000 1.2
@@ -1,14 +1,15 @@
/**********************************************/
/*** the data struct ***/
-struct Elitaire_Card{
+struct Elitaire_Card {
Evas_Object * image;
Evas_Object * next_card;
Evas_Object * shadow;
playingCard * pcard;
Elitaire * eli;
Elitaire_Job_List * jobs;
- Evas_Bool flying;
+ char flying:1;
+ char waiting:1;
};
/*** external API ***/
===================================================================
RCS file: /cvs/e/e17/apps/elitaire/src/elitaire_card_jobs.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- elitaire_card_jobs.cpp 27 Jul 2007 20:40:55 -0000 1.2
+++ elitaire_card_jobs.cpp 4 Aug 2007 00:43:18 -0000 1.3
@@ -351,7 +351,7 @@
fr = ecard->eli->frame_rate;
- ecard->flying = true;
+ ecard->waiting = true;
job->timer = ecore_animator_add(_elitaire_card_wait_time_cb, data);
return 0;
@@ -818,9 +818,10 @@
if (card && eli_card) {
if (--(job->x.i)) return 1;
- eli_card->flying = false;
+ eli_card->waiting = false;
elitaire_job_del(eli_card->jobs, data);
return 0;
}
return 0;
}
+
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
