[Bf-blender-cvs] [b6c439d] master: UI: remove number specific button offset when selecting text

Campbell Barton noreply at git.blender.org
Tue Feb 25 02:43:39 CET 2014


Commit: b6c439d0c425f918d49ebef4fe3922f8543553cf
Author: Campbell Barton
Date:   Tue Feb 25 12:42:17 2014 +1100
https://developer.blender.org/rBb6c439d0c425f918d49ebef4fe3922f8543553cf

UI: remove number specific button offset when selecting text

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

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

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 1144ebc..1ec057e 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1984,17 +1984,13 @@ static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, con
 
 	BLI_strncpy(origstr, but->drawstr, data->maxlen);
 
-	/* XXX solve generic, see: #widget_draw_text_icon */
-	if (but->type == NUM || but->type == NUMSLI) {
-		startx += (int)(UI_TEXT_MARGIN_X * U.widget_unit);
-	}
-	else if (ELEM3(but->type, TEX, SEARCH_MENU, SEARCH_MENU_UNLINK)) {
+	if (ELEM3(but->type, TEX, SEARCH_MENU, SEARCH_MENU_UNLINK)) {
 		if (but->flag & UI_HAS_ICON) {
 			startx += UI_DPI_ICON_SIZE;
 		}
-		/* but this extra .05 makes clicks inbetween characters feel nicer */
-		startx += ((UI_TEXT_MARGIN_X + 0.05f) * U.widget_unit);
 	}
+	/* but this extra .05 makes clicks inbetween characters feel nicer */
+	startx += ((UI_TEXT_MARGIN_X + 0.05f) * U.widget_unit);
 	
 	/* mouse dragged outside the widget to the left */
 	if (x < startx) {




More information about the Bf-blender-cvs mailing list