Skip to content
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.

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

Allow to change the toolbar height when changing the pref toolbar.density in Firefox (bug 1171799) #18397

Merged
merged 1 commit into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions web/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ const PDFViewerApplication = {
const { appConfig, externalServices, l10n } = this;
let eventBus;
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
eventBus = new FirefoxEventBus(
eventBus = this.preferences.eventBus = new FirefoxEventBus(
await this._allowedGlobalEventsPromise,
externalServices,
AppOptions.get("isInAutomation")
Expand Down Expand Up @@ -569,7 +569,11 @@ const PDFViewerApplication = {
await this._nimbusDataPromise
);
} else {
this.toolbar = new Toolbar(appConfig.toolbar, eventBus);
this.toolbar = new Toolbar(
appConfig.toolbar,
eventBus,
AppOptions.get("toolbarDensity")
);
}
}

Expand Down
5 changes: 5 additions & 0 deletions web/app_options.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ const defaultOptions = {
value: true,
kind: OptionKind.BROWSER,
},
toolbarDensity: {
/** @type {number} */
value: 0, // 0 = "normal", 1 = "compact", 2 = "touch"
kind: OptionKind.BROWSER,
},

annotationEditorMode: {
/** @type {number} */
Expand Down
10 changes: 10 additions & 0 deletions web/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class BasePreferences {

#initializedPromise = null;

static #eventToDispatch = new Set(["toolbarDensity"]);

constructor() {
if (this.constructor === BasePreferences) {
throw new Error("Cannot initialize BasePreferences.");
Expand Down Expand Up @@ -73,6 +75,10 @@ class BasePreferences {
}
}
);

if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
this.eventBus = null;
}
}

/**
Expand Down Expand Up @@ -113,6 +119,10 @@ class BasePreferences {
return; // Invalid preference.
}
AppOptions.set(name, value);

if (BasePreferences.#eventToDispatch.has(name)) {
this.eventBus?.dispatch(name.toLowerCase(), { source: this, value });
}
}

/**
Expand Down
12 changes: 11 additions & 1 deletion web/toolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,13 @@ class Toolbar {
/**
* @param {ToolbarOptions} options
* @param {EventBus} eventBus
* @param {number} toolbarDensity - The toolbar density value.
* The possible values are:
* - 0 (default) - The regular toolbar size.
* - 1 (compact) - The small toolbar size.
* - 2 (touch) - The large toolbar size.
*/
constructor(options, eventBus) {
constructor(options, eventBus, toolbarDensity = 0) {
this.#opts = options;
this.eventBus = eventBus;
const buttons = [
Expand Down Expand Up @@ -136,9 +141,14 @@ class Toolbar {
}
});

eventBus._on("toolbardensity", this.#updateToolbarDensity.bind(this));
this.#updateToolbarDensity({ value: toolbarDensity });

this.reset();
}

#updateToolbarDensity() {}

#setAnnotationEditorUIManager(uiManager, parentContainer) {
const colorPicker = new ColorPicker({ uiManager });
uiManager.setMainHighlightColorPicker(colorPicker);
Expand Down