From 78e6dee8d05c74d585a1cce887c181d5496eadc5 Mon Sep 17 00:00:00 2001 From: Andre Date: Tue, 2 Oct 2018 07:00:07 +0100 Subject: [PATCH] Truncate NPC name instead of subtitle in Loot Tracker (#5740) Fixes #5673 --- .../plugins/loottracker/LootTrackerBox.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java index 6ed843e12e..7a9dbac848 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerBox.java @@ -28,6 +28,7 @@ package net.runelite.client.plugins.loottracker; import com.google.common.base.Strings; import java.awt.BorderLayout; import java.awt.Color; +import java.awt.FlowLayout; import java.awt.GridLayout; import java.util.ArrayList; import java.util.Arrays; @@ -66,19 +67,24 @@ class LootTrackerBox extends JPanel setLayout(new BorderLayout(0, 1)); setBorder(new EmptyBorder(5, 0, 0, 0)); - final JPanel logTitle = new JPanel(new BorderLayout(5, 0)); + int gap = 5; + final JPanel logTitle = new JPanel(new BorderLayout(gap, 0)); logTitle.setBorder(new EmptyBorder(7, 7, 7, 7)); logTitle.setBackground(ColorScheme.DARKER_GRAY_COLOR.darker()); final JLabel titleLabel = new JLabel(id); titleLabel.setFont(FontManager.getRunescapeSmallFont()); titleLabel.setForeground(Color.WHITE); + titleLabel.setToolTipText(id); + logTitle.add(titleLabel, BorderLayout.CENTER); - logTitle.add(titleLabel, BorderLayout.WEST); + final JPanel logSubtitleAndPrice = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0)); + logSubtitleAndPrice.setBackground(ColorScheme.DARKER_GRAY_COLOR.darker()); subTitleLabel.setFont(FontManager.getRunescapeSmallFont()); subTitleLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR); - logTitle.add(subTitleLabel, BorderLayout.CENTER); + subTitleLabel.setBorder(new EmptyBorder(0, 0, 0, gap)); + logSubtitleAndPrice.add(subTitleLabel); if (!Strings.isNullOrEmpty(subtitle)) { @@ -87,7 +93,9 @@ class LootTrackerBox extends JPanel priceLabel.setFont(FontManager.getRunescapeSmallFont()); priceLabel.setForeground(ColorScheme.LIGHT_GRAY_COLOR); - logTitle.add(priceLabel, BorderLayout.EAST); + logSubtitleAndPrice.add(priceLabel); + + logTitle.add(logSubtitleAndPrice, BorderLayout.EAST); add(logTitle, BorderLayout.NORTH); add(itemContainer, BorderLayout.CENTER);