Skip to content

VS: Fix dark mode detection #16301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 20, 2023
Merged

VS: Fix dark mode detection #16301

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
229390e
detect dark mode by looking at background
majocha Nov 18, 2023
737c484
fantomas
majocha Nov 18, 2023
8552992
Merge branch 'main' into detect-darkmode
majocha Nov 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 17 additions & 27 deletions vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ open Microsoft.VisualStudio.Editor
open Microsoft.VisualStudio.PlatformUI
open Microsoft.VisualStudio.Shell
open Microsoft.VisualStudio.Shell.Interop
open Microsoft.Internal.VisualStudio.Shell.Interop
open Microsoft.VisualStudio.Language.StandardClassification
open Microsoft.VisualStudio.Text.Classification
open Microsoft.VisualStudio.Utilities
Expand Down Expand Up @@ -91,23 +90,7 @@ module internal ClassificationDefinitions =
[<Import(typeof<SVsServiceProvider>)>] serviceProvider: IServiceProvider
) =

let (|LightTheme|DarkTheme|UnknownTheme|) id =
if
id = KnownColorThemes.Light
|| id = KnownColorThemes.Blue
|| id = Guids.blueHighContrastThemeId
then
LightTheme
elif id = KnownColorThemes.Dark then
DarkTheme
else
UnknownTheme

let getCurrentThemeId () =
let themeService =
serviceProvider.GetService(typeof<SVsColorThemeService>) :?> IVsColorThemeService

themeService.CurrentTheme.ThemeId
let mutable isDarkBackground = false

let customColorData =
[
Expand Down Expand Up @@ -143,7 +126,16 @@ module internal ClassificationDefinitions =
|}
]

let setIsDarkBackground () =
isDarkBackground <-
VSColorTheme
.GetThemedColor(EnvironmentColors.ToolWindowBackgroundColorKey)
.GetBrightness() < 0.5f

let setColors _ =

setIsDarkBackground ()

let fontAndColorStorage =
serviceProvider.GetService(typeof<SVsFontAndColorStorage>) :?> IVsFontAndColorStorage

Expand Down Expand Up @@ -172,10 +164,10 @@ module internal ClassificationDefinitions =
let oldProps = formatMap.GetTextProperties(ict)

let newProps =
match getCurrentThemeId () with
| LightTheme -> oldProps.SetForeground item.LightThemeColor
| DarkTheme -> oldProps.SetForeground item.DarkThemeColor
| UnknownTheme -> oldProps
if isDarkBackground then
oldProps.SetForeground item.DarkThemeColor
else
oldProps.SetForeground item.LightThemeColor

formatMap.SetTextProperties(ict, newProps)

Expand All @@ -187,15 +179,13 @@ module internal ClassificationDefinitions =

do VSColorTheme.add_ThemeChanged handler

do setIsDarkBackground ()

member _.GetColor(ctype) =
match customColorData |> List.tryFindV (fun item -> item.ClassificationName = ctype) with
| ValueSome item ->
let light, dark = item.LightThemeColor, item.DarkThemeColor

match getCurrentThemeId () with
| LightTheme -> Nullable light
| DarkTheme -> Nullable dark
| UnknownTheme -> Nullable()
if isDarkBackground then Nullable dark else Nullable light
| ValueNone -> Nullable()

interface ISetThemeColors with
Expand Down