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

do not disable magnifier when loading a picture if possible

Browse Source 
see
http://pulkomandy.tk/projects/GrafX2/ticket/14
This commit is contained in:
Thomas Bernard 2019-05-21 14:18:12 +02:00
parent a41793ea04
commit d5cd358d72
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/buttons.c
View File

@ -3220,6 +3220,10 @@ void Load_picture(enum CONTEXT_TYPE type)
// again here // again here
if (confirm) if (confirm)
{ {
short old_image_width, old_image_height;
old_image_width = Main.image_width;
old_image_height = Main.image_height;
old_cursor_shape=Cursor_shape; old_cursor_shape=Cursor_shape;
Hide_cursor(); Hide_cursor();
Cursor_shape=CURSOR_SHAPE_HOURGLASS; Cursor_shape=CURSOR_SHAPE_HOURGLASS;
@ -3279,10 +3283,12 @@ void Load_picture(enum CONTEXT_TYPE type)
{ {
if (type==CONTEXT_MAIN_IMAGE) if (type==CONTEXT_MAIN_IMAGE)
{ {
if (Main.magnifier_mode) if (Main.magnifier_mode &&
(Main.image_width > old_image_width || Main.image_height > old_image_height))
{ {
Pixel_preview=Pixel_preview_normal; // disable magnifier
Main.magnifier_mode=0; Pixel_preview = Pixel_preview_normal;
Main.magnifier_mode = 0;
Draw_menu_button(BUTTON_MAGNIFIER,Main.magnifier_mode); Draw_menu_button(BUTTON_MAGNIFIER,Main.magnifier_mode);
} }
@ -3314,8 +3320,11 @@ void Load_picture(enum CONTEXT_TYPE type)
} }
else else
{ {
Main.offset_X=0; if (Main.image_width > old_image_width || Main.image_height > old_image_height)
Main.offset_Y=0; {
Main.offset_X = 0;
Main.offset_Y = 0;
}
Compute_limits(); Compute_limits();
Compute_paintbrush_coordinates(); Compute_paintbrush_coordinates();
} }