diff options
author | Gaming4JC <g4jc@hyperbola.info> | 2020-12-07 19:10:30 -0500 |
---|---|---|
committer | Gaming4JC <g4jc@hyperbola.info> | 2021-01-09 14:11:58 -0500 |
commit | ade5b63377b45743498608b0a0b5eed56235cac8 (patch) | |
tree | 09a1b5280a17358b6b6817a2182b9336a6664999 | |
parent | 03c971ab052cd5c12a0464400844465435259196 (diff) | |
download | iceweasel-uxp-ade5b63377b45743498608b0a0b5eed56235cac8.tar.gz |
Backport UXP #1516 - Change CAN_DRAW_IN_TITLEBAR to MOZ_CAN_DRAW_IN_TITLEBAR
-rw-r--r-- | base/content/browser.css | 2 | ||||
-rw-r--r-- | base/content/browser.xul | 8 | ||||
-rw-r--r-- | base/jar.mn | 2 | ||||
-rw-r--r-- | base/moz.build | 2 | ||||
-rw-r--r-- | components/customizableui/content/customizeMode.inc.xul | 2 | ||||
-rw-r--r-- | components/customizableui/moz.build | 3 | ||||
-rwxr-xr-x | confvars.sh | 5 | ||||
-rw-r--r-- | themes/osx/moz.build | 2 | ||||
-rw-r--r-- | themes/shared/customizableui/customizeMode.inc.css | 8 | ||||
-rw-r--r-- | themes/windows/moz.build | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/base/content/browser.css b/base/content/browser.css index 02ca013..c87a392 100644 --- a/base/content/browser.css +++ b/base/content/browser.css @@ -201,7 +201,7 @@ toolbar[customizing] > .overflow-button { display: none; } -%ifdef CAN_DRAW_IN_TITLEBAR +%ifdef MOZ_CAN_DRAW_IN_TITLEBAR #main-window:not([chromemargin]) > #titlebar, #main-window[inFullscreen] > #titlebar, #main-window[inFullscreen] .titlebar-placeholder, diff --git a/base/content/browser.xul b/base/content/browser.xul index d15a76a..683bcb8 100644 --- a/base/content/browser.xul +++ b/base/content/browser.xul @@ -44,7 +44,7 @@ titlemodifier_normal="&mainWindow.titlemodifier;" titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" #endif -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR #ifdef XP_WIN chromemargin="0,2,2,2" #else @@ -387,7 +387,7 @@ onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> </popupset> -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR <vbox id="titlebar"> <hbox id="titlebar-content"> <spacer id="titlebar-spacer" flex="1"/> @@ -434,7 +434,7 @@ #include browser-menubar.inc </toolbaritem> -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR #ifndef XP_MACOSX <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000" id="titlebar-placeholder-on-menubar-for-caption-buttons" persist="width" @@ -499,7 +499,7 @@ #if !defined(MOZ_WIDGET_GTK) <hbox class="private-browsing-indicator" skipintoolbarset="true"/> #endif -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR <hbox class="titlebar-placeholder" type="caption-buttons" id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width" #ifndef XP_MACOSX diff --git a/base/jar.mn b/base/jar.mn index 2dbd59c..3f661be 100644 --- a/base/jar.mn +++ b/base/jar.mn @@ -78,7 +78,7 @@ browser.jar: #endif content/browser/browser-sidebar.js (content/browser-sidebar.js) * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR content/browser/browser-tabsintitlebar.js (content/browser-tabsintitlebar.js) #else content/browser/browser-tabsintitlebar.js (content/browser-tabsintitlebar-stub.js) diff --git a/base/moz.build b/base/moz.build index b21c0ac..ee4a01e 100644 --- a/base/moz.build +++ b/base/moz.build @@ -14,7 +14,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'): DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): - DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 + DEFINES['MOZ_CAN_DRAW_IN_TITLEBAR'] = 1 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'): DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1 diff --git a/components/customizableui/content/customizeMode.inc.xul b/components/customizableui/content/customizeMode.inc.xul index b665630..28ce568 100644 --- a/components/customizableui/content/customizeMode.inc.xul +++ b/components/customizableui/content/customizeMode.inc.xul @@ -19,7 +19,7 @@ <vbox id="customization-palette" class="customization-palette"/> <spacer id="customization-spacer"/> <hbox id="customization-footer"> -#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef MOZ_CAN_DRAW_IN_TITLEBAR <button id="customization-titlebar-visibility-button" class="customizationmode-button" label="&customizeMode.titlebar;" type="checkbox" #NB: because oncommand fires after click, by the time we've fired, the checkbox binding diff --git a/components/customizableui/moz.build b/components/customizableui/moz.build index 5797a03..f5c34aa 100644 --- a/components/customizableui/moz.build +++ b/components/customizableui/moz.build @@ -19,6 +19,3 @@ EXTRA_JS_MODULES += [ EXTRA_PP_JS_MODULES += [ 'CustomizableUI.jsm', ] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'): - DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 diff --git a/confvars.sh b/confvars.sh index 3e45e47..d3a38a8 100755 --- a/confvars.sh +++ b/confvars.sh @@ -52,6 +52,11 @@ MOZ_SERVICES_SYNC=1 MOZ_SERVICES_HEALTHREPORT= MOZ_SAFE_BROWSING= +if test "$OS_ARCH" = "WINNT" -o \ + "$OS_ARCH" = "Darwin"; then + MOZ_CAN_DRAW_IN_TITLEBAR=1 +fi + # Disable checking that add-ons are signed by the trusted root MOZ_ADDON_SIGNING= MOZ_REQUIRE_SIGNING= diff --git a/themes/osx/moz.build b/themes/osx/moz.build index b787ab0..3fc798f 100644 --- a/themes/osx/moz.build +++ b/themes/osx/moz.build @@ -8,6 +8,6 @@ DIRS += ['communicator'] JAR_MANIFESTS += ['jar.mn'] -DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 +DEFINES['MOZ_CAN_DRAW_IN_TITLEBAR'] = 1 include('../tab-svgs.mozbuild') diff --git a/themes/shared/customizableui/customizeMode.inc.css b/themes/shared/customizableui/customizeMode.inc.css index 4259017..8535637 100644 --- a/themes/shared/customizableui/customizeMode.inc.css +++ b/themes/shared/customizableui/customizeMode.inc.css @@ -182,7 +182,7 @@ height: 24px; } -%ifdef CAN_DRAW_IN_TITLEBAR +%ifdef MOZ_CAN_DRAW_IN_TITLEBAR #customization-titlebar-visibility-button > .button-box > .button-text, %endif #customization-lwtheme-button > .box-inherit > .box-inherit > .button-text { @@ -198,7 +198,7 @@ background-size: contain; } -%ifdef CAN_DRAW_IN_TITLEBAR +%ifdef MOZ_CAN_DRAW_IN_TITLEBAR #customization-titlebar-visibility-button { list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png"); -moz-image-region: rect(0, 24px, 24px, 0); @@ -222,7 +222,7 @@ -moz-image-region: rect(0, 96px, 48px, 48px); } } -%endif /* CAN_DRAW_IN_TITLEBAR */ +%endif /* MOZ_CAN_DRAW_IN_TITLEBAR */ #main-window[customize-entered] #customization-panel-container { background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"), @@ -456,4 +456,4 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring { .customization-lwtheme-menu-footeritem:first-child { border-inline-end: 1px solid var(--panel-separator-color); -}
\ No newline at end of file +} diff --git a/themes/windows/moz.build b/themes/windows/moz.build index b787ab0..8b61104 100644 --- a/themes/windows/moz.build +++ b/themes/windows/moz.build @@ -8,6 +8,4 @@ DIRS += ['communicator'] JAR_MANIFESTS += ['jar.mn'] -DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1 - include('../tab-svgs.mozbuild') |