Merge featurecat#893 again for additional feature

kaorahi · Aug 31, 2021 · 37e5d66 · 37e5d66
2 parents 6b9e5a4 + 6e4eeaf
commit 37e5d66
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/featurecat/lizzie/gui/ConfigDialog.java b/src/main/java/featurecat/lizzie/gui/ConfigDialog.java
@@ -1825,13 +1825,14 @@ protected void done() {
 
   private class PanelWithToolTip extends JPanel {
     public void add(JLabel label) {
-      super.add(label);
-      String text = label.getText();
+      String texts[] = label.getText().split("\n", 2);
+      String labelText = texts[0];
+      String toolTipText = (texts.length >= 2) ? texts[1] : labelText;
       String displayedText =
           SwingUtilities.layoutCompoundLabel(
               label,
               label.getFontMetrics(label.getFont()),
-              text,
+              labelText,
               label.getIcon(),
               label.getVerticalAlignment(),
               label.getHorizontalAlignment(),
@@ -1841,7 +1842,9 @@ public void add(JLabel label) {
               label.getBounds(),
               label.getBounds(),
               label.getIconTextGap());
-      if (displayedText != text) label.setToolTipText(text);
+      label.setText(labelText);
+      if (displayedText != toolTipText) label.setToolTipText(toolTipText);
+      super.add(label);
     }
   }