Bug 1640010 - Port bug 1640493: Add the dropmarker back to our toolbarbuttons. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Sun, 24 May 2020 15:55:02 +0200
changeset 39245 250b57b853c4ddd05e8037a81791b08bc6b5b407
parent 39244 e31d162b318bb64bae37f5860d305c983a4e0884
child 39246 a28b4bfd062222c23ddd0f5502d64f755b9e5e63
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersmkmelin
bugs1640010, 1640493
Bug 1640010 - Port bug 1640493: Add the dropmarker back to our toolbarbuttons. r=mkmelin
calendar/lightning/content/calendar-tab-panels.inc.xhtml
calendar/lightning/content/calendar-today-pane.inc.xhtml
calendar/lightning/content/imip-bar-overlay.inc.xhtml
calendar/lightning/content/lightning-item-toolbar.inc.xhtml
mail/base/content/mainMailToolbox.inc.xhtml
mail/base/content/msgHdrView.inc.xhtml
mail/components/compose/content/editFormatButtons.inc.xhtml
mail/components/im/content/chat-conversation-info.js
mail/components/im/content/chat-messenger.inc.xhtml
mail/themes/linux/mail/primaryToolbar.css
mail/themes/osx/mail/primaryToolbar.css
mail/themes/shared/customizableui/panelUI.css
mail/themes/windows/mail/primaryToolbar.css
--- a/calendar/lightning/content/calendar-tab-panels.inc.xhtml
+++ b/calendar/lightning/content/calendar-tab-panels.inc.xhtml
@@ -465,16 +465,17 @@
                 persist="height"
                 hidden="true">
             <hbox id="calendar-task-details">
               <hbox id="other-actions-box">
                 <vbox id="task-actions-toolbox">
                   <hbox id="task-actions-toolbar" class="toolbar">
                     <toolbarbutton id="task-actions-category"
                                    type="menu"
+                                   wantdropmarker="true"
                                    label="&calendar.unifinder.tree.categories.label;"
                                    tooltiptext="&calendar.task.category.button.tooltip;"
                                    command="calendar_task_category_command"
                                    class="toolbarbutton-1 msgHeaderView-button">
                       <menupopup id="task-actions-category-popup"
                                  onpopupshowing="taskDetailsView.loadCategories(event);"
                                  onpopuphiding="return taskDetailsView.saveCategories(event);">
                         <html:input id="task-actions-category-textbox"
@@ -490,16 +491,17 @@
                                    label="&calendar.context.markcompleted.label;"
                                    tooltiptext="&calendar.task.complete.button.tooltip;"
                                    command="calendar_toggle_completed_command"
                                    class="toolbarbutton-1 msgHeaderView-button">
                       <menupopup is="calendar-task-progress-menupopup" id="task-actions-markcompleted-menupopup"/>
                     </toolbarbutton>
                     <toolbarbutton id="task-actions-priority"
                                    type="menu"
+                                   wantdropmarker="true"
                                    label="&calendar.context.priority.label;"
                                    tooltiptext="&calendar.task.priority.button.tooltip;"
                                    command="calendar_general-priority_command"
                                    class="toolbarbutton-1 msgHeaderView-button">
                       <menupopup is="calendar-task-priority-menupopup" id="task-actions-priority-menupopup"/>
                     </toolbarbutton>
                     <toolbarbutton id="calendar-delete-task-button"
                                    class="toolbarbutton-1 msgHeaderView-button"
--- a/calendar/lightning/content/calendar-today-pane.inc.xhtml
+++ b/calendar/lightning/content/calendar-today-pane.inc.xhtml
@@ -112,17 +112,18 @@
                        ondblclick="TodayPane.onDoubleClick(event);"/>
                 <label id="currentWeek-label" class="monthlabel"
                        ondblclick="TodayPane.onDoubleClick(event);"/>
                 <spacer flex="1"/>
               </hbox>
             </vbox>
             <toolbarbutton id="miniday-dropdown-button"
                            tooltiptext="&showselectedday.tooltip;"
-                           type="menu">
+                           type="menu"
+                           wantdropmarker="true">
               <panel id="miniday-month-panel" position="after_end"
                      onpopupshown="this.firstElementChild.focusCalendar();">
                 <calendar-minimonth id="miniday-dropdown-minimonth"
                                     flex="1"
                                     onchange="TodayPane.setDaywithjsDate(this.value);
                                               document.getElementById('miniday-month-panel').hidePopup();"/>
               </panel>
             </toolbarbutton>
