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

Remove jmouse_b() function

Browse Source
This commit is contained in:
David Capello 2014-11-25 22:01:36 -03:00
parent 0a7bbfba6b
commit 376fd0a23c
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/manager.cpp
View File

@ -219,7 +219,7 @@ void Manager::generateSetCursorMessage(const gfx::Point& mousePos)
Widget* dst = (capture_widget ? capture_widget: mouse_widget);
if (dst)
enqueueMessage(newMouseMessage(kSetCursorMessage, dst,
mousePos, currentMouseButtons(0)));
mousePos, currentMouseButtons()));
else
set_mouse_cursor(kArrowCursor);
}
@ -447,7 +447,7 @@ void Manager::dispatchMessages()
{
// Add the "Queue Processing" message for the manager.
enqueueMessage(newMouseMessage(kQueueProcessingMessage, this,
gfx::Point(jmouse_x(0), jmouse_y(0)), currentMouseButtons(0)));
gfx::Point(jmouse_x(0), jmouse_y(0)), currentMouseButtons()));
pumpQueue();
}
@ -660,7 +660,7 @@ void Manager::setMouse(Widget* widget)
it = widget_parents.begin();
Message* msg = newMouseMessage(kMouseEnterMessage, NULL,
gfx::Point(jmouse_x(0), jmouse_y(0)), currentMouseButtons(0));
gfx::Point(jmouse_x(0), jmouse_y(0)), currentMouseButtons());
for (; it != widget_parents.end(); ++it) {
(*it)->flags |= JI_HASMOUSE;
@ -1264,9 +1264,9 @@ Message* Manager::newMouseMessage(MessageType type,
}
// static
MouseButtons Manager::currentMouseButtons(int antique)
MouseButtons Manager::currentMouseButtons()
{
return jmouse_b(antique);
return _internal_get_mouse_buttons();
}
// static

2
src/ui/manager.h
View File

@ -108,7 +108,7 @@ namespace ui {
static Message* newMouseMessage(MessageType type,
Widget* widget, const gfx::Point& mousePos,
MouseButtons buttons, const gfx::Point& wheelDelta = gfx::Point(0, 0));
static MouseButtons currentMouseButtons(int antique);
static MouseButtons currentMouseButtons();
void broadcastKeyMsg(Message* msg);
static Manager* m_defaultManager;

15
src/ui/system.cpp
View File

@ -37,7 +37,7 @@ static bool native_cursor_set = false; // If we displayed a native cursor
/* Mouse information (button and position). */
static volatile int m_b[2];
static volatile MouseButtons m_buttons;
static int m_x[2];
static int m_y[2];
static int m_z[2];
@ -270,8 +270,12 @@ void _internal_set_mouse_position(const gfx::Point& newPos)
void _internal_set_mouse_buttons(MouseButtons buttons)
{
m_b[1] = m_b[0];
m_b[0] = buttons;
m_buttons = buttons;
}
MouseButtons _internal_get_mouse_buttons()
{
return m_buttons;
}
gfx::Point get_mouse_position()
@ -287,11 +291,6 @@ void set_mouse_position(const gfx::Point& newPos)
_internal_set_mouse_position(newPos);
}
MouseButtons jmouse_b(int antique)
{
return (MouseButtons)m_b[antique & 1];
}
int jmouse_x(int antique) { return m_x[antique & 1]; }
int jmouse_y(int antique) { return m_y[antique & 1]; }
int jmouse_z(int antique) { return m_z[antique & 1]; }

2
src/ui/system.h
View File

@ -47,11 +47,11 @@ namespace ui {
void _internal_no_mouse_position();
void _internal_set_mouse_position(const gfx::Point& newPos);
void _internal_set_mouse_buttons(MouseButtons buttons);
MouseButtons _internal_get_mouse_buttons();
gfx::Point get_mouse_position();
void set_mouse_position(const gfx::Point& newPos);
MouseButtons jmouse_b(int antique);
int jmouse_x(int antique);
int jmouse_y(int antique);
int jmouse_z(int antique);