mirrors/Firefox-UI-Fix
1
Fork 0
mirror of https://github.com/black7375/Firefox-UI-Fix.git synced 2025-12-06 02:30:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: Utils - STANDARD-MODE Native menu #744

Browse source
This commit is contained in:
alstjr7375 2023-08-13 05:32:02 +09:00
parent 8ad0d18e14
commit d7df0da75c
2 changed files with 57 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

58
__tests__/native_menu.test.scss
View file

@ -12,6 +12,7 @@
@include native_menu.NativeToolkitMenu { @include native_menu.NativeToolkitMenu {
@include example; @include example;
} }
@include native_menu.NativeMenuPopup { @include native_menu.NativeMenuPopup {
@include example; @include example;
} }
@ -20,6 +21,7 @@
@supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
@include example; @include example;
} }
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup), menupopup:is(#historyMenuPopup, #bookmarksMenuPopup),
menupopup:not([placespopup="true"]) { menupopup:not([placespopup="true"]) {
@include example; @include example;
@ -33,12 +35,15 @@
@include native_menu.NativeMenu(true) { @include native_menu.NativeMenu(true) {
@include example; @include example;
} }
@include native_menu.NonNativeMenu(true) { @include native_menu.NonNativeMenu(true) {
@include example; @include example;
} }
@include native_menu.WinNativeMenu(true) { @include native_menu.WinNativeMenu(true) {
@include example; @include example;
} }
@include native_menu.WinNonNativeMenu(true) { @include native_menu.WinNonNativeMenu(true) {
@include example; @include example;
} }
@ -54,6 +59,7 @@
@include example; @include example;
} }
} }
@media (-moz-windows-non-native-menus) { @media (-moz-windows-non-native-menus) {
@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) { @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
@include example; @include example;
@ -64,11 +70,13 @@
@include example; @include example;
} }
} }
@media not (-moz-windows-non-native-menus) { @media not (-moz-windows-non-native-menus) {
@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) { @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
@include example; @include example;
} }
} }
@media (-moz-windows-non-native-menus) { @media (-moz-windows-non-native-menus) {
@media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) { @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10), (-moz-platform: windows) {
@include example; @include example;
@ -83,12 +91,15 @@
@include native_menu.NativeMenu { @include native_menu.NativeMenu {
@include example; @include example;
} }
@include native_menu.NonNativeMenu { @include native_menu.NonNativeMenu {
@include example; @include example;
} }
@include native_menu.WinNativeMenu { @include native_menu.WinNativeMenu {
@include example; @include example;
} }
@include native_menu.WinNonNativeMenu { @include native_menu.WinNonNativeMenu {
@include example; @include example;
} }
@ -102,6 +113,7 @@
@include example; @include example;
} }
} }
@media (-moz-windows-non-native-menus) { @media (-moz-windows-non-native-menus) {
@include example; @include example;
} }
@ -110,9 +122,11 @@
@include example; @include example;
} }
} }
@media not (-moz-windows-non-native-menus) { @media not (-moz-windows-non-native-menus) {
@include example; @include example;
} }
@media (-moz-windows-non-native-menus) { @media (-moz-windows-non-native-menus) {
@include example; @include example;
} }
@ -130,6 +144,7 @@
@include native_menu.NativeToolkitMenu { @include native_menu.NativeToolkitMenu {
@include example; @include example;
} }
@include native_menu.NativeMenuPopup { @include native_menu.NativeMenuPopup {
@include example; @include example;
} }
@ -138,6 +153,7 @@
@supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
@include example; @include example;
} }
menupopup:is(#historyMenuPopup, #bookmarksMenuPopup), menupopup:is(#historyMenuPopup, #bookmarksMenuPopup),
menupopup:not([placespopup="true"]) { menupopup:not([placespopup="true"]) {
@include example; @include example;
@ -151,48 +167,43 @@
@include native_menu.NativeMenu(true) { @include native_menu.NativeMenu(true) {
@include example; @include example;
} }
@include native_menu.NonNativeMenu(true) { @include native_menu.NonNativeMenu(true) {
@include example; @include example;
} }
@include native_menu.WinNativeMenu(true) { @include native_menu.WinNativeMenu(true) {
@include example; @include example;
} }
@include native_menu.WinNonNativeMenu(true) { @include native_menu.WinNonNativeMenu(true) {
@include example; @include example;
} }
} }
@include expect { @include expect {
@media not (-moz-windows-non-native-menus) {
@media (-moz-platform: windows) {
@include example;
}
}
@supports not -moz-bool-pref("userChrome.theme.non_native_menu") { @supports not -moz-bool-pref("userChrome.theme.non_native_menu") {
@media (-moz-gtk-csd-available) { @media (-moz-gtk-csd-available) {
@include example; @include example;
} }
} }
@media (-moz-windows-non-native-menus) {
// Only Windows
@media (-moz-platform: windows) { @media (-moz-platform: windows) {
@include example; @include example;
} }
}
@supports -moz-bool-pref("userChrome.theme.non_native_menu") { @supports -moz-bool-pref("userChrome.theme.non_native_menu") {
@media (-moz-gtk-csd-available) { @media (-moz-gtk-csd-available) {
@include example; @include example;
} }
} }
@media not (-moz-windows-non-native-menus) {
// IGNORE
// Only Windows
@media (-moz-platform: windows) { @media (-moz-platform: windows) {
@include example; @include example;
} }
} }
@media (-moz-windows-non-native-menus) {
@media (-moz-platform: windows) {
@include example;
}
}
}
} }
} }
@include test("native menu - without windows media") { @include test("native menu - without windows media") {
@ -201,26 +212,28 @@
@include native_menu.NativeMenu { @include native_menu.NativeMenu {
@include example; @include example;
} }
@include native_menu.NonNativeMenu { @include native_menu.NonNativeMenu {
@include example; @include example;
} }
@include native_menu.WinNativeMenu { @include native_menu.WinNativeMenu {
@include example; @include example;
} }
@include native_menu.WinNonNativeMenu { @include native_menu.WinNonNativeMenu {
@include example; @include example;
} }
} }
@include expect { @include expect {
@media not (-moz-windows-non-native-menus) {
@include example;
}
@supports not -moz-bool-pref("userChrome.theme.non_native_menu") { @supports not -moz-bool-pref("userChrome.theme.non_native_menu") {
@media (-moz-gtk-csd-available) { @media (-moz-gtk-csd-available) {
@include example; @include example;
} }
} }
@media (-moz-windows-non-native-menus) {
// AS Windows
@media (-moz-platform: windows) {
@include example; @include example;
} }
@supports -moz-bool-pref("userChrome.theme.non_native_menu") { @supports -moz-bool-pref("userChrome.theme.non_native_menu") {
@ -228,10 +241,11 @@
@include example; @include example;
} }
} }
@media not (-moz-windows-non-native-menus) {
@include example; // IGNORE
}
@media (-moz-windows-non-native-menus) { // AS Windows
@media (-moz-platform: windows) {
@include example; @include example;
} }
} }

