Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/disco.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1809788 in OEM Priority Project: "Shell dialog messages are truncated
and ellipsized..."
https://bugs.launchpad.net/oem-priority/+bug/1809788
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/366944
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/disco.
diff --git a/debian/changelog b/debian/changelog
index fd27385..349bd96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell (3.32.1-1ubuntu1~19.04.2) UNRELEASED; urgency=medium
+
+ * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
+- Really set ellipsize mode in subtitle and body (LP: #1809788)
+
+ -- Marco Trevisan (Treviño) Fri, 03 May 2019 16:49:55 -0500
+
gnome-shell (3.32.1-1ubuntu1~19.04.1) disco; urgency=medium
* Backport from eoan to disco
diff --git a/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
new file mode 100644
index 000..8a9cf0e
--- /dev/null
+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
@@ -0,0 +1,40 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Fri, 3 May 2019 15:27:13 -0500
+Subject: dialog: Really set ellipsize mode in subtitle and body
+
+Dialog's subtitle or body could not be properly wrapped, while it's ellipsized
+when the text's width doesn't exceed the container size.
+
+Clutter text has an `ellipsize` property, however in dialog's subtitle and body
+we have been setting the `ellipsize-mode` property to Pango.EllipsizeMode.NONE
+that is not present in the underlying GObject.
+
+Not being an error in javascript, gjs didn't warn us about this, while at the
+same time the St.Label's default Pango.EllipsizeMode.END was used.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/922
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/531
+
+(cherry picked from commit 0539efc8df23909a5396194ca780613f21bb63d8)
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/0539efc8
+Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
+Applied: 3.32.2
+---
+ js/ui/dialog.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
+index 809acff..41a0763 100644
+--- a/js/ui/dialog.js
b/js/ui/dialog.js
+@@ -175,7 +175,7 @@ var MessageDialogContent = GObject.registerClass({
+ this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
+ });
+
+-let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
++let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
+ line_wrap: true };
+ Object.assign(this._subtitle.clutter_text, textProps);
+ Object.assign(this._body.clutter_text, textProps);
diff --git a/debian/patches/series b/debian/patches/series
index adbf4d0..166f74b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,6 @@ sessionMode-add-support-for-debugFlags-parameter.patch
st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
st-scroll-view-Remove-scrollbars-references-on-dispose.patch
magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
+dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
ubuntu/resolve_alternate_theme_path.patch
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
