diff options
| author | David Karlaš <david.karlas@microsoft.com> | 2019-10-10 14:28:30 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@microsoft.com> | 2019-10-10 14:28:30 +0300 |
| commit | 9218eedd8f6bc3fad563b8de45003cfb3a383a7c (patch) | |
| tree | 69d123af2fff8473b970f7ba3330842b94b61487 /main/src/addins/MonoDevelop.TextEditor | |
| parent | c48b30e307c9652ef5569bb32db63a75562f51a5 (diff) | |
Map colors for QuickFix->DiffPreview for new editor
Diffstat (limited to 'main/src/addins/MonoDevelop.TextEditor')
| -rw-r--r-- | main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs index d617afcfbd..1922bcfa33 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/ThemeToClassification.cs @@ -240,6 +240,27 @@ namespace MonoDevelop.TextEditor CreateResourceDictionary (editorFormat, defaultSettings, "urlformat", EditorThemeColors.Link, EditorFormatDefinition.ForegroundColorId); CreateResourceDictionary (editorFormat, defaultSettings, "Track Changes before save", EditorThemeColors.QuickDiffDirty); CreateResourceDictionary (editorFormat, defaultSettings, "Track Changes after save", EditorThemeColors.QuickDiffChanged); + + + // Old(MonoDevelop) diff when rendering new code/removed code uses 1 color for background and 1 color for text + // New(VS) diff uses normal syntax colored text which results in good results when mapping on light themes + // but on dark themes things looks just opposite of what they should, hence invert background color... + if (theme.FitsIdeTheme (Theme.Light)) { + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.remove.line", EditorThemeColors.PreviewDiffRemovedBackground); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.remove.word", EditorThemeColors.PreviewDiffRemovedBackground); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.remove.word", EditorThemeColors.PreviewDiffRemoved, EditorFormatDefinition.ForegroundColorId); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.add.line", EditorThemeColors.PreviewDiffAddedBackground); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.add.word", EditorThemeColors.PreviewDiffAddedBackground); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.add.word", EditorThemeColors.PreviewDiffAdded, EditorFormatDefinition.ForegroundColorId); + } else { + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.remove.line", EditorThemeColors.PreviewDiffRemoved); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.remove.word", EditorThemeColors.PreviewDiffRemoved); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.remove.word", EditorThemeColors.PreviewDiffRemovedBackground, EditorFormatDefinition.ForegroundColorId); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.add.line", EditorThemeColors.PreviewDiffAdded); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.add.word", EditorThemeColors.PreviewDiffAdded); + CreateResourceDictionary (editorFormat, defaultSettings, "deltadiff.add.word", EditorThemeColors.PreviewDiffAddedBackground, EditorFormatDefinition.ForegroundColorId); + } + CreateInlineEditField (editorFormat, defaultSettings, "RoslynRenameFieldBackgroundAndBorderTag"); CreateInlineEditField (editorFormat, defaultSettings, "ExpansionFieldBackgroundAndBorderTag"); foreach (var mapping in mappings) { |