From 5b4643d299457d86c61161bad96848a6458667c3 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 9 May 2018 12:51:23 +0200 Subject: [PATCH] Scroleable Products Pannel --- .vs/AAWeb/v15/.suo | Bin 68608 -> 71168 bytes Canvas.js | 12 ++++++++ Container.js | 1 + Panels/ProductsPanel.js | 66 +++++++++++++++++++++++++++++++++++++--- server.js | 2 +- 5 files changed, 75 insertions(+), 6 deletions(-) diff --git a/.vs/AAWeb/v15/.suo b/.vs/AAWeb/v15/.suo index 720ddf2e6e971f9f22c778117e6d3918b5698ad7..cc2147a359550a72fdf8bf4e5301d3ae9bf737bf 100644 GIT binary patch delta 2144 zcmcJQTWl0n7{}+#PG`Hd-7d7W+Y8%iOD{r;I|$T5FT35PQY>l}6%etjEkc784;^5Mmj40;GY>U?EroGC&Q;0(2?1FlGP&CH%f1We$4DYj#vlM!Bb{V%<)9&Cg|s=(UBGN0@U5^P!?O=U6;zX z&_zdOSl;a%h#ZX-R#xG%uu`70a*Rf8I%}XAdu~m+SufhsO5`j{#XT)cg=NB0k(*~J zg_JC|iaL~xHXp_ahaNG#H&_6w!HZxmSP68X0O4f? z;yPf}dl(wtdZhIb8_WyBz(-9j270>dl8Uz@@wAzI261cDfM=n%0c*8jX_9*r5{+O7 zcnRzTy8xYz*%pp3q{6t&@`ViB8YF{7AO)lXH%J5NAOmEA#lQoyfCjP+e_R{8hn1WG z3b=H(gbp~{ST4=D+E@-9NF1YpGb)Q~ImUqn$JC)Enrvw4n-w__Z?t&2Y~h6(Y3@&H zRMm}XcM&tR!YRh{Wu7DRrEb1e9tyhDg%~iR{_)eKOD7;zaO)@{IhCQ#%KHlyw#`nwN zoLD2a^^TplD*Uj_kIS^;8;{{ReV@&S`Be1Yb>1%X6AJHC_(_=tEB?A@6n%bO=3$ve zDiV#vo?jXH2I^Uu^oi%~fmfRMhjukn$7nHCp6?~^#LHs3zi)-2O2PNV7&Q=TJ{a0Z zgCooA4pT4a&$H4|vaG*4C4}X*+8*dUbb|Bl<%~CP-1zG9rhUca8_rIcm-+MI*7UDW z5^rfW@%7?hGa_FzM%tz2yhr}$S4xxTj$o^R_~gWw68r!!SWlIwR#8Il5cASVug@62 zxQ@k%<4zMJW-XxJ^E&-_CY#1bIg_a4qkPYt5qS94);IK(LA|7OwO%Yf-`Pf?Q%SQ9 zFR^bP7l(*M_RFRGGW)-s&4>%&cOZT@s)WVtB{rODj12ggR;ufIabTstTGxXm!O~Ly zoA+`J^b~PVtNllR&-RsxLrpq58L5hiT)f0(1R#hQA!4>~CMkZm+ktFm^V5yeXgRPrCS5%Fsm zWlkF5`ceBkJsug=la98+aNdg94BaFze_n*kz_~hs^*p!E7)GOaor3 zvSqRn?>!qRBO)q)e(lrlge zXMjykWRqzGHHXoZ`hiu??x%ihz!=WXWrlZpg~sb`M$~gq)nhip=DyFm-Ck~ZbB36B zitCF)6bH3D(LWO zsuDg-RUKO&BGCdV=DZX1>j#s(!_91&#)`TTZ$d{}*HdCS(8r diff --git a/Canvas.js b/Canvas.js index 33232af19..e6855f970 100644 --- a/Canvas.js +++ b/Canvas.js @@ -364,6 +364,18 @@ function newCanvas() { var event = window.event || event; // old IE support let delta = Math.max(-1, Math.min(1, event.wheelDelta || -event.detail)); + /* We try first with panels. */ + + let panelContainer = canvas.panelsSpace.getContainer({ x: event.pageX, y: event.pageY }); + + if (panelContainer !== undefined && panelContainer.isWheelable === true) { + + panelContainer.eventHandler.raiseEvent("Mouse Wheel", event.wheelDelta); + return false; // This instructs the browser not to take the event and scroll the page. + } + + /* We try second with floating objects. */ + let floatingObjectIndex = canvas.floatingSpace.floatingLayer.isInside(event.pageX, event.pageY); if (floatingObjectIndex > 0) { diff --git a/Container.js b/Container.js index 990a5b91c..c35dfa52c 100644 --- a/Container.js +++ b/Container.js @@ -9,6 +9,7 @@ function newContainer() { parentContainer: undefined, isDraggeable: true, isClickeable: false, + isWheelable: false, name: undefined, initialize: initialize }; diff --git a/Panels/ProductsPanel.js b/Panels/ProductsPanel.js index 4e1d28bfd..e8a3e6e6e 100644 --- a/Panels/ProductsPanel.js +++ b/Panels/ProductsPanel.js @@ -16,6 +16,7 @@ container.initialize(); container.isDraggeable = true; + container.isWheelable = true; thisObject.container = container; thisObject.container.frame.containerName = "Bot's Products"; @@ -23,6 +24,9 @@ let isInitialized = false; let productCards = []; + let visibleProductCards = []; + let firstVisibleCard = 1; + return thisObject; function initialize() { @@ -71,12 +75,12 @@ productCard.initialize(); - /* Container Stuff */ productCard.container.displacement.parentDisplacement = thisObject.container.displacement; productCard.container.frame.parentFrame = thisObject.container.frame; productCard.container.parentContainer = thisObject.container; + productCard.container.isWheelable = true; /* Positioning within thisObject Panel */ @@ -89,6 +93,14 @@ lastY = lastY + productCard.container.frame.height; + /* Add to Visible Product Array */ + + if (lastY < thisObject.container.frame.height) { + + visibleProductCards.push(productCard); + + } + /* Add to the Product Array */ productCards.push(productCard); @@ -96,15 +108,59 @@ /* Listen to Status Changes Events */ productCard.container.eventHandler.listenToEvent('Status Changed', onProductCardStatusChanged); + productCard.container.eventHandler.listenToEvent('Mouse Wheel', onMouseWheel); } } } + thisObject.container.eventHandler.listenToEvent("Mouse Wheel", onMouseWheel); isInitialized = true; } + function onMouseWheel(pDelta) { + + if (pDelta > 0) { + pDelta = 1; + } else { + pDelta = -1; + } + + firstVisibleCard = firstVisibleCard + pDelta; + + let availableSlots = visibleProductCards.length; + + if (firstVisibleCard < 1) { firstVisibleCard = 1; } + if (firstVisibleCard > (productCards.length - availableSlots + 1)) { firstVisibleCard = productCards.length - availableSlots + 1; } + + visibleProductCards = []; + var lastY = 5; + + for (let i = 0; i < productCards.length; i++) { + + if (i + 1 >= firstVisibleCard && i + 1 < firstVisibleCard + availableSlots) { + + let productCard = productCards[i]; + + /* Positioning within thisObject Panel */ + + let position = { + x: 10, + y: thisObject.container.frame.height - thisObject.container.frame.getBodyHeight() + }; + productCard.container.frame.position.x = position.x; + productCard.container.frame.position.y = position.y + lastY; + + lastY = lastY + productCard.container.frame.height; + + /* Add to Visible Product Array */ + + visibleProductCards.push(productCard); + } + } + } + function onProductCardStatusChanged(pProductCard) { thisObject.container.eventHandler.raiseEvent('Product Card Status Changed', pProductCard); @@ -139,9 +195,9 @@ /* Now we see which is the inner most container that has it */ - for (var i = 0; i < productCards.length; i++) { + for (var i = 0; i < visibleProductCards.length; i++) { - container = productCards[i].getContainer(point); + container = visibleProductCards[i].getContainer(point); if (container !== undefined) { @@ -171,8 +227,8 @@ thisObject.container.frame.draw(false, false, true); - for (let i = 0; i < productCards.length; i++) { - productCards[i].draw(); + for (let i = 0; i < visibleProductCards.length; i++) { + visibleProductCards[i].draw(); } } diff --git a/server.js b/server.js index e5f2aa0df..e65a7925a 100644 --- a/server.js +++ b/server.js @@ -6,7 +6,7 @@ if (CONSOLE_LOG === true) { } -const DEBUG_MODE = true; // This forces the server to read Plotters from the local drive. +const DEBUG_MODE = false; // This forces the server to read Plotters from the local drive. if (CONSOLE_LOG === true && DEBUG_MODE === true) {