Merge branch 'feature-newgamesstatistics' into 'V3.3'

#457 Fixed position of bookmarks on small displays, fixed font size when resizing



See merge request !425

core/src/cz/nic/tablexia/screen/statistics/StatisticsScreen.java

@@ -81,13 +81,13 @@ public class StatisticsScreen extends AbstractTablexiaScreen<Void> {
     private static final float NOTEBOOK_WIDTH_SCALE             = 0.7f;
     private static final float NOTEBOOK_HEIGHT_SCALE            = 0.85f;
     private static final float BOOKMARK_SIZE_SCALE              = 0.6f;
-    private static final float BOOKMARKS_POSITION_X_SCALE       = 0.112f;
-    private static final float BOOKMARKS_POSITION_Y_SCALE       = 0.15f;
+    private static final float BOOKMARK_POSITION_X_SCALE        = 0.565f;
+    private static final float BOOKMARKS_GROUP_POSITION_Y_SCALE = 0.15f;
     private static final float BOOKMARKS_PADDING                = 0.1f;
     private static final float UP_DOWN_BUTTON_SIZE              = 65;
-    private static final float UP_BUTTON_POSITION_Y_SCALE       = 0.72f;
+    private static final float UP_BUTTON_POSITION_Y_SCALE       = 0.75f;
     private static final float UP_DOWN_BUTTON_POSITION_X_SCALE  = 0.2f;
-    private static final float DOWN_BUTTON_POSITION_Y_SCALE     = 0.08f;
+    private static final float DOWN_BUTTON_POSITION_Y_SCALE     = 0.05f;
     private static final float SELECTED_GAME_WIDTH              = 0.66f;
 
     public static final String                                  GFX_PATH                = "gfx/";
@@ -230,7 +230,7 @@ public class StatisticsScreen extends AbstractTablexiaScreen<Void> {
             );
             button.setTouchable(Touchable.disabled);
             button.getLabel().setAlignment(Align.right);
-            button.getLabel().setTablexiaLabelStyle(new TablexiaLabel.TablexiaLabelStyle(BOOKMARK_FONT_TYPE, Color.BLACK));
+            button.fontType(BOOKMARK_FONT_TYPE);
             button.setUserObject(gameMenuDefinition);
             button.setWidth(getScreenTextureRegion(GFX_PATH + BOOKMARK_TEXT + BOOKMARKS_TEXTURES[i]).getRegionWidth() * SELECTED_GAME_WIDTH);
             button.setY((GameMenuDefinition.values().length - i) * BOOKMARKS_PADDING * getViewportHeight());
@@ -657,9 +657,10 @@ public class StatisticsScreen extends AbstractTablexiaScreen<Void> {
         notebook.setBounds(getStage().getWidth() * NOTEBOOK_POSITION_SCALE, 0, getStage().getWidth() * NOTEBOOK_WIDTH_SCALE, getStage().getHeight() * NOTEBOOK_HEIGHT_SCALE);
         upButton.setButtonPosition(getViewportWidth() * UP_DOWN_BUTTON_POSITION_X_SCALE, getViewportHeight() * UP_BUTTON_POSITION_Y_SCALE);
         downButton.setPosition(getViewportWidth() * UP_DOWN_BUTTON_POSITION_X_SCALE, getViewportHeight() * DOWN_BUTTON_POSITION_Y_SCALE);
-        bookmarksGroup.setPosition(getStage().getWidth() * BOOKMARKS_POSITION_X_SCALE, getStage().getHeight() * BOOKMARKS_POSITION_Y_SCALE);
+        bookmarksGroup.setY(getViewportHeight() * BOOKMARKS_GROUP_POSITION_Y_SCALE);
         for(Actor button : bookmarksGroup.getChildren()) {
-             button.setY((GameMenuDefinition.values().length - bookmarksGroup.getChildren().indexOf(button, true)) * BOOKMARKS_PADDING * getViewportHeight());
+            button.setPosition(getViewportWidth() * BOOKMARK_POSITION_X_SCALE - button.getWidth(),
+                    (GameMenuDefinition.values().length - bookmarksGroup.getChildren().indexOf(button, true)) * BOOKMARKS_PADDING * getViewportHeight());
         }
 
         scrollPane.setSize(graphs.getWidth(), graphs.getHeight());