skyline-emu
Add OSC opacity adjustment
Related to #1580
It is my first contribution ever to this project, I was thinking it was a good one to start, Tell me if i made any mistake 😊
The contribution looks fine (good job!) but I'd recommend rebasing the commit atop ftx1 rather than master and following our naming convention for commits a bit more closely, a better name might be "Add OSC opacity adjustment".
I'd also recommend joining our Discord server, that's generally where we coordinate development.
Thanks :)
I'm already on the discord server by the way, i'll spend more time on it next time
Are branch's rules written somewhere ? I'did not find anything about that, is ftx1 the still in dev branch ?
Basically GPU is awkward and it kinda introduced so much code that's constantly in flux and not up to master quality we haven't merged it, but issue is ftx1 is now miles ahead master so we're just gonna do all prs to that, then when we CR ftx1 we'll just ignore these changes
The contribution looks fine (good job!) but I'd recommend rebasing the commit atop
ftx1rather thanmasterand following our naming convention for commits a bit more closely, a better name might be "Add OSC opacity adjustment".I'd also recommend joining our Discord server, that's generally where we coordinate development.
I've just rebase from ftx1, hope i didn't make any mistake :)
You did what was asked in the literal sense, but it wasn't the result you were meant to have.
git remote add upstream [email protected]:skyline-emu/skyline.git -f
(skip this step if already using "upstream" or replace "upstream" with the remote name for THIS official repository below)
git reset --hard upstream/ftx1
git cherry-pick 0286ece7e332d3e0512fe9f035535254a70f0a1b
git push -f
If you use that series of commands, it will reset the branch to match ftx1, pick your change onto it, and push the fixed branch to your remote (also fixing the PR)
A couple of things more:
- Alpha should be applied on the button's text too
- You still didn't fix the commit title, just removing the
[OSC]part is good
In fact it is already applied to text since alpha is changed in renderCenteredText of OnScreenButton.kt
Exemple of text being opacified
If you write "fix or fixes" #0000 instead of related it will link and close the issue when the PR is merged.
Oh my bad then, I looked at #1754 screnshots and it looked like it didn't apply opacity to text.
Looking good now!
Yeah thats way better :) really like this reviews i'm learning new things
@lynxnb Feel free to rebase this PR if it's good to go. I'm leaving these OSC PRs to you.
//emu.skyline.input.onscreen.OnScreenControllerView
fun resetControls() {
controls.allButtons.forEach {
it.resetRelativeValues()
it.config.enabled = true
}
controls.globalScale = 1.15f
controls.alpha = 255 //you probably forgot to reset the alpha here
invalidate()
}
@KikiManjaro @lynxnb
Oups, i did not see that, maybe i could make the change in #1754 ? @lynxnb