[xiph-commits] r10073 - trunk/planarity

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2005-09-26 02:29:45 -0700 (Mon, 26 Sep 2005)
New Revision: 10073

Modified:
   trunk/planarity/gameboard_logic_buttonbar.c
   trunk/planarity/gameboard_logic_mouse.c
   trunk/planarity/graph_generate.c
   trunk/planarity/version.h
Log:
Resizing during play, the checkbutton is not moved unless it has
already deployed: fixed

'falling off' a button during a press segfault: fixed



Modified: trunk/planarity/gameboard_logic_buttonbar.c
===================================================================
--- trunk/planarity/gameboard_logic_buttonbar.c	2005-09-26 08:42:18 UTC (rev 10072)
+++ trunk/planarity/gameboard_logic_buttonbar.c	2005-09-26 09:29:45 UTC (rev 10073)
@@ -146,6 +146,11 @@
     }
 
     states[9].position = 3; //activate it
+
+    states[9].x = states[9].x_target = g->g.width-BUTTONBAR_BORDER;
+    states[9].y_active = g->g.height - BUTTONBAR_Y_FROM_BOTTOM;
+    states[9].y = states[9].y_inactive = states[9].y_active + BUTTON_EXPOSE;
+    
     states[9].y_target = states[9].y_active;
     states[i].sweepdeploy = 0;
 

Modified: trunk/planarity/gameboard_logic_mouse.c
===================================================================
--- trunk/planarity/gameboard_logic_mouse.c	2005-09-26 08:42:18 UTC (rev 10072)
+++ trunk/planarity/gameboard_logic_mouse.c	2005-09-26 09:29:45 UTC (rev 10073)
@@ -142,7 +142,7 @@
       if(g->b.grabbed==b)
 	button_set_state(g,b,1,1);
       else
-	button_set_state(g,b,0,0);
+	button_set_state(g,g->b.grabbed,0,0);
     }else{
       /* no button is grabbed; any button may see a rollover */
       if(b)

Modified: trunk/planarity/graph_generate.c
===================================================================
--- trunk/planarity/graph_generate.c	2005-09-26 08:42:18 UTC (rev 10072)
+++ trunk/planarity/graph_generate.c	2005-09-26 09:29:45 UTC (rev 10073)
@@ -44,7 +44,7 @@
 static gen_instance i_list[FINITE_LEVELS]={ 
   {"mesh1", 1, "A Small Beginning",           generate_mesh_1,  1.,1., 1 }, // 1
   {"mesh1", 2, "My First Real Level(tm)",     generate_mesh_1,  1.,1., 2 }, // 2
-  {"data" , 0, "My First Mission Impossible(tm)",  generate_data,    1.,1.5,3 }, // 3
+  {"data" , 0, "My First Mission Impossible(tm)",  generate_data, 20.,1.,3 }, // 3
   {"mesh1", 3, "Larger, Not Harder",          generate_mesh_1,  1.,1., 3 }, // 4
   {"meshC", 5, "The Trick Is It's Easy",      generate_mesh_1C, 1.,1., 2 }, // 5
   {"meshM", 6, "If You Squint, It's a Brick", generate_mesh_1M, 1.,1., 1 }, // 6

Modified: trunk/planarity/version.h
===================================================================
--- trunk/planarity/version.h	2005-09-26 08:42:18 UTC (rev 10072)
+++ trunk/planarity/version.h	2005-09-26 09:29:45 UTC (rev 10073)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Mon Sep 26 04:40:44 EDT 2005] */
+/* DO NOT EDIT: Automated versioning hack [Mon Sep 26 05:28:23 EDT 2005] */