mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 04:12:46 +02:00
Hide edit tools when inactive
This commit is contained in:
parent
0509270bc6
commit
e4f7e35587
2 changed files with 21 additions and 7 deletions
|
@ -125,7 +125,7 @@ var toolBar = (function () {
|
||||||
width: toolWidth,
|
width: toolWidth,
|
||||||
height: toolHeight,
|
height: toolHeight,
|
||||||
alpha: 0.9,
|
alpha: 0.9,
|
||||||
visible: true
|
visible: false
|
||||||
});
|
});
|
||||||
|
|
||||||
browseModelsButton = toolBar.addTool({
|
browseModelsButton = toolBar.addTool({
|
||||||
|
@ -133,7 +133,7 @@ var toolBar = (function () {
|
||||||
width: toolWidth,
|
width: toolWidth,
|
||||||
height: toolHeight,
|
height: toolHeight,
|
||||||
alpha: 0.9,
|
alpha: 0.9,
|
||||||
visible: true
|
visible: false
|
||||||
});
|
});
|
||||||
|
|
||||||
newCubeButton = toolBar.addTool({
|
newCubeButton = toolBar.addTool({
|
||||||
|
@ -142,7 +142,7 @@ var toolBar = (function () {
|
||||||
width: toolWidth,
|
width: toolWidth,
|
||||||
height: toolHeight,
|
height: toolHeight,
|
||||||
alpha: 0.9,
|
alpha: 0.9,
|
||||||
visible: true
|
visible: false
|
||||||
});
|
});
|
||||||
|
|
||||||
newSphereButton = toolBar.addTool({
|
newSphereButton = toolBar.addTool({
|
||||||
|
@ -151,7 +151,7 @@ var toolBar = (function () {
|
||||||
width: toolWidth,
|
width: toolWidth,
|
||||||
height: toolHeight,
|
height: toolHeight,
|
||||||
alpha: 0.9,
|
alpha: 0.9,
|
||||||
visible: true
|
visible: false
|
||||||
});
|
});
|
||||||
|
|
||||||
newLightButton = toolBar.addTool({
|
newLightButton = toolBar.addTool({
|
||||||
|
@ -160,7 +160,7 @@ var toolBar = (function () {
|
||||||
width: toolWidth,
|
width: toolWidth,
|
||||||
height: toolHeight,
|
height: toolHeight,
|
||||||
alpha: 0.9,
|
alpha: 0.9,
|
||||||
visible: true
|
visible: false
|
||||||
});
|
});
|
||||||
|
|
||||||
newTextButton = toolBar.addTool({
|
newTextButton = toolBar.addTool({
|
||||||
|
@ -169,9 +169,8 @@ var toolBar = (function () {
|
||||||
width: toolWidth,
|
width: toolWidth,
|
||||||
height: toolHeight,
|
height: toolHeight,
|
||||||
alpha: 0.9,
|
alpha: 0.9,
|
||||||
visible: true
|
visible: false
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
that.setActive = function(active) {
|
that.setActive = function(active) {
|
||||||
|
@ -196,11 +195,22 @@ var toolBar = (function () {
|
||||||
propertiesTool.setVisible(true);
|
propertiesTool.setVisible(true);
|
||||||
Window.setFocus();
|
Window.setFocus();
|
||||||
}
|
}
|
||||||
|
that.showTools(isActive);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
toolBar.selectTool(activeButton, isActive);
|
toolBar.selectTool(activeButton, isActive);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Sets visibility of tool buttons, excluding the power button
|
||||||
|
that.showTools = function(doShow) {
|
||||||
|
toolBar.showTool(newModelButton, doShow);
|
||||||
|
toolBar.showTool(browseModelsButton, doShow);
|
||||||
|
toolBar.showTool(newCubeButton, doShow);
|
||||||
|
toolBar.showTool(newSphereButton, doShow);
|
||||||
|
toolBar.showTool(newLightButton, doShow);
|
||||||
|
toolBar.showTool(newTextButton, doShow);
|
||||||
|
};
|
||||||
|
|
||||||
var RESIZE_INTERVAL = 50;
|
var RESIZE_INTERVAL = 50;
|
||||||
var RESIZE_TIMEOUT = 120000; // 2 minutes
|
var RESIZE_TIMEOUT = 120000; // 2 minutes
|
||||||
var RESIZE_MAX_CHECKS = RESIZE_TIMEOUT / RESIZE_INTERVAL;
|
var RESIZE_MAX_CHECKS = RESIZE_TIMEOUT / RESIZE_INTERVAL;
|
||||||
|
|
|
@ -271,6 +271,10 @@ ToolBar = function(x, y, direction) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.showTool = function(tool, doShow) {
|
||||||
|
this.tools[tool].show(doShow);
|
||||||
|
}
|
||||||
|
|
||||||
this.show = function(doShow) {
|
this.show = function(doShow) {
|
||||||
for(var tool in this.tools) {
|
for(var tool in this.tools) {
|
||||||
|
|
Loading…
Reference in a new issue