fix clutter text bug

Exslims · Oct 24, 2017 · 26d6822 · 26d6822
1 parent 382ee03
commit 26d6822
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...in/java/com/mercury/platform/ui/components/panel/notification/TradeNotificationPanel.java b/...in/java/com/mercury/platform/ui/components/panel/notification/TradeNotificationPanel.java
@@ -175,7 +175,6 @@ protected JPanel getCurrencyPanel(Double curCount, String curIconPath) {
             JLabel currencyLabel = componentsFactory.getIconLabel("currency/" + curIconPath + ".png", 26);
             JPanel curPanel = this.componentsFactory.getJPanel(new GridLayout(1, 0, 4, 0), AppThemeColor.MSG_HEADER);
             curPanel.setAlignmentX(SwingConstants.LEFT);
-            curPanel.setPreferredSize(new Dimension((int) (this.componentsFactory.getScale() * 70), (int) (this.componentsFactory.getScale() * 26)));
             JLabel countLabel = this.componentsFactory.getTextLabel(curCountStr, FontStyle.BOLD, 17f);
             countLabel.setHorizontalAlignment(SwingConstants.RIGHT);
             curPanel.add(countLabel);

diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TestEngine.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/TestEngine.java
@@ -158,9 +158,9 @@ public NotificationDescriptor getRandomItemIncMessage() {
     public NotificationDescriptor getRandomCurrencyIncMessage() {
         NotificationDescriptor notificationDescriptor = parser.parse(String.format(currencyTemplate,
                 nickNames.get(random.nextInt(nickNames.size())),
-                random.nextInt(200) + 1,
+                random.nextInt(1500) + 1,
                 currency.get(random.nextInt(currency.size())),
-                random.nextInt(200) + 1,
+                random.nextInt(1500) + 1,
                 currency.get(random.nextInt(currency.size())),
                 leagues.get(random.nextInt(leagues.size())),
                 offer.get(random.nextInt(offer.size()))
@@ -189,9 +189,9 @@ public NotificationDescriptor getRandomItemOutMessage() {
     public NotificationDescriptor getRandomCurrencyOutMessage() {
         NotificationDescriptor notificationDescriptor = parser.parse(String.format(currencyTemplate,
                 nickNames.get(random.nextInt(nickNames.size())),
-                random.nextInt(200) + 1,
+                random.nextInt(1500) + 1,
                 currency.get(random.nextInt(currency.size())),
-                random.nextInt(200) + 1,
+                random.nextInt(1500) + 1,
                 currency.get(random.nextInt(currency.size())),
                 leagues.get(random.nextInt(leagues.size())),
                 offer.get(random.nextInt(offer.size()))