Up version number to v0.6.1
This commit is contained in:
parent
5729057e32
commit
0efcfe0b27
7 changed files with 27 additions and 14 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue