diff --git a/CMakeLists.txt b/CMakeLists.txt index 71dac7a..8bc36ff 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,8 +260,8 @@ elseif(APPLE) BUNDLE True MACOSX_BUNDLE_GUI_IDENTIFIER com.infinipaint.infinipaint MACOSX_BUNDLE_BUNDLE_NAME infinipaint - MACOSX_BUNDLE_BUNDLE_VERSION "0.6.0" - MACOSX_BUNDLE_SHORT_VERSION_STRING "0.6.0" + MACOSX_BUNDLE_BUNDLE_VERSION "0.6.1" + MACOSX_BUNDLE_SHORT_VERSION_STRING "0.6.1" MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/macosinstall/Info.plist ) add_custom_command(TARGET main POST_BUILD @@ -483,7 +483,7 @@ if(APPLE OR WIN32) set(CPACK_PACKAGE_NAME "infinipaint") set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "6") - set(CPACK_PACKAGE_VERSION_PATCH "0") + set(CPACK_PACKAGE_VERSION_PATCH "1") set(CPACK_PACKAGE_VENDOR "ErrorAtLine0") set(CPACK_PACKAGE_CONTACT "erroratline0@gmail.com") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle index 021403a..79f65aa 100644 --- a/android-project/app/build.gradle +++ b/android-project/app/build.gradle @@ -34,8 +34,8 @@ android { applicationId 'com.erroratline0.InfiniPaint' minSdkVersion 27 targetSdk 36 - versionCode 2 - versionName "0.6.0" + versionCode 3 + versionName "0.6.1" externalNativeBuild { cmake { cppFlags "-fexceptions", "-frtti" diff --git a/linuxinstall/com.infinipaint.infinipaint.metainfo.xml b/linuxinstall/com.infinipaint.infinipaint.metainfo.xml index 05a2528..5aba7b9 100644 --- a/linuxinstall/com.infinipaint.infinipaint.metainfo.xml +++ b/linuxinstall/com.infinipaint.infinipaint.metainfo.xml @@ -60,6 +60,15 @@ com.infinipaint.infinipaint.desktop + + +

Patch update:

+
    +
  • Added fill color 1 and back color 0 to theme editor
  • +
  • Added disable touch for drawing option
  • +
+
+

Major update:

diff --git a/macosinstall/Info.plist b/macosinstall/Info.plist index 329672d..9555178 100755 --- a/macosinstall/Info.plist +++ b/macosinstall/Info.plist @@ -13,9 +13,9 @@ CFBundleSpokenName InfiniPaint CFBundleVersion - 0.6.0 + 0.6.1 CFBundleShortVersionString - 0.6.0 + 0.6.1 CFBundlePackageType APPL NSHumanReadableCopyright diff --git a/src/DrawingProgram/DrawingProgram.cpp b/src/DrawingProgram/DrawingProgram.cpp index 3df76fd..6f08572 100644 --- a/src/DrawingProgram/DrawingProgram.cpp +++ b/src/DrawingProgram/DrawingProgram.cpp @@ -120,9 +120,11 @@ void DrawingProgram::input_text_callback(const InputManager::TextCallbackArgs& t } void DrawingProgram::input_mouse_button_callback(const InputManager::MouseButtonCallbackArgs& button) { + if(button.deviceType == InputManager::MouseDeviceType::TOUCH && world.main.conf.disableTouchForDrawing) + return; + auto buttonCallbacks = [&](const InputManager::MouseButtonCallbackArgs& b) { - if(b.deviceType != InputManager::MouseDeviceType::TOUCH || !world.main.conf.disableTouchForDrawing) - drawTool->input_mouse_button_on_canvas_callback(b); + drawTool->input_mouse_button_on_canvas_callback(b); }; if(button.down) { @@ -174,8 +176,10 @@ void DrawingProgram::input_mouse_button_callback(const InputManager::MouseButton } void DrawingProgram::input_mouse_motion_callback(const InputManager::MouseMotionCallbackArgs& motion) { - if(motion.deviceType != InputManager::MouseDeviceType::TOUCH || !world.main.conf.disableTouchForDrawing) - drawTool->input_mouse_motion_callback(motion); + if(motion.deviceType == InputManager::MouseDeviceType::TOUCH && world.main.conf.disableTouchForDrawing) + return; + + drawTool->input_mouse_motion_callback(motion); } void DrawingProgram::input_key_callback(const InputManager::KeyCallbackArgs& key) { diff --git a/src/VersionConstants.hpp b/src/VersionConstants.hpp index 781a436..d91424c 100644 --- a/src/VersionConstants.hpp +++ b/src/VersionConstants.hpp @@ -29,6 +29,6 @@ namespace VersionConstants { constexpr int SAVEFILE_HEADER_LEN = 12; // DO NOT CHANGE THIS HEADER LENGTH const std::string CURRENT_SAVEFILE_HEADER = "INFPNT000006"; // Change whenever the save file is incompatible with the previous version - const std::string CURRENT_VERSION_STRING = "0.6.0"; - constexpr VersionNumber CURRENT_VERSION_NUMBER(0, 6, 0); + const std::string CURRENT_VERSION_STRING = "0.6.1"; + constexpr VersionNumber CURRENT_VERSION_NUMBER(0, 6, 1); } diff --git a/windowsinstall/infinipaint.manifest b/windowsinstall/infinipaint.manifest index 81997c6..52742bb 100644 --- a/windowsinstall/infinipaint.manifest +++ b/windowsinstall/infinipaint.manifest @@ -1,6 +1,6 @@ - +