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.

Sign up for GitHub

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

Jump to bottom

Feature/color improvements #181

Merged
merged 9 commits into from
Oct 22, 2020
Merged

Feature/color improvements #181

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
70553a1
Merge pull request #5 from viliusle/master
Giwayume Oct 18, 2020
6c984cc
Coded gradient pickers
Giwayume Oct 19, 2020
ee4731c
Implement section hiding
Giwayume Oct 20, 2020
4856746
Merge pull request #6 from viliusle/master
Giwayume Oct 20, 2020
f8cfdf6
Add color swatches
Giwayume Oct 22, 2020
42aa88f
Move aria labelledby to input on number input
Giwayume Oct 22, 2020
4db10f1
Fix color picker, renamed functions
Giwayume Oct 22, 2020
f1c3c93
Rename missed helper functions
Giwayume Oct 22, 2020
dae792c
comment out host
Giwayume Oct 22, 2020
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
Next Next commit
Fix color picker, renamed functions
  • Loading branch information
@Giwayume
Giwayume committed Oct 22, 2020
commit 4db10f1e5ac993d6ca14a06cbcf2e11f368fcf46
7 changes: 3 additions & 4 deletions src/js/tools/pick_color.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,13 @@ class Pick_color_class extends Base_tools_class {
//find color
var c = ctx.getImageData(mouse.x, mouse.y, 1, 1).data;
var hex = this.Helper.rgbToHex(c[0], c[1], c[2]);
this.Base_gui.GUI_colors.change_color(hex);

const newColorDefinition = { hex };
if (c[3] > 0) {
//set alpha
this.Base_gui.GUI_colors.change_alpha(c[3]);
newColorDefinition.a = c[3];
}

this.Base_gui.GUI_colors.render_colors();
this.Base_gui.GUI_colors.set_color(newColorDefinition);
}

}
Expand Down