Skip to content

Commit

Permalink
Fix pencil cursor for GfxCanvas painting on windows
Browse files Browse the repository at this point in the history
Was missing the wx rc from SLADE.rc
  • Loading branch information
sirjuddington committed Apr 24, 2024
1 parent 6b65d60 commit 1019199
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 36 deletions.
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
/win_installer/Output
/cmake-build-*
/.idea/
/msvc/.vs
/msvc/x64/
/.vs
/out/

Expand All @@ -42,4 +40,10 @@
!/dist/CMakeLists.txt
!/dist/makebuild.ps1

/msvc/*
!/msvc/resource.h
!/msvc/slade.ico
!/msvc/SLADE.manifest
!/msvc/SLADE.rc

CMakeSettings.json
67 changes: 34 additions & 33 deletions msvc/SLADE.rc
Original file line number Diff line number Diff line change
Expand Up @@ -25,61 +25,62 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE
//

1 TEXTINCLUDE
1 TEXTINCLUDE
BEGIN
"resource.h\0"
"resource.h\0"
END

2 TEXTINCLUDE
2 TEXTINCLUDE
BEGIN
"#include ""winres.h""\r\n"
"\0"
"#include ""winres.h""\r\n"
"\0"
END

3 TEXTINCLUDE
3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
"\r\n"
"\0"
END

#endif // APSTUDIO_INVOKED

#include <wx/msw/wx.rc>

/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,3,0
PRODUCTVERSION 3,3,0
FILEFLAGSMASK 0x3fL
FILEVERSION 3, 3, 0
PRODUCTVERSION 3, 3, 0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
FILEOS 0x40004L
FILETYPE 0x1L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "0c0904b0"
BEGIN
VALUE "FileDescription", "SLADE"
VALUE "FileVersion", "3.3.0 alpha"
VALUE "InternalName", "SLADE.exe"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "SLADE.exe"
VALUE "ProductName", "SLADE"
VALUE "ProductVersion", "3.3.0 alpha"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0xc09, 1200
END
BLOCK "StringFileInfo"
BEGIN
BLOCK "0c0904b0"
BEGIN
VALUE "FileDescription", "SLADE"
VALUE "FileVersion", "3.3.0 alpha"
VALUE "InternalName", "SLADE.exe"
VALUE "LegalCopyright", "Copyright (C) 2023"
VALUE "OriginalFilename", "SLADE.exe"
VALUE "ProductName", "SLADE"
VALUE "ProductVersion", "3.3.0 alpha"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0xc09, 1200
END
END


Expand Down
2 changes: 1 addition & 1 deletion src/UI/Canvas/GfxCanvasBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void GfxCanvasBase::onMouseMovement(wxMouseEvent& e)
if (on_image)
{
if (editing_mode_ != EditMode::None)
window()->SetCursor(wxCursor(wxCURSOR_PAINT_BRUSH));
window()->SetCursor(wxCursor(wxCURSOR_PENCIL));
else if (allow_drag_)
window()->SetCursor(wxCursor(wxCURSOR_SIZING));
}
Expand Down

0 comments on commit 1019199

Please sign in to comment.