diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2007-09-22 12:34:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2007-09-22 12:34:40 +0400 |
| commit | 5d2bf66e794167be7004987bc95cdcf60f474ce9 (patch) | |
| tree | 63bbaf8e8c41872c599fca27360edce8aa4bc701 | |
| parent | 0ed3e0bb4f346410d3e021420159d91a26c67052 (diff) | |
fix for some button overlap problems
| -rw-r--r-- | source/blender/src/buttons_shading.c | 2 | ||||
| -rw-r--r-- | source/blender/src/header_image.c | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index e3bb782acef..e5026f6f64e 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -1208,7 +1208,7 @@ void uiblock_image_panel(uiBlock *block, Image **ima_pp, ImageUser *iuser, uiBlockSetFunc(block, NULL, NULL, NULL); } } - + uiBlockEndAlign(block); } static void texture_panel_image(Image **ima, ImageUser *iuser) diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c index 4aa3543493a..3ee30991639 100644 --- a/source/blender/src/header_image.c +++ b/source/blender/src/header_image.c @@ -1174,13 +1174,16 @@ void image_buttons(void) 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 @@ void image_buttons(void) 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; } } |