--- a/calendar/lightning/content/imip-bar-overlay.inc.xhtml
+++ b/calendar/lightning/content/imip-bar-overlay.inc.xhtml
@@ -269,16 +269,17 @@
                             oncommand="ltnImipBar.executeAction('DECLINED', 'NONE'); event.stopPropagation();"/>
                   <!-- add here more menuitem as needed -->
                 </menupopup>
               </toolbarbutton>
 
               <!-- more options -->
               <toolbarbutton id="imipMoreButton"
                              type="menu"
+                             wantdropmarker="true"
                              tooltiptext="&lightning.imipbar.btnMore.tooltiptext;"
                              label="&lightning.imipbar.btnMore.label;"
                              class="toolbarbutton-1 msgHeaderView-button imipMoreButton"
                              hidden="true">
                 <menupopup id="imipMoreDropdown">
                   <menuitem id="imipMoreButton_SaveCopy"
                             tooltiptext="&lightning.imipbar.btnSaveCopy.tooltiptext;"
                             label="&lightning.imipbar.btnSaveCopy.label;"
--- a/calendar/lightning/content/lightning-item-toolbar.inc.xhtml
+++ b/calendar/lightning/content/lightning-item-toolbar.inc.xhtml
@@ -20,16 +20,17 @@
                  disable-on-readonly="true"
                  label="&event.toolbar.attendees.label;"
                  tooltiptext="&event.toolbar.attendees.tooltip;"
                  command="cmd_attendees"/>
   <toolbarbutton id="button-privacy"
                  mode="dialog"
                  class="cal-event-toolbarbutton toolbarbutton-1"
                  type="menu"
+                 wantdropmarker="true"
                  disable-on-readonly="true"
                  label="&event.toolbar.privacy.label;"
                  tooltiptext="&event.toolbar.privacy.tooltip;">
     <menupopup id="event-privacy-menupopup">
       <menuitem id="event-privacy-public-menuitem"
                 name="event-privacy-group"
                 label="&event.menu.options.privacy.public.label;"
                 type="radio"
@@ -62,16 +63,17 @@
                  label="&event.toolbar.delete.label;"
                  tooltiptext="&event.toolbar.delete.tooltip;"
                  command="cmd_item_delete"
                  disable-on-readonly="true"/>
   <toolbarbutton id="button-priority"
                  mode="dialog"
                  class="cal-event-toolbarbutton toolbarbutton-1"
                  type="menu"
+                 wantdropmarker="true"
                  disable-on-readonly="true"
                  label="&event.menu.options.priority2.label;"
                  tooltiptext="&event.toolbar.priority.tooltip;">
     <menupopup id="event-priority-menupopup">
       <menuitem id="event-priority-none-menuitem"
                 name="event-priority-group"
                 label="&event.menu.options.priority.notspecified.label;"
                 type="radio"
@@ -92,16 +94,17 @@
                 type="radio"
                 command="cmd_priority_high"/>
     </menupopup>
   </toolbarbutton>
   <toolbarbutton id="button-status"
                  mode="dialog"
                  class="cal-event-toolbarbutton toolbarbutton-1 event-only"
                  type="menu"
+                 wantdropmarker="true"
                  disable-on-readonly="true"
                  label="&newevent.status.label;"
                  tooltiptext="&event.toolbar.status.tooltip;">
     <menupopup id="event-status-menupopup">
       <menuitem id="event-status-none-menuitem"
                 name="event-status-group"
                 label="&newevent.eventStatus.none.label;"
                 type="radio"
@@ -122,16 +125,17 @@
                 type="radio"
                 command="cmd_status_cancelled"/>
     </menupopup>
   </toolbarbutton>
   <toolbarbutton id="button-freebusy"
                  mode="dialog"
                  class="cal-event-toolbarbutton toolbarbutton-1 event-only"
                  type="menu"
+                 wantdropmarker="true"
                  disable-on-readonly="true"
                  label="&event.menu.options.show.time.label;"
                  tooltiptext="&event.toolbar.freebusy.tooltip;">
     <menupopup id="event-freebusy-menupopup">
       <menuitem id="event-freebusy-busy-menuitem"
                 name="event-freebusy-group"
                 label="&event.menu.options.show.time.busy.label;"
                 type="radio"
