[Centaury] Change CAN_DRAW_IN_TITLEBAR...
This commit is contained in:
parent
421127b9c5
commit
085f763d52
|
@ -205,7 +205,7 @@ toolbar[customizing] > .overflow-button {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
%ifdef CAN_DRAW_IN_TITLEBAR
|
%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
|
||||||
#main-window:not([chromemargin]) > #titlebar,
|
#main-window:not([chromemargin]) > #titlebar,
|
||||||
#main-window[inFullscreen] > #titlebar,
|
#main-window[inFullscreen] > #titlebar,
|
||||||
#main-window[inFullscreen] .titlebar-placeholder,
|
#main-window[inFullscreen] .titlebar-placeholder,
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
titlemodifier_normal="&mainWindow.titlemodifier;"
|
titlemodifier_normal="&mainWindow.titlemodifier;"
|
||||||
titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
|
titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
|
||||||
#endif
|
#endif
|
||||||
#ifdef CAN_DRAW_IN_TITLEBAR
|
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
|
||||||
#ifdef XP_WIN
|
#ifdef XP_WIN
|
||||||
chromemargin="0,2,2,2"
|
chromemargin="0,2,2,2"
|
||||||
#else
|
#else
|
||||||
|
@ -390,7 +390,7 @@
|
||||||
onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
|
onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
|
||||||
</popupset>
|
</popupset>
|
||||||
|
|
||||||
#ifdef CAN_DRAW_IN_TITLEBAR
|
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
|
||||||
<vbox id="titlebar">
|
<vbox id="titlebar">
|
||||||
<hbox id="titlebar-content">
|
<hbox id="titlebar-content">
|
||||||
<spacer id="titlebar-spacer" flex="1"/>
|
<spacer id="titlebar-spacer" flex="1"/>
|
||||||
|
@ -437,7 +437,7 @@
|
||||||
#include browser-menubar.inc
|
#include browser-menubar.inc
|
||||||
</toolbaritem>
|
</toolbaritem>
|
||||||
|
|
||||||
#ifdef CAN_DRAW_IN_TITLEBAR
|
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
|
||||||
#ifndef XP_MACOSX
|
#ifndef XP_MACOSX
|
||||||
<hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
|
<hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000"
|
||||||
id="titlebar-placeholder-on-menubar-for-caption-buttons" persist="width"
|
id="titlebar-placeholder-on-menubar-for-caption-buttons" persist="width"
|
||||||
|
@ -502,7 +502,7 @@
|
||||||
#if !defined(MOZ_WIDGET_GTK)
|
#if !defined(MOZ_WIDGET_GTK)
|
||||||
<hbox class="private-browsing-indicator" skipintoolbarset="true"/>
|
<hbox class="private-browsing-indicator" skipintoolbarset="true"/>
|
||||||
#endif
|
#endif
|
||||||
#ifdef CAN_DRAW_IN_TITLEBAR
|
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
|
||||||
<hbox class="titlebar-placeholder" type="caption-buttons"
|
<hbox class="titlebar-placeholder" type="caption-buttons"
|
||||||
id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width"
|
id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width"
|
||||||
#ifndef XP_MACOSX
|
#ifndef XP_MACOSX
|
||||||
|
|
|
@ -75,7 +75,7 @@ browser.jar:
|
||||||
#endif
|
#endif
|
||||||
content/browser/browser-sidebar.js (content/browser-sidebar.js)
|
content/browser/browser-sidebar.js (content/browser-sidebar.js)
|
||||||
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
|
* 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)
|
content/browser/browser-tabsintitlebar.js (content/browser-tabsintitlebar.js)
|
||||||
#else
|
#else
|
||||||
content/browser/browser-tabsintitlebar.js (content/browser-tabsintitlebar-stub.js)
|
content/browser/browser-tabsintitlebar.js (content/browser-tabsintitlebar-stub.js)
|
||||||
|
|
|
@ -13,9 +13,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
|
||||||
DEFINES['HAVE_SHELL_SERVICE'] = 1
|
DEFINES['HAVE_SHELL_SERVICE'] = 1
|
||||||
DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
|
DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
|
||||||
|
|
||||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
|
|
||||||
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
|
|
||||||
|
|
||||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
|
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
|
||||||
DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
|
DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
<vbox id="customization-palette" class="customization-palette"/>
|
<vbox id="customization-palette" class="customization-palette"/>
|
||||||
<spacer id="customization-spacer"/>
|
<spacer id="customization-spacer"/>
|
||||||
<hbox id="customization-footer">
|
<hbox id="customization-footer">
|
||||||
#ifdef CAN_DRAW_IN_TITLEBAR
|
#ifdef MOZ_CAN_DRAW_IN_TITLEBAR
|
||||||
<button id="customization-titlebar-visibility-button" class="customizationmode-button"
|
<button id="customization-titlebar-visibility-button" class="customizationmode-button"
|
||||||
label="&customizeMode.titlebar;" type="checkbox"
|
label="&customizeMode.titlebar;" type="checkbox"
|
||||||
#NB: because oncommand fires after click, by the time we've fired, the checkbox binding
|
#NB: because oncommand fires after click, by the time we've fired, the checkbox binding
|
||||||
|
|
|
@ -19,6 +19,3 @@ EXTRA_JS_MODULES += [
|
||||||
EXTRA_PP_JS_MODULES += [
|
EXTRA_PP_JS_MODULES += [
|
||||||
'CustomizableUI.jsm',
|
'CustomizableUI.jsm',
|
||||||
]
|
]
|
||||||
|
|
||||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
|
|
||||||
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
|
|
||||||
|
|
|
@ -48,6 +48,12 @@ MOZ_SAFE_BROWSING=
|
||||||
MOZ_GAMEPAD=1
|
MOZ_GAMEPAD=1
|
||||||
MOZ_AV1=1
|
MOZ_AV1=1
|
||||||
MOZ_SECURITY_SQLSTORE=1
|
MOZ_SECURITY_SQLSTORE=1
|
||||||
|
|
||||||
|
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
|
# Disable checking that add-ons are signed by the trusted root
|
||||||
MOZ_ADDON_SIGNING=0
|
MOZ_ADDON_SIGNING=0
|
||||||
MOZ_REQUIRE_SIGNING=0
|
MOZ_REQUIRE_SIGNING=0
|
||||||
|
|
|
@ -8,6 +8,4 @@ DIRS += ['communicator']
|
||||||
|
|
||||||
JAR_MANIFESTS += ['jar.mn']
|
JAR_MANIFESTS += ['jar.mn']
|
||||||
|
|
||||||
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
|
|
||||||
|
|
||||||
include('../tab-svgs.mozbuild')
|
include('../tab-svgs.mozbuild')
|
||||||
|
|
|
@ -182,7 +182,7 @@
|
||||||
height: 24px;
|
height: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
%ifdef CAN_DRAW_IN_TITLEBAR
|
%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
|
||||||
#customization-titlebar-visibility-button > .button-box > .button-text,
|
#customization-titlebar-visibility-button > .button-box > .button-text,
|
||||||
%endif
|
%endif
|
||||||
#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text {
|
#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text {
|
||||||
|
@ -198,7 +198,7 @@
|
||||||
background-size: contain;
|
background-size: contain;
|
||||||
}
|
}
|
||||||
|
|
||||||
%ifdef CAN_DRAW_IN_TITLEBAR
|
%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
|
||||||
#customization-titlebar-visibility-button {
|
#customization-titlebar-visibility-button {
|
||||||
list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
|
list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png");
|
||||||
-moz-image-region: rect(0, 24px, 24px, 0);
|
-moz-image-region: rect(0, 24px, 24px, 0);
|
||||||
|
@ -222,7 +222,7 @@
|
||||||
-moz-image-region: rect(0, 96px, 48px, 48px);
|
-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 {
|
#main-window[customize-entered] #customization-panel-container {
|
||||||
background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"),
|
background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"),
|
||||||
|
|
|
@ -8,6 +8,4 @@ DIRS += ['communicator']
|
||||||
|
|
||||||
JAR_MANIFESTS += ['jar.mn']
|
JAR_MANIFESTS += ['jar.mn']
|
||||||
|
|
||||||
DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
|
|
||||||
|
|
||||||
include('../tab-svgs.mozbuild')
|
include('../tab-svgs.mozbuild')
|
||||||
|
|
Loading…
Reference in New Issue
Block a user