diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /widget/cocoa/nsLookAndFeel.mm | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'widget/cocoa/nsLookAndFeel.mm')
| -rw-r--r-- | widget/cocoa/nsLookAndFeel.mm | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/widget/cocoa/nsLookAndFeel.mm b/widget/cocoa/nsLookAndFeel.mm index 779984be0c..69bd348da8 100644 --- a/widget/cocoa/nsLookAndFeel.mm +++ b/widget/cocoa/nsLookAndFeel.mm @@ -3,7 +3,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "AppearanceOverride.h" #include "mozilla/widget/ThemeChangeKind.h" #include "nsLookAndFeel.h" #include "nsCocoaFeatures.h" @@ -239,9 +238,6 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme, case ColorID::MozButtonhoverface: case ColorID::MozButtonactiveface: case ColorID::MozButtondisabledface: - case ColorID::MozColheader: - case ColorID::MozColheaderhover: - case ColorID::MozColheaderactive: color = GetColorFromNSColor(NSColor.controlColor); if (!NS_GET_A(color)) { color = GetColorFromNSColor(NSColor.controlBackgroundColor); @@ -301,9 +297,6 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme, case ColorID::Menutext: case ColorID::Infotext: case ColorID::MozCellhighlighttext: - case ColorID::MozColheadertext: - case ColorID::MozColheaderhovertext: - case ColorID::MozColheaderactivetext: case ColorID::MozSidebartext: color = GetColorFromNSColor(NSColor.controlTextColor); break; @@ -319,6 +312,17 @@ nsresult nsLookAndFeel::NativeGetColor(ColorID aID, ColorScheme aScheme, // For inactive list selection color = GetColorFromNSColor(NSColor.secondarySelectedControlColor); break; + case ColorID::MozColheadertext: + case ColorID::MozColheaderhovertext: + case ColorID::MozColheaderactivetext: + color = GetColorFromNSColor(NSColor.headerTextColor); + break; + case ColorID::MozColheaderactive: + color = GetColorFromNSColor( + NSColor.unemphasizedSelectedContentBackgroundColor); + break; + case ColorID::MozColheader: + case ColorID::MozColheaderhover: case ColorID::MozEventreerow: // Background color of even list rows. color = @@ -460,11 +464,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) { case IntID::AlertNotificationOrigin: aResult = NS_ALERT_TOP; break; - case IntID::TabFocusModel: - aResult = [NSApp isFullKeyboardAccessEnabled] - ? nsIContent::eTabFocus_any - : nsIContent::eTabFocus_textControlsMask; - break; case IntID::ScrollToClick: { aResult = [[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollerPagingBehavior"]; @@ -630,10 +629,6 @@ void nsLookAndFeel::RecordAccessibilityTelemetry() { object:nil suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately]; - [MOZGlobalAppearance.sharedInstance addObserver:self - forKeyPath:@"effectiveAppearance" - options:0 - context:nil]; [NSApp addObserver:self forKeyPath:@"effectiveAppearance" options:0 |