mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-21 07:47:32 +09:00
Merge remote-tracking branch 'origin/master' into custom
This commit is contained in:
commit
924da4a2cc
559 changed files with 9029 additions and 12082 deletions
|
|
@ -45,7 +45,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
|
||||
|
|
@ -388,7 +388,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"/>
|
||||
|
|
@ -437,7 +437,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"
|
||||
|
|
@ -507,7 +507,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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue