Resolve #2855 and #2856

Co-authored-by: Ivan <v23620@gmail.com>
FAForever · Dec 18, 2022 · f3c1f1c · f3c1f1c
1 parent 602d75d
commit f3c1f1c
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 27 deletions.
diff --git a/src/main/java/com/faforever/client/chat/ChannelTabController.java b/src/main/java/com/faforever/client/chat/ChannelTabController.java
@@ -212,10 +212,15 @@ private void setChannelTopic(String content) {
 
   private void updateChannelTopic() {
     String oldTopicContent = topicContent;
-    ChannelTopic topic = chatChannel.getTopic();
-    setChannelTopic(topic.getContent());
-    if (StringUtils.isNotBlank(topic.getAuthor())) {
-      onChatMessage(new ChatMessage(channelName, Instant.now(), topic.getAuthor(), i18n.get("chat.topicUpdated", oldTopicContent, topic.getContent())));
+    String newTopicContent = chatChannel.getTopic().getContent();
+    if (StringUtils.equals(oldTopicContent, newTopicContent)) {
+      return;
+    }
+
+    setChannelTopic(newTopicContent);
+    String username = chatChannel.getTopic().getAuthor();
+    if (StringUtils.isNotBlank(username) && chatChannel.getUser(username) != null) {
+      onChatMessage(new ChatMessage(channelName, Instant.now(), username, i18n.get("chat.topicUpdated", oldTopicContent, newTopicContent)));
     }
 
     if (topicPane.isDisable()) {

diff --git a/src/main/java/com/faforever/client/chat/ChatChannel.java b/src/main/java/com/faforever/client/chat/ChatChannel.java
@@ -8,6 +8,7 @@
 import javafx.collections.ObservableMap;
 import lombok.RequiredArgsConstructor;
 import lombok.Value;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -72,6 +73,7 @@ public int getUserCount() {
     return users.size();
   }
 
+  @Nullable
   public ChatChannelUser getUser(String username) {
     return users.get(username);
   }

diff --git a/src/main/java/com/faforever/client/fx/PlatformService.java b/src/main/java/com/faforever/client/fx/PlatformService.java
@@ -104,10 +104,11 @@ public void reveal(Path path) {
     }
   }
 
-
   /**
    * Show a Window, restore it to it's state before minimizing (normal/restored or maximized) and move it to foreground
    * will only work on windows systems
+   * Note: An application cannot force a window to the foreground while the user is working with another window.
+   * Instead, Windows flashes the taskbar button of the window to notify the user.
    */
   public void focusWindow(String windowTitle) {
     focusWindow(windowTitle, null);
@@ -118,6 +119,7 @@ public void focusWindow(String windowTitle, @Nullable Long processId) {
     if (!isWindows) {
       return;
     }
+    log.debug("Focus '{}' window", windowTitle);
     focusWindow(getWindow(windowTitle, processId));
   }
 

diff --git a/src/main/java/com/faforever/client/game/CustomGamesController.java b/src/main/java/com/faforever/client/game/CustomGamesController.java
@@ -152,8 +152,6 @@ public TilesSortingOrder fromString(String string) {
     JavaFxUtil.bind(gameDetailPane.visibleProperty(), toggleGameDetailPaneButton.selectedProperty());
     JavaFxUtil.bind(gameDetailPane.managedProperty(), gameDetailPane.visibleProperty());
 
-    setSelectedGame(null);
-
     toggleGameDetailPaneButton.selectedProperty().addListener(observable -> {
       preferences.setShowGameDetailsSidePane(toggleGameDetailPaneButton.isSelected());
       preferencesService.storeInBackground();
@@ -265,7 +263,6 @@ private void disposeGamesContainer() {
 
   @VisibleForTesting
   void setSelectedGame(GameBean game) {
-    gameDetailController.getRoot().setVisible(true);
     gameDetailController.setGame(game);
   }
 

diff --git a/src/main/java/com/faforever/client/game/GameDetailController.java b/src/main/java/com/faforever/client/game/GameDetailController.java
@@ -65,7 +65,7 @@ public class GameDetailController implements Controller<Pane> {
   private final NotificationService notificationService;
   private final EventBus eventBus;
 
-  public Pane gameDetailRoot;
+  public Pane root;
   public Label gameTypeLabel;
   public Label mapLabel;
   public Label numberOfPlayersLabel;
@@ -93,14 +93,14 @@ public class GameDetailController implements Controller<Pane> {
   public void initialize() {
     imageViewHelper.setDefaultPlaceholderImage(mapImageView, true);
     contextMenuBuilder.addCopyLabelContextMenu(gameTitleLabel, mapLabel, gameTypeLabel);
-    JavaFxUtil.bindManagedToVisible(joinButton, watchButton, gameTitleLabel, hostLabel, mapLabel, numberOfPlayersLabel,
+    JavaFxUtil.bindManagedToVisible(root, joinButton, watchButton, gameTitleLabel, hostLabel, mapLabel, numberOfPlayersLabel,
         mapPreviewContainer, gameTypeLabel, playtimeLabel, generateMapButton);
     JavaFxUtil.bind(mapPreviewContainer.visibleProperty(), mapImageView.imageProperty().isNotNull());
-    gameDetailRoot.parentProperty().addListener(observable -> {
-      if (!(gameDetailRoot.getParent() instanceof Pane)) {
+    root.parentProperty().addListener(observable -> {
+      if (!(root.getParent() instanceof Pane)) {
         return;
       }
-      gameDetailRoot.maxWidthProperty().bind(((Pane) gameDetailRoot.getParent()).widthProperty());
+      root.maxWidthProperty().bind(((Pane) root.getParent()).widthProperty());
     });
 
     eventBus.register(this);
@@ -266,7 +266,7 @@ public void setPlaytimeVisible(boolean visible) {
 
   @Override
   public Pane getRoot() {
-    return gameDetailRoot;
+    return root;
   }
 
   public void onJoinButtonClicked() {

diff --git a/src/main/java/com/faforever/client/game/GamesTableController.java b/src/main/java/com/faforever/client/game/GamesTableController.java
@@ -162,9 +162,7 @@ public void initializeGameTable(ObservableList<GameBean> games, Function<String,
   }
 
   private void selectFirstGame() {
-    if (!gamesTable.getItems().isEmpty()) {
-      gamesTable.getSelectionModel().selectFirst();
-    }
+    gamesTable.getSelectionModel().selectFirst();
   }
 
   private void applyLastSorting(TableView<GameBean> gamesTable) {

diff --git a/src/main/java/com/faforever/client/login/LoginController.java b/src/main/java/com/faforever/client/login/LoginController.java
@@ -357,7 +357,7 @@ public CompletableFuture<Void> onLoginButtonClicked() {
 
     return oAuthValuesReceiver.receiveValues(redirectUriCandidates, state, verifier)
         .thenCompose(values -> {
-          platformService.focusWindow(clientProperties.getMainWindowTitle());
+          platformService.focusWindow(i18n.get("login.title"));
           String actualState = values.getState();
           if (!state.equals(actualState)) {
             handleInvalidSate(actualState, state);

diff --git a/src/main/resources/theme/play/game_detail.fxml b/src/main/resources/theme/play/game_detail.fxml
@@ -11,7 +11,8 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
-<GridPane fx:id="gameDetailRoot" maxHeight="1.7976931348623157E308" maxWidth="-Infinity" minWidth="50.0"
+
+<GridPane fx:id="root" maxHeight="1.7976931348623157E308" maxWidth="-Infinity" minWidth="50.0"
           styleClass="game-detail" vgap="10.0" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="com.faforever.client.game.GameDetailController">
     <columnConstraints>

diff --git a/src/test/java/com/faforever/client/game/CustomGamesControllerTest.java b/src/test/java/com/faforever/client/game/CustomGamesControllerTest.java
@@ -21,7 +21,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.testfx.util.WaitForAsyncUtils;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -91,7 +90,6 @@ public void setUp() throws Exception {
       }
       return instance;
     });
-    verify(gameDetailController).setGame(null);
   }
 
   @Test
@@ -110,16 +108,14 @@ public void testSetSelectedGameDoesNotShowDetailPaneIfDisabled() {
   }
 
   @Test
-  public void testTiles() {
-    instance.tilesButton.fire();
-    WaitForAsyncUtils.waitForFxEvents();
+  public void testDisplayTiles() {
+    runOnFxThreadAndWait(() -> instance.tilesButton.fire());
     verify(gamesTilesContainerController).createTiledFlowPane(games, instance.chooseSortingTypeChoiceBox);
   }
 
   @Test
   public void testHideSidePane() {
-    instance.toggleGameDetailPaneButton.fire();
-    WaitForAsyncUtils.waitForFxEvents();
+    runOnFxThreadAndWait(() -> instance.toggleGameDetailPaneButton.fire());
 
     assertFalse(preferencesService.getPreferences().isShowGameDetailsSidePane());
     verify(preferencesService, atLeast(2)).storeInBackground();

diff --git a/src/test/java/com/faforever/client/game/GameDetailControllerTest.java b/src/test/java/com/faforever/client/game/GameDetailControllerTest.java
@@ -190,7 +190,7 @@ public void testTeamListener() {
 
   @Test
   public void testGetRoot() {
-    assertEquals(instance.gameDetailRoot, instance.getRoot());
+    assertEquals(instance.root, instance.getRoot());
   }
 
   @Test