mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-03 23:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not center the mouse pointer when zoom (Paul Pridham idea).

Browse Source
This commit is contained in:
David Capello 2010-10-12 10:37:54 -03:00
parent 1bbcf0af38
commit bd2db4508e
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.html
View File

@ -338,6 +338,7 @@ make</pre>
Mateusz&nbsp;Czaplinski, Mateusz&nbsp;Czaplinski,
Nathan&nbsp;"whitedoor"&nbsp;Smith, Nathan&nbsp;"whitedoor"&nbsp;Smith,
Nora&nbsp;Amendez, Nora&nbsp;Amendez,
Paul&nbsp;Pridham,
Peter&nbsp;"tjaden"&nbsp;Wang, Peter&nbsp;"tjaden"&nbsp;Wang,
Philippe&nbsp;Michael&nbsp;Groarke, Philippe&nbsp;Michael&nbsp;Groarke,
Robert&nbsp;"Bob"&nbsp;J&nbsp;Ohannessian, Robert&nbsp;"Bob"&nbsp;J&nbsp;Ohannessian,

22
src/widgets/editor/editor.cpp
View File

@ -1718,16 +1718,27 @@ void Editor::editor_set_zoom_and_center_in_mouse(int zoom, int mouse_x, int mous
JWidget view = jwidget_get_view(this); JWidget view = jwidget_get_view(this);
JRect vp = jview_get_viewport_position(view); JRect vp = jview_get_viewport_position(view);
int x, y; int x, y;
bool centerMouse = get_config_bool("Editor", "CenterMouseInZoom", false);
int mx, my;
hide_drawing_cursor(); hide_drawing_cursor();
screen_to_editor(mouse_x, mouse_y, &x, &y); screen_to_editor(mouse_x, mouse_y, &x, &y);
x = m_offset_x - jrect_w(vp)/2 + ((1<<zoom)>>1) + (x << zoom); if (centerMouse) {
y = m_offset_y - jrect_h(vp)/2 + ((1<<zoom)>>1) + (y << zoom); mx = (vp->x1+vp->x2)/2;
my = (vp->y1+vp->y2)/2;
}
else {
mx = mouse_x;
my = mouse_y;
}
x = m_offset_x - (mx - vp->x1) + ((1<<zoom)>>1) + (x << zoom);
y = m_offset_y - (my - vp->y1) + ((1<<zoom)>>1) + (y << zoom);
if ((m_zoom != zoom) || if ((m_zoom != zoom) ||
(m_cursor_editor_x != (vp->x1+vp->x2)/2) || (m_cursor_editor_x != mx) ||
(m_cursor_editor_y != (vp->y1+vp->y2)/2)) { (m_cursor_editor_y != my)) {
int use_refresh_region = (m_zoom == zoom) ? true: false; int use_refresh_region = (m_zoom == zoom) ? true: false;
m_zoom = zoom; m_zoom = zoom;
@ -1735,7 +1746,8 @@ void Editor::editor_set_zoom_and_center_in_mouse(int zoom, int mouse_x, int mous
editor_update(); editor_update();
editor_set_scroll(x, y, use_refresh_region); editor_set_scroll(x, y, use_refresh_region);
jmouse_set_position((vp->x1+vp->x2)/2, (vp->y1+vp->y2)/2); if (centerMouse)
jmouse_set_position(mx, my);
} }
show_drawing_cursor(); show_drawing_cursor();
jrect_free(vp); jrect_free(vp);