mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-27 06:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename jmouse_hide/show() to ui::hide/show_mouse_cursor()

Browse Source
This commit is contained in:
David Capello 2014-11-25 21:35:06 -03:00
parent b74262e36e
commit a35c32dcfe
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/ui/editor/editor.cpp
View File

@ -620,7 +620,7 @@ void Editor::drawMaskSafe()
if (thick) if (thick)
clearBrushPreview(); clearBrushPreview();
else else
jmouse_hide(); ui::hide_mouse_cursor();
GraphicsPtr g = getGraphics(getClientBounds()); GraphicsPtr g = getGraphics(getClientBounds());
@ -634,7 +634,7 @@ void Editor::drawMaskSafe()
if (thick) if (thick)
drawBrushPreview(m_cursorScreen); drawBrushPreview(m_cursorScreen);
else else
jmouse_show(); ui::show_mouse_cursor();
} }
} }
@ -923,18 +923,18 @@ void Editor::showDrawingCursor()
ASSERT(m_sprite != NULL); ASSERT(m_sprite != NULL);
if (!m_cursorThick && canDraw()) { if (!m_cursorThick && canDraw()) {
jmouse_hide(); ui::hide_mouse_cursor();
drawBrushPreview(ui::get_mouse_position()); drawBrushPreview(ui::get_mouse_position());
jmouse_show(); ui::show_mouse_cursor();
} }
} }
void Editor::hideDrawingCursor() void Editor::hideDrawingCursor()
{ {
if (m_cursorThick) { if (m_cursorThick) {
jmouse_hide(); ui::hide_mouse_cursor();
clearBrushPreview(); clearBrushPreview();
jmouse_show(); ui::show_mouse_cursor();
} }
} }
@ -947,9 +947,9 @@ void Editor::moveDrawingCursor()
// Redraw it only when the mouse change to other pixel (not // Redraw it only when the mouse change to other pixel (not
// when the mouse moves only). // when the mouse moves only).
if (m_cursorScreen != mousePos) { if (m_cursorScreen != mousePos) {
jmouse_hide(); ui::hide_mouse_cursor();
moveBrushPreview(mousePos); moveBrushPreview(mousePos);
jmouse_show(); ui::show_mouse_cursor();
} }
} }
} }

4
src/ui/system.cpp
View File

@ -234,13 +234,13 @@ void set_mouse_cursor(CursorType type)
update_mouse_cursor(); update_mouse_cursor();
} }
void jmouse_hide() void hide_mouse_cursor()
{ {
ASSERT(mouse_scares >= 0); ASSERT(mouse_scares >= 0);
mouse_scares++; mouse_scares++;
} }
void jmouse_show() void show_mouse_cursor()
{ {
ASSERT(mouse_scares > 0); ASSERT(mouse_scares > 0);
mouse_scares--; mouse_scares--;

4
src/ui/system.h
View File

@ -41,8 +41,8 @@ namespace ui {
CursorType get_mouse_cursor(); CursorType get_mouse_cursor();
void set_mouse_cursor(CursorType type); void set_mouse_cursor(CursorType type);
void jmouse_hide(); void hide_mouse_cursor();
void jmouse_show(); void show_mouse_cursor();
void _internal_no_mouse_position(); void _internal_no_mouse_position();
void _internal_set_mouse_position(const gfx::Point& newPos); void _internal_set_mouse_position(const gfx::Point& newPos);

4
src/ui/window.cpp
View File

@ -574,14 +574,14 @@ void Window::moveWindow(const gfx::Rect& rect, bool use_blit)
// Move the window's graphics // Move the window's graphics
ScreenGraphics g; ScreenGraphics g;
jmouse_hide(); hide_mouse_cursor();
{ {
IntersectClip clip(&g, man_pos); IntersectClip clip(&g, man_pos);
if (clip) { if (clip) {
ui::move_region(moveableRegion, dx, dy); ui::move_region(moveableRegion, dx, dy);
} }
} }
jmouse_show(); show_mouse_cursor();
reg1.createSubtraction(reg1, moveableRegion); reg1.createSubtraction(reg1, moveableRegion);
reg1.offset(dx, dy); reg1.offset(dx, dy);