[tor-commits] [tor-messenger-build/master] Trac 16491: Contact list entries don't adapt to the actual font size
arlo at torproject.org
arlo at torproject.org
Sat Nov 5 19:03:36 UTC 2016
commit 3475b6f0a9415708ca4a2b849ff9cb0b0c44385a
Author: Arlo Breault <arlolra at gmail.com>
Date: Sat Nov 5 12:02:48 2016 -0700
Trac 16491: Contact list entries don't adapt to the actual font size
---
ChangeLog | 1 +
.../0001-Set-Tor-Messenger-preferences.patch | 2 +-
...0002-Trac-16489-Prevent-account-autologin.patch | 2 +-
...Support-Special-Characters-input-prompt-o.patch | 2 +-
...Better-error-reporting-for-failed-outgoin.patch | 2 +-
.../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +-
...-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +-
...-XMPP-createConversation-should-handle-in.patch | 2 +-
...-Set-_userVCard-own-property-when-downloa.patch | 2 +-
.../0009-XMPP-in-band-registration.patch | 2 +-
.../instantbird/0010-Remove-search-from-UI.patch | 2 +-
.../0011-Add-Tor-Messenger-branding.patch | 2 +-
projects/instantbird/0012-Account-picture.patch | 2 +-
.../0013-Modify-protocol-defaults.patch | 2 +-
.../instantbird/0014-Modify-IRC-defaults.patch | 2 +-
projects/instantbird/0015-Modify-themes.patch | 2 +-
.../instantbird/0016-Modify-XMPP-defaults.patch | 2 +-
projects/instantbird/0017-Remove-logging-UI.patch | 2 +-
projects/instantbird/0018-Cert-override.patch | 2 +-
.../0019-Display-all-traffic-over-Tor.patch | 2 +-
.../instantbird/0020-Trac-17480-Content-sink.patch | 2 +-
.../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +-
...-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +-
...Contact-list-entries-should-adapt-their-h.patch | 322 +++++++++++++++++++++
projects/instantbird/config | 1 +
25 files changed, 346 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c8fb3ae..3257cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Tor Messenger 0.3.0b1 --
* Use the tor-browser-45.4.0esr-6.0-1 branch (41f1c54a) on tor-browser
* Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45
* Update ctypes-otr to 00e4e80a
+ * Trac 16491: Contact list entries don't adapt to the actual font size
* Trac 16536: Investigate Tor Browser patches relevant to Tor Messenger
* Trac 17471: Investigate Tor Browser preferences relevant to Tor Messenger
* Trac 17480: Make url linkification toggleable
diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index edd6951..d485eec 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,7 +1,7 @@
From b229ec3ed7af7f4e78b1d75a26c1ed76046ad3fe Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:48:41 -0700
-Subject: [PATCH 01/22] Set Tor Messenger preferences
+Subject: [PATCH 01/23] Set Tor Messenger preferences
---
im/app/profile/all-instantbird.js | 399 ++++++++++++++++++++++++++++++++++++--
diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
index 33be92a..96a0b5a 100644
--- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
+++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
@@ -1,7 +1,7 @@
From facec2ac69b9068c63278572ffdfa432f259f373 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Mon, 16 Nov 2015 20:37:53 -0800
-Subject: [PATCH 02/22] Trac 16489: Prevent account autologin
+Subject: [PATCH 02/23] Trac 16489: Prevent account autologin
---
chat/components/src/imAccounts.js | 2 +-
diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
index 9b9417f..7702b9f 100644
--- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
+++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
@@ -1,7 +1,7 @@
From e8cbcbe0aab97d75fec3abe65b575f3e814e7837 Mon Sep 17 00:00:00 2001
From: aleth <aleth at instantbird.org>
Date: Sat, 30 Jan 2016 20:56:38 +0100
-Subject: [PATCH 03/22] Trac 17896: Support "Special Characters" input prompt
+Subject: [PATCH 03/23] Trac 17896: Support "Special Characters" input prompt
on OS X
* Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian
diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
index 93eb82f..9aa4468 100644
--- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
+++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
@@ -1,7 +1,7 @@
From 922480805c668eecb6edbbda2b2a4dfb61107144 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Tue, 2 Feb 2016 16:04:51 -0800
-Subject: [PATCH 04/22] Trac 17494: Better error reporting for failed outgoing
+Subject: [PATCH 04/23] Trac 17494: Better error reporting for failed outgoing
messages
* Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep
diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
index 83a4ddd..ba27e8c 100644
--- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
+++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
@@ -1,7 +1,7 @@
From 6990be2c6ac257be6f8aa284814489be2c6f25ea Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Tue, 15 Mar 2016 17:40:42 -0700
-Subject: [PATCH 05/22] Trac 13312: OTR over Twitter DMs
+Subject: [PATCH 05/23] Trac 13312: OTR over Twitter DMs
---
chat/components/src/imConversations.js | 4 +-
diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
index fd8e394..dce21df 100644
--- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
+++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
@@ -1,7 +1,7 @@
From ef854ddec3ec3f62d612484d7099e461fe18d128 Mon Sep 17 00:00:00 2001
From: Nihanth Subramanya <nhnt11 at gmail.com>
Date: Sun, 9 Oct 2016 21:53:04 -0700
-Subject: [PATCH 06/22] Bug 1218193 - Fix tab strip background colour on OS X.
+Subject: [PATCH 06/23] Bug 1218193 - Fix tab strip background colour on OS X.
r=aleth
---
diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
index 01da37e..2e7f702 100644
--- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
+++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
@@ -1,7 +1,7 @@
From a60538df8166c6eb8e267ac92598706c25ff35f8 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 9 Oct 2016 21:57:07 -0700
-Subject: [PATCH 07/22] Bug 1246431 - XMPP createConversation should handle
+Subject: [PATCH 07/23] Bug 1246431 - XMPP createConversation should handle
incoming messages from the server properly. r=aleth
---
diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
index bc5194a..fb53f3c 100644
--- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
+++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
@@ -1,7 +1,7 @@
From 2ed57a22907efdee880b30d956391d52417b01a6 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 28 Aug 2016 08:57:41 -0700
-Subject: [PATCH 08/22] Bug 1298574 - Set _userVCard own property when
+Subject: [PATCH 08/23] Bug 1298574 - Set _userVCard own property when
downloading vCard fails. r=aleth
* This prevents an infinite req / res cycle.
diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch
index db258da..cfa567c 100644
--- a/projects/instantbird/0009-XMPP-in-band-registration.patch
+++ b/projects/instantbird/0009-XMPP-in-band-registration.patch
@@ -1,7 +1,7 @@
From d28b2c39b8f9249490dc6499d831e6e6adbe838a Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 18:42:25 -0700
-Subject: [PATCH 09/22] XMPP in-band registration
+Subject: [PATCH 09/23] XMPP in-band registration
---
chat/locales/en-US/xmpp.properties | 5 +
diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch
index fe91747..26555bc 100644
--- a/projects/instantbird/0010-Remove-search-from-UI.patch
+++ b/projects/instantbird/0010-Remove-search-from-UI.patch
@@ -1,7 +1,7 @@
From 33ec527a5ba77bbe3af57666c9a25b54d2d97512 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 18:47:48 -0700
-Subject: [PATCH 10/22] Remove search from UI
+Subject: [PATCH 10/23] Remove search from UI
---
im/content/nsContextMenu.js | 18 +-----------------
diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
index 6b0847f..7245db5 100644
--- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
+++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
@@ -1,7 +1,7 @@
From 41c60f97c6049e4e3bc130fa963616e9ddc77af6 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 18:56:27 -0700
-Subject: [PATCH 11/22] Add Tor Messenger branding
+Subject: [PATCH 11/23] Add Tor Messenger branding
---
im/app/macbuild/Contents/Info.plist.in | 2 +-
diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch
index be7c944..5e7abb8 100644
--- a/projects/instantbird/0012-Account-picture.patch
+++ b/projects/instantbird/0012-Account-picture.patch
@@ -1,7 +1,7 @@
From 65de52be6fbf68084231270ec14c84f225ed0fed Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:24:09 -0700
-Subject: [PATCH 12/22] Account picture
+Subject: [PATCH 12/23] Account picture
---
im/content/blist.xul | 3 +--
diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch
index 363c197..3e5cd3a 100644
--- a/projects/instantbird/0013-Modify-protocol-defaults.patch
+++ b/projects/instantbird/0013-Modify-protocol-defaults.patch
@@ -1,7 +1,7 @@
From 8dd9a15845160e182b8ca44e6f4d07fdd59ffed0 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:25:34 -0700
-Subject: [PATCH 13/22] Modify protocol defaults
+Subject: [PATCH 13/23] Modify protocol defaults
* Top protocols
diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch
index 3543d97..83667ef 100644
--- a/projects/instantbird/0014-Modify-IRC-defaults.patch
+++ b/projects/instantbird/0014-Modify-IRC-defaults.patch
@@ -1,7 +1,7 @@
From ac449194473c8d254672c653b73f66350e665cc8 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:31:58 -0700
-Subject: [PATCH 14/22] Modify IRC defaults
+Subject: [PATCH 14/23] Modify IRC defaults
* ctcp ping
diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch
index e70f9aa..47a8d62 100644
--- a/projects/instantbird/0015-Modify-themes.patch
+++ b/projects/instantbird/0015-Modify-themes.patch
@@ -1,7 +1,7 @@
From 38fbe7232753738d91ce12c4df53fe83a3192e16 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:36:38 -0700
-Subject: [PATCH 15/22] Modify themes
+Subject: [PATCH 15/23] Modify themes
* theme extension updateh
diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch
index b91f9f4..42e07c6 100644
--- a/projects/instantbird/0016-Modify-XMPP-defaults.patch
+++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch
@@ -1,7 +1,7 @@
From 64746206241b088e2a609662fcbe0edc3baad88b Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:38:49 -0700
-Subject: [PATCH 16/22] Modify XMPP defaults
+Subject: [PATCH 16/23] Modify XMPP defaults
* xmpp-default-domain
diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch
index 802dfe8..83c6c6c 100644
--- a/projects/instantbird/0017-Remove-logging-UI.patch
+++ b/projects/instantbird/0017-Remove-logging-UI.patch
@@ -1,7 +1,7 @@
From 47bb9db3798b59d066399ec289295229a1aa4168 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:50:48 -0700
-Subject: [PATCH 17/22] Remove logging UI
+Subject: [PATCH 17/23] Remove logging UI
---
im/content/preferences/privacy.xul | 20 --------------------
diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch
index ffd1fd2..f7c0f5a 100644
--- a/projects/instantbird/0018-Cert-override.patch
+++ b/projects/instantbird/0018-Cert-override.patch
@@ -1,7 +1,7 @@
From 9ded93b407e23a54bd335d273d31496bc426ffd1 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:56:46 -0700
-Subject: [PATCH 18/22] Cert override
+Subject: [PATCH 18/23] Cert override
---
im/app/profile/cert_override.txt | 3 +++
diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
index 41a87c1..c8d5779 100644
--- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
+++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
@@ -1,7 +1,7 @@
From 119c059b638fcb772c4e9aa952d9899d58d93264 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:58:31 -0700
-Subject: [PATCH 19/22] Display all traffic over Tor
+Subject: [PATCH 19/23] Display all traffic over Tor
---
im/content/accountWizard.xul | 2 ++
diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch
index 723330d..47c8e37 100644
--- a/projects/instantbird/0020-Trac-17480-Content-sink.patch
+++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch
@@ -1,7 +1,7 @@
From 7512783d8cbcd15c9b0c2bfd07fbf4c2ff628f6e Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Wed, 5 Oct 2016 11:09:25 -0700
-Subject: [PATCH 20/22] Trac 17480: Content sink
+Subject: [PATCH 20/23] Trac 17480: Content sink
---
chat/modules/imContentSink.jsm | 30 +++++-------------------------
diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
index 5a16f93..43d0546 100644
--- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
+++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
@@ -1,7 +1,7 @@
From d6b9d9b02c72f979a8a01eef2bd6c358dfc5394b Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 2 Oct 2016 08:46:55 -0700
-Subject: [PATCH 21/22] SASL ECDSA-NIST256P-CHALLENGE
+Subject: [PATCH 21/23] SASL ECDSA-NIST256P-CHALLENGE
---
chat/components/src/imAccounts.js | 1 +
diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
index 56a638e..7064a26 100644
--- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
+++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
@@ -1,7 +1,7 @@
From 6c0d0db66b8375dd63a1f7bfe1661c8956f6d6cb Mon Sep 17 00:00:00 2001
From: aleth <aleth at instantbird.org>
Date: Wed, 26 Oct 2016 20:16:58 +0200
-Subject: [PATCH 22/22] Bug 1313137 - "msg is not defined" error in
+Subject: [PATCH 22/23] Bug 1313137 - "msg is not defined" error in
irc.js:changeBuddyNick. r=clokep
--HG--
diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
new file mode 100644
index 0000000..c0ee26e
--- /dev/null
+++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
@@ -0,0 +1,322 @@
+From b55560a8e94434e8320e428145f9d93ca494ce04 Mon Sep 17 00:00:00 2001
+From: aleth <aleth at instantbird.org>
+Date: Thu, 12 May 2016 15:10:43 +0200
+Subject: [PATCH 23/23] Bug 954368 - Contact list entries should adapt their
+ height to the actual font size. r=florian
+
+--HG--
+extra : rebase_source : 9820f3a68794f98260f3ac406772da6d176d02ec
+---
+ chat/themes/imtooltip.css | 1 +
+ im/content/blist.css | 38 ++++++++++++---
+ im/content/blist.js | 7 +++
+ im/content/blist.xul | 4 ++
+ im/content/contact.xml | 57 +++++++++++-----------
+ im/content/conv.xml | 10 ++--
+ .../en-US/chrome/instantbird/instantbird.dtd | 6 +++
+ im/themes/blist.css | 22 ++++-----
+ 8 files changed, 92 insertions(+), 53 deletions(-)
+
+diff --git a/chat/themes/imtooltip.css b/chat/themes/imtooltip.css
+index c4525be..630da39 100644
+--- a/chat/themes/imtooltip.css
++++ b/chat/themes/imtooltip.css
+@@ -31,6 +31,7 @@
+
+ .tooltipBuddies {
+ margin-left: -3px;
++ --blist-item-height: 20px; /* 16px icon plus padding */
+ }
+
+ .tooltipDisplayName {
+diff --git a/im/content/blist.css b/im/content/blist.css
+index d47e4f3..15b61b1 100644
+--- a/im/content/blist.css
++++ b/im/content/blist.css
+@@ -30,15 +30,28 @@ group {
+ -moz-box-align: center;
+ }
+
+-/* The height is required for the animation to work. The skin can
+- * specify an additionnal min-height value if there are things of
+- * constant size (icons + padding) */
+-contact,
+-buddy,
++/* The height is required for the animation to work. */
+ group {
+ height: 1em;
+ }
+
++conv,
++contact,
++buddy {
++ /* Variable set from blist.js. This is necessary as CSS transitions don't
++ work with height: auto.
++ Usually 16+2+2px for the protocol icon, padding top and bottom. */
++ height: var(--blist-item-height);
++}
++
++contact[open],
++contact[aliasing],
++#buddylistbox:focus > contact[selected] {
++ /* This is fine because height transitions in this state are on the
++ buddies, and there is no transition on selection (it's instant). */
++ height: auto;
++}
++
+ /* Possible values of the |state| attribute:
+ - not set: the binding is not initialized yet,
+ - showing: during the expand animation,
+@@ -51,23 +64,24 @@ contact:not([state]),
+ buddy:not([state]) {
+ height: 0;
+ }
++
+ contact[state="showing"],
+ buddy[state="showing"] {
+ /* Should match the transition effect for contact/buddy collapsing so
+ that reordering doesn't make the whole list jump. */
+- -moz-transition: height .2s ease-in;
++ transition: height .2s ease-in;
+ }
+
+ contact[state="fading"] {
+ opacity: 0;
+- -moz-transition: opacity .4s ease-in 1s;
++ transition: opacity .4s ease-in 1s;
+ }
+
+ contact[state="collapsing"],
+ buddy[state="collapsing"],
+ group[collapsing="true"] {
+ height: 0;
+- -moz-transition: height .2s ease-in;
++ transition: height .2s ease-in;
+ }
+
+ contact[state="collapsing"] *,
+@@ -78,6 +92,14 @@ group[collapsing="true"] * {
+ display: none;
+ }
+
++#dummyContact {
++ height: auto;
++}
++
++#dummylistbox {
++ visibility: hidden;
++}
++
+ tooltip[type="im"] {
+ -moz-binding: url("chrome://chat/content/imtooltip.xml#tooltip");
+ }
+diff --git a/im/content/blist.js b/im/content/blist.js
+index 9ec10e2..ce76ffc 100644
+--- a/im/content/blist.js
++++ b/im/content/blist.js
+@@ -820,6 +820,13 @@ var buddyList = {
+ .setAttribute("checked", "true");
+ }
+
++ // Find the correct height of a contact list item. This can vary depending
++ // on the platform font and font size.
++ let dummyContact = document.getElementById("dummyContact");
++ let contactHeight = dummyContact.getBoundingClientRect().height;
++ document.getElementById("buddyListMsg")
++ .style.setProperty("--blist-item-height", contactHeight + "px");
++
+ let blistBox = document.getElementById("buddylistbox");
+ blistBox.removeGroup = function(aGroupElt) {
+ let index = buddyList._displayedGroups.indexOf(aGroupElt);
+diff --git a/im/content/blist.xul b/im/content/blist.xul
+index f29a48b..71ee2c9 100644
+--- a/im/content/blist.xul
++++ b/im/content/blist.xul
+@@ -224,6 +224,10 @@
+ onfocus="buddyList.buddylistboxFocus();"
+ onselect="buddyList.listboxSelect(event);"
+ tooltip="imTooltip"/>
++ <richlistbox id="dummylistbox">
++ <contact id="dummyContact" displayname="&dummyContact.label;"
++ state="visible" status="unknown"/>
++ </richlistbox>
+ <spacer id="listSpacer" flex="1"
+ onclick='document.getElementById("buddylistbox").focus();'/>
+ </notificationbox>
+diff --git a/im/content/contact.xml b/im/content/contact.xml
+index 5fc36dd..f2b4641 100644
+--- a/im/content/contact.xml
++++ b/im/content/contact.xml
+@@ -16,11 +16,11 @@
+
+ <binding id="contact" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
+ <content>
+- <xul:stack class="prplBuddyIcon" mousethrough="always">
+- <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/>
+- <xul:image class="statusIcon" xbl:inherits="status"/>
+- </xul:stack>
+- <xul:hbox flex="1" class="contact-hbox" mousethrough="always">
++ <xul:hbox flex="1" class="contact-hbox" mousethrough="always" align="center">
++ <xul:stack class="prplBuddyIcon" mousethrough="always">
++ <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/>
++ <xul:image class="statusIcon" xbl:inherits="status"/>
++ </xul:stack>
+ <xul:label crop="end" flex="1" mousethrough="always"
+ anonid="displayname" class="contactDisplayName blistDisplayName"
+ xbl:inherits="value=displayname,status"/>
+@@ -529,30 +529,29 @@
+
+ <binding id="contact-big" extends="chrome://instantbird/content/contact.xml#contact">
+ <content>
+- <xul:hbox flex="1" mousethrough="always">
+- <xul:stack class="prplBuddyIcon" mousethrough="always">
+- <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/>
+- <xul:image class="statusIcon" xbl:inherits="status"/>
+- </xul:stack>
+- <xul:vbox flex="1" class="contact-vbox" mousethrough="always">
+- <xul:hbox class="contact-hbox" mousethrough="always">
+- <xul:label crop="end" flex="1" mousethrough="always"
+- anonid="displayname" class="contactDisplayName blistDisplayName"
+- xbl:inherits="value=displayname,status"/>
+- <xul:button anonid="startChatBubble" class="startChatBubble"
+- tooltiptext="&openConversationCmd.label;"/>
+- </xul:hbox>
+- <xul:hbox class="contact-hbox" mousethrough="always">
+- <xul:label crop="end" flex="1" mousethrough="always"
+- anonid="statusText" class="contactStatusText"
+- xbl:inherits="value=statusText"/>
+- <xul:button anonid="expander" class="expander-down"
+- tooltiptextexpand="&expandContactTooltip;"
+- tooltiptextcollapse="&collapseContactTooltip;"
+- tooltiptext="&expandContactTooltip;"/>
+- </xul:hbox>
+- </xul:vbox>
+- </xul:hbox>
++ <xul:vbox flex="1" class="contact-vbox" mousethrough="always">
++ <xul:hbox flex="1" class="contact-hbox" mousethrough="always" align="center">
++ <xul:stack class="prplBuddyIcon" mousethrough="always">
++ <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/>
++ <xul:image class="statusIcon" xbl:inherits="status"/>
++ </xul:stack>
++ <xul:label crop="end" flex="1" mousethrough="always"
++ anonid="displayname" class="contactDisplayName blistDisplayName"
++ xbl:inherits="value=displayname,status"/>
++ <xul:button anonid="startChatBubble" class="startChatBubble"
++ tooltiptext="&openConversationCmd.label;"/>
++ </xul:hbox>
++
++ <xul:hbox flex="1" class="contact-hbox" mousethrough="always" align="center">
++ <xul:label crop="end" flex="1" mousethrough="always"
++ anonid="statusText" class="contactStatusText contactIconSpace"
++ xbl:inherits="value=statusText"/>
++ <xul:button anonid="expander" class="expander-down"
++ tooltiptextexpand="&expandContactTooltip;"
++ tooltiptextcollapse="&collapseContactTooltip;"
++ tooltiptext="&expandContactTooltip;"/>
++ </xul:hbox>
++ </xul:vbox>
+ <xul:vbox anonid="contactBuddies" class="contactBuddies">
+ <children/>
+ </xul:vbox>
+diff --git a/im/content/conv.xml b/im/content/conv.xml
+index 96a33af..c41da6f 100644
+--- a/im/content/conv.xml
++++ b/im/content/conv.xml
+@@ -16,11 +16,11 @@
+
+ <binding id="conv" extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
+ <content>
+- <xul:stack class="prplBuddyIcon" mousethrough="always">
+- <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/>
+- <xul:image class="statusIcon" xbl:inherits="status"/>
+- </xul:stack>
+- <xul:hbox flex="1" class="conv-hbox" mousethrough="always">
++ <xul:hbox flex="1" class="conv-hbox" mousethrough="always" align="center">
++ <xul:stack class="prplBuddyIcon" mousethrough="always">
++ <xul:image class="protoIcon" xbl:inherits="src=iconPrpl,status"/>
++ <xul:image class="statusIcon" xbl:inherits="status"/>
++ </xul:stack>
+ <xul:label crop="end" flex="1" mousethrough="always"
+ anonid="displayname" class="convDisplayName blistDisplayName"
+ xbl:inherits="value=displayname,status"/>
+diff --git a/im/locales/en-US/chrome/instantbird/instantbird.dtd b/im/locales/en-US/chrome/instantbird/instantbird.dtd
+index 80b8948..fce965b 100644
+--- a/im/locales/en-US/chrome/instantbird/instantbird.dtd
++++ b/im/locales/en-US/chrome/instantbird/instantbird.dtd
+@@ -95,6 +95,12 @@
+ <!ENTITY userIcon.label "Change your icon">
+ <!ENTITY contactsHeader.label "Contacts">
+ <!ENTITY convsHeader.label "Conversations on hold">
++<!-- LOCALIZATION NOTE (dummyContact.label):
++ This string is not displayed anywhere, but it is used to calculate
++ the height of an item in the contact list. Therefore you should
++ set it to a string which contains characters that cover all
++ vertical sizes that occur in your language. -->
++<!ENTITY dummyContact.label "SgFyWp">
+
+ <!ENTITY openConversationCmd.label "Start a conversation">
+ <!ENTITY openConversationCmd.accesskey "c">
+diff --git a/im/themes/blist.css b/im/themes/blist.css
+index 9922674..c033b51 100644
+--- a/im/themes/blist.css
++++ b/im/themes/blist.css
+@@ -100,14 +100,7 @@ group {
+ padding: 0 2px;
+ }
+
+-conv,
+-contact,
+-buddy {
+- height: 20px; /* 16+2+2px for the protocol icon, padding top and bottom */
+-}
+-
+ /* The vertical padding directly on the binding would not be animated. */
+-.prplBuddyIcon,
+ group>* {
+ padding-top: 2px;
+ padding-bottom: 2px;
+@@ -153,21 +146,28 @@ contact[droptarget] > buddy[dummy] {
+ margin: 0;
+ }
+
++.contactDisplayName,
+ .buddyDisplayName {
+ -moz-margin-start: 2px;
+ }
+
++/* Used for the second line of a contact-big to add space on the left
++ where the .prplBuddyIcon sits on the first line. */
++.contactIconSpace {
++ /* .prplBuddyIcon width+margins (16+3+3) + .contactStatusText margin (2) */
++ margin-inline-start: 24px;
++}
++
+ .contact-hbox,
+ .conv-hbox {
+ margin: 2px 0;
+- -moz-margin-start: 2px;
+ min-height: 16px;
+ overflow-x: hidden;
+ }
+
+ /* Avoid a strange jumping bug when hovering and the startChatBubble appears */
+ .contact-vbox {
+- min-height: 40px;
++ min-height: calc(var(--blist-item-height) * 2);
+ }
+
+ .hideGroupButton,
+@@ -240,8 +240,8 @@ contact[droptarget] > buddy[dummy] {
+ .startChatBubble,
+ .expander-up,
+ .expander-down {
+- width: 16px;
+- height: 16px;
++ max-width: 16px;
++ max-height: 16px;
+ min-height: 16px;
+ min-width: 16px;
+ }
+--
+2.10.2
+
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 238042f..9a95eae 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -84,6 +84,7 @@ input_files:
- filename: 0020-Trac-17480-Content-sink.patch
- filename: 0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
- filename: 0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
+ - filename: 0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
- filename: mozconfig-common
- filename: 'mozconfig-[% c("var/osname") %]'
name: mozconfig
More information about the tor-commits
mailing list