Bug 575289: [SourceEditor] Add default colors for dark theme
Change-Id: I7bc646dd6036cd4b6dc6a9bcc26e6c1b692ca82f
diff --git a/ltk/org.eclipse.statet.ltk.ui/css/e4_dark.css b/ltk/org.eclipse.statet.ltk.ui/css/e4_dark.css
index b2eb502..e772ff6 100644
--- a/ltk/org.eclipse.statet.ltk.ui/css/e4_dark.css
+++ b/ltk/org.eclipse.statet.ltk.ui/css/e4_dark.css
@@ -18,6 +18,20 @@
'org.eclipse.statet.workbench.themes.DocViewBackgroundColor=50,55,60'
'org.eclipse.statet.workbench.themes.DocViewColor=235,235,235'
+ 'org.eclipse.statet.workbench.themes.CodeDefaultColor=225,230,240'
+ 'org.eclipse.statet.workbench.themes.CodeBracketColor=248,249,250'
+ 'org.eclipse.statet.workbench.themes.CodePreprocessorColor=96,159,251'
+ 'org.eclipse.statet.workbench.themes.CodeCommentColor=115,160,125'
+ 'org.eclipse.statet.workbench.themes.CodeCommentTaskTagColor=115,160,150'
+ 'org.eclipse.statet.workbench.themes.CodeDocuColor=20,150,195'
+ 'org.eclipse.statet.workbench.themes.CodeDocuTagColor=135,160,175'
+ 'org.eclipse.statet.workbench.themes.CodeKeywordColor=190,75,160'
+ 'org.eclipse.statet.workbench.themes.CodeConstColor=195,135,215'
+ 'org.eclipse.statet.workbench.themes.CodeStringColor=150,175,255'
+ 'org.eclipse.statet.workbench.themes.CodeNumberColor=155,195,255'
+ 'org.eclipse.statet.workbench.themes.CodeOperatorColor=195,170,135'
+ 'org.eclipse.statet.workbench.themes.CodeSubColor=210,140,105'
+
'org.eclipse.statet.workbench.themes.ConsoleInfoColor=90,135,225'
'org.eclipse.statet.workbench.themes.ConsoleInputColor=30,160,95'
'org.eclipse.statet.workbench.themes.ConsoleOutputColor=205,205,205'
diff --git a/ltk/org.eclipse.statet.ltk.ui/plugin.xml b/ltk/org.eclipse.statet.ltk.ui/plugin.xml
index 3736c9d..933b5cc 100644
--- a/ltk/org.eclipse.statet.ltk.ui/plugin.xml
+++ b/ltk/org.eclipse.statet.ltk.ui/plugin.xml
@@ -878,74 +878,67 @@
id="org.eclipse.statet.workbench.themes.CodeDefaultColor"
isEditable="false"
label=""
- value="0,0,0">
- </colorDefinition>
+ value="0,0,0"/>
+ <colorDefinition
+ id="org.eclipse.statet.workbench.themes.CodeBracketColor"
+ isEditable="false"
+ label=""
+ value="0,0,0"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodePreprocessorColor"
isEditable="false"
label=""
- value="96,159,251">
- </colorDefinition>
+ value="96,159,251"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeCommentColor"
isEditable="false"
label=""
- value="63,127,79">
- </colorDefinition>
+ value="65,125,70"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeCommentTaskTagColor"
isEditable="false"
label=""
- value="63,127,95">
- </colorDefinition>
+ value="65,125,95"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeDocuColor"
isEditable="false"
label=""
- value="15,127,159">
- </colorDefinition>
+ value="15,125,160"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeDocuTagColor"
isEditable="false"
label=""
- value="135,159,175">
- </colorDefinition>
+ value="135,160,175"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeKeywordColor"
isEditable="false"
label=""
- value="127,0,95">
- </colorDefinition>
+ value="125,0,95"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeConstColor"
isEditable="false"
label=""
- value="127,0,127">
- </colorDefinition>
+ value="90,5,165"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeStringColor"
isEditable="false"
label=""
- value="63,63,175">
- </colorDefinition>
+ value="65,65,175"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeNumberColor"
isEditable="false"
label=""
- value="0,0,127">
- </colorDefinition>
+ value="0,30,130"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeOperatorColor"
isEditable="false"
label=""
- value="159,63,127">
- </colorDefinition>
+ value="165,100,35"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeSubColor"
isEditable="false"
label=""
- value="63,95,95">
- </colorDefinition>
+ value="150,45,0"/>
<colorDefinition
id="org.eclipse.statet.workbench.themes.CodeDocCommandColor"
isEditable="false"
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/presentation/AbstractTextStylesConfigurationBlock.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/presentation/AbstractTextStylesConfigurationBlock.java
index 3189510..7d0debd 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/presentation/AbstractTextStylesConfigurationBlock.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/presentation/AbstractTextStylesConfigurationBlock.java
@@ -613,8 +613,8 @@
final GridData gd= new GridData(SWT.FILL, SWT.FILL, true, true);
gd.horizontalSpan= 2;
final PixelConverter conv= new PixelConverter(previewerControl);
- gd.widthHint= conv.convertWidthInCharsToPixels(20);
- gd.heightHint= conv.convertHeightInCharsToPixels(5);
+ gd.widthHint= conv.convertWidthInCharsToPixels(40);
+ gd.heightHint= conv.convertHeightInCharsToPixels(10);
previewerControl.setLayoutData(gd);
}
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/workbench/ui/IWaThemeConstants.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/workbench/ui/IWaThemeConstants.java
index 2bd31d8..1beba6f 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/workbench/ui/IWaThemeConstants.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/workbench/ui/IWaThemeConstants.java
@@ -27,6 +27,8 @@
String CODE_DEFAULT_COLOR= "org.eclipse.statet.workbench.themes.CodeDefaultColor"; //$NON-NLS-1$
+ String CODE_BRACKET_COLOR= "org.eclipse.statet.workbench.themes.CodeBracketColor"; //$NON-NLS-1$
+
String CODE_PREPROCESSOR_COLOR= "org.eclipse.statet.workbench.themes.CodePreprocessorColor"; //$NON-NLS-1$
String CODE_COMMENT_COLOR= "org.eclipse.statet.workbench.themes.CodeCommentColor"; //$NON-NLS-1$
