[Morphix-cvs] mcp2/src callbacks.c,1.3,1.4

[<ale...@us...>]

Update of /cvsroot/morphix/mcp2/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4046

Modified Files:
	callbacks.c 
Log Message:
fixed height/width


Index: callbacks.c
===================================================================
RCS file: /cvsroot/morphix/mcp2/src/callbacks.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** callbacks.c	9 Dec 2003 22:42:14 -0000	1.3
--- callbacks.c	11 Dec 2003 16:30:59 -0000	1.4
***************
*** 28,35 ****
  
  /* GDK_WINDOW coord helpers */
! int top_border = 10;
! int side_border = 20;
  int box_width = 100;
! int box_height = 100;
  int icon_width = MAX_ICON_WIDTH;
  int icon_height = MAX_ICON_HEIGHT;
--- 28,35 ----
  
  /* GDK_WINDOW coord helpers */
! int top_border = 5;
! int side_border = 10;
  int box_width = 100;
! int box_height = 110;
  int icon_width = MAX_ICON_WIDTH;
  int icon_height = MAX_ICON_HEIGHT;
***************
*** 119,123 ****
  		int y_coord = top_border + (nr_y * box_height + nr_y * top_border);
  
! 		if (x_coord + side_border * 2 > minimum_width) {
  			nr_x = 0;
  			nr_y++;
--- 119,123 ----
  		int y_coord = top_border + (nr_y * box_height + nr_y * top_border);
  
! 		if (x_coord + side_border * 2 + box_width > minimum_width) {
  			nr_x = 0;
  			nr_y++;
***************
*** 128,134 ****
  		if (items[i]->selected == TRUE) {
  			GdkColor color;
! 			color.red = 32768; 
! 			color.blue = 65535; 
! 			color.green = 32768;
  			int circle_width = 30;
  			gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color);
--- 128,134 ----
  		if (items[i]->selected == TRUE) {
  			GdkColor color;
! 			color.red = 16384; 
! 			color.blue = 49151; 
! 			color.green = 16384;
  			int circle_width = 30;
  			gtk_widget_modify_fg(da,GTK_STATE_NORMAL,&color);
***************
*** 206,210 ****
  		y_coord = top_border + (nr_y * box_height + nr_y * top_border);
  			
! 		if (x_coord + side_border * 2 > minimum_width) {
  			nr_x = 0;
  			nr_y++;
--- 206,210 ----
  		y_coord = top_border + (nr_y * box_height + nr_y * top_border);
  			
! 		if (x_coord + side_border * 2 + box_width > minimum_width) {
  			nr_x = 0;
  			nr_y++;
***************
*** 215,219 ****
  	}
  	minimum_width = MINIMUM_WIDTH;
! 	minimum_height = y_coord + box_height + top_border * 3;
  }
  
--- 215,219 ----
  	}
  	minimum_width = MINIMUM_WIDTH;
! 	minimum_height = box_height * (nr_y + 1) + top_border * 7;
  }
  
***************
*** 289,293 ****
  			int y_coord = top_border + (nr_y * box_height + nr_y * top_border);
  			
! 			if (x_coord + side_border * 2 > minimum_width) {
  				nr_x = 0;
  				nr_y++;
--- 289,293 ----
  			int y_coord = top_border + (nr_y * box_height + nr_y * top_border);
  			
! 			if (x_coord + side_border * 2 + box_width > minimum_width) {
  				nr_x = 0;
  				nr_y++;