fixed PY-14220 Fix darkula theme issues

This commit is contained in:
Ekaterina Tuzova
2014-11-13 18:41:19 +03:00
parent 975bfaa953
commit 75bbbc916f
4 changed files with 14 additions and 4 deletions
@@ -5,12 +5,14 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.BrowserHyperlinkListener;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.text.MarkdownUtil;
import com.intellij.util.ui.UIUtil;
import com.petebevin.markdown.MarkdownProcessor;
import net.sourceforge.jeuclid.MathMLParserSupport;
import net.sourceforge.jeuclid.context.LayoutContextImpl;
import net.sourceforge.jeuclid.context.Parameter;
import net.sourceforge.jeuclid.converter.Converter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.ipnb.editor.IpnbEditorUtil;
import org.jetbrains.plugins.ipnb.editor.panels.IpnbTexPackageDefinitions;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -71,6 +73,7 @@ public class IpnbUtils {
public static JEditorPane createLatexPane(@NotNull final String source) {
final JEditorPane editorPane = new JEditorPane();
editorPane.setBackground(IpnbEditorUtil.getBackground());
editorPane.setContentType(new HTMLEditorKit().getContentType());
editorPane.setEditorKit(new HTMLEditorKit());
@@ -197,6 +200,7 @@ public class IpnbUtils {
final String xmlString = session.buildXMLString(options);
if (xmlString == null) return;
final LayoutContextImpl context = (LayoutContextImpl)LayoutContextImpl.getDefaultLayoutContext();
context.setParameter(Parameter.MATHCOLOR, UIUtil.getTextAreaForeground());
context.setParameter(Parameter.MATHSIZE, 18);
final Document document = MathMLParserSupport.parseString(xmlString);
@@ -20,6 +20,7 @@ import com.intellij.execution.impl.ConsoleViewUtil;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorFactory;
import com.intellij.openapi.editor.colors.EditorColors;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.project.Project;
@@ -59,13 +60,17 @@ public class IpnbEditorUtil {
}
private static void setupEditor(@NotNull final EditorEx editor) {
if (!UIUtil.isUnderDarcula())
editor.setBackgroundColor(Gray._247);
editor.setBackgroundColor(getEditablePanelBackground());
noScrolling(editor);
editor.getScrollPane().setBorder(null);
ConsoleViewUtil.setupConsoleEditor(editor, false, false);
}
public static Color getEditablePanelBackground() {
return !UIUtil.isUnderDarcula() ? Gray._247 : EditorColorsManager.getInstance().getGlobalScheme().getColor(
EditorColors.GUTTER_BACKGROUND);
}
public static Editor createPlainCodeEditor(@NotNull final Project project, @NotNull final String text) {
final EditorFactory editorFactory = EditorFactory.getInstance();
assert editorFactory != null;
@@ -2,7 +2,6 @@ package org.jetbrains.plugins.ipnb.editor.panels;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.Gray;
import com.intellij.ui.JBColor;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
@@ -136,7 +135,7 @@ public abstract class IpnbEditablePanel<T extends JComponent, K extends IpnbEdit
textArea.setLineWrap(true);
textArea.setEditable(true);
textArea.setBorder(BorderFactory.createLineBorder(JBColor.lightGray));
textArea.setBackground(Gray._247);
textArea.setBackground(IpnbEditorUtil.getEditablePanelBackground());
textArea.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
@@ -1,6 +1,7 @@
package org.jetbrains.plugins.ipnb.editor.panels.code;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.ipnb.editor.IpnbEditorUtil;
import org.jetbrains.plugins.ipnb.editor.panels.IpnbPanel;
import org.jetbrains.plugins.ipnb.format.cells.output.IpnbOutputCell;
@@ -19,6 +20,7 @@ public class IpnbCodeOutputPanel<K extends IpnbOutputCell> extends IpnbPanel<JCo
JTextArea textArea = new JTextArea(myCell.getSourceAsString());
textArea.setLineWrap(true);
textArea.setEditable(false);
textArea.setBackground(IpnbEditorUtil.getBackground());
return textArea;
}
}