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

Adds Hotspot control to custom cursor.

Browse Source
This commit is contained in:
Robert Wenzlaff
2003-11-12 13:32:11 +00:00
parent bd993f13d4
commit a0471975d8
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/editmesh.c
View File

@@ -7376,7 +7376,7 @@ void KnifeSubdivide(char mode){
oldcursor=get_cursor(); oldcursor=get_cursor();
//set_cursor(CURSOR_PENCIL); //set_cursor(CURSOR_PENCIL);
win=winlay_get_active_window(); win=winlay_get_active_window();
window_set_custom_cursor(win, mask, bitmap); window_set_custom_cursor(win, mask, bitmap, 0, 15);
//GHOST_SetCustomCursorShape(win->ghostwin, mask, bitmap, 0, 15); //GHOST_SetCustomCursorShape(win->ghostwin, mask, bitmap, 0, 15);
curve=get_mouse_trail(&len, TRAIL_MIXED); curve=get_mouse_trail(&len, TRAIL_MIXED);

2
source/blender/src/editscreen.c
View File

@@ -3068,7 +3068,7 @@ void set_timecursor(int nr)
} }
curcursor= CURSOR_NONE; curcursor= CURSOR_NONE;
window_set_custom_cursor(mainwin, mask, bitmap); window_set_custom_cursor(mainwin, mask, bitmap, 7, 7);
BIF_renderwin_set_custom_cursor(mask, bitmap); BIF_renderwin_set_custom_cursor(mask, bitmap);
} }

5
source/blender/src/ghostwinlay.c
View File

@@ -326,8 +326,9 @@ void window_set_cursor(Window *win, int curs) {
} }
} }
void window_set_custom_cursor(Window *win, unsigned char mask[16][2], unsigned char bitmap[16][2]) { void window_set_custom_cursor(Window *win, unsigned char mask[16][2],
GHOST_SetCustomCursorShape(win->ghostwin, bitmap, mask, 7, 7); unsigned char bitmap[16][2], int hotx, int hoty) {
GHOST_SetCustomCursorShape(win->ghostwin, bitmap, mask, hotx, hoty);
} }
void window_make_active(Window *win) { void window_make_active(Window *win) {

2
source/blender/src/renderwin.c
View File

@@ -985,6 +985,6 @@ void BIF_toggle_render_display(void)
void BIF_renderwin_set_custom_cursor(unsigned char mask[16][2], unsigned char bitmap[16][2]) void BIF_renderwin_set_custom_cursor(unsigned char mask[16][2], unsigned char bitmap[16][2])
{ {
if (render_win) { if (render_win) {
window_set_custom_cursor(render_win->win, mask, bitmap); window_set_custom_cursor(render_win->win, mask, bitmap, 7, 7);
} }
} }

3
source/blender/src/winlay.h
View File

@@ -64,7 +64,8 @@ char* window_get_title (Window *win);
void window_set_title (Window *win, char *title); void window_set_title (Window *win, char *title);
void window_set_cursor (Window *win, int cursor); void window_set_cursor (Window *win, int cursor);
void window_set_custom_cursor (Window *win, unsigned char mask[16][2], unsigned char bitmap[16][2]); void window_set_custom_cursor (Window *win, unsigned char mask[16][2],
unsigned char bitmap[16][2], int hotx, int hoty );
void window_warp_pointer (Window *win, int x, int y); void window_warp_pointer (Window *win, int x, int y);