--- a/mail/base/content/mainMailToolbox.inc.xhtml
+++ b/mail/base/content/mainMailToolbox.inc.xhtml
@@ -72,16 +72,17 @@
         <menuitem id="button-ForwardAsAttachmentMenu"
                   label="&buttonMenuForwardAsAttachment.label;"
                   tooltiptext="&forwardAsAttachment.tooltip;"
                   command="cmd_forwardAttachment"/>
       </menupopup>
     </toolbarbutton>
     <toolbarbutton id="button-file"
                    type="menu"
+                   wantdropmarker="true"
                    class="toolbarbutton-1"
                    label="&fileButton.label;"
                    tooltiptext="&fileButton.tooltip;"
                    observes="button_file"
                    oncommand="MsgMoveMessage(event.target._folder)">
       <menupopup is="folder-menupopup" id="button-filePopup"
                  mode="filing"
                  showRecent="true"
@@ -258,16 +259,17 @@
                   label="&markStarredCmd.label;"
                   accesskey="&markStarredCmd.accesskey;"
                   key="key_toggleFlagged"
                   command="cmd_markAsFlagged"/>
       </menupopup>
     </toolbarbutton>
     <toolbarbutton id="button-tag"
                    type="menu"
+                   wantdropmarker="true"
                    class="toolbarbutton-1"
                    label="&tagButton.label;"
                    tooltiptext="&tagButton.tooltip;"
                    command="cmd_tag">
       <menupopup id="button-tagpopup"
                  onpopupshowing="InitMessageTags(this);">
         <menuitem id="button-addNewTag"
                   label="&addNewTag.label;"
--- a/mail/base/content/msgHdrView.inc.xhtml
+++ b/mail/base/content/msgHdrView.inc.xhtml
@@ -139,18 +139,19 @@
                                                    oncommand="goDoCommand('button_junk'); RestoreFocusAfterHdrButton();"/>
                                     <toolbarbutton id="hdrTrashButton"
                                                    label="&hdrTrashButton1.label;"
                                                    tooltiptext="&hdrTrashButton1.tooltip;"
                                                    observes="button_delete"
                                                    class="toolbarbutton-1 msgHeaderView-button hdrTrashButton"
                                                    oncommand="goDoCommand(event.shiftKey ? 'button_shiftDelete' :
                                                                           'button_delete'); RestoreFocusAfterHdrButton();"/>
-                                    <toolbarbutton type="menu"
-                                                   id="otherActionsButton"
+                                    <toolbarbutton id="otherActionsButton"
+                                                   type="menu"
+                                                   wantdropmarker="true"
                                                    label="&otherActionsButton2.label;"
                                                    tooltiptext="&otherActionsButton.tooltip;"
                                                    class="toolbarbutton-1 msgHeaderView-button">
                                       <menupopup id="otherActionsPopup"
                                                  onpopupshowing="onShowOtherActionsPopup();">
 #ifdef MAIN_WINDOW
                                         <menuitem id="otherActionsOpenConversation"
                                                   label="&otherActionsOpenConversation1.label;"
--- a/mail/components/compose/content/editFormatButtons.inc.xhtml
+++ b/mail/components/compose/content/editFormatButtons.inc.xhtml
@@ -172,19 +172,20 @@
         <toolbarbutton id="indentButton"
                        class="formatting-button"
                        tooltiptext="&indentToolbarCmd.tooltip;"
                        observes="cmd_indent"/>
 
         <toolbarseparator class="toolbarseparator-standard"/>
 
         <toolbarbutton id="AlignPopupButton"
+                       type="menu"
+                       wantdropmarker="true"
                        class="formatting-button"
                        tooltiptext="&AlignPopupButton.tooltip;"
-                       type="menu"
                        observes="cmd_align">
           <menupopup id="AlignPopup">
             <menuitem id="AlignLeftItem" class="menuitem-iconic" label="&alignLeft.label;"
                       oncommand="doStatefulCommand('cmd_align', 'left')"
                       tooltiptext="&alignLeftButton.tooltip;"    />
             <menuitem id="AlignCenterItem" class="menuitem-iconic" label="&alignCenter.label;"
                       oncommand="doStatefulCommand('cmd_align', 'center')"
                       tooltiptext="&alignCenterButton.tooltip;"  />
@@ -194,19 +195,20 @@
             <menuitem id="AlignJustifyItem" class="menuitem-iconic" label="&alignJustify.label;"
                       oncommand="doStatefulCommand('cmd_align', 'justify')"
                       tooltiptext="&alignJustifyButton.tooltip;" />
           </menupopup>
         </toolbarbutton>
 
         <!-- InsertPopupButton is used by messengercompose.xhtml -->
         <toolbarbutton id="InsertPopupButton"
