archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

bugfix, console text selection /w wrapped lines now works.

Browse Source
This commit is contained in:
Campbell Barton
2010-09-27 16:35:14 +00:00
parent 1a3cc12999
commit f8e5e953c5
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_console/console_draw.c
View File

@@ -163,16 +163,20 @@ static int console_draw_string(ConsoleDrawContext *cdc, char *str, int str_len,
/* just advance the height */
if(cdc->draw==0) {
if(cdc->pos_pick) {
if((cdc->mval[1] != INT_MAX) && cdc->xy[1] <= cdc->mval[1]) {
if((cdc->xy[1]+cdc->lheight >= cdc->mval[1])) {
if(cdc->pos_pick && (cdc->mval[1] != INT_MAX)) {
if(cdc->xy[1] <= cdc->mval[1]) {
if((y_next >= cdc->mval[1])) {
int ofs = (int)floor(((float)cdc->mval[0] / (float)cdc->cwidth));
/* wrap */
if(str_len > cdc->console_width)
ofs += (cdc->console_width * ((int)((((float)(y_next - cdc->mval[1]) / (float)(y_next-cdc->xy[1])) * tot_lines))));
CLAMP(ofs, 0, str_len);
*cdc->pos_pick += str_len - ofs;
} else
*cdc->pos_pick += str_len + 1;
}
}
cdc->xy[1]= y_next;