0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-22 17:27:57 +01:00

VerticalShapes toggle button

This commit is contained in:
peteruithoven 2014-01-13 15:52:40 +01:00
parent d156dc9902
commit ab329aaaf1
8 changed files with 35 additions and 12 deletions

BIN
img/btnArrowClose.xcf Normal file

Binary file not shown.

BIN
img/btnArrowOpen.xcf Normal file

Binary file not shown.

View File

@ -1,7 +1,7 @@
var twistIncrement = Math.PI/1800; var twistIncrement = Math.PI/1800;
var btnNew, btnPrevious, btnNext, btnOops, btnStop, btnInfo, btnRotate; var btnNew, btnPrevious, btnNext, btnOops, btnStop, btnInfo, btnRotate;
var btnSettings, btnWordArt, btnZoom, btnMove, btnUpDown, btnTwist, btnShape, btnEditClosed, btnEditOpen; var btnSettings, btnWordArt, btnZoom, btnMove, btnUpDown, btnTwist, btnShape, btnEditClosed, btnEditOpen; btnToggleVerticalShapes;
var btnDiv,btnConv,btnStraight,btnSine, buttonGroupAdd, popupWordArt; var btnDiv,btnConv,btnStraight,btnSine, buttonGroupAdd, popupWordArt;
var state; var state;
@ -41,7 +41,7 @@ function initButtonBehavior() {
btnConv = $("#btnConv"); btnConv = $("#btnConv");
btnSine = $("#btnSine"); btnSine = $("#btnSine");
btnAdd = $("#btnAdd"); btnAdd = $("#btnAdd");
btnToggleVertical = $("#btnToggleVertical"); btnToggleVerticalShapes = $("#btnToggleVerticalShapes");
buttonGroupAdd = $("#buttonGroupAdd"); buttonGroupAdd = $("#buttonGroupAdd");
buttonGroupVerticalShapes = $("#buttonGroupVerticalShapes"); buttonGroupVerticalShapes = $("#buttonGroupVerticalShapes");
popupWordArt = $("#popupWordArt"); popupWordArt = $("#popupWordArt");
@ -67,18 +67,29 @@ function initButtonBehavior() {
btnConv.on("onButtonClick", onBtnConv); btnConv.on("onButtonClick", onBtnConv);
btnSine.on("onButtonClick", onBtnSine); btnSine.on("onButtonClick", onBtnSine);
btnAdd.on("onButtonClick", onBtnAdd); btnAdd.on("onButtonClick", onBtnAdd);
btnToggleVertical.on("onButtonClick", onBtnToggleVertical); btnToggleVerticalShapes.on("onButtonClick", onBtnToggleVerticalShapes);
getSavedSketchStatus(); getSavedSketchStatus();
setSketchModified(false); setSketchModified(false);
function onBtnToggleVertical() { function onBtnToggleVerticalShapes() {
buttonGroupVerticalShapes.toggle(); console.log("onBtnToggleVerticalShapes");
var btnImg;
if(buttonGroupVerticalShapes.is(":hidden")) {
btnImg = "img/buttons/btnArrowClose.png";
} else {
btnImg = "img/buttons/btnArrowOpen.png";
}
btnToggleVerticalShapes.attr("src",btnImg);
buttonGroupVerticalShapes.fadeToggle(BUTTON_GROUP_SHOW_DURATION);
} }
function onBtnAdd() { function onBtnAdd() {
buttonGroupAdd.fadeToggle(POPUP_SHOW_DURATION); buttonGroupAdd.fadeToggle(BUTTON_GROUP_SHOW_DURATION);
} }
function onBtnStraight() { function onBtnStraight() {

View File

@ -23,6 +23,7 @@ var showOrHide = false;
var clientInfo = {}; var clientInfo = {};
var POPUP_SHOW_DURATION = 175; var POPUP_SHOW_DURATION = 175;
var BUTTON_GROUP_SHOW_DURATION = 80;
$(function() { $(function() {
console.log("ready"); console.log("ready");

View File

@ -165,8 +165,8 @@
} }
#buttonGroupVerticalShapes { #buttonGroupVerticalShapes {
top: 10px; top: 7px;
left: 10px; left: 8px;
padding-top: 20px; padding-top: 20px;
width: 65px; width: 65px;
@ -175,10 +175,10 @@
} }
} }
#btnToggleVertical { #btnToggleVerticalShapes {
position: absolute; position: absolute;
top: 0; top: 3px;
left: 10px; left: 6px;
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -105,7 +105,7 @@
<img id="btnSine" class="btn" src="img/buttons/btnSine.png" /> <img id="btnSine" class="btn" src="img/buttons/btnSine.png" />
<img id="btnStraight" class="btn" src="img/buttons/btnStraight.png" /> <img id="btnStraight" class="btn" src="img/buttons/btnStraight.png" />
</div> </div>
<img id="btnToggleVertical" class="btn" src="img/buttons/btnArrowOpen.png" /> <img id="btnToggleVerticalShapes" class="btn" src="img/buttons/btnArrowClose.png" />
</div> </div>
</div> </div>
@ -114,6 +114,17 @@
<img id="btnEditClosed" class="btn" src="img/buttons/btnEditClosed.png" /> <img id="btnEditClosed" class="btn" src="img/buttons/btnEditClosed.png" />
<img id="btnEditOpen" class="btn" src="img/buttons/btnEditOpen.png" /> <img id="btnEditOpen" class="btn" src="img/buttons/btnEditOpen.png" />
<div id="buttonGroupVerticalShapes" class="buttonGroup">
<img id="btnTwistLeft" class="btn" src="img/buttons/btnTwistLeft.png" />
<img id="btnTwistRight" class="btn" src="img/buttons/btnTwistRight.png" />
<img id="btnUp" class="btn" src="img/buttons/btnUp.png" />
<img id="btnDown" class="btn" src="img/buttons/btnDown.png" />
<hr>
<img id="btnConv" class="btn" src="img/buttons/btnConv.png" />
<img id="btnDiv" class="btn" src="img/buttons/btnDiv.png" />
<img id="btnSine" class="btn" src="img/buttons/btnSine.png" />
<img id="btnStraight" class="btn" src="img/buttons/btnStraight.png" />
</div>
</div> </div>
</div> </div>