+                       type="menu"
+                       wantdropmarker="true"
                        class="formatting-button"
                        tooltiptext="&InsertPopupButton.tooltip;"
-                       type="menu"
                        observes="cmd_renderedHTMLEnabler">
           <menupopup id="InsertPopup">
             <menuitem id="InsertLinkItem" class="menuitem-iconic" observes="cmd_link"
                       oncommand="goDoCommand('cmd_link')" label="&linkToolbarCmd.label;"
                       tooltiptext="&linkToolbarCmd.tooltip;"   />
             <menuitem id="InsertAnchorItem" class="menuitem-iconic" observes="cmd_anchor"
                       oncommand="goDoCommand('cmd_anchor')" label="&anchorToolbarCmd.label;"
                       tooltiptext="&anchorToolbarCmd.tooltip;" />
@@ -218,19 +220,20 @@
                       tooltiptext="&hruleToolbarCmd.tooltip;"  />
             <menuitem id="InsertTableItem"  class="menuitem-iconic" observes="cmd_table"
                       oncommand="goDoCommand('cmd_table')" label="&tableToolbarCmd.label;"
                       tooltiptext="&tableToolbarCmd.tooltip;"  />
           </menupopup>
         </toolbarbutton>
 
         <toolbarbutton id="smileButtonMenu"
+                       type="menu"
+                       wantdropmarker="true"
                        class="formatting-button"
                        tooltiptext="&SmileButton.tooltip;"
-                       type="menu"
                        observes="cmd_smiley">
           <menupopup id="smilyPopup">
             <menuitem id="smileySmile" class="menuitem-iconic" label="&smiley1Cmd.label;"
                       oncommand="doStatefulCommand('cmd_smiley', ':-)')"/>
             <menuitem id="smileyFrown" class="menuitem-iconic" label="&smiley2Cmd.label;"
                       oncommand="doStatefulCommand('cmd_smiley', ':-(')"/>
             <menuitem id="smileyWink" class="menuitem-iconic" label="&smiley3Cmd.label;"
                       oncommand="doStatefulCommand('cmd_smiley', ';-)')"/>
--- a/mail/components/im/content/chat-conversation-info.js
+++ b/mail/components/im/content/chat-conversation-info.js
@@ -87,16 +87,17 @@
             <label class="otr-label"
                    crop="end"
                    data-l10n-id="state-label"
                    flex="1"/>
             <toolbarbutton id="otrButton"
                            mode="dialog"
                            class="otr-button"
                            type="menu"
+                           wantdropmarker="true"
                            label="Insecure"
                            data-l10n-id="start-tooltip">
               <menupopup class="otr-menu-popup">
                 <menuitem class="otr-start" data-l10n-id="start-label"
                           oncommand='this.closest("chat-conversation-info").onOtrStartClicked();'/>
                 <menuitem class="otr-end" data-l10n-id="end-label"
                           oncommand='this.closest("chat-conversation-info").onOtrEndClicked();'/>
                 <menuitem class="otr-auth" data-l10n-id="auth-label"
--- a/mail/components/im/content/chat-messenger.inc.xhtml
+++ b/mail/components/im/content/chat-messenger.inc.xhtml
@@ -24,18 +24,19 @@
                              oncommand="chatHandler.addBuddy()"/>
               <toolbarbutton id="button-join-chat"
                              class="toolbarbutton-1"
                              label="&joinChatButton.label;"
                              oncommand="chatHandler.joinChat()"/>
               <toolbaritem id="chat-status-selector"
                            orient="horizontal"
                            align="center" flex="1">
-                <toolbarbutton type="menu"
-                               id="statusTypeIcon"
+                <toolbarbutton id="statusTypeIcon"
+                               type="menu"
+                               wantdropmarker="true"
                                class="toolbarbutton-1"
                                status="available">
                   <menupopup id="setStatusTypeMenupopup"
                              oncommand="statusSelector.editStatus(event);">
                     <menuitem id="statusTypeAvailable" label="&status.available;"
                               status="available" class="menuitem-iconic"/>
                     <menuitem id="statusTypeUnavailable" label="&status.unavailable;"
                               status="unavailable" class="menuitem-iconic"/>
--- a/mail/themes/linux/mail/primaryToolbar.css
+++ b/mail/themes/linux/mail/primaryToolbar.css
@@ -164,18 +164,17 @@
   margin-left: 4px;
 }
 
 #button-chat[unreadMessages="true"] {
   fill: var(--toolbarbutton-icon-fill-attention);
   stroke-opacity: 0.5;
 }
 
