github
/
darklaf
mirror of https://github.com/weisJ/darklaf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed incorrect tooltip size calculation.

pull/97/head
weisj 5 years ago
parent
283e617ada
commit
c81c54d0e3
2 changed files with 33 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      core/src/main/java/com/github/weisj/darklaf/components/tooltip/DarkToolTip.java
  2. 37
      core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkTooltipUI.java

18
core/src/main/java/com/github/weisj/darklaf/components/tooltip/DarkToolTip.java
Unescape View File

@ -38,7 +38,6 @@ import java.util.Objects;
public class DarkToolTip extends JToolTip implements PropertyChangeListener { public class DarkToolTip extends JToolTip implements PropertyChangeListener {
public static final String TIP_TEXT_PROPERTY = "tiptext";
private static final AlphaComposite COMPOSITE = AlphaComposite.getInstance(AlphaComposite.SRC_OVER); private static final AlphaComposite COMPOSITE = AlphaComposite.getInstance(AlphaComposite.SRC_OVER);
private static final float MAX_ALPHA = 1.0f; private static final float MAX_ALPHA = 1.0f;
private final Animator fadeAnimator; private final Animator fadeAnimator;
@ -130,7 +129,7 @@ public class DarkToolTip extends JToolTip implements PropertyChangeListener {
@Override @Override
public void propertyChange(final PropertyChangeEvent evt) { public void propertyChange(final PropertyChangeEvent evt) {
if (TIP_TEXT_PROPERTY.equals(evt.getPropertyName())) { if (DarkTooltipUI.TIP_TEXT_PROPERTY.equals(evt.getPropertyName())) {
setPreferredSize(getUI().getPreferredSize(this)); setPreferredSize(getUI().getPreferredSize(this));
if (!Objects.equals(evt.getNewValue(), evt.getOldValue())) { if (!Objects.equals(evt.getNewValue(), evt.getOldValue())) {
notifyToolTipListeners(ToolTipEvent.TEXT); notifyToolTipListeners(ToolTipEvent.TEXT);
@ -169,19 +168,4 @@ public class DarkToolTip extends JToolTip implements PropertyChangeListener {
paintImmediately(0, 0, getWidth(), getHeight()); paintImmediately(0, 0, getWidth(), getHeight());
} }
} }
@Override
public void setTipText(final String tipText) {
if (tipText != null && !tipText.startsWith("<html>")) {
if (tipText.contains("\n")) {
super.setTipText("<html>" + tipText.replaceAll("\n", "<\\br>") + "</html>");
} else {
super.setTipText("<html><body><nobr>" + tipText + "</nobr></body></html>");
}
} else {
super.setTipText(tipText);
}
}
} }

37
core/src/main/java/com/github/weisj/darklaf/ui/tooltip/DarkTooltipUI.java
Unescape View File

@ -54,10 +54,12 @@ public class DarkTooltipUI extends BasicToolTipUI implements PropertyChangeListe
public static final String KEY_PLAIN_TOOLTIP = "JComponent.plainTooltip"; public static final String KEY_PLAIN_TOOLTIP = "JComponent.plainTooltip";
public static final String VARIANT_PLAIN = "plain"; public static final String VARIANT_PLAIN = "plain";
public static final String VARIANT_BALLOON = "balloon"; public static final String VARIANT_BALLOON = "balloon";
public static final String TIP_TEXT_PROPERTY = "tiptext";
protected JToolTip toolTip; protected JToolTip toolTip;
protected JRootPane lastRootPane; protected JRootPane lastRootPane;
protected ToolTipStyle style; protected ToolTipStyle style;
protected boolean isTipTextChanging;
protected MouseListener exitListener = new MouseAdapter() { protected MouseListener exitListener = new MouseAdapter() {
@Override @Override
public void mouseExited(final MouseEvent e) { public void mouseExited(final MouseEvent e) {
@ -149,9 +151,7 @@ public class DarkTooltipUI extends BasicToolTipUI implements PropertyChangeListe
Alignment align = (Alignment) c.getClientProperty(KEY_POINTER_LOCATION); Alignment align = (Alignment) c.getClientProperty(KEY_POINTER_LOCATION);
border.setPointerLocation(align == null ? Alignment.CENTER : align); border.setPointerLocation(align == null ? Alignment.CENTER : align);
toolTip.setBorder(border); toolTip.setBorder(border);
if (toolTip.getClientProperty(KEY_STYLE) == null) { updateStyle();
toolTip.putClientProperty(KEY_STYLE, ToolTipStyle.BALLOON);
}
} }
@Override @Override
@ -197,7 +197,6 @@ public class DarkTooltipUI extends BasicToolTipUI implements PropertyChangeListe
Dimension prefSize = new Dimension(insets.left + insets.right, Dimension prefSize = new Dimension(insets.left + insets.right,
insets.top + insets.bottom); insets.top + insets.bottom);
String text = ((JToolTip) c).getTipText(); String text = ((JToolTip) c).getTipText();
if ((text != null) && !text.equals("")) { if ((text != null) && !text.equals("")) {
View v = (View) c.getClientProperty(PropertyKey.HTML); View v = (View) c.getClientProperty(PropertyKey.HTML);
if (v != null) { if (v != null) {
@ -278,14 +277,42 @@ public class DarkTooltipUI extends BasicToolTipUI implements PropertyChangeListe
if (newComp instanceof Component) { if (newComp instanceof Component) {
((Component) newComp).addMouseListener(mouseListener); ((Component) newComp).addMouseListener(mouseListener);
} }
updateStyle();
} else if (TIP_TEXT_PROPERTY.equals(key)) {
if (!isTipTextChanging) {
isTipTextChanging = true;
String tipText = tooltip.getTipText();
if (tipText != null && !tipText.startsWith("<html>")) {
if (tipText.contains("\n")) {
tooltip.setTipText("<html>" + tipText.replaceAll("\n", "<\\br>") + "</html>");
} else {
tooltip.setTipText("<html><body><nobr>" + tipText + "</nobr></body></html>");
}
} else {
tooltip.setTipText(tipText);
}
updateSize();
isTipTextChanging = false;
}
} }
} }
if (KEY_STYLE.equals(key)) { if (KEY_STYLE.equals(key)) {
tooltip.setPreferredSize(getPreferredSize(tooltip)); updateSize();
} }
} }
} }
private void updateStyle() {
JComponent comp = toolTip.getComponent();
if (comp != null) {
Object style = comp.getClientProperty(KEY_STYLE);
Object tooltipStyle = toolTip.getClientProperty(KEY_STYLE);
toolTip.putClientProperty(KEY_STYLE, style instanceof ToolTipStyle ? style :
tooltipStyle instanceof ToolTipStyle ? tooltipStyle
: ToolTipStyle.BALLOON);
}
}
protected ToolTipStyle getStyle() { protected ToolTipStyle getStyle() {
Object prop = toolTip.getClientProperty(KEY_STYLE); Object prop = toolTip.getClientProperty(KEY_STYLE);
String propValue = prop != null ? prop.toString() : null; String propValue = prop != null ? prop.toString() : null;

Write Preview
Loading…
Cancel
Save