diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/pages/WallPage.java b/core/src/cz/nic/tablexia/screen/gamemenu/pages/WallPage.java index 90774d3b85c5097b2842e6c6ccda195765050954..1e7ff60b040ca9d95fa7f53e63db4e87b04e14a3 100644 --- a/core/src/cz/nic/tablexia/screen/gamemenu/pages/WallPage.java +++ b/core/src/cz/nic/tablexia/screen/gamemenu/pages/WallPage.java @@ -9,6 +9,8 @@ import cz.nic.tablexia.screen.gamemenu.GameMenuAssets; import cz.nic.tablexia.screen.gamemenu.GameMenuScreen; /** + * This class represents the page between the office and game menu pages + * It works as a separator and PagedScrollPane can't snap to this page * Created by Drahomir Karchnak on 02/12/15. */ public class WallPage extends MenuPage{ @@ -21,8 +23,10 @@ public class WallPage extends MenuPage{ public WallPage(AbstractTablexiaScreen<int[][]> screen) { super(screen); + //offset of the pagedScrollPane pagedScrollPaneOffsetY = ((GameMenuScreen) screen).getPagedScrollPane().getY(); + //Sets size and position of WallPage setSize(mid.getRegionWidth(), getScreen().getSceneOuterHeight()); setPosition(getScreen().getSceneWidth(), getScreen().getSceneOuterBottomY() - getScreen().getSceneOuterBottomY()); } @@ -31,6 +35,7 @@ public class WallPage extends MenuPage{ public void draw(Batch batch, float parentAlpha) { batch.setColor(batch.getColor().r, batch.getColor().g, batch.getColor().b, parentAlpha); + //Disables Blending, no need when drawing the background batch.disableBlending(); //Just adjusting sourceX coordinate to get animated background/sky @@ -48,6 +53,7 @@ public class WallPage extends MenuPage{ false); + //Enables Blending for foreground layer batch.enableBlending(); batch.draw( mid, @@ -62,6 +68,7 @@ public class WallPage extends MenuPage{ @Override public boolean isSnapToAllowed() { + //PagedScrollPane can't snap to this page return false; } diff --git a/core/src/cz/nic/tablexia/util/ui/PagedScrollPane.java b/core/src/cz/nic/tablexia/util/ui/PagedScrollPane.java index e9dd92bc7e688e1719abfae4557c1a64cd9a07bc..427f80d2c921876beef1b28a5da38e52f50e96fe 100644 --- a/core/src/cz/nic/tablexia/util/ui/PagedScrollPane.java +++ b/core/src/cz/nic/tablexia/util/ui/PagedScrollPane.java @@ -181,8 +181,11 @@ public class PagedScrollPane extends ScrollPane { setSmoothScrolling(smooth); setScrollX(page.getX()); - MenuPage leavePage = (MenuPage) contentTable.getChildren().get(indexCurrentPage); - leavePage.onScrollPageExit(); + //Is changing page ? + if(indexCurrentPage != i) { + MenuPage leavePage = (MenuPage) contentTable.getChildren().get(indexCurrentPage); + leavePage.onScrollPageExit(); + } //in case smooth scrolling is set to false, we need to update visual scroll if (!smooth) {