library-mirrors/dat.gui
1
0
Fork 0
mirror of https://github.com/dataarts/dat.gui.git synced 2024-10-10 06:54:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed issue with color controllers on scrolling pages. Fixes #37

Browse Source
This commit is contained in:
Jeff Nusz 2016-10-05 12:15:50 -07:00
parent 0aec885446
commit 6f0fcb64f5
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dat/controllers/ColorController.js
View File

@ -194,10 +194,9 @@ class ColorController extends Controller {
function setSV(e) {
e.preventDefault();
const w = dom.getWidth(_this.__saturation_field);
const o = dom.getOffset(_this.__saturation_field);
let s = (e.clientX - o.left + document.body.scrollLeft) / w;
let v = 1 - (e.clientY - o.top + document.body.scrollTop) / w;
const fieldRect = _this.__saturation_field.getBoundingClientRect();
let s = (e.clientX - fieldRect.left) / (fieldRect.right - fieldRect.left);
let v = 1 - (e.clientY - fieldRect.top) / (fieldRect.bottom - fieldRect.top);
if (v > 1) {
v = 1;
@ -223,9 +222,8 @@ class ColorController extends Controller {
function setH(e) {
e.preventDefault();
const s = dom.getHeight(_this.__hue_field);
const o = dom.getOffset(_this.__hue_field);
let h = 1 - (e.clientY - o.top + document.body.scrollTop) / s;
const fieldRect = _this.__hue_field.getBoundingClientRect();
let h = 1 - (e.clientY - fieldRect.top) / (fieldRect.bottom - fieldRect.top);
if (h > 1) {
h = 1;

5
src/dat/controllers/NumberControllerSlider.js
View File

@ -62,11 +62,10 @@ class NumberControllerSlider extends NumberController {
function onMouseDrag(e) {
e.preventDefault();
const offset = dom.getOffset(_this.__background);
const width = dom.getWidth(_this.__background);
const bgRect = _this.__background.getBoundingClientRect();
_this.setValue(
map(e.clientX, offset.left, offset.left + width, _this.__min, _this.__max)
map(e.clientX, bgRect.left, bgRect.right, _this.__min, _this.__max)
);
return false;