Revision: 53882
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53882
Author: campbellbarton
Date: 2013-01-17 18:59:19 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
use define for text offset & seletion.
and no need to calloc memory for string selection.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2013-01-17 15:27:58 UTC (rev 53881)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2013-01-17 18:59:19 UTC (rev 53882)
@@ -1416,11 +1416,11 @@
}
/* note, but->block->aspect is used here, when drawing button style is getting
scaled too */
-static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data,
short x)
+static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data,
const float x)
{
uiStyle *style = UI_GetStyle(); // XXX pass on as arg
uiFontStyle *fstyle = &style->widget;
- int startx = but->rect.xmin;
+ float startx = but->rect.xmin;
char *origstr, password_str[UI_MAX_DRAW_STR];
uiStyleFontSet(fstyle);
@@ -1430,18 +1430,20 @@
ui_button_text_password_hide(password_str, but, FALSE);
- origstr = MEM_callocN(sizeof(char) * data->maxlen, "ui_textedit
origstr");
+ origstr = MEM_mallocN(sizeof(char) * data->maxlen, "ui_textedit
origstr");
BLI_strncpy(origstr, but->drawstr, data->maxlen);
- /* XXX solve generic */
- if (but->type == NUM || but->type == NUMSLI)
+ /* XXX solve generic, see: #widget_draw_text_icon */
+ if (but->type == NUM || but->type == NUMSLI) {
startx += (int)(0.5f * (BLI_rctf_size_y(&but->rect)));
+ }
else if (ELEM3(but->type, TEX, SEARCH_MENU, SEARCH_MENU_UNLINK)) {
- /* text draws with offset 0.40, but this extra .05 makes clicks
inbetween characters feel nicer */
- startx += (0.45f * U.widget_unit);
- if (but->flag & UI_HAS_ICON)
+ 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);
}
/* mouse dragged outside the widget to the left */
@@ -1511,7 +1513,7 @@
MEM_freeN(origstr);
}
-static void ui_textedit_set_cursor_select(uiBut *but, uiHandleButtonData
*data, short x)
+static void ui_textedit_set_cursor_select(uiBut *but, uiHandleButtonData
*data, const float x)
{
if (x > data->selstartx) data->selextend = EXTEND_RIGHT;
else if (x < data->selstartx) data->selextend = EXTEND_LEFT;
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h
2013-01-17 15:27:58 UTC (rev 53881)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h
2013-01-17 18:59:19 UTC (rev 53882)
@@ -537,6 +537,8 @@
#define UI_TRANSP_DARK 100
#define UI_TRANSP_LIGHT 160
+#define UI_TEXT_MARGIN_X 0.4f
+
/* interface_style.c */
void uiStyleInit(void);
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2013-01-17 15:27:58 UTC (rev 53881)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2013-01-17 18:59:19 UTC (rev 53882)
@@ -1325,11 +1325,11 @@
rect->xmin += (int)(0.8f * BLI_rcti_size_y(rect));
if (but->editstr || (but->flag & UI_TEXT_LEFT)) {
- rect->xmin += (0.4f * U.widget_unit) /
but->block->aspect;
+ rect->xmin += (UI_TEXT_MARGIN_X *
U.widget_unit) / but->block->aspect;
}
}
else if ((but->flag & UI_TEXT_LEFT)) {
- rect->xmin += (0.4f * U.widget_unit) /
but->block->aspect;
+ rect->xmin += (UI_TEXT_MARGIN_X * U.widget_unit) /
but->block->aspect;
}
/* unlink icon for this button type */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
