E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_int_config_display.c 


Log Message:
Make flip work properly now. Tested ala raster's suggested method.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_int_config_display.c	25 Jul 2006 04:01:18 -0000	1.20
+++ e_int_config_display.c	25 Jul 2006 09:54:30 -0000	1.21
@@ -214,6 +214,7 @@
 	cfdata->can_flip = rots & (ECORE_X_RANDR_FLIP_X | ECORE_X_RANDR_FLIP_Y);
 	cfdata->flip = cfdata->rotation &
 	  (ECORE_X_RANDR_FLIP_X | ECORE_X_RANDR_FLIP_Y);
+
 	if (cfdata->rotation & (ECORE_X_RANDR_FLIP_X))
 	  cfdata->flip_x = 1;
 	if (cfdata->rotation & (ECORE_X_RANDR_FLIP_Y))
@@ -307,15 +308,12 @@
      {
 	int rot;
 
-	if ((cfdata->flip_x) && (cfdata->flip_y))
-	  cfdata->flip = cfdata->rotation & 
-	  (ECORE_X_RANDR_FLIP_X | ECORE_X_RANDR_FLIP_Y);
-	else if (cfdata->flip_x)
-	  cfdata->flip = cfdata->rotation & (ECORE_X_RANDR_FLIP_X);
-	else if (cfdata->flip_y)
-	  cfdata->flip = cfdata->rotation & (ECORE_X_RANDR_FLIP_Y);
-	  
-	  
+	cfdata->flip = cfdata->rotation;	
+	if (cfdata->flip_x)
+	  cfdata->flip = cfdata->flip | ECORE_X_RANDR_FLIP_X;
+	if (cfdata->flip_y)
+	  cfdata->flip = cfdata->flip | ECORE_X_RANDR_FLIP_Y;
+	
 	rot = ecore_x_randr_screen_rotation_get(man->root);
 // FIXME: a bug in x where it returns that the current rotation is still
 // normal (none) when it isn't. so just blindly ask for a new rot anyway.
@@ -351,7 +349,7 @@
    
    of = e_widget_framelist_add(evas, _("Resolution"), 0);   
    ol = e_widget_ilist_add(evas, 24, 24, NULL);
-   e_widget_min_size_set(ol, 170, 240);
+   e_widget_min_size_set(ol, 170, 215);
    e_widget_framelist_object_append(of, ol);
    e_widget_list_object_append(o2, of, 1, 1, 0.5);
 
@@ -481,7 +479,7 @@
         e_widget_framelist_object_append(of, ob);
 	if (!(cfdata->can_rotate & ECORE_X_RANDR_FLIP_Y)) e_widget_disabled_set(ob, 1);
 	
-	e_widget_list_object_append(o2, of, 0, 0, 0.5);
+	e_widget_list_object_append(o2, of, 1, 1, 0.5);
      }
    
    e_widget_list_object_append(o, o2, 0, 0, 0.0);