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

Magnifier: Both views positions are preserved on switching to Spare and back. Changing zoom with dropdown menu doesn't accidentally zoom on mouse

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1298 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2010-02-02 19:40:51 +00:00
parent 051f5e60cf
commit e96be96ce1
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
windows.c
View File

@@ -1777,18 +1777,18 @@ void Compute_magnifier_data(void)
/// Changes magnifier factor and updates everything needed
void Change_magnifier_factor(byte factor_index)
void Change_magnifier_factor(byte factor_index, byte point_at_mouse)
{
int target_x,target_y; // These coordinates are in image space
byte point_at_mouse=0;
byte magnified_view_leads=1;
// Values that need to be computed before switching to the new zoom factor
if (Cursor_in_menu || !Main_magnifier_mode)
if (!point_at_mouse || Cursor_in_menu || !Main_magnifier_mode)
{
// Locate the pixel in center of the magnified area
target_x = Main_magnifier_offset_X + (Main_magnifier_width >> 1);
target_y = Main_magnifier_offset_Y + (Main_magnifier_height >> 1);
point_at_mouse=0;
}
else if (Mouse_X>=Main_X_zoom)
{
@@ -1803,6 +1803,7 @@ void Change_magnifier_factor(byte factor_index)
target_x=Mouse_X+Main_offset_X;
target_y=Mouse_Y+Main_offset_Y;
magnified_view_leads=0;
point_at_mouse=0;
}
Main_magnifier_factor=ZOOM_FACTOR[factor_index];