diff --git a/README.MD b/README.MD index 1663dd24..eef39e81 100644 --- a/README.MD +++ b/README.MD @@ -1,4 +1,4 @@ -# gameOS v0.6.7 +# gameOS v0.6.7.1 ![gameOS Pegasus theme](https://i.imgur.com/Zzq3q1n.png) @@ -39,8 +39,9 @@ If no media files are showing up, make sure that Skraper Assets is checked in th ## Version history v0.6.7.1 - Fixed crash on Android -- Fixed back button not returning to game details while watching preview video - Added WiiWare logo +- Hiding text title when selected (only happens when no logo is found) +- Fixed back button exiting game details when viewing video preview v0.6.7 - Major performance improvements (thanks to @SinisterSpatula for finding the fix) diff --git a/layer_details/GameDetails2.qml b/layer_details/GameDetails2.qml index ecded3ec..4d0f543c 100644 --- a/layer_details/GameDetails2.qml +++ b/layer_details/GameDetails2.qml @@ -14,7 +14,8 @@ Item { property int padding: vpx(50) property int cornerradius: vpx(8) property bool showVideo: false - property bool boxAvailable: gameData.assets.boxFront + property bool boxAvailable: gameData.assets.boxFront != null + property bool moreDetailsToggle: false property int videooffset: vpx(330) property int numbuttons: (gameData.assets.videos.length != null) ? 4 : 3 @@ -22,6 +23,7 @@ Item { signal detailsCloseRequested signal filtersRequested signal videoPreview + signal moreDetails signal switchCollection(int collectionIdx) @@ -39,6 +41,19 @@ Item { } } + onMoreDetailsToggleChanged: { + if (moreDetailsToggle) + { + console.log("moreDetailsToggle: False"); + moreDetailsToggle = false; + } + else + { + console.log("moreDetailsToggle: True"); + moreDetailsToggle = true; + } + } + visible: (backgroundbox.opacity == 0) ? false : true opacity: 1 Behavior on opacity { NumberAnimation { duration: 100 } } @@ -72,7 +87,11 @@ Item { } if (api.keys.isCancel(event)) { event.accepted = true; - closedetails(); + if (showVideo) + toggleVideo(); + else + closedetails(); + return; } if (api.keys.isNextPage(event) || api.keys.isPrevPage(event)) { @@ -101,6 +120,7 @@ Item { metadata.opacity = 1; infoContainer.opacity = 1; gameDescription.opacity = 1; + videoBtn.focus = true } else { // VIDEO showVideo = true @@ -112,6 +132,7 @@ Item { metadata.opacity = 0; infoContainer.opacity = 0; gameDescription.opacity = 0; + videoBackBtn.focus = true } } } @@ -418,13 +439,11 @@ Item { Keys.onPressed: { if (api.keys.isAccept(event) && !event.isAutoRepeat) { event.accepted = true; - videoBackBtn.focus = true toggleVideo(); } } onClicked: { //focus = true - videoBackBtn.focus = true toggleVideo(); } @@ -560,13 +579,11 @@ Item { if (api.keys.isAccept(event) && !event.isAutoRepeat) { event.accepted = true; toggleVideo(); - videoBtn.focus = true; } } onClicked: { focus = true toggleVideo(); - videoBtn.focus = true; } // Round the corners diff --git a/layer_grid/GameGridItem.qml b/layer_grid/GameGridItem.qml index 7baf925e..50aaa08b 100644 --- a/layer_grid/GameGridItem.qml +++ b/layer_grid/GameGridItem.qml @@ -289,7 +289,9 @@ Item { text: game.title width: itemcontainer.width - vpx(30) anchors { margins: vpx(10) } - color: selected ? "orange" : "white" + color: "white" + opacity: selected ? 0 : 1 + Behavior on opacity { NumberAnimation { duration: 100 } } font.pixelSize: vpx(18) //font.family: openSans font.bold: true diff --git a/layer_menu/PlatformMenu.qml b/layer_menu/PlatformMenu.qml index ab6c7af6..8617feab 100644 --- a/layer_menu/PlatformMenu.qml +++ b/layer_menu/PlatformMenu.qml @@ -263,7 +263,7 @@ Item { } // Settings screen - Settings { + /*Settings { id: settings visible: false focus: false @@ -275,7 +275,7 @@ Item { width: parent.width height: parent.height onCloseRequested: toggleSettings() - } + }*/ LinearGradient { width: vpx(2) @@ -285,8 +285,8 @@ Item { right: parent.right bottom: parent.bottom } - /*start: Qt.point(0, 0) - end: Qt.point(0, height)*/ + //start: Qt.point(0, 0) + //end: Qt.point(0, height) gradient: Gradient { GradientStop { position: 0.0; color: "#00ffffff" } GradientStop { position: 0.5; color: "#ffffffff" }