[Bf-blender-cvs] [0fdac7c] UI-graphical-redesign: Make checkbox widgets rounded

Julian Eisel noreply at git.blender.org
Fri May 29 15:05:35 CEST 2015


Commit: 0fdac7ca7b670e7928bb55c539cfc9cc66defc2b
Author: Julian Eisel
Date:   Fri May 29 14:56:44 2015 +0200
Branches: UI-graphical-redesign
https://developer.blender.org/rB0fdac7ca7b670e7928bb55c539cfc9cc66defc2b

Make checkbox widgets rounded

===================================================================

M	source/blender/editors/interface/interface_widgets.c

===================================================================

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index fb7b319..4156614 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -3253,32 +3253,37 @@ static void widget_optionbut(uiWidgetColors *wcol, rcti *rect, int state, int UN
 	rcti recttemp = *rect;
 	float rad;
 	int delta;
-	
+
 	widget_init(&wtb);
-	
+
 	/* square */
 	recttemp.xmax = recttemp.xmin + BLI_rcti_size_y(&recttemp);
-	
+
 	/* smaller */
-	delta = 1 + BLI_rcti_size_y(&recttemp) / 8;
+	delta = 1 + BLI_rcti_size_y(&recttemp) / 10;
 	recttemp.xmin += delta;
 	recttemp.ymin += delta;
 	recttemp.xmax -= delta;
 	recttemp.ymax -= delta;
-	
+
 	/* half rounded */
-	rad = 0.2f * U.widget_unit;
+	rad = 0.35f * U.widget_unit;
 	round_box_edges(&wtb, UI_CNR_ALL, &recttemp, rad);
-	
+
+	/* some offset for decoration */
+	BLI_rcti_translate(&recttemp, -0.1f * U.widget_unit, -0.1f * U.widget_unit);
+	BLI_rcti_resize(&recttemp, 0.8f * BLI_rcti_size_x(&recttemp), 0.8f * BLI_rcti_size_y(&recttemp));
+
 	/* decoration */
 	if (state & UI_SELECT) {
 		widget_check_trias(&wtb.tria1, &recttemp);
 	}
-	
+
 	widgetbase_draw(&wtb, wcol);
-	
+
 	/* text space */
-	rect->xmin += BLI_rcti_size_y(rect) * 0.7 + delta;
+	rect->xmin += BLI_rcti_size_y(rect) * 0.5 + delta;
+	rect->ymin += 0.1f * U.widget_unit;
 }
 
 /* labels use Editor theme colors for text */




More information about the Bf-blender-cvs mailing list