[Pale-Moon] Issue MoonchildProductions/UXP#1516 - Change CAN_DRAW_IN_TITLEBAR to MOZ_CAN_DRAW_IN_TITLEBAR and set it for Windows only

Also updates platform commit pointer to match
This commit is contained in:
Matt A. Tobin 2020-04-14 19:20:29 -04:00 • committed by Roy Tam
commit 4950e7ff47
5 changed files with 17 additions and 15 deletions

View file

@ -4706,7 +4706,7 @@ var TabsOnTop = {
var TabsInTitlebar = {
init: function() {
#ifdef CAN_DRAW_IN_TITLEBAR
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
this._readPref();
Services.prefs.addObserver(this._prefName, this, false);
@ -4719,7 +4719,7 @@ var TabsInTitlebar = {
},
allowedBy: function(condition, allow) {
#ifdef CAN_DRAW_IN_TITLEBAR
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
if (allow) {
if (condition in this._disallowed) {
delete this._disallowed[condition];
@ -4738,7 +4738,7 @@ var TabsInTitlebar = {
return document.documentElement.getAttribute("tabsintitlebar") == "true";
},
#ifdef CAN_DRAW_IN_TITLEBAR
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
observe: function(subject, topic, data) {
if (topic == "nsPref:changed")
this._readPref();
@ -4812,7 +4812,7 @@ var TabsInTitlebar = {
#endif
uninit: function() {
#ifdef CAN_DRAW_IN_TITLEBAR
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
this._initialized = false;
Services.prefs.removeObserver(this._prefName, this);
#endif
@ -4826,7 +4826,7 @@ function updateAppButtonDisplay() {
window.menubar.visible &&
document.getElementById("toolbar-menubar").getAttribute("autohide") == "true";
#ifdef CAN_DRAW_IN_TITLEBAR
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
document.getElementById("titlebar").hidden = !displayAppButton;
if (displayAppButton)
@ -4842,7 +4842,7 @@ function updateAppButtonDisplay() {
}
#endif
#ifdef CAN_DRAW_IN_TITLEBAR
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
function onTitlebarMaxClick() {
if (window.windowState == window.STATE_MAXIMIZED)
window.restore();