MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ui: extract body inner html if it happens that passed bodyInnerHtml is actually "<html><body>..." (WEB-47316)

Browse Source 
GitOrigin-RevId: 53840b542f35f68a626ea13d24ca49fb1ad1c6df
This commit is contained in:
Sergey Simonchik
2020-10-21 20:28:16 +00:00
committed by intellij-monorepo-bot
parent 74cc882106
commit c3d1ad0a2b
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/util/ui/SwingHelper.java
+10 -7
View File
@@ -628,6 +628,9 @@ public class SwingHelper {
@NotNull
public static @Nls String buildHtml(@NotNull @Nls String headInnerHtml, @NotNull @Nls String bodyInnerHtml) {
if (bodyInnerHtml.contains("<html>")) {
bodyInnerHtml = UIUtil.getHtmlBody(bodyInnerHtml);
}
return HtmlChunk.html().children(
HtmlChunk.head().addRaw(headInnerHtml),
HtmlChunk.body().addRaw(bodyInnerHtml)
@@ -746,23 +749,23 @@ public class SwingHelper {
}
}
public static JEditorPane createHtmlLabel(@NotNull @Nls final String innerHtml, @Nullable @Nls String disabledHtml,
@Nullable final Consumer<? super String> hyperlinkListener) {
disabledHtml = disabledHtml == null ? innerHtml : disabledHtml;
public static @NotNull JEditorPane createHtmlLabel(@NotNull @Nls String bodyInnerHtml,
@Nullable @Nls String disabledBodyInnerHtml,
@Nullable Consumer<? super String> hyperlinkListener) {
final Font font = UIUtil.getLabelFont();
String html = buildHtml(
UIUtil.getCssFontDeclaration(font, UIUtil.getActiveTextColor(), null, null),
innerHtml
bodyInnerHtml
);
String disabled = buildHtml(
String disabledHtml = buildHtml(
UIUtil.getCssFontDeclaration(font, UIUtil.getInactiveTextColor(), null, null),
disabledHtml
ObjectUtils.notNull(disabledBodyInnerHtml, bodyInnerHtml)
);
final JEditorPane pane = new SwingHelper.HtmlViewerBuilder()
.setCarryTextOver(false)
.setFont(UIUtil.getLabelFont())
.setDisabledHtml(disabled)
.setDisabledHtml(disabledHtml)
.create();
pane.setText(html);
pane.addHyperlinkListener(