Some fixes to the padding calculations for the home screen. Wasn't quite right.

Author: lanceewing

core/src/main/java/emu/joric/HomeScreen.java

@@ -197,13 +197,17 @@ private void addAppButtonsToStage(Stage stage, PaginationWidget paginationWidget
         float viewportWidth = viewportManager.getWidth();
         float viewportHeight = viewportManager.getHeight();
 
-        int sidePadding = (viewportHeight > (viewportWidth / 1.25f))? 15 : 30;
+        // This is the padding on the left and right sides of the screen, not app buttons.
+        int sidePadding = (viewportHeight > (viewportWidth / 1.25f))? 12 : 15;
 
         int availableHeight = (int)(viewportHeight - PAGINATION_HEIGHT);
-        int columns = (int)((viewportWidth - sidePadding) / ICON_IMAGE_WIDTH);
+        int columns = (int)((viewportWidth - (sidePadding * 2)) / ICON_IMAGE_WIDTH);
         int rows = (int)(availableHeight / (ICON_IMAGE_HEIGHT + ICON_LABEL_HEIGHT + 10));
 
+        // This is the total amount of padding after removal of side padding.
         int totalHorizPadding = 0;
+        
+        // This is the amount of padding either side of each app button.
         int horizPaddingUnit = 0;
 
         Button infoButton = buildButton("INFO", null, "png/info.png", 96, 96, null, null);
@@ -874,7 +878,9 @@ public void showProgramPage(int programIndex, boolean skipScroll) {
 
         // Work out how far to move from far left to get to program's page.
         int programsPerPage = pagedScrollPane.getProgramsPerPage();
-        float pageWidth = viewportManager.isPortrait()? 1130.0f : 1970.0f;
+        float pageWidth = viewportManager.isPortrait()? 
+                1080 + pagedScrollPane.getContentSpacing() : 
+                1920 + pagedScrollPane.getContentSpacing();
         float newScrollX = pageWidth * (programIndex / programsPerPage) + pageWidth;
 
         // Set program highlight to the program with the specified index.

core/src/main/java/emu/joric/ui/PagedScrollPane.java

@@ -16,6 +16,8 @@
 
 public class PagedScrollPane extends ScrollPane {
 
+    private static final int CONTENT_SPACING = 50;
+    
     private boolean wasPanDragFling = false;
 
     private float lastScrollX = 0;
@@ -58,7 +60,7 @@ public void setHomeScreen(HomeScreen homeScreen) {
 
     private void setup() {
         content = new Table();
-        content.defaults().space(50);
+        content.defaults().space(CONTENT_SPACING);
         super.setWidget(content);
         Button.debugCellColor = new Color(1, 1, 1, 1.0f);
     }
@@ -209,7 +211,7 @@ public int getNumOfPages() {
     public int getCurrentPageNumber() {
         int pageNumber = 0;
         if (content.getChildren().notEmpty()) {
-            int pageWidth = (int)(content.getChild(0).getWidth() + 50);
+            int pageWidth = (int)(content.getChild(0).getWidth() + CONTENT_SPACING);
             pageNumber = Math.round(getScrollX() / pageWidth);
         }
         return pageNumber;
@@ -386,6 +388,15 @@ public void prevProgramPage() {
         updateSelection(currentSelectionIndex - getProgramsPerPage(), false);
     }
 
+    /**
+     * Gets the number of pixels gap between pages.
+     * 
+     * @return The number of pixels gap between pages.
+     */
+    public int getContentSpacing() {
+        return CONTENT_SPACING;
+    }
+    
     /**
      * This method is used by the key navigation, i.e. when it has calculated a specific
      * program index to move to. The navigation keys are used to navigation +/- one
@@ -397,7 +408,8 @@ public void prevProgramPage() {
     private void showProgramPage(int programIndex) {
         // Work out how far to move from far left to get to program's page.
         int programsPerPage = getProgramsPerPage();
-        float pageWidth = ViewportManager.getInstance().isPortrait()? 1130.0f : 1970.0f;
+        float pageWidth = ViewportManager.getInstance().isPortrait()? 
+                1080.0f + CONTENT_SPACING : 1920.0f + CONTENT_SPACING;
         float newScrollX = pageWidth * (programIndex / programsPerPage) + pageWidth;
 
         setScrollX(newScrollX);