From d9ed3c2348f017b4b5bed6591c995c8faae683e9 Mon Sep 17 00:00:00 2001 From: David Capello Date: Tue, 25 Nov 2014 21:30:56 -0300 Subject: [PATCH] Rename jmouse_[gs]et_cursor() to ui::[gs]et_mouse_cursor() --- src/app/app.cpp | 2 +- src/app/commands/cmd_play_animation.cpp | 4 ++-- src/app/commands/cmd_preview.cpp | 2 +- .../commands/filters/color_curve_editor.cpp | 4 ++-- src/app/ui/color_button.cpp | 2 +- src/app/ui/editor/drawing_state.cpp | 4 ++-- src/app/ui/editor/editor.cpp | 2 +- src/app/ui/editor/moving_pixels_state.cpp | 2 +- src/app/ui/editor/scrolling_state.cpp | 2 +- src/app/ui/editor/select_box_state.cpp | 8 +++---- src/app/ui/editor/standby_state.cpp | 22 +++++++++---------- src/app/ui/editor/zooming_state.cpp | 2 +- src/app/ui/mini_editor.cpp | 2 +- src/app/ui/skin/skin_theme.cpp | 2 +- src/app/ui/styled_button.cpp | 2 +- src/app/ui/timeline.cpp | 16 +++++++------- src/ui/link_label.cpp | 2 +- src/ui/manager.cpp | 10 ++++----- src/ui/slider.cpp | 6 ++--- src/ui/splitter.cpp | 4 ++-- src/ui/system.cpp | 10 ++++----- src/ui/system.h | 4 ++-- src/ui/textbox.cpp | 4 ++-- src/ui/theme.cpp | 6 ++--- src/ui/widget.cpp | 2 +- src/ui/window.cpp | 4 ++-- 26 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/app/app.cpp b/src/app/app.cpp index 7580a939d..f848f80b0 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -187,7 +187,7 @@ void App::initialize(int argc, const char* argv[]) ui::set_use_native_cursors( ctx->settings()->experimental()->useNativeCursor()); - jmouse_set_cursor(kArrowCursor); + ui::set_mouse_cursor(kArrowCursor); ui::Manager::getDefault()->invalidate(); diff --git a/src/app/commands/cmd_play_animation.cpp b/src/app/commands/cmd_play_animation.cpp index 110e08fc8..038f8477e 100644 --- a/src/app/commands/cmd_play_animation.cpp +++ b/src/app/commands/cmd_play_animation.cpp @@ -100,7 +100,7 @@ protected: switch (msg->type()) { case kOpenMessage: - jmouse_set_cursor(kNoCursor); + ui::set_mouse_cursor(kNoCursor); break; case kCloseMessage: @@ -123,7 +123,7 @@ protected: } case kSetCursorMessage: - jmouse_set_cursor(kNoCursor); + ui::set_mouse_cursor(kNoCursor); return true; } diff --git a/src/app/commands/cmd_preview.cpp b/src/app/commands/cmd_preview.cpp index 0531584fb..597817392 100644 --- a/src/app/commands/cmd_preview.cpp +++ b/src/app/commands/cmd_preview.cpp @@ -173,7 +173,7 @@ protected: } case kSetCursorMessage: - jmouse_set_cursor(kNoCursor); + ui::set_mouse_cursor(kNoCursor); return true; } diff --git a/src/app/commands/filters/color_curve_editor.cpp b/src/app/commands/filters/color_curve_editor.cpp index 61da9f788..faf201170 100644 --- a/src/app/commands/filters/color_curve_editor.cpp +++ b/src/app/commands/filters/color_curve_editor.cpp @@ -128,7 +128,7 @@ bool ColorCurveEditor::onProcessMessage(Message* msg) // Edit node else { m_status = STATUS_MOVING_POINT; - jmouse_set_cursor(kHandCursor); + ui::set_mouse_cursor(kHandCursor); } captureMouse(); @@ -167,7 +167,7 @@ bool ColorCurveEditor::onProcessMessage(Message* msg) switch (m_status) { case STATUS_MOVING_POINT: - jmouse_set_cursor(kArrowCursor); + ui::set_mouse_cursor(kArrowCursor); CurveEditorChange(); m_editPoint = NULL; invalidate(); diff --git a/src/app/ui/color_button.cpp b/src/app/ui/color_button.cpp index 88e2f5316..6774751b0 100644 --- a/src/app/ui/color_button.cpp +++ b/src/app/ui/color_button.cpp @@ -151,7 +151,7 @@ bool ColorButton::onProcessMessage(Message* msg) case kSetCursorMessage: if (hasCapture()) { - jmouse_set_cursor(kEyedropperCursor); + ui::set_mouse_cursor(kEyedropperCursor); return true; } break; diff --git a/src/app/ui/editor/drawing_state.cpp b/src/app/ui/editor/drawing_state.cpp index 22c980666..34c3f4b60 100644 --- a/src/app/ui/editor/drawing_state.cpp +++ b/src/app/ui/editor/drawing_state.cpp @@ -162,10 +162,10 @@ bool DrawingState::onSetCursor(Editor* editor) { if (m_toolLoop->getInk()->isEyedropper()) { editor->hideDrawingCursor(); - jmouse_set_cursor(kEyedropperCursor); + ui::set_mouse_cursor(kEyedropperCursor); } else { - jmouse_set_cursor(kNoCursor); + ui::set_mouse_cursor(kNoCursor); editor->showDrawingCursor(); } return true; diff --git a/src/app/ui/editor/editor.cpp b/src/app/ui/editor/editor.cpp index be3c5f64b..64e11a8e9 100644 --- a/src/app/ui/editor/editor.cpp +++ b/src/app/ui/editor/editor.cpp @@ -1317,7 +1317,7 @@ void Editor::editor_setcursor() if (!used) { hideDrawingCursor(); - jmouse_set_cursor(kArrowCursor); + ui::set_mouse_cursor(kArrowCursor); } } diff --git a/src/app/ui/editor/moving_pixels_state.cpp b/src/app/ui/editor/moving_pixels_state.cpp index cbee557a1..de8ecf932 100644 --- a/src/app/ui/editor/moving_pixels_state.cpp +++ b/src/app/ui/editor/moving_pixels_state.cpp @@ -311,7 +311,7 @@ bool MovingPixelsState::onSetCursor(Editor* editor) // Move selection if (m_pixelsMovement->isDragging()) { editor->hideDrawingCursor(); - jmouse_set_cursor(kMoveCursor); + ui::set_mouse_cursor(kMoveCursor); return true; } diff --git a/src/app/ui/editor/scrolling_state.cpp b/src/app/ui/editor/scrolling_state.cpp index b86475084..98211c151 100644 --- a/src/app/ui/editor/scrolling_state.cpp +++ b/src/app/ui/editor/scrolling_state.cpp @@ -81,7 +81,7 @@ bool ScrollingState::onMouseMove(Editor* editor, MouseMessage* msg) bool ScrollingState::onSetCursor(Editor* editor) { editor->hideDrawingCursor(); - jmouse_set_cursor(kScrollCursor); + ui::set_mouse_cursor(kScrollCursor); return true; } diff --git a/src/app/ui/editor/select_box_state.cpp b/src/app/ui/editor/select_box_state.cpp index c795204f1..7c50f0ad0 100644 --- a/src/app/ui/editor/select_box_state.cpp +++ b/src/app/ui/editor/select_box_state.cpp @@ -124,8 +124,8 @@ bool SelectBoxState::onSetCursor(Editor* editor) { if (m_movingRuler >= 0) { switch (m_rulers[m_movingRuler].getOrientation()) { - case Ruler::Horizontal: jmouse_set_cursor(kSizeNSCursor); return true; - case Ruler::Vertical: jmouse_set_cursor(kSizeWECursor); return true; + case Ruler::Horizontal: ui::set_mouse_cursor(kSizeNSCursor); return true; + case Ruler::Vertical: ui::set_mouse_cursor(kSizeWECursor); return true; } } @@ -136,10 +136,10 @@ bool SelectBoxState::onSetCursor(Editor* editor) if (touchRuler(editor, *it, x, y)) { switch (it->getOrientation()) { case Ruler::Horizontal: - jmouse_set_cursor(kSizeNSCursor); + ui::set_mouse_cursor(kSizeNSCursor); return true; case Ruler::Vertical: - jmouse_set_cursor(kSizeWECursor); + ui::set_mouse_cursor(kSizeWECursor); return true; } } diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp index e6b1f255f..ae4a57f5a 100644 --- a/src/app/ui/editor/standby_state.cpp +++ b/src/app/ui/editor/standby_state.cpp @@ -434,35 +434,35 @@ bool StandbyState::onSetCursor(Editor* editor) editor->hideDrawingCursor(); if (customization && customization->isCopySelectionKeyPressed()) - jmouse_set_cursor(kArrowPlusCursor); + ui::set_mouse_cursor(kArrowPlusCursor); else - jmouse_set_cursor(kMoveCursor); + ui::set_mouse_cursor(kMoveCursor); return true; } } else if (ink->isEyedropper()) { editor->hideDrawingCursor(); - jmouse_set_cursor(kEyedropperCursor); + ui::set_mouse_cursor(kEyedropperCursor); return true; } else if (ink->isZoom()) { editor->hideDrawingCursor(); - jmouse_set_cursor(kMagnifierCursor); + ui::set_mouse_cursor(kMagnifierCursor); return true; } else if (ink->isScrollMovement()) { editor->hideDrawingCursor(); - jmouse_set_cursor(kScrollCursor); + ui::set_mouse_cursor(kScrollCursor); return true; } else if (ink->isCelMovement()) { editor->hideDrawingCursor(); - jmouse_set_cursor(kMoveCursor); + ui::set_mouse_cursor(kMoveCursor); return true; } else if (ink->isSlice()) { - jmouse_set_cursor(kNoCursor); + ui::set_mouse_cursor(kNoCursor); editor->showDrawingCursor(); return true; } @@ -470,13 +470,13 @@ bool StandbyState::onSetCursor(Editor* editor) // Draw if (editor->canDraw()) { - jmouse_set_cursor(kNoCursor); + ui::set_mouse_cursor(kNoCursor); editor->showDrawingCursor(); } // Forbidden else { editor->hideDrawingCursor(); - jmouse_set_cursor(kForbiddenCursor); + ui::set_mouse_cursor(kForbiddenCursor); } return true; @@ -575,7 +575,7 @@ void StandbyState::transformSelection(Editor* editor, MouseMessage* msg, HandleT // TODO steal the PixelsMovement of the other editor and use it for this one. StatusBar::instance()->showTip(1000, "The sprite is locked in other editor"); - jmouse_set_cursor(kForbiddenCursor); + ui::set_mouse_cursor(kForbiddenCursor); } } @@ -680,7 +680,7 @@ bool StandbyState::Decorator::onSetCursor(Editor* editor) // Hide the drawing cursor (just in case) and show the new system cursor. editor->hideDrawingCursor(); - jmouse_set_cursor(newCursor); + ui::set_mouse_cursor(newCursor); return true; } diff --git a/src/app/ui/editor/zooming_state.cpp b/src/app/ui/editor/zooming_state.cpp index f3647029a..ea970401d 100644 --- a/src/app/ui/editor/zooming_state.cpp +++ b/src/app/ui/editor/zooming_state.cpp @@ -76,7 +76,7 @@ bool ZoomingState::onMouseMove(Editor* editor, MouseMessage* msg) bool ZoomingState::onSetCursor(Editor* editor) { editor->hideDrawingCursor(); - jmouse_set_cursor(kMagnifierCursor); + ui::set_mouse_cursor(kMagnifierCursor); return true; } diff --git a/src/app/ui/mini_editor.cpp b/src/app/ui/mini_editor.cpp index ffef1a045..bc26573ea 100644 --- a/src/app/ui/mini_editor.cpp +++ b/src/app/ui/mini_editor.cpp @@ -103,7 +103,7 @@ protected: switch (msg->type()) { case kSetCursorMessage: - jmouse_set_cursor(kArrowCursor); + ui::set_mouse_cursor(kArrowCursor); return true; } diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp index 5303c03ed..51e95e1af 100644 --- a/src/app/ui/skin/skin_theme.cpp +++ b/src/app/ui/skin/skin_theme.cpp @@ -90,7 +90,7 @@ protected: switch (msg->type()) { case kSetCursorMessage: - jmouse_set_cursor(kArrowCursor); + ui::set_mouse_cursor(kArrowCursor); return true; case kKeyDownMessage: diff --git a/src/app/ui/styled_button.cpp b/src/app/ui/styled_button.cpp index fa585f7ae..7481ab782 100644 --- a/src/app/ui/styled_button.cpp +++ b/src/app/ui/styled_button.cpp @@ -40,7 +40,7 @@ StyledButton::StyledButton(const std::string& styleName) : Button("") { bool StyledButton::onProcessMessage(Message* msg) { switch (msg->type()) { case kSetCursorMessage: - jmouse_set_cursor(kHandCursor); + ui::set_mouse_cursor(kHandCursor); return true; } return Button::onProcessMessage(msg); diff --git a/src/app/ui/timeline.cpp b/src/app/ui/timeline.cpp index c21cf9440..ea71795a2 100644 --- a/src/app/ui/timeline.cpp +++ b/src/app/ui/timeline.cpp @@ -1003,32 +1003,32 @@ void Timeline::setCursor(ui::Message* msg, const gfx::Point& mousePos) { // Scrolling. if (m_state == STATE_SCROLLING || m_scroll) { - jmouse_set_cursor(kScrollCursor); + ui::set_mouse_cursor(kScrollCursor); } // Moving. else if (m_state == STATE_MOVING_RANGE) { if (isCopyKeyPressed(msg)) - jmouse_set_cursor(kArrowPlusCursor); + ui::set_mouse_cursor(kArrowPlusCursor); else - jmouse_set_cursor(kMoveCursor); + ui::set_mouse_cursor(kMoveCursor); } // Normal state. else if (m_hot_part == A_PART_HEADER_ONIONSKIN_RANGE_LEFT || m_state == STATE_MOVING_ONIONSKIN_RANGE_LEFT) { - jmouse_set_cursor(kSizeWCursor); + ui::set_mouse_cursor(kSizeWCursor); } else if (m_hot_part == A_PART_HEADER_ONIONSKIN_RANGE_RIGHT || m_state == STATE_MOVING_ONIONSKIN_RANGE_RIGHT) { - jmouse_set_cursor(kSizeECursor); + ui::set_mouse_cursor(kSizeECursor); } else if (m_hot_part == A_PART_RANGE_OUTLINE) { - jmouse_set_cursor(kMoveCursor); + ui::set_mouse_cursor(kMoveCursor); } else if (m_hot_part == A_PART_SEPARATOR) { - jmouse_set_cursor(kSizeWECursor); + ui::set_mouse_cursor(kSizeWECursor); } else { - jmouse_set_cursor(kArrowCursor); + ui::set_mouse_cursor(kArrowCursor); } } diff --git a/src/ui/link_label.cpp b/src/ui/link_label.cpp index 2dd9cbd60..1e759155d 100644 --- a/src/ui/link_label.cpp +++ b/src/ui/link_label.cpp @@ -42,7 +42,7 @@ bool LinkLabel::onProcessMessage(Message* msg) case kSetCursorMessage: // TODO theme stuff if (isEnabled()) { - jmouse_set_cursor(kHandCursor); + set_mouse_cursor(kHandCursor); return true; } break; diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp index 018e9ff23..7982afcff 100644 --- a/src/ui/manager.cpp +++ b/src/ui/manager.cpp @@ -119,7 +119,7 @@ Manager::~Manager() // Finish the main manager. if (m_defaultManager == this) { // No more cursor - jmouse_set_cursor(kNoCursor); + set_mouse_cursor(kNoCursor); // Destroy timers Timer::checkNoTimers(); @@ -161,7 +161,7 @@ void Manager::run() first_time = false; Manager::getDefault()->invalidate(); - jmouse_set_cursor(kArrowCursor); + set_mouse_cursor(kArrowCursor); } while (!getChildren().empty()) @@ -221,7 +221,7 @@ void Manager::generateSetCursorMessage(const gfx::Point& mousePos) enqueueMessage(newMouseMessage(kSetCursorMessage, dst, mousePos, currentMouseButtons(0))); else - jmouse_set_cursor(kArrowCursor); + set_mouse_cursor(kArrowCursor); } static MouseButtons mouse_buttons_from_she_to_ui(const she::Event& sheEvent) @@ -276,12 +276,12 @@ void Manager::generateMessagesFromSheEvents() } case she::Event::MouseEnter: { - jmouse_set_cursor(kArrowCursor); + set_mouse_cursor(kArrowCursor); break; } case she::Event::MouseLeave: { - jmouse_set_cursor(kOutsideDisplay); + set_mouse_cursor(kOutsideDisplay); setMouse(NULL); _internal_no_mouse_position(); diff --git a/src/ui/slider.cpp b/src/ui/slider.cpp index c34020aff..bf844e4bd 100644 --- a/src/ui/slider.cpp +++ b/src/ui/slider.cpp @@ -229,12 +229,12 @@ void Slider::setupSliderCursor() { if (hasCapture()) { if (slider_press_left) - jmouse_set_cursor(kArrowCursor); + set_mouse_cursor(kArrowCursor); else - jmouse_set_cursor(kSizeWECursor); + set_mouse_cursor(kSizeWECursor); } else - jmouse_set_cursor(kArrowCursor); + set_mouse_cursor(kArrowCursor); } } // namespace ui diff --git a/src/ui/splitter.cpp b/src/ui/splitter.cpp index e4df54333..2ca09e1ae 100644 --- a/src/ui/splitter.cpp +++ b/src/ui/splitter.cpp @@ -166,9 +166,9 @@ bool Splitter::onProcessMessage(Message* msg) if (change_cursor) { if (getAlign() & JI_HORIZONTAL) - jmouse_set_cursor(kSizeWECursor); + set_mouse_cursor(kSizeWECursor); else - jmouse_set_cursor(kSizeNSCursor); + set_mouse_cursor(kSizeNSCursor); return true; } } diff --git a/src/ui/system.cpp b/src/ui/system.cpp index a752a1bd0..12a3bf59d 100644 --- a/src/ui/system.cpp +++ b/src/ui/system.cpp @@ -165,9 +165,9 @@ int clock() void set_display(she::Display* display) { - CursorType cursor = jmouse_get_cursor(); + CursorType cursor = get_mouse_cursor(); - jmouse_set_cursor(kNoCursor); + set_mouse_cursor(kNoCursor); mouse_display = display; if (display) { @@ -182,7 +182,7 @@ void set_display(she::Display* display) } } - jmouse_set_cursor(cursor); // Restore mouse cursor + set_mouse_cursor(cursor); // Restore mouse cursor } } @@ -220,12 +220,12 @@ void set_use_native_cursors(bool state) use_native_mouse_cursor = state; } -CursorType jmouse_get_cursor() +CursorType get_mouse_cursor() { return mouse_cursor_type; } -void jmouse_set_cursor(CursorType type) +void set_mouse_cursor(CursorType type) { if (mouse_cursor_type == type) return; diff --git a/src/ui/system.h b/src/ui/system.h index c7ae4cafb..54c93f932 100644 --- a/src/ui/system.h +++ b/src/ui/system.h @@ -38,8 +38,8 @@ namespace ui { void update_cursor_overlay(); void set_use_native_cursors(bool state); - CursorType jmouse_get_cursor(); - void jmouse_set_cursor(CursorType type); + CursorType get_mouse_cursor(); + void set_mouse_cursor(CursorType type); void jmouse_hide(); void jmouse_show(); diff --git a/src/ui/textbox.cpp b/src/ui/textbox.cpp index 166d6d43d..fa45757ba 100644 --- a/src/ui/textbox.cpp +++ b/src/ui/textbox.cpp @@ -96,7 +96,7 @@ bool TextBox::onProcessMessage(Message* msg) if (view) { captureMouse(); m_oldPos = static_cast(msg)->position(); - jmouse_set_cursor(kScrollCursor); + set_mouse_cursor(kScrollCursor); return true; } break; @@ -120,7 +120,7 @@ bool TextBox::onProcessMessage(Message* msg) View* view = View::getView(this); if (view && hasCapture()) { releaseMouse(); - jmouse_set_cursor(kArrowCursor); + set_mouse_cursor(kArrowCursor); return true; } break; diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp index 58a6bb7cb..9f0949d55 100644 --- a/src/ui/theme.cpp +++ b/src/ui/theme.cpp @@ -42,12 +42,12 @@ Theme::~Theme() void Theme::regenerate() { - CursorType type = jmouse_get_cursor(); - jmouse_set_cursor(kNoCursor); + CursorType type = get_mouse_cursor(); + set_mouse_cursor(kNoCursor); onRegenerate(); - jmouse_set_cursor(type); + set_mouse_cursor(type); } ////////////////////////////////////////////////////////////////////// diff --git a/src/ui/widget.cpp b/src/ui/widget.cpp index 28a2cbba9..8d6ffd015 100644 --- a/src/ui/widget.cpp +++ b/src/ui/widget.cpp @@ -1365,7 +1365,7 @@ bool Widget::onProcessMessage(Message* msg) if (getParent() != NULL) return getParent()->sendMessage(msg); else { - jmouse_set_cursor(kArrowCursor); + set_mouse_cursor(kArrowCursor); return true; } diff --git a/src/ui/window.cpp b/src/ui/window.cpp index 731e91805..645b47a45 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -309,7 +309,7 @@ bool Window::onProcessMessage(Message* msg) case kMouseUpMessage: if (hasCapture()) { releaseMouse(); - jmouse_set_cursor(kArrowCursor); + set_mouse_cursor(kArrowCursor); if (clickedWindowPos != NULL) { delete clickedWindowPos; @@ -409,7 +409,7 @@ bool Window::onProcessMessage(Message* msg) case HitTestBorderS: cursor = kSizeSCursor; break; } - jmouse_set_cursor(cursor); + set_mouse_cursor(cursor); return true; } break;