[Editor] When in HCM, don't apply light/dark color in the comment buttons (bug 1977269)

Add fix the color name to use in HCM.
This commit is contained in:
Calixte Denizet 2025-09-22 17:27:38 +02:00
parent 44affa76b9
commit 5d079c10b6
3 changed files with 27 additions and 19 deletions

View File

@ -445,14 +445,15 @@ const PDFViewerApplication = {
const container = appConfig.mainContainer, const container = appConfig.mainContainer,
viewer = appConfig.viewerContainer; viewer = appConfig.viewerContainer;
const annotationEditorMode = AppOptions.get("annotationEditorMode"); const annotationEditorMode = AppOptions.get("annotationEditorMode");
const pageColors = const hasForcedColors =
AppOptions.get("forcePageColors") || AppOptions.get("forcePageColors") ||
window.matchMedia("(forced-colors: active)").matches window.matchMedia("(forced-colors: active)").matches;
? { const pageColors = hasForcedColors
background: AppOptions.get("pageColorsBackground"), ? {
foreground: AppOptions.get("pageColorsForeground"), background: AppOptions.get("pageColorsBackground"),
} foreground: AppOptions.get("pageColorsForeground"),
: null; }
: null;
let altTextManager; let altTextManager;
if (AppOptions.get("enableUpdatedAddImage")) { if (AppOptions.get("enableUpdatedAddImage")) {
@ -521,7 +522,8 @@ const PDFViewerApplication = {
eventBus, eventBus,
linkService, linkService,
overlayManager, overlayManager,
ltr ltr,
hasForcedColors
) )
: null; : null;

View File

@ -84,15 +84,15 @@
--comment-button-focus-outline-color: light-dark(#0062fa, #00cadb); --comment-button-focus-outline-color: light-dark(#0062fa, #00cadb);
@media screen and (forced-colors: active) { @media screen and (forced-colors: active) {
--comment-button-bg: Canvas; --comment-button-bg: ButtonFace;
--comment-button-fg: ButtonText; --comment-button-fg: ButtonText;
--comment-button-hover-bg: Canvas; --comment-button-hover-bg: SelectedItemText;
--comment-button-hover-fg: Highlight; --comment-button-hover-fg: SelectedItem;
--comment-button-active-bg: Canvas; --comment-button-active-bg: SelectedItemText;
--comment-button-active-fg: Highlight; --comment-button-active-fg: SelectedItem;
--comment-button-border-color: ButtonBorder; --comment-button-border-color: ButtonBorder;
--comment-button-active-border-color: ButtonBorder; --comment-button-active-border-color: ButtonBorder;
--comment-button-hover-border-color: Highlight; --comment-button-hover-border-color: SelectedItem;
--comment-button-box-shadow: none; --comment-button-box-shadow: none;
--comment-button-focus-outline-color: CanvasText; --comment-button-focus-outline-color: CanvasText;
--comment-button-selected-bg: ButtonBorder; --comment-button-selected-bg: ButtonBorder;

View File

@ -34,13 +34,16 @@ class CommentManager {
#sidebar; #sidebar;
static #hasForcedColors = null;
constructor( constructor(
commentDialog, commentDialog,
sidebar, sidebar,
eventBus, eventBus,
linkService, linkService,
overlayManager, overlayManager,
ltr ltr,
hasForcedColors
) { ) {
const dateFormat = new Intl.DateTimeFormat(undefined, { const dateFormat = new Intl.DateTimeFormat(undefined, {
dateStyle: "long", dateStyle: "long",
@ -56,6 +59,7 @@ class CommentManager {
dateFormat dateFormat
); );
this.#popup.sidebar = this.#sidebar; this.#popup.sidebar = this.#sidebar;
CommentManager.#hasForcedColors = hasForcedColors;
} }
setSidebarUiManager(uiManager) { setSidebarUiManager(uiManager) {
@ -110,10 +114,12 @@ class CommentManager {
} }
static _makeCommentColor(color, opacity) { static _makeCommentColor(color, opacity) {
return findContrastColor( return this.#hasForcedColors
applyOpacity(...color, opacity ?? 1), ? null
CSSConstants.commentForegroundColor : findContrastColor(
); applyOpacity(...color, opacity ?? 1),
CSSConstants.commentForegroundColor
);
} }
destroy() { destroy() {