Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use native Windows cursors to preserve the drop shadow

Browse Source
This commit is contained in:
StrikerX3 2020-12-18 22:51:15 -03:00 committed by Lukas Dürrenberger
parent 4135855ad4
commit ee8c4fdcda
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/SFML/Window/Win32/CursorImpl.cpp
View File

@ -36,7 +36,8 @@ namespace priv
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
CursorImpl::CursorImpl() : CursorImpl::CursorImpl() :
m_cursor(NULL) m_cursor(NULL),
m_systemCursor(false)
{ {
// That's it. // That's it.
} }
@ -118,6 +119,7 @@ bool CursorImpl::loadFromPixels(const Uint8* pixels, Vector2u size, Vector2u hot
// Create the cursor // Create the cursor
m_cursor = reinterpret_cast<HCURSOR>(CreateIconIndirect(&cursorInfo)); m_cursor = reinterpret_cast<HCURSOR>(CreateIconIndirect(&cursorInfo));
m_systemCursor = false;
// The data has been copied into the cursor, so get rid of these // The data has been copied into the cursor, so get rid of these
DeleteObject(color); DeleteObject(color);
@ -166,8 +168,9 @@ bool CursorImpl::loadFromSystem(Cursor::Type type)
case Cursor::NotAllowed: shape = IDC_NO; break; case Cursor::NotAllowed: shape = IDC_NO; break;
} }
// Create a copy of the shared system cursor that we can destroy later // Get the shared system cursor and make sure not to destroy it
m_cursor = CopyCursor(LoadCursor(NULL, shape)); m_cursor = LoadCursor(NULL, shape);
m_systemCursor = true;
if (m_cursor) if (m_cursor)
{ {
@ -184,7 +187,7 @@ bool CursorImpl::loadFromSystem(Cursor::Type type)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void CursorImpl::release() void CursorImpl::release()
{ {
if (m_cursor) { if (m_cursor && !m_systemCursor) {
DestroyCursor(m_cursor); DestroyCursor(m_cursor);
m_cursor = NULL; m_cursor = NULL;
} }

1
src/SFML/Window/Win32/CursorImpl.hpp
View File

@ -93,6 +93,7 @@ private:
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
HCURSOR m_cursor; HCURSOR m_cursor;
bool m_systemCursor;
}; };
} // namespace priv } // namespace priv