diff options
| author | Matt Ebb <matt@mke3.net> | 2006-02-02 15:16:23 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2006-02-02 15:16:23 +0300 |
| commit | b38145ff510d7970dbb089ed9d7bbe27d81d3015 (patch) | |
| tree | 22b0d60c211936b91d3c1eef49df509e6fcf7ef3 /source | |
| parent | 6cede56718e5f0889b541be2de24fea54077442a (diff) | |
* This should have come along with the cursors commit before, to make the standard cursor show when over a window header. *blush*
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/editscreen.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index 061e70c5938..357e2b744de 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -74,6 +74,7 @@ #include "BKE_blender.h" #include "BKE_screen.h" +#include "BIF_cursors.h" #include "BIF_editsound.h" #include "BIF_glutil.h" #include "BIF_gl.h" @@ -166,7 +167,11 @@ static int choose_cursor(ScrArea *sa) else if(G.f & G_WEIGHTPAINT) return CURSOR_VPAINT; else if(G.f & G_FACESELECT) return CURSOR_FACESEL; else return CURSOR_STD; - } else { + } + else if (sa->spacetype==SPACE_TEXT) { + return CURSOR_TEXTEDIT; + } + else { return CURSOR_STD; } } @@ -1246,6 +1251,7 @@ void screenmain(void) if (newactarea) { if (BLI_in_rcti(&newactarea->headrct, mval[0], mval[1])) { newactwin= newactarea->headwin; + set_cursor(CURSOR_STD); } else { newactwin= newactarea->win; } @@ -1256,7 +1262,8 @@ void screenmain(void) if (newactarea && (newactarea != g_activearea)) { if (g_activearea) scrarea_queue_headredraw(g_activearea); scrarea_queue_headredraw(newactarea); - set_cursor(newactarea->cursor); + if (!(BLI_in_rcti(&newactarea->headrct, mval[0], mval[1]))) /* header always gets std cursor */ + set_cursor(newactarea->cursor); g_activearea= newactarea; } /* when you move mouse from header to window, buttons can remain hilited otherwise */ @@ -1267,7 +1274,8 @@ void screenmain(void) if (G.curscreen->winakt) { areawinset(G.curscreen->winakt); - set_cursor(choose_cursor(g_activearea)); + if (!(BLI_in_rcti(&newactarea->headrct, mval[0], mval[1]))) /* header always gets std cursor */ + set_cursor(choose_cursor(g_activearea)); } } else { |