[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12105] trunk/blender/source/blender/src: fix for some button overlap problems

[Campbell Barton]

Revision: 12105
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12105
Author:   campbellbarton
Date:     2007-09-22 10:34:40 +0200 (Sat, 22 Sep 2007)

Log Message:
-----------
fix for some button overlap problems

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_shading.c
    trunk/blender/source/blender/src/header_image.c

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c	2007-09-22 06:58:40 UTC (rev 12104)
+++ trunk/blender/source/blender/src/buttons_shading.c	2007-09-22 08:34:40 UTC (rev 12105)
@@ -1208,7 +1208,7 @@
 			 uiBlockSetFunc(block, NULL, NULL, NULL);
 		 }
 	 }
-
+	 uiBlockEndAlign(block);
 }	
 
 static void texture_panel_image(Image **ima, ImageUser *iuser)

Modified: trunk/blender/source/blender/src/header_image.c
===================================================================
--- trunk/blender/source/blender/src/header_image.c	2007-09-22 06:58:40 UTC (rev 12104)
+++ trunk/blender/source/blender/src/header_image.c	2007-09-22 08:34:40 UTC (rev 12105)
@@ -1174,13 +1174,16 @@
 		xco+= XIC + 18;
 		
 		uiBlockBeginAlign(block);
-		uiDefIconButBitI(block, TOG, SI_SYNC_UVSEL, B_REDR, ICON_MESH_HLT, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "Sync Mesh Selection");
+		uiDefIconButBitI(block, TOG, SI_SYNC_UVSEL, B_REDR, ICON_MESH_HLT, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "Sync Mesh Selection (vert & face selection mode override sticky)");
+		xco+= XIC;
 		if ((G.sima->flag & SI_SYNC_UVSEL)==0) {
-			xco+= XIC;
 			ubut = uiDefIconTextButC(block, ICONTEXTROW, B_REDR, ICON_STICKY_UVS_LOC,
 					"Sticky UV Selection: %t|Disable%x1|Shared Location%x0|Shared Vertex%x2",
 					xco,0,XIC+10,YIC, &(G.sima->sticky), 0, 3.0, 0, 0,
 					"Sticky UV Selection (Hotkeys: Shift C, Alt C, Ctrl C)");
+			xco+= XIC + 16;
+		} else {
+			xco+= 6;
 		}
 		uiBlockEndAlign(block);
 		
@@ -1197,15 +1200,11 @@
 			str_pt = str_menu;
 			str_pt[0]='\0';
 			mesh_layers_menu_concat(&G.editMesh->fdata, CD_MTFACE, str_pt);
-			xco+= XIC+8;
 			ubut = uiDefButI(block, MENU, B_NOP, str_menu ,xco,0,115,YIC, &act, 0, 0, 0, 0, "Active UV Layer for editing");
 			uiButSetFunc(ubut, do_image_buttons_set_uvlayer_callback, &act, NULL);
 			
 			/*MEM_freeN(str);*/
-			xco+= 80;
-			
-		} else {
-			xco+= XIC+16;
+			xco+= 120;
 		}
 	}