From f6df6343cb7b1053333915b52867b2b69d1c420e Mon Sep 17 00:00:00 2001
From: Magnus Melin <mkmelin+mozilla@iki.fi>
Date: Tue, 16 Jul 2019 09:19:14 +0300
Subject: [PATCH] Bug 1565992 - attendees dialog recipients area needs
 scrollbars when adding many invitees. r=darktrojan

---
 .../calendar-event-dialog-attendees-custom-elements.js   | 3 ++-
 .../content/dialogs/calendar-event-dialog-attendees.xul  | 8 ++++----
 .../base/themes/common/dialogs/calendar-event-dialog.css | 9 ---------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/calendar/base/content/dialogs/calendar-event-dialog-attendees-custom-elements.js b/calendar/base/content/dialogs/calendar-event-dialog-attendees-custom-elements.js
index 4b1f644f79..587007fca4 100644
--- a/calendar/base/content/dialogs/calendar-event-dialog-attendees-custom-elements.js
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees-custom-elements.js
@@ -1407,12 +1407,13 @@ class MozCalendarEventFreebusyRow extends MozXULElement {
         this.offset = 0;
         this.mStartDate = null;
         this.mEndDate = null;
-        this.range = 0;
         this.startHour = 0;
         this.endHour = 24;
         this.mForce24Hours = false;
         this.mZoomFactor = 100;
         this.initTimeRange();
+        // XXX: range should not be taken from an element by id.
+        // Move the range attribute to calendar-event-freebusy-row?
         this.range = Number(document.getElementById("freebusy-grid").getAttribute("range"));
         this.onLoad();
     }
diff --git a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
index 342795845e..7af82af53c 100644
--- a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
@@ -72,7 +72,7 @@
   <hbox flex="1">
     <vbox id="attendees-container" flex="1" width="250" persist="width">
       <box class="attendee-spacer-top"/>
-      <calendar-event-attendees-list flex="1" id="attendees-list" class="listbox-noborder">
+      <calendar-event-attendees-list flex="1" id="attendees-list" class="listbox-noborder" orient="vertical">
         <richlistitem class="addressingWidgetItem" allowevents="true">
           <hbox class="addressingWidgetCell" width="27" align="center" pack="center">
             <image class="status-icon"/>
@@ -121,12 +121,12 @@
               </hbox>
             </richlistitem>
           </calendar-event-freebusy-timebar>
-          <calendar-event-freebusy-grid flex="1"
-                                        id="freebusy-grid"
+          <calendar-event-freebusy-grid id="freebusy-grid"
+                                        flex="1"
+                                        orient="vertical"
                                         range="16"
                                         class="listbox-noborder"
                                         seltype="multiple"
-                                        rows="-1"
                                         disabled="true">
             <richlistitem class="addressingWidgetItem"
                           allowevents="true">
diff --git a/calendar/base/themes/common/dialogs/calendar-event-dialog.css b/calendar/base/themes/common/dialogs/calendar-event-dialog.css
index 2ac994628e..1bc6e9e766 100644
--- a/calendar/base/themes/common/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-event-dialog.css
@@ -298,9 +298,6 @@ label.label {
 #freebusy-grid {
     min-width: 1px;
     -moz-user-focus: normal;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
     overflow: hidden;
 }
 
@@ -626,8 +623,6 @@ calendar-event-freebusy-day > box {
 #attendees-list {
     -moz-user-focus: normal;
     overflow: hidden;
-    display: flex;
-    flex-direction: column;
 }
 
 #attendees-list > richlistitem {
@@ -651,10 +646,6 @@ calendar-event-freebusy-day > box {
     width: 100%;
 }
 
-.attendees-list-listbox > listboxbody {
-    overflow-y: hidden !important;
-}
-
 .selection-bar-left {
     width: 3px;
     cursor: w-resize;