mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Editor::editor_set_zoom_and_center_in_mouse to remove duplicated code.

Browse Source
This commit is contained in:
David Capello 2010-05-06 22:15:58 -03:00
parent dfd0bb0c00
commit bffd54bf79
3 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/editor.h
View File

@ -202,6 +202,8 @@ private:
void editor_request_size(int *w, int *h); void editor_request_size(int *w, int *h);
void editor_setcursor(int x, int y); void editor_setcursor(int x, int y);
void editor_update_candraw(); void editor_update_candraw();
void editor_set_zoom_and_center_in_mouse(int zoom, int mouse_x, int mouse_y);
IToolLoop* createToolLoopImpl(Context* context, JMessage msg); IToolLoop* createToolLoopImpl(Context* context, JMessage msg);
void for_each_pixel_of_pen(int screen_x, int screen_y, void for_each_pixel_of_pen(int screen_x, int screen_y,

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

@ -1398,39 +1398,9 @@ bool Editor::msg_proc(JMessage msg)
break; break;
case WHEEL_ZOOM: { case WHEEL_ZOOM: {
JWidget view = jwidget_get_view(this); int zoom = MID(MIN_ZOOM, m_zoom-dz, MAX_ZOOM);
JRect vp = jview_get_viewport_position(view); if (m_zoom != zoom)
int x, y, zoom; editor_set_zoom_and_center_in_mouse(zoom, msg->mouse.x, msg->mouse.y);
x = 0;
y = 0;
zoom = MID(MIN_ZOOM, m_zoom-dz, MAX_ZOOM);
/* zoom */
if (m_zoom != zoom) {
/* TODO: este pedazo de código es igual que el de la
rutina: editor_keys_toset_zoom, tengo que intentar
unir ambos, alguna función como:
editor_set_zoom_and_center_in_mouse */
screen_to_editor(jmouse_x(0), jmouse_y(0), &x, &y);
x = m_offset_x - jrect_w(vp)/2 + ((1<<zoom)>>1) + (x << zoom);
y = m_offset_y - jrect_h(vp)/2 + ((1<<zoom)>>1) + (y << zoom);
if ((m_cursor_editor_x != (vp->x1+vp->x2)/2) ||
(m_cursor_editor_y != (vp->y1+vp->y2)/2)) {
int use_refresh_region = (m_zoom == zoom) ? true: false;
m_zoom = zoom;
editor_update();
editor_set_scroll(x, y, use_refresh_region);
jmouse_set_position((vp->x1+vp->x2)/2, (vp->y1+vp->y2)/2);
}
}
jrect_free(vp);
break; break;
} }
@ -1658,6 +1628,34 @@ void Editor::editor_update_candraw()
); );
} }
void Editor::editor_set_zoom_and_center_in_mouse(int zoom, int mouse_x, int mouse_y)
{
JWidget view = jwidget_get_view(this);
JRect vp = jview_get_viewport_position(view);
int x, y;
hide_drawing_cursor();
screen_to_editor(mouse_x, mouse_y, &x, &y);
x = m_offset_x - jrect_w(vp)/2 + ((1<<zoom)>>1) + (x << zoom);
y = m_offset_y - jrect_h(vp)/2 + ((1<<zoom)>>1) + (y << zoom);
if ((m_zoom != zoom) ||
(m_cursor_editor_x != (vp->x1+vp->x2)/2) ||
(m_cursor_editor_y != (vp->y1+vp->y2)/2)) {
int use_refresh_region = (m_zoom == zoom) ? true: false;
m_zoom = zoom;
editor_update();
editor_set_scroll(x, y, use_refresh_region);
jmouse_set_position((vp->x1+vp->x2)/2, (vp->y1+vp->y2)/2);
}
show_drawing_cursor();
jrect_free(vp);
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Decorator implementation // Decorator implementation

28
src/widgets/editor/keys.cpp
View File

@ -49,7 +49,7 @@ bool Editor::editor_keys_toset_zoom(int scancode)
y = 0; y = 0;
zoom = -1; zoom = -1;
switch (scancode) { /* TODO make these keys configurable */ switch (scancode) { // TODO make these keys configurable
case KEY_1: zoom = 0; break; case KEY_1: zoom = 0; break;
case KEY_2: zoom = 1; break; case KEY_2: zoom = 1; break;
case KEY_3: zoom = 2; break; case KEY_3: zoom = 2; break;
@ -58,30 +58,10 @@ bool Editor::editor_keys_toset_zoom(int scancode)
case KEY_6: zoom = 5; break; case KEY_6: zoom = 5; break;
} }
/* zoom */ // Change zoom
if (zoom >= 0) { if (zoom >= 0) {
hide_drawing_cursor(); editor_set_zoom_and_center_in_mouse(zoom, jmouse_x(0), jmouse_y(0));
screen_to_editor(jmouse_x(0), jmouse_y(0), &x, &y); return true;
x = m_offset_x - jrect_w(vp)/2 + ((1<<zoom)>>1) + (x << zoom);
y = m_offset_y - jrect_h(vp)/2 + ((1<<zoom)>>1) + (y << zoom);
if ((m_zoom != zoom) ||
(m_cursor_editor_x != (vp->x1+vp->x2)/2) ||
(m_cursor_editor_y != (vp->y1+vp->y2)/2)) {
int use_refresh_region = (m_zoom == zoom) ? true: false;
m_zoom = zoom;
editor_update();
editor_set_scroll(x, y, use_refresh_region);
jmouse_set_position((vp->x1+vp->x2)/2, (vp->y1+vp->y2)/2);
jrect_free(vp);
show_drawing_cursor();
return true;
}
} }
jrect_free(vp); jrect_free(vp);