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

Center zoom to cursor. May be improved. Testing and reports welcome.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1135 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2009-11-01 19:31:14 +00:00
parent fffb90dfaf
commit 5e3f845176
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
windows.c
View File

@ -1532,15 +1532,22 @@ void Compute_magnifier_data(void)
} }
/// Changes magnifier factor and updates everything needed
// ------------ Changer le facteur de zoom et tout mettre à jour -------------
void Change_magnifier_factor(byte factor_index) void Change_magnifier_factor(byte factor_index)
{ {
short center_x; short center_x;
short center_y; short center_y;
// Values that need to be computed before switching to the new zoom factor
if (Cursor_in_menu)
{
center_x=Main_magnifier_offset_X+(Main_magnifier_width>>1); center_x=Main_magnifier_offset_X+(Main_magnifier_width>>1);
center_y=Main_magnifier_offset_Y+(Main_magnifier_height>>1); center_y=Main_magnifier_offset_Y+(Main_magnifier_height>>1);
} else {
// Zoom to cursor
center_x = (Paintbrush_X - Main_magnifier_offset_X) * 255 / Main_magnifier_width;
center_y = (Paintbrush_Y - Main_magnifier_offset_Y) * 255 / Main_magnifier_height;
}
Main_magnifier_factor=ZOOM_FACTOR[factor_index]; Main_magnifier_factor=ZOOM_FACTOR[factor_index];
Compute_magnifier_data(); Compute_magnifier_data();
@ -1549,8 +1556,14 @@ void Change_magnifier_factor(byte factor_index)
{ {
// Recalculer le décalage de la loupe // Recalculer le décalage de la loupe
// Centrage "brut" de lécran par rapport à la loupe // Centrage "brut" de lécran par rapport à la loupe
if (Cursor_in_menu)
{
Main_magnifier_offset_X=center_x-(Main_magnifier_width>>1); Main_magnifier_offset_X=center_x-(Main_magnifier_width>>1);
Main_magnifier_offset_Y=center_y-(Main_magnifier_height>>1); Main_magnifier_offset_Y=center_y-(Main_magnifier_height>>1);
} else {
Main_magnifier_offset_X = Paintbrush_X - center_x * Main_magnifier_width / 255 ;
Main_magnifier_offset_Y = Paintbrush_Y - center_y * Main_magnifier_height / 255 ;
}
// Correction en cas de débordement de l'image // Correction en cas de débordement de l'image
if (Main_magnifier_offset_X+Main_magnifier_width>Main_image_width) if (Main_magnifier_offset_X+Main_magnifier_width>Main_image_width)
Main_magnifier_offset_X=Main_image_width-Main_magnifier_width; Main_magnifier_offset_X=Main_image_width-Main_magnifier_width;