ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #10715 from abextm/multiline-pluginhub

Browse Source 
PluginHubPanel: Limit height of description to 2 lines, enable word wrap
This commit is contained in:
Abex
2020-02-09 05:20:30 -07:00
committed by GitHub
parent 9a5337db3c b05fe5b68f
commit 7c6de858c3
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java
View File

@@ -28,6 +28,7 @@ import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.html.HtmlEscapers;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
@@ -157,8 +158,14 @@ class PluginHubPanel extends PluginPanel
version.setFont(FontManager.getRunescapeSmallFont()); version.setFont(FontManager.getRunescapeSmallFont());
version.setToolTipText(manifest.getVersion()); version.setToolTipText(manifest.getVersion());
JLabel description = new JLabel(manifest.getDescription()); String descriptionText = manifest.getDescription();
description.setToolTipText(manifest.getDescription()); if (!descriptionText.startsWith("<html>"))
{
descriptionText = "<html>" + HtmlEscapers.htmlEscaper().escape(descriptionText) + "</html>";
}
JLabel description = new JLabel(descriptionText);
description.setVerticalAlignment(JLabel.TOP);
description.setToolTipText(descriptionText);
JLabel icon = new JLabel(); JLabel icon = new JLabel();
icon.setHorizontalAlignment(JLabel.CENTER); icon.setHorizontalAlignment(JLabel.CENTER);
@@ -277,15 +284,16 @@ class PluginHubPanel extends PluginPanel
.addComponent(addrm, 0, 50, GroupLayout.PREFERRED_SIZE) .addComponent(addrm, 0, 50, GroupLayout.PREFERRED_SIZE)
.addGap(5)))); .addGap(5))));
int lineHeight = description.getFontMetrics(description.getFont()).getHeight();
layout.setVerticalGroup(layout.createParallelGroup() layout.setVerticalGroup(layout.createParallelGroup()
.addComponent(icon, HEIGHT, HEIGHT, HEIGHT) .addComponent(icon, HEIGHT, GroupLayout.DEFAULT_SIZE, HEIGHT + lineHeight)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGap(5) .addGap(5)
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(pluginName) .addComponent(pluginName)
.addComponent(author)) .addComponent(author))
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
.addComponent(description) .addComponent(description, lineHeight, GroupLayout.PREFERRED_SIZE, lineHeight * 2)
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE) .addGroup(layout.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(version, BOTTOM_LINE_HEIGHT, BOTTOM_LINE_HEIGHT, BOTTOM_LINE_HEIGHT) .addComponent(version, BOTTOM_LINE_HEIGHT, BOTTOM_LINE_HEIGHT, BOTTOM_LINE_HEIGHT)