Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_fm.c e_int_config_display.c
Log Message:
fix screen res dialog - "are you sure dialog" was a glitch with auto-remembers.
fixed. also the selection jumps back to the old res too now. fix res adjust
of windows to adjust right again.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -3 -r1.554 -r1.555
--- e_border.c 14 Oct 2006 09:43:12 -0000 1.554
+++ e_border.c 17 Oct 2006 13:49:47 -0000 1.555
@@ -509,9 +509,10 @@
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if (!bd->pre_res_change.valid) return;
+ if (bd->new_client) return;
memcpy(&pre_res_change, &bd->pre_res_change, sizeof(pre_res_change));
-
+
if (bd->fullscreen)
{
e_border_unfullscreen(bd);
@@ -814,7 +815,6 @@
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if ((x == bd->fx.x) && (y == bd->fx.y)) return;
- bd->pre_res_change.valid = 0;
bd->fx.x = x;
bd->fx.y = y;
bd->changed = 1;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- e_fm.c 17 Oct 2006 12:29:00 -0000 1.94
+++ e_fm.c 17 Oct 2006 13:49:47 -0000 1.95
@@ -5,12 +5,6 @@
#define OVERCLIP 128
-/* FIXME: display symlinks in icons somehow */
-/* FIXME: bug: drag multiple files doesnt display all files being dragged
- only 1 icon shown to be dragged (instead of at least a group) */
-/* FIXME: need a mapping of mimetype to actions to do on the file
- * (e actions like import as wallpaper etc. as well as execute app
- * X on the file based on what mimetypes the app handles) */
/* FIXME: use edje messages & embryo for scrolling of bg's */
/* FIXME: put in code to allow for custom icons per file/dir somehow */
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_int_config_display.c 8 Oct 2006 08:04:17 -0000 1.26
+++ e_int_config_display.c 17 Oct 2006 13:49:47 -0000 1.27
@@ -10,10 +10,11 @@
static void _free_data (E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
static int _basic_apply_data (E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas
*evas, E_Config_Dialog_Data *cfdata);
-static void _load_rates (void *data);
+static void _load_rates (void *data, E_Config_Dialog_Data
*cfdata);
static void _ilist_item_change (void *data);
static int _deferred_noxrandr_error (void *data);
+/* FIXME: although this works.. this is nasty - shoudl be in cfdata */
Evas_Object *rate_list = NULL;
Evas_Object *res_list = NULL;
@@ -51,6 +52,7 @@
int flip;
int flip_x;
int flip_y;
+ int orig_res, orig_refresh;
SureBox *surebox;
};
@@ -93,6 +95,8 @@
sb->cfdata->orig_size = sb->orig_size;
sb->cfdata->orig_rate = sb->orig_rate;
e_config_save_queue();
+ e_widget_ilist_selected_set(res_list, sb->cfdata->orig_res);
+ e_widget_ilist_selected_set(rate_list, sb->cfdata->orig_refresh);
_surebox_dialog_cb_delete(dia->win);
}
@@ -141,6 +145,8 @@
sb->cfdata->orig_size = sb->orig_size;
sb->cfdata->orig_rate = sb->orig_rate;
e_config_save_queue();
+ e_widget_ilist_selected_set(res_list, sb->cfdata->orig_res);
+ e_widget_ilist_selected_set(rate_list, sb->cfdata->orig_refresh);
sb->timer = NULL;
e_object_del(E_OBJECT(sb->dia));
sb->dia = NULL;
@@ -170,9 +176,9 @@
e_dialog_button_add(sb->dia, _("Yes"), NULL, _surebox_dialog_cb_yes, sb);
e_dialog_button_add(sb->dia, _("No"), NULL, _surebox_dialog_cb_no, sb);
e_dialog_button_focus_num(sb->dia, 1);
+ e_win_centered_set(sb->dia->win, 1);
e_win_borderless_set(sb->dia->win, 1);
e_win_layer_set(sb->dia->win, 6);
- e_win_centered_set(sb->dia->win, 1);
e_win_sticky_set(sb->dia->win, 1);
e_dialog_show(sb->dia);
e_object_ref(E_OBJECT(cfd));
@@ -436,8 +442,9 @@
if ((res->size.width == size.width) &&
(res->size.height == size.height))
{
+ cfdata->orig_res = i;
e_widget_ilist_selected_set(ol, i);
- _load_rates(res);
+ _load_rates(res, cfdata);
}
}
}
@@ -489,7 +496,7 @@
}
static void
-_load_rates(void *data)
+_load_rates(void *data, E_Config_Dialog_Data *cfdata)
{
int k, r;
E_Manager *man;
@@ -509,7 +516,10 @@
snprintf(buf, sizeof(buf), "%i Hz", rts[k].rate);
e_widget_ilist_append(rate_list, NULL, buf, NULL, NULL, NULL);
if (rt.rate == rts[k].rate)
- e_widget_ilist_selected_set(rate_list, k);
+ {
+ if (cfdata) cfdata->orig_refresh = k;
+ e_widget_ilist_selected_set(rate_list, k);
+ }
}
e_widget_ilist_selected_set(rate_list, 0);
}
@@ -517,7 +527,7 @@
static void
_ilist_item_change(void *data)
{
- _load_rates(data);
+ _load_rates(data, NULL);
}
static int
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
