diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /platform/platform-api/src/com/intellij/ui/InplaceButton.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/platform-api/src/com/intellij/ui/InplaceButton.java')
| -rw-r--r-- | platform/platform-api/src/com/intellij/ui/InplaceButton.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/platform-api/src/com/intellij/ui/InplaceButton.java b/platform/platform-api/src/com/intellij/ui/InplaceButton.java index 04ea9161f99c..89dd0dfc34e2 100644 --- a/platform/platform-api/src/com/intellij/ui/InplaceButton.java +++ b/platform/platform-api/src/com/intellij/ui/InplaceButton.java @@ -101,7 +101,11 @@ public class InplaceButton extends JComponent implements ActiveComponent { setIcons(source.getRegular(), source.getInactive(), source.getHovered()); } - public void setIcons(final Icon regular, final Icon inactive, final Icon hovered) { + public void setIcons(final Icon regular, Icon inactive, Icon hovered) { + if (regular == null) return; + if (inactive == null) inactive = regular; + if (hovered == null) hovered = regular; + int width = Math.max(regular.getIconWidth(), inactive.getIconWidth()); width = Math.max(width, hovered.getIconWidth()); int height = Math.max(regular.getIconHeight(), inactive.getIconHeight()); |