Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.3.0.3 version #57

Merged
merged 6 commits into from
Jun 23, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix for missing mouse hover helper for some tools, version update
  • Loading branch information
viliusle committed Jun 23, 2017
commit 7de806aba017266454f3b5502e698e5f57036bd4
2 changes: 1 addition & 1 deletion config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var canvas_grid = document.getElementById("canvas_grid").getContext("2d"); //gr
var canvas_preview = document.getElementById("canvas_preview").getContext("2d"); //mini preview

//global settings
var VERSION = '3.3.0.2';
var VERSION = '3.3.0.3';
var WIDTH; //canvas midth
var HEIGHT; //canvas height
var COLOR = '#0000ff'; //active color
Expand Down
4 changes: 2 additions & 2 deletions js/draw_tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ function DRAW_TOOLS_CLASS() {
}
};
this.erase = function (type, mouse, event) {
if (mouse.valid == false || mouse.click_valid == false)
if (mouse.valid == false || (mouse.click_valid == false && type != 'move'))
return true;
var strict = GUI.action_data().attributes.strict;
var size = GUI.action_data().attributes.size;
Expand Down Expand Up @@ -787,7 +787,7 @@ function DRAW_TOOLS_CLASS() {
}
};
this.brush = function (type, mouse, event) {
if (mouse.valid == false || mouse.click_valid == false)
if (mouse.valid == false || (mouse.click_valid == false && type != 'move'))
return true;
var brush_type = GUI.action_data().attributes.type;
var color_rgb = HELPER.hex2rgb(COLOR);
Expand Down
1 change: 1 addition & 0 deletions js/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ function EVENTS_CLASS() {
//undo
if (EVENTS.ctrl_pressed == true){
EDIT.undo();
event.preventDefault();
}
}
//t - trim
Expand Down