From f03589a9898592a5ce9f1192665a4030a148eddc Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Mon, 22 Feb 2016 10:38:50 +0100 Subject: Menu: add boolean drag(float, float, int, int) --- core/src/ch/asynk/rustanddust/menu/MainMenu.java | 3 +++ core/src/ch/asynk/rustanddust/menu/MenuCtrl.java | 8 ++++++++ core/src/ch/asynk/rustanddust/menu/NewGameMenu.java | 3 +++ core/src/ch/asynk/rustanddust/menu/OptionsMenu.java | 3 +++ core/src/ch/asynk/rustanddust/menu/PlayMenu.java | 13 +++++++------ core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java | 3 +++ 6 files changed, 27 insertions(+), 6 deletions(-) (limited to 'core/src/ch/asynk') diff --git a/core/src/ch/asynk/rustanddust/menu/MainMenu.java b/core/src/ch/asynk/rustanddust/menu/MainMenu.java index 7908c625..c51f73eb 100644 --- a/core/src/ch/asynk/rustanddust/menu/MainMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/MainMenu.java @@ -93,6 +93,9 @@ public class MainMenu extends Patch implements MenuCtrl.Panel @Override public MenuCtrl.MenuType prepare() { return MenuCtrl.MenuType.MAIN; } + @Override + public boolean drag(float x, float y, int dx, int dy) { return true; } + @Override public MenuCtrl.MenuType touch(float x, float y) { diff --git a/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java b/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java index 34d556d2..49a959c9 100644 --- a/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java +++ b/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java @@ -34,6 +34,7 @@ public class MenuCtrl implements Disposable, Drawable public MenuType touch(float x, float y); public String getAsk(); public void postAnswer(boolean ok); + public boolean drag(float x, float y, int dx, int dy); } public boolean visible; @@ -57,6 +58,13 @@ public class MenuCtrl implements Disposable, Drawable this.visible = true; } + public boolean drag(float x, float y, int dx, int dy) + { + if (current == MenuType.PLAY) + panels[current.i].drag(x, y, dx, dy); + return true; + } + public boolean touch(float x, float y) { if (okCancel.hit(x, y)) { diff --git a/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java b/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java index 5bbef042..f91ed931 100644 --- a/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java @@ -114,6 +114,9 @@ public class NewGameMenu extends Patch implements MenuCtrl.Panel title.setPosition(x, y); } + @Override + public boolean drag(float x, float y, int dx, int dy) { return true; } + @Override public MenuCtrl.MenuType touch(float x, float y) { diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java index c99295ec..8ec9b10f 100644 --- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java @@ -157,6 +157,9 @@ public class OptionsMenu extends Patch implements MenuCtrl.Panel @Override public MenuCtrl.MenuType prepare() { return MenuCtrl.MenuType.OPTIONS; } + @Override + public boolean drag(float x, float y, int dx, int dy) { return true; } + @Override public MenuCtrl.MenuType touch(float x, float y) { diff --git a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java index 54ba4123..fb1c9efb 100644 --- a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java @@ -106,6 +106,13 @@ public class PlayMenu extends Patch implements MenuCtrl.Panel title.setPosition(x, y); } + @Override + public boolean drag(float x, float y, int dx, int dy) + { + if (!list.hit(x, y)) return false; + return list.drag(x, y, dx, dy); + } + @Override public MenuCtrl.MenuType touch(float x, float y) { @@ -143,12 +150,6 @@ public class PlayMenu extends Patch implements MenuCtrl.Panel return MenuCtrl.MenuType.NONE; } - public boolean drag(float x, float y, int dx, int dy) - { - if (!list.hit(x, y)) return false; - return list.drag(x, y, dx, dy); - } - @Override public void dispose() { diff --git a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java index 202cea75..e397660f 100644 --- a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java +++ b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java @@ -62,6 +62,9 @@ public class TutorialsMenu extends Patch implements MenuCtrl.Panel title.setPosition(x, y); } + @Override + public boolean drag(float x, float y, int dx, int dy) { return true; } + @Override public MenuCtrl.MenuType touch(float x, float y) { -- cgit v1.2.3