Home
Phabricator
Search
Log In
Paste
P611
Masterwork From Distant Lands
Active
Public
Actions
Authored by
davidedmundson
on Jun 22 2020, 2:27 PM.
Edit Paste
Archive Paste
View Raw File
Subscribe
Mute Notifications
Award Token
Flag For Later
Tags
None
Subscribers
None
diff --git a/input.cpp b/input.cpp
index a0ba034ce..514fbaab6 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1667,7 +1667,7 @@ public:
connect(tool, &TabletToolInterface::cursorChanged, cursor, &Cursor::cursorChanged);
connect(tool, &TabletToolInterface::cursorChanged, cursor, [cursor] (TabletCursor* tcursor) {
static const auto createDefaultCursor = [] {
- WaylandCursorImage defaultCursor;
+ CursorImage defaultCursor;
WaylandCursorImage::Image ret;
defaultCursor.loadThemeCursor(CursorShape(Qt::CrossCursor), &ret);
return ret;
diff --git a/pointer_input.h b/pointer_input.h
index 1ae6a7505..c29362275 100644
--- a/pointer_input.h
+++ b/pointer_input.h
@@ -215,6 +215,9 @@ public:
QPoint hotSpot() const;
void markAsRendered();
+ void loadThemeCursor(CursorShape shape, WaylandCursorImage::Image *image);
+ void loadThemeCursor(const QByteArray &shape, WaylandCursorImage::Image *image);
+
Q_SIGNALS:
void changed();
@@ -228,9 +231,6 @@ private:
void updateDrag();
void updateDragCursor();
- void loadThemeCursor(CursorShape shape, WaylandCursorImage::Image *image);
- void loadThemeCursor(const QByteArray &shape, WaylandCursorImage::Image *image);
-
enum class CursorSource {
LockScreen,
EffectsOverride,
davidedmundson
edited the content of this paste.
(Show Details)
Jun 22 2020, 2:27 PM
davidedmundson
changed the title of this paste from untitled to
Masterwork From Distant Lands
.
Log In to Comment