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

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

View File

@ -620,7 +620,7 @@ void Editor::drawMaskSafe()
if (thick)
clearBrushPreview();
else
jmouse_hide();
ui::hide_mouse_cursor();
GraphicsPtr g = getGraphics(getClientBounds());
@ -634,7 +634,7 @@ void Editor::drawMaskSafe()
if (thick)
drawBrushPreview(m_cursorScreen);
else
jmouse_show();
ui::show_mouse_cursor();
}
}
@ -923,18 +923,18 @@ void Editor::showDrawingCursor()
ASSERT(m_sprite != NULL);
if (!m_cursorThick && canDraw()) {
jmouse_hide();
ui::hide_mouse_cursor();
drawBrushPreview(ui::get_mouse_position());
jmouse_show();
ui::show_mouse_cursor();
}
}
void Editor::hideDrawingCursor()
{
if (m_cursorThick) {
jmouse_hide();
ui::hide_mouse_cursor();
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
// when the mouse moves only).
if (m_cursorScreen != mousePos) {
jmouse_hide();
ui::hide_mouse_cursor();
moveBrushPreview(mousePos);
jmouse_show();
ui::show_mouse_cursor();
}
}
}

View File

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

View File

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

View File

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