diff options
| author | Stephan Wahlbrink | 2021-08-07 17:42:19 +0000 |
|---|---|---|
| committer | Stephan Wahlbrink | 2021-08-07 17:46:08 +0000 |
| commit | 93526b8f80905b769dedbb43fe36c1823ebea757 (patch) | |
| tree | 641adf72299291ce57cfe1bb2dfba750ad1613fc | |
| parent | bf2e6dce82c16e65a8de2c52adbfcd5e35ccfcea (diff) | |
| download | org.eclipse.statet-r-93526b8f80905b769dedbb43fe36c1823ebea757.tar.gz org.eclipse.statet-r-93526b8f80905b769dedbb43fe36c1823ebea757.tar.xz org.eclipse.statet-r-93526b8f80905b769dedbb43fe36c1823ebea757.zip | |
Bug 575289: [R-Editor, Rd-Editor] Make use of added theme color
Change-Id: I37c599347edb7ff4bdd40bfa6921a182f2a38a7b
| -rw-r--r-- | r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java index eedb7e76..756eab98 100644 --- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java +++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java @@ -119,10 +119,11 @@ public class RUIPreferenceConstants { final IEclipsePreferences pref = scope.getNode(RUI.BUNDLE_ID); final ThemeUtil theme = new ThemeUtil(); - final String defaultColor = theme.getColorPrefValue(IWaThemeConstants.CODE_DEFAULT_COLOR); - final String commentColor = theme.getColorPrefValue(IWaThemeConstants.CODE_COMMENT_COLOR); - final String commentTasktagColor = theme.getColorPrefValue(IWaThemeConstants.CODE_COMMENT_TASKTAG_COLOR); - final String keywordColor = theme.getColorPrefValue(IWaThemeConstants.CODE_KEYWORD_COLOR); + final String defaultColor= theme.getColorPrefValue(IWaThemeConstants.CODE_DEFAULT_COLOR); + final String bracketColor= theme.getColorPrefValue(IWaThemeConstants.CODE_BRACKET_COLOR); + final String commentColor= theme.getColorPrefValue(IWaThemeConstants.CODE_COMMENT_COLOR); + final String commentTasktagColor= theme.getColorPrefValue(IWaThemeConstants.CODE_COMMENT_TASKTAG_COLOR); + final String keywordColor= theme.getColorPrefValue(IWaThemeConstants.CODE_KEYWORD_COLOR); String color; pref.put(R.TS_DEFAULT_ROOT + TEXTSTYLE_COLOR_SUFFIX, defaultColor); @@ -288,7 +289,7 @@ public class RUIPreferenceConstants { pref.putBoolean(R.TS_OPERATORS_SUB_USERDEFINED_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false); pref.putBoolean(R.TS_OPERATORS_SUB_USERDEFINED_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false); - pref.put(R.TS_GROUPING_ROOT + TEXTSTYLE_COLOR_SUFFIX, defaultColor); + pref.put(R.TS_GROUPING_ROOT + TEXTSTYLE_COLOR_SUFFIX, bracketColor); pref.putBoolean(R.TS_GROUPING_ROOT + TEXTSTYLE_BOLD_SUFFIX, false); pref.putBoolean(R.TS_GROUPING_ROOT + TEXTSTYLE_ITALIC_SUFFIX, false); pref.putBoolean(R.TS_GROUPING_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false); @@ -309,6 +310,12 @@ public class RUIPreferenceConstants { pref.putBoolean(Rd.TS_DEFAULT_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false); pref.putBoolean(Rd.TS_DEFAULT_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false); + pref.put(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_COLOR_SUFFIX, bracketColor); + pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_BOLD_SUFFIX, false); + pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_ITALIC_SUFFIX, false); + pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false); + pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false); + pref.put(Rd.TS_VERBATIM_ROOT + TEXTSTYLE_COLOR_SUFFIX, theme.getColorPrefValue(IWaThemeConstants.CODE_VERBATIM_COLOR) ); pref.putBoolean(Rd.TS_VERBATIM_ROOT + TEXTSTYLE_BOLD_SUFFIX, false); @@ -361,12 +368,6 @@ public class RUIPreferenceConstants { pref.putBoolean(Rd.TS_UNLISTED_TAG_ROOT + TEXTSTYLE_ITALIC_SUFFIX, true); pref.putBoolean(Rd.TS_UNLISTED_TAG_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false); pref.putBoolean(Rd.TS_UNLISTED_TAG_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false); - - pref.put(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_COLOR_SUFFIX, defaultColor); - pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_BOLD_SUFFIX, false); - pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_ITALIC_SUFFIX, false); - pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false); - pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false); } } |