Skip to content
Open
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
3 changes: 3 additions & 0 deletions prefs/compact-mode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
- name: zen.view.compact.show-background-tab-toast
value: true

- name: zen.view.compact.enable-on-fullscreen
value: true

# Do not edit manually
- name: zen.view.compact.should-enable-at-startup
hidden: true
Expand Down
33 changes: 33 additions & 0 deletions src/zen/compact-mode/ZenCompactMode.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,18 @@ var gZenCompactModeManager = {
const tabIsRightObserver = this._updateSidebarIsOnRight.bind(this);
Services.prefs.addObserver('zen.tabs.vertical.right-side', tabIsRightObserver);

const enableOnFullscreenObserver = this._updateEnableOnFullscreen.bind(this);
Services.prefs.addObserver('zen.view.compact.enable-on-fullscreen', enableOnFullscreenObserver);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use XPCOMUtils.defineLazyPreferenceGetter here instead of adding our own observers.

window.addEventListener('sizemodechange', this.enableOnFullscreen.bind(this));

window.addEventListener(
'unload',
() => {
Services.prefs.removeObserver('zen.tabs.vertical.right-side', tabIsRightObserver);
Services.prefs.removeObserver(
'zen.view.compact.enable-on-fullscreen',
enableOnFullscreenObserver
);
},
{ once: true }
);
Expand Down Expand Up @@ -95,11 +103,19 @@ var gZenCompactModeManager = {
});
},

get fullscreen() {
return window.windowState === window.STATE_FULLSCREEN;
},

get preference() {
return lazyCompactMode.mainAppWrapper.getAttribute('zen-compact-mode') === 'true';
},

get shouldBeCompact() {
if (this._enableOnFullscreen && this.fullscreen) {
return true;
}

return !document.documentElement.getAttribute('chromehidden').includes('toolbar');
},

Expand Down Expand Up @@ -142,6 +158,19 @@ var gZenCompactModeManager = {
return gNavToolbox;
},

enableOnFullscreen() {
if (!this._enableOnFullscreen) {
return;
}

if (this.fullscreen) {
this._oldPreference = this.preference;
this.preference = true;
} else {
this.preference = this._oldPreference;
}
},

addHasPolyfillObserver() {
this.sidebarObserverId = ZenHasPolyfill.observeSelectorExistence(
this.sidebar,
Expand Down Expand Up @@ -450,6 +479,10 @@ var gZenCompactModeManager = {
this._sidebarIsOnRight = Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
},

_updateEnableOnFullscreen() {
this._enableOnFullscreen = Services.prefs.getBoolPref('zen.view.compact.enable-on-fullscreen');
},

toggleSidebar() {
this.sidebar.toggleAttribute('zen-user-show');
},
Expand Down