UI Refactor T41640

Make the UI API more consistent and reduce confusion with some naming.

mainly:
- API function calls
- enum values

some internal static functions have been left for now

1 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/windowmanager/intern/wm_dragdrop.c b/source/blender/windowmanager/intern/wm_dragdrop.c
index e5bba9285b4..145e9df7eb0 100644
--- a/source/blender/windowmanager/intern/wm_dragdrop.c
+++ b/source/blender/windowmanager/intern/wm_dragdrop.c
@@ -271,16 +271,16 @@ void wm_drags_check_ops(bContext *C, wmEvent *event)
 
 static void wm_drop_operator_draw(const char *name, int x, int y)
 {
-	int width = UI_GetStringWidth(name);
+	int width = UI_fontstyle_string_width(name);
 	int padding = 4 * UI_DPI_FAC;
 	
 	glColor4ub(0, 0, 0, 50);
 	
-	uiSetRoundBox(UI_CNR_ALL | UI_RB_ALPHA);
-	uiRoundBox(x, y, x + width + 2 * padding, y + 4 * padding, padding);
+	UI_draw_roundbox_corner_set(UI_CNR_ALL | UI_RB_ALPHA);
+	UI_draw_roundbox(x, y, x + width + 2 * padding, y + 4 * padding, padding);
 	
 	glColor4ub(255, 255, 255, 255);
-	UI_DrawString(x + padding, y + padding, name);
+	UI_draw_string(x + padding, y + padding, name);
 }
 
 static const char *wm_drag_name(wmDrag *drag)
@@ -366,12 +366,12 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect)
 		}
 		
 		if (rect) {
-			int w =  UI_GetStringWidth(wm_drag_name(drag));
+			int w =  UI_fontstyle_string_width(wm_drag_name(drag));
 			drag_rect_minmax(rect, x, y, x + w, y + iconsize);
 		}
 		else {
 			glColor4ub(255, 255, 255, 255);
-			UI_DrawString(x, y, wm_drag_name(drag));
+			UI_draw_string(x, y, wm_drag_name(drag));
 		}
 		
 		/* operator name with roundbox */
@@ -394,7 +394,7 @@ void wm_drags_draw(bContext *C, wmWindow *win, rcti *rect)
 			}
 			
 			if (rect) {
-				int w =  UI_GetStringWidth(wm_drag_name(drag));
+				int w =  UI_fontstyle_string_width(wm_drag_name(drag));
 				drag_rect_minmax(rect, x, y, x + w, y + iconsize);
 			}
 			else