also 1.4.2

tooltips showing too quickly who is in incoming notifications
Morph21 · Dec 23, 2024 · 3f07df3 · 3f07df3
1 parent bf47887
commit 3f07df3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/...java/com/mercury/platform/ui/components/panel/notification/TradeIncNotificationPanel.java b/...java/com/mercury/platform/ui/components/panel/notification/TradeIncNotificationPanel.java
@@ -62,6 +62,8 @@ protected JPanel getHeader() {
         });
         JButton openChatButton = componentsFactory.getIconButton(IconConst.CHAT_OPEN, 15, AppThemeColor.MSG_HEADER, TranslationKey.open_chat.value());
         openChatButton.addActionListener(e -> controller.performOpenChat());
+        JButton whoIsButton = componentsFactory.getIconButton(IconConst.WHO_IS, 15, AppThemeColor.MSG_HEADER, TranslationKey.who_is.value());
+        whoIsButton.addActionListener(e -> controller.performWhoIs());
         JButton hideButton = componentsFactory.getIconButton(IconConst.CLOSE, 15, AppThemeColor.MSG_HEADER, TranslationKey.close.value());
         hideButton.addActionListener(action -> {
             this.controller.performHide();
@@ -70,6 +72,7 @@ protected JPanel getHeader() {
         interactionPanel.add(tradeButton);
         interactionPanel.add(kickButton);
         interactionPanel.add(leaveButton);
+        interactionPanel.add(whoIsButton);
         interactionPanel.add(openChatButton);
         interactionPanel.add(hideButton);
 

diff --git a/...mercury/platform/ui/components/panel/notification/controller/IncomingPanelController.java b/...mercury/platform/ui/components/panel/notification/controller/IncomingPanelController.java
@@ -7,4 +7,6 @@ public interface IncomingPanelController extends NotificationController {
     void performKickLeave(String nickName);
 
     void showITH();
+
+    void performWhoIs();
 }
diff --git a/.../platform/ui/components/panel/notification/controller/NotificationIncomingController.java b/.../platform/ui/components/panel/notification/controller/NotificationIncomingController.java
@@ -39,6 +39,11 @@ public void performKickLeave(String nickName) {
         }
     }
 
+    @Override
+    public void performWhoIs() {
+        MercuryStoreCore.chatCommandSubject.onNext("/whois " + StringUtils.trim(notificationDescriptor.getWhisperNickname()));
+    }
+
     @Override
     public void performOfferTrade() {
         MercuryStoreCore.chatCommandSubject.onNext("/tradewith " + StringUtils.trim(notificationDescriptor.getWhisperNickname()));

diff --git a/.../mercury/platform/ui/components/panel/notification/controller/stub/IncStubController.java b/.../mercury/platform/ui/components/panel/notification/controller/stub/IncStubController.java
@@ -37,4 +37,9 @@ public void performKickLeave(String nickName) {
     public void showITH() {
 
     }
+
+    @Override
+    public void performWhoIs() {
+
+    }
 }
diff --git a/app-ui/src/main/resources/notes/patch/patch-notes-new.json b/app-ui/src/main/resources/notes/patch/patch-notes-new.json
@@ -2,6 +2,9 @@
   {
     "version": "1.4.2",
     "minorChanges": [
+      {
+        "changed": "Added who is button to incoming notifications"
+      },
       {
         "changed": "Added parser for Thai language"
       },
@@ -21,6 +24,9 @@
       },
       {
         "changed": "Fixed time not showing short for minutes when more than 20 minutes passed after some resolutions"
+      },
+      {
+        "changed": "Fixed tooltips showing too quickly"
       }
     ]
   },

diff --git a/app/src/main/java/com/mercury/platform/AppMain.java b/app/src/main/java/com/mercury/platform/AppMain.java
@@ -36,8 +36,6 @@ public static void main(String[] args) {
             System.setProperty("jna.nosys", "true");
 
             UIManager.put("ToolTipManager.enableToolTipMode", "allWindows");
-            ToolTipManager.sharedInstance().setInitialDelay(100);
-            ToolTipManager.sharedInstance().setReshowDelay(100);
 
             boolean standalone = BooleanUtils.toBoolean(System.getProperty("standalone"));
             boolean dev = BooleanUtils.toBoolean(System.getProperty("dev"));