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

Improved zoom-on-mouse: when changing zoom factor, the pixel under mouse cursor, either in normal or magnified view, stays 'stuck' under it, and both views re-center accordingly. Only limits are the scrolling constraints of Grafx2: The zoomed view must always be part of the non-zoomed view, it's not allowed to see above and left of picture limits, and it auto-scrolls left or top when you go near the right or bottom limit (show more pixels)

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1295 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-02-02 01:06:14 +00:00
parent 0125c15209
commit 47f8f8ffc4
1 changed files with 82 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
windows.c
View File

@ -1655,8 +1655,7 @@ void Position_screen_according_to_zoom(void)
-(Main_separator_position>>1); -(Main_separator_position>>1);
if (Main_offset_X<0) if (Main_offset_X<0)
Main_offset_X=0; Main_offset_X=0;
else else if (Main_image_width<Main_offset_X+Main_separator_position)
if (Main_image_width<Main_offset_X+Main_separator_position)
Main_offset_X=Main_image_width-Main_separator_position; Main_offset_X=Main_image_width-Main_separator_position;
} }
else else
@ -1669,8 +1668,51 @@ void Position_screen_according_to_zoom(void)
-(Menu_Y>>1); -(Menu_Y>>1);
if (Main_offset_Y<0) if (Main_offset_Y<0)
Main_offset_Y=0; Main_offset_Y=0;
else else if (Main_image_height<Main_offset_Y+Menu_Y)
if (Main_image_height<Main_offset_Y+Menu_Y) Main_offset_Y=Main_image_height-Menu_Y;
}
else
Main_offset_Y=0;
}
// -- Recenter the non-zoomed part of image around a precise pixel
void Position_screen_according_to_position(int target_x, int target_y)
{
// Centrage en X
if (Main_image_width>Main_separator_position)
{
Main_offset_X=target_x-Mouse_X;
// Do not allow the zoomed part to show something that the
// non-zoomed part doesn't see. All clipping is computed according
// to the non-zoomed part.
if (Main_magnifier_offset_X<Main_offset_X)
Main_offset_X=Main_magnifier_offset_X;
else if (Main_magnifier_offset_X+Main_magnifier_width > Main_offset_X+Main_separator_position)
Main_offset_X = Main_magnifier_offset_X+Main_magnifier_width-Main_separator_position;
if (Main_offset_X<0)
Main_offset_X=0;
else if (Main_image_width<Main_offset_X+Main_separator_position)
Main_offset_X=Main_image_width-Main_separator_position;
}
else
Main_offset_X=0;
// Centrage en Y
if (Main_image_height>Menu_Y)
{
Main_offset_Y=target_y-Mouse_Y;
// Do not allow the zoomed part to show something that the
// non-zoomed part doesn't see. All clipping is computed according
// to the non-zoomed part.
if (Main_magnifier_offset_Y<Main_offset_Y)
Main_offset_Y=Main_magnifier_offset_Y;
else if (Main_magnifier_offset_Y+Main_magnifier_height > Main_offset_Y)
Main_offset_Y = Main_magnifier_offset_Y+Main_magnifier_height;
if (Main_offset_Y<0)
Main_offset_Y=0;
else if (Main_image_height<Main_offset_Y+Menu_Y)
Main_offset_Y=Main_image_height-Menu_Y; Main_offset_Y=Main_image_height-Menu_Y;
} }
else else
@ -1737,18 +1779,30 @@ void Compute_magnifier_data(void)
/// Changes magnifier factor and updates everything needed /// Changes magnifier factor and updates everything needed
void Change_magnifier_factor(byte factor_index) void Change_magnifier_factor(byte factor_index)
{ {
float center_x; int target_x,target_y; // These coordinates are in image space
float center_y; byte point_at_mouse=0;
byte magnified_view_leads=1;
// Values that need to be computed before switching to the new zoom factor // Values that need to be computed before switching to the new zoom factor
if (Cursor_in_menu || !Main_magnifier_mode) if (Cursor_in_menu || !Main_magnifier_mode)
{ {
center_x = Main_magnifier_offset_X + (Main_magnifier_width / 2); // Locate the pixel in center of the magnified area
center_y = Main_magnifier_offset_Y + (Main_magnifier_height / 2); target_x = Main_magnifier_offset_X + (Main_magnifier_width >> 1);
} else { target_y = Main_magnifier_offset_Y + (Main_magnifier_height >> 1);
// Zoom to cursor }
center_x = (Paintbrush_X - Main_magnifier_offset_X) / (float)Main_magnifier_width; else if (Mouse_X>=Main_X_zoom)
center_y = (Paintbrush_Y - Main_magnifier_offset_Y) / (float)Main_magnifier_height; {
// Locate the pixel under the cursor, in magnified area
target_x=((Mouse_X-Main_X_zoom)/Main_magnifier_factor)+Main_magnifier_offset_X;
target_y=(Mouse_Y/Main_magnifier_factor)+Main_magnifier_offset_Y;
point_at_mouse=1;
}
else
{
// Locate the pixel under the cursor, in normal area
target_x=Mouse_X+Main_offset_X;
target_y=Mouse_Y+Main_offset_Y;
magnified_view_leads=0;
} }
Main_magnifier_factor=ZOOM_FACTOR[factor_index]; Main_magnifier_factor=ZOOM_FACTOR[factor_index];
@ -1756,17 +1810,20 @@ void Change_magnifier_factor(byte factor_index)
if (Main_magnifier_mode) if (Main_magnifier_mode)
{ {
// Recalculer le décalage de la loupe // Recompute the magnifier offset (center its view)
// Centrage "brut" de lécran par rapport à la loupe if (point_at_mouse)
if (Cursor_in_menu)
{ {
Main_magnifier_offset_X=center_x-(Main_magnifier_width>>1); // Target pixel must be located under the mouse position.
Main_magnifier_offset_Y=center_y-(Main_magnifier_height>>1); Main_magnifier_offset_X = target_x-((Mouse_X-Main_X_zoom)/Main_magnifier_factor);
} else { Main_magnifier_offset_Y = target_y-((Mouse_Y)/Main_magnifier_factor);
Main_magnifier_offset_X = Paintbrush_X - center_x * Main_magnifier_width ;
Main_magnifier_offset_Y = Paintbrush_Y - center_y * Main_magnifier_height ;
} }
// Correction en cas de débordement de l'image else
{
// Target pixel must be positioned at new center
Main_magnifier_offset_X = target_x-(Main_magnifier_width>>1);
Main_magnifier_offset_Y = target_y-(Main_magnifier_height>>1);
}
// Fix cases where the image would overflow on edges
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;
if (Main_magnifier_offset_Y+Main_magnifier_height>Main_image_height) if (Main_magnifier_offset_Y+Main_magnifier_height>Main_image_height)
@ -1776,7 +1833,10 @@ void Change_magnifier_factor(byte factor_index)
if (Main_magnifier_offset_Y<0) if (Main_magnifier_offset_Y<0)
Main_magnifier_offset_Y=0; Main_magnifier_offset_Y=0;
Position_screen_according_to_zoom(); if (magnified_view_leads)
Position_screen_according_to_zoom();
else
Position_screen_according_to_position(target_x, target_y);
Pixel_preview=Pixel_preview_magnifier; Pixel_preview=Pixel_preview_magnifier;