-.button-appmenu .toolbarbutton-text,
-.button-appmenu .toolbarbutton-menu-dropmarker {
+.button-appmenu .toolbarbutton-text {
   display: none;
 }
 
 #button-newMsgPopup .menuitem-iconic {
   fill: currentColor;
 }
 
 toolbar[mode="text"] .button-appmenu .toolbarbutton-icon {
--- a/mail/themes/osx/mail/primaryToolbar.css
+++ b/mail/themes/osx/mail/primaryToolbar.css
@@ -199,18 +199,17 @@
   padding-inline-end: 1px;
 }
 
 toolbar:not([mode="text"]) .badgeButton-badge {
   margin-inline-start: 11px;
   margin-bottom: 12px;
 }
 
-.button-appmenu .toolbarbutton-text,
-.button-appmenu .toolbarbutton-menu-dropmarker {
+.button-appmenu .toolbarbutton-text {
   display: none;
 }
 
 toolbar[mode="text"] .button-appmenu .toolbarbutton-icon {
   display: -moz-box;
 }
 
 #folderPane-toolbar > .toolbarbutton-1,
--- a/mail/themes/shared/customizableui/panelUI.css
+++ b/mail/themes/shared/customizableui/panelUI.css
@@ -115,17 +115,17 @@ panelview {
   margin-inline-start: 0;
 }
 
 panelview[id^=PanelUI-webext-] {
   overflow: hidden;
 }
 
 panelview:not([mainview]) .toolbarbutton-text,
-.cui-widget-panel toolbarbutton:not([wrap]) > .toolbarbutton-text,
+.cui-widget-panel .toolbarbutton-text,
 #overflowMenu-customize-button > .toolbarbutton-text {
   text-align: start;
   display: -moz-box;
 }
 
 .cui-widget-panel {
   --arrowpanel-padding: 4px 0;
 }
@@ -208,17 +208,16 @@ toolbarbutton[constrain-size="true"][cui
 }
 
 #zoom-in-button > .toolbarbutton-text,
 #zoom-out-button > .toolbarbutton-text,
 #zoom-reset-button > .toolbarbutton-icon {
   display: none;
 }
 
-#customization-palette .toolbarbutton-multiline-text,
 #customization-palette .toolbarbutton-text {
   display: none;
 }
 
 .subview-subheader,
 panelview .toolbarbutton-1,
 .subviewbutton,
 .widget-overflow-list .toolbarbutton-1 {
@@ -425,20 +424,16 @@ menuitem.panel-subview-footer:not([disab
 .PanelUI-subView toolbarseparator[orient="vertical"] {
   height: 24px;
   border-inline-start: 1px solid var(--panel-separator-color);
   border-top: none;
   margin: 0;
   margin-inline: 6px 7px;
 }
 
-toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 #search-container[cui-areatype="menu-panel"] {
   padding-block: 6px;
 }
 
 toolbarpaletteitem[place="palette"] > #search-container {
   min-width: 7em;
   width: 7em;
   min-height: 37px;
@@ -598,17 +593,17 @@ toolbarpaletteitem[place="menu-panel"] >
   padding: 8px;
 }
 
 .subviewbutton-back:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
 
 .subviewbutton-back > .toolbarbutton-text {
-  /* !important to override .cui-widget-panel toolbarbutton:not([wrap]) > .toolbarbutton-text
+  /* !important to override .cui-widget-panel .toolbarbutton-text
    * selector further down. */
   display: none !important;
 }
 
 .subviewbutton.download {
   -moz-box-align: start;
   min-height: 48px;
   padding-inline-start: 8px;
--- a/mail/themes/windows/mail/primaryToolbar.css
+++ b/mail/themes/windows/mail/primaryToolbar.css
@@ -129,18 +129,17 @@
   border-bottom: 1px solid var(--chrome-content-separator-color);
 }
 
 .mail-toolbox > toolbar:-moz-lwtheme,
 .contentTabToolbox > toolbar:-moz-lwtheme {
   border-top: none;
 }
 
-.button-appmenu .toolbarbutton-text,
-.button-appmenu .toolbarbutton-menu-dropmarker {
+.button-appmenu .toolbarbutton-text {
   display: none;
 }
 
 toolbar[mode="text"] .button-appmenu .toolbarbutton-icon {
   display: -moz-box;
 }
 
 #folderPane-toolbar > .toolbarbutton-1,