mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-22 05:38:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed flick scroll issues

Browse Source
This commit is contained in:
Anuken
2018-04-21 18:03:43 -04:00
parent 292ce33e0f
commit 48061d3cae
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify.
#Sat Apr 21 15:53:18 EDT 2018
#Sat Apr 21 18:03:09 EDT 2018
version=release
androidBuildCode=526
androidBuildCode=528
name=Mindustry
code=3.5
build=custom build

1
core/src/io/anuke/mindustry/input/PlaceMode.java
View File

@ -313,7 +313,6 @@ public enum PlaceMode{
cy += 1;
}
}
}
}

22
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@ -11,9 +11,13 @@ import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.scene.Element;
import io.anuke.ucore.scene.event.InputEvent;
import io.anuke.ucore.scene.event.InputListener;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.SettingsDialog;
import io.anuke.ucore.scene.ui.Slider;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Mathf;
@ -92,6 +96,24 @@ public class SettingsMenuDialog extends SettingsDialog{
prefs.add(menu);
ScrollPane pane = new ScrollPane(prefs, "clear");
pane.addCaptureListener(new InputListener() {
@Override
public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
Element actor = pane.hit(x, y, true);
if (actor instanceof Slider) {
pane.setFlickScroll(false);
return true;
}
return super.touchDown(event, x, y, pointer, button);
}
@Override
public void touchUp(InputEvent event, float x, float y, int pointer, int button) {
pane.setFlickScroll(true);
super.touchUp(event, x, y, pointer, button);
}
});
pane.setFadeScrollBars(false);
row();