library-mirrors/dat.gui
1
0
Fork 0
mirror of https://github.com/dataarts/dat.gui.git synced 2024-12-12 04:08:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dionysius-brach' of https://github.com/dionysiusmarquis/dat.gui into dionysiusmarquis-dionysius-brach

Browse Source
This commit is contained in:
Jeff Nusz 2016-08-17 15:05:22 -07:00
commit 8d1ce070d6
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dat/controllers/NumberControllerBox.js
View File

@ -86,6 +86,8 @@ define([
function onMouseDrag(e) { function onMouseDrag(e) {
document.activeElement.blur();
var diff = prev_y - e.clientY; var diff = prev_y - e.clientY;
_this.setValue(_this.getValue() + diff * _this.__impliedStep); _this.setValue(_this.getValue() + diff * _this.__impliedStep);
@ -114,7 +116,7 @@ define([
{ {
updateDisplay: function() { updateDisplay: function() {
if (dom.isActive(this.__input)) return;
this.__input.value = this.__truncationSuspended ? this.getValue() : roundToDecimal(this.getValue(), this.__precision); this.__input.value = this.__truncationSuspended ? this.getValue() : roundToDecimal(this.getValue(), this.__precision);
return NumberControllerBox.superclass.prototype.updateDisplay.call(this); return NumberControllerBox.superclass.prototype.updateDisplay.call(this);
} }

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

@ -56,6 +56,8 @@ function(NumberController, dom, css, common, styleSheet) {
function onMouseDown(e) { function onMouseDown(e) {
document.activeElement.blur();
dom.bind(window, 'mousemove', onMouseDrag); dom.bind(window, 'mousemove', onMouseDrag);
dom.bind(window, 'mouseup', onMouseUp); dom.bind(window, 'mouseup', onMouseUp);

6
src/dat/controllers/factory.js
View File

@ -38,10 +38,16 @@ define([
if (common.isNumber(arguments[2]) && common.isNumber(arguments[3])) { if (common.isNumber(arguments[2]) && common.isNumber(arguments[3])) {
// Has min and max. // Has min and max.
if (common.isNumber(arguments[4])) // has step
return new NumberControllerSlider(object, property, arguments[2], arguments[3], arguments[4]);
else
return new NumberControllerSlider(object, property, arguments[2], arguments[3]); return new NumberControllerSlider(object, property, arguments[2], arguments[3]);
} else { } else {
if (common.isNumber(arguments[4]))
return new NumberControllerBox(object, property, { min: arguments[2], max: arguments[3], step: arguments[4] });
else
return new NumberControllerBox(object, property, { min: arguments[2], max: arguments[3] }); return new NumberControllerBox(object, property, { min: arguments[2], max: arguments[3] });
} }

3
src/dat/gui/style.css
View File

@ -273,7 +273,8 @@
background: #303030; background: #303030;
cursor: ew-resize; } cursor: ew-resize; }
.dg .c .slider-fg { .dg .c .slider-fg {
background: #2fa1d6; } background: #2fa1d6;
max-width: 100%; }
.dg .c .slider:hover { .dg .c .slider:hover {
background: #3c3c3c; } background: #3c3c3c; }
.dg .c .slider:hover .slider-fg { .dg .c .slider:hover .slider-fg {