Differential D13396 Diff 35732 plugins/platforms/x11/standalone/x11cursor.cpp

Changeset View

Standalone View

View Options

plugins/platforms/x11/standalone/x11cursor.cpp

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Line(s)138 if (lastPos != currentPos() || lastMask != m_buttonMask) {
139 emit mouseChanged(currentPos(), lastPos, 139​ emit mouseChanged(currentPos(), lastPos,
140 x11ToQtMouseButtons(m_buttonMask), x11ToQtMouseButtons(lastMask), 140​ x11ToQtMouseButtons(m_buttonMask), x11ToQtMouseButtons(lastMask),
141 x11ToQtKeyboardModifiers(m_buttonMask), x11ToQtKeyboardModifiers(lastMask)); 141​ x11ToQtKeyboardModifiers(m_buttonMask), x11ToQtKeyboardModifiers(lastMask));
142 lastPos = currentPos(); 142​ lastPos = currentPos();
143 lastMask = m_buttonMask; 143​ lastMask = m_buttonMask;
144 } 144​ }
145} 145​}
146 146​
147xcb_cursor_t X11Cursor::getX11Cursor(Qt::CursorShape shape) 147​xcb_cursor_t X11Cursor::getX11Cursor(CursorShape shape)
148{ 148​{
149 return getX11Cursor(cursorName(shape)); 149​ return getX11Cursor(shape.name());
150} 150​}
151 151​
152xcb_cursor_t X11Cursor::getX11Cursor(const QByteArray &name) 152​xcb_cursor_t X11Cursor::getX11Cursor(const QByteArray &name)
153{ 153​{
154 auto it = m_cursors.constFind(name); 154​ auto it = m_cursors.constFind(name);
155 if (it != m_cursors.constEnd()) { 155​ if (it != m_cursors.constEnd()) {
156 return it.value(); 156​ return it.value();
157 } 157​ }
Show All 39 Lines