diff --git a/gradle.properties b/gradle.properties index ff3ece997c..c23f4c0aa3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ project.build.version=1.12.31.1 runelite.injected-client.version=1.12.31.1 glslang.path= -microbot.version=2.6.11 +microbot.version=2.6.12 microbot.commit.sha=nogit microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/ microbot.repo.username= diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/ui/MicrobotPluginListItem.java b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/ui/MicrobotPluginListItem.java index ee4c756e6e..85a4b43d16 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/microbot/ui/MicrobotPluginListItem.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/microbot/ui/MicrobotPluginListItem.java @@ -46,6 +46,7 @@ class MicrobotPluginListItem extends JPanel implements SearchablePlugin { private static final ImageIcon ON_STAR; private static final ImageIcon OFF_STAR; + private static final int MIN_ITEM_HEIGHT = 20; private final MicrobotPluginListPanel pluginListPanel; @@ -90,9 +91,10 @@ class MicrobotPluginListItem extends JPanel implements SearchablePlugin } setLayout(new BorderLayout(3, 0)); - setPreferredSize(new Dimension(MicrobotPluginListPanel.LIST_ITEM_WIDTH, 20)); JLabel nameLabel = createNameLabel(pluginConfig); + int itemHeight = Math.max(MIN_ITEM_HEIGHT, nameLabel.getPreferredSize().height); + setPreferredSize(new Dimension(MicrobotPluginListPanel.LIST_ITEM_WIDTH, itemHeight)); pinButton = new JToggleButton(OFF_STAR); pinButton.setSelectedIcon(ON_STAR); @@ -185,19 +187,27 @@ class MicrobotPluginListItem extends JPanel implements SearchablePlugin @NotNull private static JLabel createNameLabel(MicrobotPluginConfigurationDescriptor pluginConfig) { - JLabel nameLabel = new JLabel(pluginConfig.getName()); int buttons = 21 /*pin*/ + 25 /*config, if present*/ + 34 /*toggle approx*/ + 12 /*margins*/; int textWidth = MicrobotPluginListPanel.LIST_ITEM_WIDTH - buttons; - nameLabel.setText("
" + pluginConfig.getName() + "
"); + JLabel nameLabel = new JLabel("
" + htmlBody(pluginConfig.getName()) + "
"); nameLabel.setForeground(Color.WHITE); + nameLabel.setHorizontalAlignment(JLabel.LEFT); + nameLabel.setVerticalAlignment(JLabel.CENTER); if (!pluginConfig.getDescription().isEmpty()) { - nameLabel.setToolTipText("" + pluginConfig.getName() + ":
" + pluginConfig.getDescription() + ""); + nameLabel.setToolTipText("" + htmlBody(pluginConfig.getName()) + ":
" + htmlBody(pluginConfig.getDescription()) + ""); } return nameLabel; } + private static String htmlBody(String html) + { + return html + .replaceFirst("(?i)^\\s*", "") + .replaceFirst("(?i)\\s*$", ""); + } + @Override public String getSearchableName() {