From 723180132dc5a3b5147311ff2c6c33ac3c4ef686 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Wed, 13 Aug 2025 21:14:47 +0200 Subject: [PATCH] Issue #2847 - Extend `-moz-os-version` media query with win11. Resolves #2847 --- layout/style/nsMediaFeatures.cpp | 3 ++- widget/LookAndFeel.h | 1 + widget/windows/nsLookAndFeel.cpp | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp index d4f4a89622..aa34490a47 100644 --- a/layout/style/nsMediaFeatures.cpp +++ b/layout/style/nsMediaFeatures.cpp @@ -87,7 +87,8 @@ const OperatingSystemVersionInfo osVersionStrings[] = { { LookAndFeel::eOperatingSystemVersion_WindowsVista, L"windows-vista" }, { LookAndFeel::eOperatingSystemVersion_Windows7, L"windows-win7" }, { LookAndFeel::eOperatingSystemVersion_Windows8, L"windows-win8" }, - { LookAndFeel::eOperatingSystemVersion_Windows10, L"windows-win10" } + { LookAndFeel::eOperatingSystemVersion_Windows10, L"windows-win10" }, + { LookAndFeel::eOperatingSystemVersion_Windows11, L"windows-win11" } }; #endif diff --git a/widget/LookAndFeel.h b/widget/LookAndFeel.h index 741f287346..2e371ef89b 100644 --- a/widget/LookAndFeel.h +++ b/widget/LookAndFeel.h @@ -455,6 +455,7 @@ public: eOperatingSystemVersion_Windows7, eOperatingSystemVersion_Windows8, eOperatingSystemVersion_Windows10, + eOperatingSystemVersion_Windows11, eOperatingSystemVersion_Unknown }; diff --git a/widget/windows/nsLookAndFeel.cpp b/widget/windows/nsLookAndFeel.cpp index e803d845b4..f03b7a7383 100644 --- a/widget/windows/nsLookAndFeel.cpp +++ b/widget/windows/nsLookAndFeel.cpp @@ -27,7 +27,9 @@ nsLookAndFeel::GetOperatingSystemVersion() return version; } - if (IsWin10OrLater()) { + if (IsWin11OrLater()) { + version = eOperatingSystemVersion_Windows11; + } else if (IsWin10OrLater()) { version = eOperatingSystemVersion_Windows10; } else if (IsWin8OrLater()) { version = eOperatingSystemVersion_Windows8;