17
src/utils/_native_menu.scss
View file

@ -26,11 +26,9 @@
} }
@mixin NativeMenu($win-media: false) { @mixin NativeMenu($win-media: false) {
@media not (-moz-windows-non-native-menus) { @include WinNativeMenu($win-media) {
@include _WinMedia($win-media) {
@content; @content;
} }
}
@include NotOption("userChrome.theme.non_native_menu") { @include NotOption("userChrome.theme.non_native_menu") {
@include OS($linux) { @include OS($linux) {
@content; @content;
@ -38,13 +36,10 @@
} }
} }
@mixin NonNativeMenu($win-media: false) { @mixin NonNativeMenu($win-media: false) {
@media (-moz-windows-non-native-menus) { @include WinNonNativeMenu($win-media) {
@include _WinMedia($win-media) {
@content; @content;
} }
}
@include Option("userChrome.theme.non_native_menu") { @include Option("userChrome.theme.non_native_menu") {
@include OS($linux) { @include OS($linux) {
@content; @content;
@ -53,17 +48,25 @@
} }
@mixin WinNativeMenu($win-media: false) { @mixin WinNativeMenu($win-media: false) {
@if $osESR {
@media not (-moz-windows-non-native-menus) { @media not (-moz-windows-non-native-menus) {
@include _WinMedia($win-media) { @include _WinMedia($win-media) {
@content; @content;
} }
} }
} }
}
@mixin WinNonNativeMenu($win-media: false) { @mixin WinNonNativeMenu($win-media: false) {
@if $osESR {
@media (-moz-windows-non-native-menus) { @media (-moz-windows-non-native-menus) {
@include _WinMedia($win-media) { @include _WinMedia($win-media) {
@content; @content;
} }
} }
} @else {
@include _WinMedia(true) {
@content;
}
}
} }