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

don't use borders and insets in output html/rtf (IDEA-67767)

Browse Source
This commit is contained in:
Dmitry Batrak
2014-04-23 13:58:31 +04:00
parent 6c4dbea374
commit 43b861b75d
6 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/editor/richcopy/view/HtmlTransferableData.java
+2 -4
View File
@@ -58,9 +58,7 @@ public class HtmlTransferableData extends AbstractSyntaxAwareReaderTransferableD
myFontNameRegistry = mySyntaxInfo.getFontNameRegistry();
try {
buildColorMap();
myResultBuffer.append("<div style=\"border:1px inset;padding:2%;\">")
.append("<pre style=\"margin:0;padding:6px;background-color:");
// .append("<pre style='height:30%;overflow:auto;margin:0;padding:6px;background-color:")
myResultBuffer.append("<pre style=\"background-color:");
appendColor(myResultBuffer, mySyntaxInfo.getDefaultBackground());
myResultBuffer.append(';');
if (myFontNameRegistry.size() == 1) {
@@ -85,7 +83,7 @@ public class HtmlTransferableData extends AbstractSyntaxAwareReaderTransferableD
finally {
it.dispose();
}
myResultBuffer.append("</pre></div>");
myResultBuffer.append("</pre>");
}
finally {
myResultBuffer = null;
platform/lang-impl/src/com/intellij/openapi/editor/richcopy/view/RtfTransferableData.java
+1 -3
View File
@@ -87,11 +87,9 @@ public class RtfTransferableData extends AbstractSyntaxAwareInputStreamTransfera
}
private static void rectangularBackground(@NotNull SyntaxInfo syntaxInfo, @NotNull StringBuilder buffer, @NotNull Runnable next) {
buffer.append("\n\\s0\\box\\brdrhair\\brdrcf").append(syntaxInfo.getDefaultForeground()).append("\\brsp317").append("\\cbpat")
.append(syntaxInfo.getDefaultBackground());
buffer.append("\n\\s0\\box").append("\\cbpat").append(syntaxInfo.getDefaultBackground());
saveBackground(buffer, syntaxInfo.getDefaultBackground());
next.run();
buffer.append("\\par");
}
private static void content(@NotNull SyntaxInfo syntaxInfo, @NotNull StringBuilder buffer, @NotNull String rawText, int maxLength) {
platform/platform-tests/testData/editor/richcopy/BlockSelection.html
+2 -2
View File
@@ -1,3 +1,3 @@
<div style="border:1px inset;padding:2%;"><pre style="margin:0;padding:6px;background-color:#ffffff;font-family:'___PLATFORM_SPECIFIC___';font-size:___PLATFORM_SPECIFIC___;" bgcolor="#ffffff"> <font color="#000080"><b><span style="color:#000080;font-weight:bold;">int </span></b></font><font color="#000000"><span style="color:#000000;">field;</span></font><font color="#000000"><span style="color:#000000;">
<pre style="background-color:#ffffff;font-family:'___PLATFORM_SPECIFIC___';font-size:___PLATFORM_SPECIFIC___;" bgcolor="#ffffff"> <font color="#000080"><b><span style="color:#000080;font-weight:bold;">int </span></b></font><font color="#000000"><span style="color:#000000;">field;</span></font><font color="#000000"><span style="color:#000000;">
</span></font><font color="#000000"><span style="color:#000000;">
</span></font><font color="#000000"><span style="color:#000000;"> </span></font><font color="#000080"><b><span style="color:#000080;font-weight:bold;">public static void </span></b></font><font color="#000000"><span style="color:#000000;">main(String[] args) {</span></font></pre></div>
</span></font><font color="#000000"><span style="color:#000000;"> </span></font><font color="#000080"><b><span style="color:#000080;font-weight:bold;">public static void </span></b></font><font color="#000000"><span style="color:#000000;">main(String[] args) {</span></font></pre>
platform/platform-tests/testData/editor/richcopy/BlockSelection.rtf
+2 -2
View File
@@ -1,7 +1,7 @@
{\rtf1\ansi\deff0{\colortbl;\red0\green0\blue0;\red255\green255\blue255;\red0\green0\blue128;}
{\fonttbl{\f1 ___PLATFORM_SPECIFIC___;}}
\s0\box\brdrhair\brdrcf1\brsp317\cbpat2\cb2
\s0\box\cbpat2\cb2
\cf3\f1\plain
\cf3\f1\fs___PLATFORM_SPECIFIC___\b
int \cf1\plain
@@ -15,4 +15,4 @@ field;
\cf3\f1\fs___PLATFORM_SPECIFIC___\b
public static void \cf1\plain
\cf1\f1\fs___PLATFORM_SPECIFIC___
main(String[] args) \{\par}
main(String[] args) \{}
platform/platform-tests/testData/editor/richcopy/NormalSelection.html
+2 -2
View File
@@ -1,8 +1,8 @@
<div style="border:1px inset;padding:2%;"><pre style="margin:0;padding:6px;background-color:#ffffff;font-family:'___PLATFORM_SPECIFIC___';font-size:___PLATFORM_SPECIFIC___;" bgcolor="#ffffff"><font color="#000080"><b><span style="color:#000080;font-weight:bold;">public class </span></b></font><font color="#000000"><span style="color:#000000;">Basic {
<pre style="background-color:#ffffff;font-family:'___PLATFORM_SPECIFIC___';font-size:___PLATFORM_SPECIFIC___;" bgcolor="#ffffff"><font color="#000080"><b><span style="color:#000080;font-weight:bold;">public class </span></b></font><font color="#000000"><span style="color:#000000;">Basic {
</span></font><font color="#000000"><span style="color:#000000;"> </span></font><font color="#000080"><b><span style="color:#000080;font-weight:bold;">int </span></b></font><font color="#000000"><span style="color:#000000;">field;
</span></font><font color="#000000"><span style="color:#000000;">
</span></font><font color="#000000"><span style="color:#000000;"> </span></font><font color="#000080"><b><span style="color:#000080;font-weight:bold;">public static void </span></b></font><font color="#000000"><span style="color:#000000;">main(String[] args) {
</span></font><font color="#000000"><span style="color:#000000;"> System.out.println(</span></font><font color="#008000"><b><span style="color:#008000;font-weight:bold;">"Hello</span></b></font><font color="#000080"><b><span style="color:#000080;font-weight:bold;">\t</span></b></font><font color="#008000"><b><span style="color:#008000;font-weight:bold;">world!"</span></b></font><font color="#000000"><span style="color:#000000;">);
</span></font><font color="#000000"><span style="color:#000000;"> }
</span></font><font color="#000000"><span style="color:#000000;">}
</span></font></pre></div>
</span></font></pre>
platform/platform-tests/testData/editor/richcopy/NormalSelection.rtf
+2 -2
View File
@@ -1,7 +1,7 @@
{\rtf1\ansi\deff0{\colortbl;\red0\green0\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue0;}
{\fonttbl{\f1 ___PLATFORM_SPECIFIC___;}}
\s0\box\brdrhair\brdrcf1\brsp317\cbpat2\cb2\cf3\f1\plain
\s0\box\cbpat2\cb2\cf3\f1\plain
\cf3\f1\fs___PLATFORM_SPECIFIC___\b
public class \cf1\plain
\cf1\f1\fs___PLATFORM_SPECIFIC___
@@ -32,4 +32,4 @@ world!"\cf1\plain
\}\line
\}\line
\par}
}