LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.1: fixed minor alignment errors in option slider

Browse Source
This commit is contained in:
Evan Debenham 2020-06-01 17:08:04 -04:00
parent 15718fc30f
commit 8578e3c397
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/OptionSlider.java
View File

@ -121,7 +121,8 @@ public abstract class OptionSlider extends Component {
//sets the selected value //sets the selected value
selectedVal = minVal + Math.round(sliderNode.x / tickDist); selectedVal = minVal + Math.round(sliderNode.x / tickDist);
sliderNode.x = (int) (x + tickDist * (selectedVal - minVal)); sliderNode.x = x + tickDist * (selectedVal - minVal);
PixelScene.align(sliderNode);
onChange(); onChange();
pressed = false; pressed = false;
} }
@ -152,7 +153,8 @@ public abstract class OptionSlider extends Component {
tickDist = sliderBG.width()/(maxVal - minVal); tickDist = sliderBG.width()/(maxVal - minVal);
for (int i = 0; i < sliderTicks.length; i++){ for (int i = 0; i < sliderTicks.length; i++){
sliderTicks[i].y = sliderBG.y-5; sliderTicks[i].y = sliderBG.y-5;
sliderTicks[i].x = (int)(x + 2 + (tickDist*i)); sliderTicks[i].x = x + 2 + (tickDist*i);
PixelScene.align(sliderTicks[i]);
} }
minTxt.setPos( minTxt.setPos(
@ -164,8 +166,9 @@ public abstract class OptionSlider extends Component {
sliderBG.y-6-minTxt.height() sliderBG.y-6-minTxt.height()
); );
sliderNode.x = (int)(x + tickDist*(selectedVal-minVal)); sliderNode.x = x + tickDist*(selectedVal-minVal);
sliderNode.y = sliderBG.y-4; sliderNode.y = sliderBG.y-4;
PixelScene.align(sliderNode);
pointerArea.x = x; pointerArea.x = x;
pointerArea.y = y; pointerArea.y = y;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
View File

@ -360,7 +360,7 @@ public class WndSettings extends WndTabbed {
Assets.Sounds.ITEM, Assets.Sounds.ITEM,
Assets.Sounds.SHATTER, Assets.Sounds.SHATTER,
Assets.Sounds.EVOKE, Assets.Sounds.EVOKE,
Assets.Sounds.TELEPORT)); Assets.Sounds.SECRET));
} }
} }
}; };