turn show/hide details button in custom games into an icon (FAForever…

…#1732)
BlackYps · May 28, 2020 · 0b588cd · 0b588cd
1 parent e549651
commit 0b588cd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/main/java/com/faforever/client/game/CustomGamesController.java b/src/main/java/com/faforever/client/game/CustomGamesController.java
@@ -280,10 +280,10 @@ public void toggleSidePane() {
 
   private void setSidePane(boolean displayed) {
     if (displayed) {
-      toggleSidePaneButton.setText(i18n.get("view.hideSidePane"));
+      toggleSidePaneButton.setText("");
       sidePaneColumn.setMinWidth(sidePaneColumn.getPrefWidth());
     } else {
-      toggleSidePaneButton.setText(i18n.get("view.showSidePane"));
+      toggleSidePaneButton.setText("");
       sidePaneColumn.setMinWidth(0);
     }
   }

diff --git a/src/main/resources/theme/play/custom_games.fxml b/src/main/resources/theme/play/custom_games.fxml
@@ -46,12 +46,6 @@
                                         <HBox alignment="BASELINE_LEFT"/>
                                     </children>
                                 </FlowPane>
-                                <Button fx:id="toggleSidePaneButton" minWidth="-Infinity" mnemonicParsing="false"
-                                        onAction="#toggleSidePane" text="%view.hideSidePane">
-                                    <padding>
-                                        <Insets right="50"/>
-                                    </padding>
-                                </Button>
                                 <ToggleButton fx:id="tableButton" minWidth="-Infinity" mnemonicParsing="false"
                                               onAction="#onTableButtonClicked" styleClass="game-list-type"
                                               text="%view.table">
@@ -70,9 +64,12 @@
                                         <Label styleClass="icon" text=""/>
                                     </graphic>
                                 </ToggleButton>
+                                <Button fx:id="toggleSidePaneButton" mnemonicParsing="false"
+                                        onAction="#toggleSidePane" styleClass="icon-button, small-button" text="">
+                                </Button>
                             </children>
                             <padding>
-                                <Insets bottom="10.0" left="20.0" right="10.0" top="10.0"/>
+                                <Insets bottom="10.0" left="20.0" right="-10.0" top="10.0"/>
                             </padding>
                         </HBox>
                 <ScrollPane fx:id="gameDetailPane" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1"

diff --git a/src/main/resources/theme/style.css b/src/main/resources/theme/style.css
@@ -240,6 +240,10 @@
   -fx-background-color: transparent;
 }
 
+.small-button > .text {
+  -fx-font-size: 1em;
+}
+
 .more-button {
   -fx-pref-height: 296px;
 }

diff --git a/src/test/java/com/faforever/client/game/CustomGamesControllerTest.java b/src/test/java/com/faforever/client/game/CustomGamesControllerTest.java
@@ -168,7 +168,7 @@ public void testHideSidePane() {
     assertFalse(preferencesService.getPreferences().isShowGameDetailsSidePane());
     verify(preferencesService, atLeast(2)).storeInBackground();
 
-    assertEquals(instance.toggleSidePaneButton.getText(), i18n.get("view.showSidePane"));
+    assertEquals(instance.toggleSidePaneButton.getText(), "");
     assertFalse(instance.gameDetailPane.isManaged());
     assertFalse(instance.gameDetailPane.isVisible());
   }