Commit 88a19c2a authored by Holger Kaelberer's avatar Holger Kaelberer
Browse files

balanceboxe: minor fixes and cleanup

Remove shadow from the bounding walls again.
parent 98b23025
......@@ -171,7 +171,7 @@ ActivityBase {
anchors.top: parent.top
anchors.topMargin: -items.wallSize/2
shadow: true
shadow: false
shadowHorizontalOffset: Math.min(items.tilt.yRotation, items.wallSize)
shadowVerticalOffset: Math.min(items.tilt.xRotation, items.wallSize)
}
......@@ -187,7 +187,7 @@ ActivityBase {
anchors.top: parent.bottom
anchors.topMargin: -items.wallSize/2
shadow: true
shadow: false
shadowHorizontalOffset: Math.min(items.tilt.yRotation, items.wallSize)
shadowVerticalOffset: Math.min(items.tilt.xRotation, items.wallSize)
}
......@@ -202,7 +202,7 @@ ActivityBase {
anchors.leftMargin: - items.wallSize/2
anchors.top: parent.top
anchors.topMargin: -items.wallSize/2
shadow: true
shadow: false
shadowHorizontalOffset: Math.min(items.tilt.yRotation, items.wallSize)
shadowVerticalOffset: Math.min(items.tilt.xRotation, items.wallSize)
}
......@@ -217,7 +217,7 @@ ActivityBase {
anchors.leftMargin: - items.wallSize/2
anchors.top: parent.top
anchors.topMargin: -items.wallSize/2
shadow: true
shadow: false
shadowHorizontalOffset: Math.min(items.tilt.yRotation, items.wallSize)
shadowVerticalOffset: Math.min(items.tilt.xRotation, items.wallSize)
}
......
......@@ -24,6 +24,8 @@
(- fix inconsistent tilting behaviour on different android devices)
- make sensitivity configurable?
- use Qt classes instead of jni for orientation?
- visualize when in test-mode in Balancebox
- fix back-button on android (missing parent?)
*/
.pragma library
.import QtQuick 2.0 as Quick
......@@ -88,7 +90,7 @@ function start(items_) {
+ " timeStep=" + items.world.timeStep
+ " posIterations=" + items.world.positionIterations
+ " velIterations=" + items.world.velocityIterations
+ " boardSizePix=" + boardSizePix
+ " boardSizePix=" + boardSizePix + " (real " + items.mapWrapper.length + ")"
+ " pixelsPerMeter=" + pixelsPerMeter
+ " vFactor=" + vFactor
+ " dpi=" + items.dpi);
......@@ -97,7 +99,7 @@ function start(items_) {
if (GCompris.ApplicationInfo.isMobile) {
var or = GCompris.ApplicationInfo.getRequestedOrientation();
GCompris.ApplicationInfo.setRequestedOrientation(5);
/* -1: SCREEN_ORIENTATION_UNSPECIFIED
/* -1: SCREEN_ORIENTATION_UNSPECIFIED
* 0: SCREEN_ORIENTATION_LANDSCAPE: forces landscape, inverted rotation
* on S2
* 5: SCREEN_ORIENTATION_NOSENSOR:
......
......@@ -86,7 +86,7 @@ function createEmptyLevel()
function initLevel()
{
console.log("XXX editor initLevel levels=" + JSON.stringify(levels));
//console.log("XXX editor initLevel levels=" + JSON.stringify(levels));
if (currentLevel >= numberOfLevel) {
levels.push(createEmptyLevel());
numberOfLevel++;
......@@ -171,7 +171,7 @@ function modelToLevel()
map: map,
targets: targets
}
console.log("XXX level: " + JSON.stringify(level) + " - " + map);
//console.log("XXX level: " + JSON.stringify(level) + " - " + map);
return level;
}
......
......@@ -47,14 +47,16 @@ ActivityBase {
activityInfo: ActivityInfoTree.rootMenu
onBack: {
console.log("XXX onBack to " + to);
console.log("XXX onBack to " + to + " depth=" + pageView.depth);
pageView.pop(to);
console.log("XXX onBack to " + to + " depth=" + pageView.depth);
// Restore focus that has been taken by the loaded activity
if(pageView.currentItem == menuActivity)
focus = true;
}
onHome: {
console.log("XXX Menu onHome depth=" + pageView.depth);
if(pageView.depth === 1) {
Core.quit(main);
}
......@@ -72,7 +74,6 @@ ActivityBase {
console.log("XXX onForward to " + dialogs);
var toPush = new Array();
for (var i = 0; i < dialogs.length; i++) {
displayDialog(dialogs[i]);
toPush.push({item: dialogs[i]});
}
pageView.push(toPush);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment