Skip to content
Snippets Groups Projects
Commit 19fd432f authored by Matyáš Latner's avatar Matyáš Latner
Browse files

#58 Menu buttons nad selectbox click sound

parent 3585abdd
Branches
Tags
No related merge requests found
File added
......@@ -31,10 +31,12 @@ public class ApplicationSoundManager extends TablexiaSoundManager implements IAp
private static final String MAINMENU_PATH = "mainmenu/";
public static final String MAINMENU_OPEN = MAINMENU_PATH + "mainmenu_open.mp3";
public static final String MAINMENU_CLOSE = MAINMENU_PATH + "mainmenu_close.mp3";
public static final String MAINMENU_BUTTON = MAINMENU_PATH + "mainmenu_button.mp3";
public void load() {
loadSound(MAINMENU_OPEN);
loadSound(MAINMENU_CLOSE);
loadSound(MAINMENU_BUTTON);
}
private String createAssetPath(String fileName) {
......
......@@ -186,6 +186,7 @@ public abstract class AbstractMenu extends Stack implements Disposable {
@Override
public void clicked(InputEvent event, float x, float y) {
if (!isDisableControl()) {
ApplicationSoundManager.getInstance().getSound(ApplicationSoundManager.MAINMENU_BUTTON).play();
disableMenuGravity(true);
toggleMenu();
}
......
......@@ -21,6 +21,7 @@ import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.bus.ApplicationBus;
import cz.nic.tablexia.bus.event.SubMenuControlEvent;
import cz.nic.tablexia.loader.application.ApplicationFontManager;
import cz.nic.tablexia.loader.application.ApplicationSoundManager;
import cz.nic.tablexia.menu.AbstractMenu;
import cz.nic.tablexia.menu.IMenuItem;
import cz.nic.tablexia.menu.main.locale.LocaleSelectBox;
......@@ -134,6 +135,7 @@ public class MainMenu extends AbstractMenu {
private void performMenuAction(IMenuItem menuItem) {
if (!isDisableControl()) {
ApplicationSoundManager.getInstance().getSound(ApplicationSoundManager.MAINMENU_BUTTON).play();
if (menuItem.getMenuAction() != null) {
disableMenuGravity(true);
}
......
......@@ -13,6 +13,7 @@ import cz.nic.tablexia.Tablexia;
import cz.nic.tablexia.TablexiaApplication;
import cz.nic.tablexia.bus.ApplicationBus;
import cz.nic.tablexia.bus.event.MenuControlEvent;
import cz.nic.tablexia.loader.application.ApplicationSoundManager;
import cz.nic.tablexia.menu.AbstractMenu;
import cz.nic.tablexia.menu.IMenuItem;
import cz.nic.tablexia.model.User;
......@@ -59,6 +60,7 @@ public class UserMenu extends AbstractMenu {
userItemGroup.addListener(new ClickListener() {
@Override
public void clicked(InputEvent event, float x, float y) {
ApplicationSoundManager.getInstance().getSound(ApplicationSoundManager.MAINMENU_BUTTON).play();
doMenuAction(menuItem.getMenuAction(), true, true);
menuItem.performAction();
}
......
......@@ -21,6 +21,8 @@ import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.ObjectSet;
import cz.nic.tablexia.loader.application.ApplicationSoundManager;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.removeActor;
......@@ -51,10 +53,12 @@ public abstract class AbstractTablexiaSelectBox<T> extends Widget implements Dis
public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
if (pointer == 0 && button != 0) return false;
if (disabled) return false;
if (selectBoxList.hasParent())
ApplicationSoundManager.getInstance().getSound(ApplicationSoundManager.MAINMENU_BUTTON).play();
if (selectBoxList.hasParent()) {
hideList();
else
} else {
showList();
}
return true;
}
});
......@@ -265,6 +269,7 @@ public abstract class AbstractTablexiaSelectBox<T> extends Widget implements Dis
hideListener = new InputListener() {
public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
ApplicationSoundManager.getInstance().getSound(ApplicationSoundManager.MAINMENU_BUTTON).play();
Actor target = event.getTarget();
if (isAscendantOf(target)) return false;
list.selection.set(selectBox.getSelected());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment