m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always display the colorpicker cursor as there is no preview brush.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1444 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2010-04-05 09:50:25 +00:00
parent eb14b70724
commit a865415df6
1 changed files with 57 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/windows.c
View File

@ -2020,70 +2020,67 @@ void Display_cursor(void)
case CURSOR_SHAPE_COLORPICKER: case CURSOR_SHAPE_COLORPICKER:
if (!Paintbrush_hidden) if (!Paintbrush_hidden)
Display_paintbrush(Paintbrush_X,Paintbrush_Y,Fore_color,1); Display_paintbrush(Paintbrush_X,Paintbrush_Y,Fore_color,1);
if (!Cursor_hidden) if (Config.Cursor==1)
{ {
if (Config.Cursor==1) // Barres formant la croix principale
start_y=(Mouse_Y<5)?5-Mouse_Y:0;
if (start_y<3)
Vertical_XOR_line (Mouse_X,Mouse_Y+start_y-5,3-start_y);
start_x=(Mouse_X<5)?(short)5-Mouse_X:0;
if (start_x<3)
Horizontal_XOR_line(Mouse_X+start_x-5,Mouse_Y,3-start_x);
end_x=(Mouse_X+6>Screen_width)?Mouse_X+6-Screen_width:0;
if (end_x<3)
Horizontal_XOR_line(Mouse_X+3,Mouse_Y,3-end_x);
end_y=(Mouse_Y+6>Menu_Y/*Screen_height*/)?Mouse_Y+6-Menu_Y/*Screen_height*/:0;
if (end_y<3)
Vertical_XOR_line (Mouse_X,Mouse_Y+3,3-end_y);
// Petites barres aux extrémités
start_x=(!Mouse_X);
start_y=(!Mouse_Y);
end_x=(Mouse_X>=Screen_width-1);
end_y=(Mouse_Y>=Menu_Y-1);
if (Mouse_Y>5)
Horizontal_XOR_line(start_x+Mouse_X-1,Mouse_Y-6,3-(start_x+end_x));
if (Mouse_X>5)
Vertical_XOR_line (Mouse_X-6,start_y+Mouse_Y-1,3-(start_y+end_y));
if (Mouse_X<Screen_width-6)
Vertical_XOR_line (Mouse_X+6,start_y+Mouse_Y-1,3-(start_y+end_y));
if (Mouse_Y<Menu_Y-6)
Horizontal_XOR_line(start_x+Mouse_X-1,Mouse_Y+6,3-(start_x+end_x));
}
else
{
temp=(Config.Cursor)?CURSOR_SHAPE_THIN_COLORPICKER:CURSOR_SHAPE_COLORPICKER;
start_x=Mouse_X-Gfx->Cursor_offset_X[temp];
start_y=Mouse_Y-Gfx->Cursor_offset_Y[temp];
for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++)
{ {
// Barres formant la croix principale if(y_pos<0) continue;
if(y_pos>=Screen_height) break;
start_y=(Mouse_Y<5)?5-Mouse_Y:0; for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++)
if (start_y<3)
Vertical_XOR_line (Mouse_X,Mouse_Y+start_y-5,3-start_y);
start_x=(Mouse_X<5)?(short)5-Mouse_X:0;
if (start_x<3)
Horizontal_XOR_line(Mouse_X+start_x-5,Mouse_Y,3-start_x);
end_x=(Mouse_X+6>Screen_width)?Mouse_X+6-Screen_width:0;
if (end_x<3)
Horizontal_XOR_line(Mouse_X+3,Mouse_Y,3-end_x);
end_y=(Mouse_Y+6>Menu_Y/*Screen_height*/)?Mouse_Y+6-Menu_Y/*Screen_height*/:0;
if (end_y<3)
Vertical_XOR_line (Mouse_X,Mouse_Y+3,3-end_y);
// Petites barres aux extrémités
start_x=(!Mouse_X);
start_y=(!Mouse_Y);
end_x=(Mouse_X>=Screen_width-1);
end_y=(Mouse_Y>=Menu_Y-1);
if (Mouse_Y>5)
Horizontal_XOR_line(start_x+Mouse_X-1,Mouse_Y-6,3-(start_x+end_x));
if (Mouse_X>5)
Vertical_XOR_line (Mouse_X-6,start_y+Mouse_Y-1,3-(start_y+end_y));
if (Mouse_X<Screen_width-6)
Vertical_XOR_line (Mouse_X+6,start_y+Mouse_Y-1,3-(start_y+end_y));
if (Mouse_Y<Menu_Y-6)
Horizontal_XOR_line(start_x+Mouse_X-1,Mouse_Y+6,3-(start_x+end_x));
}
else
{
temp=(Config.Cursor)?CURSOR_SHAPE_THIN_COLORPICKER:CURSOR_SHAPE_COLORPICKER;
start_x=Mouse_X-Gfx->Cursor_offset_X[temp];
start_y=Mouse_Y-Gfx->Cursor_offset_Y[temp];
for (y_pos=start_y,counter_y=0;counter_y<15;y_pos++,counter_y++)
{ {
if(y_pos<0) continue; if(x_pos<0) continue;
if(y_pos>=Screen_height) break; if(x_pos>=Screen_width) break;
for (x_pos=start_x,counter_x=0;counter_x<15;x_pos++,counter_x++) color=Gfx->Cursor_sprite[temp][counter_y][counter_x];
{ // On sauvegarde dans Cursor_background pour restaurer plus tard
if(x_pos<0) continue; Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos);
if(x_pos>=Screen_width) break; if (color!=MC_Trans)
color=Gfx->Cursor_sprite[temp][counter_y][counter_x]; Pixel(x_pos,y_pos,color);
// On sauvegarde dans Cursor_background pour restaurer plus tard
Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos);
if (color!=MC_Trans)
Pixel(x_pos,y_pos,color);
}
} }
Update_rect(Max(start_x,0),Max(start_y,0),counter_x,counter_y);
} }
Update_rect(Max(start_x,0),Max(start_y,0),counter_x,counter_y);
} }
break; break;
@ -2108,7 +2105,7 @@ void Display_cursor(void)
// On sauvegarde dans Cursor_background pour restaurer plus tard // On sauvegarde dans Cursor_background pour restaurer plus tard
Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos); Cursor_background[counter_y][counter_x]=Read_pixel(x_pos,y_pos);
if (color!=MC_Trans) if (color!=MC_Trans)
Pixel(x_pos,y_pos,color); Pixel(x_pos,y_pos,color);
} }
} }
Update_rect(Max(start_x,0),Max(start_y,0),counter_x,counter_y); Update_rect(Max(start_x,0),Max(start_y,0),counter_x,counter_y);
@ -2323,8 +2320,6 @@ void Hide_cursor(void)
break; break;
case CURSOR_SHAPE_COLORPICKER: case CURSOR_SHAPE_COLORPICKER:
if (!Cursor_hidden)
{
if (Config.Cursor==1) if (Config.Cursor==1)
{ {
// Barres formant la croix principale // Barres formant la croix principale
@ -2383,7 +2378,6 @@ void Hide_cursor(void)
} }
Update_rect(Max(start_x,0),Max(start_y,0),counter_x,counter_y); Update_rect(Max(start_x,0),Max(start_y,0),counter_x,counter_y);
} }
}
if (!Paintbrush_hidden) if (!Paintbrush_hidden)
Hide_paintbrush(Paintbrush_X,Paintbrush_Y); Hide_paintbrush(Paintbrush_X,Paintbrush_Y);
break; break;