Skip to content

Commit

Permalink
Merge pull request #23 from RBertoCases/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
RBertoCases authored Sep 23, 2021
2 parents b7c3111 + 134a30f commit 61826bf
Show file tree
Hide file tree
Showing 30 changed files with 157 additions and 320 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@
*.files
*.includes
*.code-workspace
.vs/
.vs/
theme.sync-conflict-20210919-184226-VBAVGBA.qml
layer_grid/SoftwareScreen.sync-conflict-20210919-184227-VBAVGBA.qml
layer_help/ControllerHelp.sync-conflict-20210919-184227-VBAVGBA.qml
layer_help/ControllerHelpButton.sync-conflict-20210919-184226-VBAVGBA.qml
9 changes: 8 additions & 1 deletion README.MD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# skylineOS v0.11
# skylineOS v0.12

A clean and simple theme that aims to recreate the experience of Nintendo's Switch console. skylineOS is a theme for [Pegasus Frontend](http://pegasus-frontend.org/) forked from switchOS.

Expand All @@ -14,6 +14,13 @@ See [wiki](https://github.com/RBertoCases/skylineOS/wiki) for more information.

## Version history

v0.12

- Made Back button controller prompt functional
- Changed button icons to work better with new ability to remap controllers in Pegasus
- Changed Settings Icon
- General system stability improvements have been made to enhance the user's experience

v0.11

- Changed DropShadows (when enabled) to apply to highlighted items only
Expand Down
Binary file removed assets/images/Settings.png
Binary file not shown.
Binary file modified assets/images/controller/0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion assets/images/controller/0.svg

This file was deleted.

Binary file modified assets/images/controller/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion assets/images/controller/1.svg

This file was deleted.

Binary file modified assets/images/controller/10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/controller/11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/controller/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion assets/images/controller/2.svg

This file was deleted.

Binary file modified assets/images/controller/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion assets/images/controller/3.svg

This file was deleted.

Binary file modified assets/images/controller/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/controller/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/controller/7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/controller/8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/navigation/Settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/screenshot_allsoft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/screenshot_allsoft_ps1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/screenshot_bar_end.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/screenshot_bar_start.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 8 additions & 21 deletions layer_grid/SoftwareScreen.qml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ FocusScope

SequentialAnimation {
id: na
ColorAnimation { target: sortButton; property: "color"; from: sortButton.color; to: theme.accent; duration: 150; easing.type: Easing.OutQuad }
ColorAnimation { target: sortButton; property: "color"; from: theme.accent; to: sortButton.color; duration: 150; easing.type: Easing.OutQuad }
ColorAnimation { target: sortButton; property: "color"; from: sortButton.color; to: theme.press; duration: 100; easing.type: Easing.OutQuad }
ColorAnimation { target: sortButton; property: "color"; from: theme.press; to: sortButton.color; duration: 200; easing.type: Easing.InQuad }
}

// Top bar
Expand Down Expand Up @@ -151,7 +151,7 @@ FocusScope

anchors {
left: sortIcon.right
leftMargin: vpx(3); rightMargin: vpx(17)
leftMargin: vpx(5); rightMargin: vpx(17)
verticalCenter: sortIcon.verticalCenter
}

Expand Down Expand Up @@ -199,14 +199,12 @@ FocusScope
cached: true
}



MouseArea {
anchors.fill: headerIcon
hoverEnabled: true
onEntered: {}
onExited: {}
onClicked: showHomeScreen();
onClicked: {}
}

// Line
Expand Down Expand Up @@ -269,9 +267,9 @@ FocusScope
cellHeight: cellWidth
preferredHighlightBegin: Math.round(screenheight*0.1388)
preferredHighlightEnd: Math.round(screenheight*0.6527)
highlightRangeMode: ListView.StrictlyEnforceRange // Highlight never moves outside the range
highlightRangeMode: ListView.ApplyRange//StrictlyEnforceRange // Highlight never moves outside the range
snapMode: ListView.NoSnap
highlightMoveDuration: 150 //150 is default
highlightMoveDuration: 100//200 //150 is default


model: softwareList[sortByIndex].games //api.collections.get(collectionIndex).games
Expand Down Expand Up @@ -307,10 +305,10 @@ FocusScope
height: parent.height
asynchronous: true
smooth: true
source: gameBG//modelData.assets.screenshots[0] ? modelData.assets.screenshots[0] : ""
source: modelData.collections.get(0).shortName === "steam" ? modelData.assets.screenshot : gameBG
sourceSize { width: 256; height: 256 }
fillMode: (gameBG == modelData.assets.boxFront) ? Image.PreserveAspectFit : Image.PreserveAspectCrop
layer.enabled: false //FIXME: disabled because it blurs the gameImages. Can't figure out how to get it below the image instead of on top.
layer.enabled: false //FIXME: disabled because it blurs the gameImages.
layer.effect: DropShadow {
transparentBorder: true
horizontalOffset: 0
Expand Down Expand Up @@ -369,17 +367,6 @@ FocusScope
z:8
}

/*DropShadow {
id: logoshadow
anchors.fill: logo
horizontalOffset: 0
verticalOffset: 2
radius: 4.0
samples: 6
color: "#80000000"
source: logo
}*/

MouseArea {
anchors.fill: gameImage
hoverEnabled: true
Expand Down
Loading

0 comments on commit 61826bf

Please sign in to comment.