Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
It looks like this might be held up because the previous version is held up (bug 1811900) -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/364362 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Commit message:
magnifier: Show cursor when magnifier is enabled and scale it properly
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1818790 in gnome-shell (Ubuntu): "[regression] Desktop zoom is missing
the mouse pointer"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1818790
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365180
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 027f211..aa59db3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-shell (3.32.0-1ubuntu2) UNRELEASED; urgency=medium
+
+ * d/p/magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch:
+- magnifier: Show cursor when magnifier is enabled and scale it to
+ match monitor scaling (LP: #1818790)
+
+ -- Marco Trevisan (Treviño) Wed, 27 Mar 2019 16:51:27 +0100
+
gnome-shell (3.32.0-1ubuntu1) disco; urgency=medium
* Merge with debian, remaining changes:
diff --git a/debian/patches/magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch b/debian/patches/magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
new file mode 100644
index 000..0bb6c71
--- /dev/null
+++ b/debian/patches/magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
@@ -0,0 +1,216 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Wed, 27 Mar 2019 16:14:39 +0100
+Subject: magnifier: Show cursor when magnifier is enabled and scale it
+ properly
+
+Show the cursor when using the magnifier and apply the proper monitor scaling
+to it.
+
+GNOME-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1020
+Ubuntu-Bug: https://bugs.launchpad.net/bugs/1818790
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/454
+Applied-Upstream: no
+Forwarded: yes
+---
+ js/ui/layout.js| 24 ++---
+ js/ui/magnifier.js | 76 +++---
+ 2 files changed, 87 insertions(+), 13 deletions(-)
+
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index 27a3099..376a585 100644
+--- a/js/ui/layout.js
b/js/ui/layout.js
+@@ -930,22 +930,38 @@ var LayoutManager = GObject.registerClass({
+ return ws.get_work_area_for_monitor(monitorIndex);
+ }
+
++_findIndexForRect(x, y, width, height) {
++let rect = new Meta.Rectangle({
++x: Math.floor(x),
++y: Math.floor(y),
++width: Math.ceil(x + width) - Math.floor(x),
++height: Math.ceil(y + height) - Math.floor(y)
++});
++return global.display.get_monitor_index_for_rect(rect);
++}
++
+ // This call guarantees that we return some monitor to simplify usage of it
+ // In practice all tracked actors should be visible on some monitor anyway
+ findIndexForActor(actor) {
+ let [x, y] = actor.get_transformed_position();
+ let [w, h] = actor.get_transformed_size();
+-let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h });
+-return global.display.get_monitor_index_for_rect(rect);
++return this._findIndexForRect(x, y, w, h);
+ }
+
+-findMonitorForActor(actor) {
+-let index = this.findIndexForActor(actor);
++_findMonitorForIndex(index) {
+ if (index >= 0 && index < this.monitors.length)
+ return this.monitors[index];
+ return null;
+ }
+
++findMonitorForActor(actor) {
++return this._findMonitorForIndex(this.findIndexForActor(actor));
++}
++
++findMonitorForPoint(x, y) {
++return this._findMonitorForIndex(this._findIndexForRect(x, y, 1, 1));
++}
++
+ _queueUpdateRegions() {
+ if (this._startingUp)
+ return;
+diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
+index 546ab1d..c77e47f 100644
+--- a/js/ui/magnifier.js
b/js/ui/magnifier.js
+@@ -51,31 +51,58 @@ var MouseSpriteContent = GObject.registerClass({
+ }, class MouseSpriteContent extends GObject.Object {
+ _init() {
+ super._init();
++this._scale = 1.0;
++this._monitorScale = 1.0;
+ this._texture = null;
+ }
+
+ vfunc_get_preferred_size() {
+ if (!this._texture)
+-return [0, 0];
++return [false, 0, 0];
+
+-return [this._texture.get_width(), this._texture.get_height()];
++let width = this._texture.get_width() / this._scale;
++let height = this._texture.get_height() / this._scale;
++
++return [true, width, height];
+ }
+
+ vfunc_paint_content(actor, node) {
+ if (!this._texture)
+ return;
+
+-
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365150 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Review: Approve LGTM! +1 -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365150 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365180 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365180 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Review: Approve I didn't spot anything bad. Let's merge it to master, thanks! -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365180 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365150 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
Commit message:
display: support UI scaled logical displays mode for X11 randr scaling
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1820850 in mutter (Ubuntu): "[FFe] Distro patch GNOME hi-dpi support for
x11 sessions"
https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1820850
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365150
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 89af966..ab949c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gnome-control-center (1:3.32.0.1-1ubuntu6) disco; urgency=medium
+
+ * debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch:
+- Make sure the display panel primary monitor matches configured one
+ * debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch:
+- Support scaled logical monitors using UI scale as it could happen when
+ using the X11 Randr scaling (LP: #1820850)
+
+ -- Marco Trevisan (Treviño) Wed, 27 Mar 2019 06:10:59 +0100
+
gnome-control-center (1:3.32.0.1-1ubuntu5) disco; urgency=medium
* debian/patches/0001-sound-Fix-crash-when-sound-device-set-to-NULL.patch:
diff --git a/debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch b/debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch
new file mode 100644
index 000..5df1bc6
--- /dev/null
+++ b/debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch
@@ -0,0 +1,33 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Mon, 18 Mar 2019 02:00:49 +0100
+Subject: display: Don't always set the primary monitor to the first in list
+
+As per the binding that we have between the list store and the combo-box, when
+the first element is added to the list-store, the combo box set this value as
+the selected-index, and this leads to a call to cc_display_monitor_set_primary
+which set the first-listed monitor as primary and unset the real primary monitor.
+
+To avoid this, just ignore the binding when rebuilding the UI, since in this
+phase control-center should just reflect the actual state without changing
+anything.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/issues/419
+Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/436
+Applied-Upstream: yes, 3.32.1
+---
+ panels/display/cc-display-panel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
+index 9604883..85ea4ce 100644
+--- a/panels/display/cc-display-panel.c
b/panels/display/cc-display-panel.c
+@@ -550,7 +550,7 @@ on_primary_display_selected_index_changed_cb (CcDisplayPanel *panel)
+ gint idx = hdy_combo_row_get_selected_index (panel->primary_display_row);
+ g_autoptr(CcDisplayMonitor) output = NULL;
+
+- if (idx < 0)
++ if (idx < 0 || panel->rebuilding)
+ return;
+
+ output = g_list_model_get_item (G_LIST_MODEL (panel->primary_display_list), idx);
diff --git a/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch b/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch
new file mode 100644
index 000..c9609a2
--- /dev/null
+++ b/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch
@@ -0,0 +1,233 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Wed, 27 Mar 2019 05:42:41 +0100
+Subject: display: Support UI scaled logical monitor mode
+
+When this mode is selected we need to assume that all the monitors are scaled
+by their scaling and the global UI scale.
+
+Origin: https://gitlab.gnome.org/3v1n0/gnome-control-center/commits/layout-global-scale
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1820850
+Forwarded: No, MPs will follow shortly
+---
+ panels/display/cc-display-arrangement.c | 45 +
+ panels/display/cc-display-config-dbus.c | 16 +---
+ panels/display/cc-display-config.c | 6 +
+ panels/display/cc-display-config.h | 2 ++
+ 4 files changed, 61 insertions(+), 8 deletions(-)
+
+diff --git a/panels/display/cc-display-arrangement.c b/panels/display/cc-display-arrangement.c
+index adbbcbc..c3b14e4 100644
+--- a/panels/display/cc-display-arrangement.c
b/panels/display/cc-display-arrangement.c
+@@ -95,10 +95,31 @@ apply_rotation_to_geometry (CcDisplayMonitor *output,
+ }
+ }
+
++static double
++get_maximum_scale (CcDisplayConfig *config)
++{
++ GList *outputs, *l;
++ double max_scale =
