Merge lp:~azzar1/unity/round-gtk-scaling-to-closest-integer into lp:unity

[Andrea Azzarone]

Round gtk scaling factor to closest integer.

Round gtk scaling factor to closest integer.

[Omer Akram (om26er)]

What's the impact of this one ? Will scaling of 1.68 effectively result in 2X scaling ?

[Andrea Azzarone (azzar1)]

This will not affect unity scaling, neither text scaling. Just gtk
window scaling that is integer. So yes 1.68 will be 2.

On Fri, Dec 16, 2016 at 8:34 PM, Omer Akram <email address hidden> wrote:
> What's the impact of this one ? Will scaling of 1.68 effectively result in 2X scaling ?
> --
> https://code.launchpad.net/~azzar1/unity/round-gtk-scaling-to-closest-integer/+merge/313459
> You are the owner of lp:~azzar1/unity/round-gtk-scaling-to-closest-integer.
>
> Launchpad-Message-Rationale: Owner
> Launchpad-Message-For: azzar1
> Launchpad-Notification-Type: code-review
> Launchpad-Branch: ~azzar1/unity/round-gtk-scaling-to-closest-integer
> Launchpad-Project: unity

[David Jordan (dmj726)]

Will test shortly on 14" and 17" machines, though I expect to see some issues with text size, qt scaling, etc.

[David Jordan (dmj726)]

The sudden switch in scaling factor when the user manually picks say 1.68 is pretty jarring, and I'm not sure it would be readily understood why it's happening, especially when text size changes at each step.

Let's leave the manual scaling alone and just focus on defaulting to scales we can represent perfectly.

review: Needs Fixing

[David Jordan (dmj726)]

Actually, digging into this more, I'd say this is a minor improvement (moving the sudden, size increase to 1.5x instead of having the jump at 2x), so I'm definitely fine with this patch.

It's not a fix for bug #1649736 though.

review: Approve

[Andrea Azzarone (azzar1)]

Merged patch from https://bugs.launchpad.net/ubuntu/+source/unity/+bug/1649736/comments/6

[Marco Trevisan (Treviño) (3v1n0)]

Looks good, thanks.

review: Approve

[David Jordan (dmj726)]

Looks good to me!

[Kai-Heng Feng (kaihengfeng)]

Thanks for the patch!

=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2016-11-30 11:06:15 +0000
+++ unity-shared/UnitySettings.cpp	2016-12-20 16:33:36 +0000
@@ -346,7 +346,7 @@
       const auto dpi = std::max(dpi_x, dpi_y);
 
       if (dpi > DPI_SCALING_LIMIT)
-        scale = static_cast<int>(std::lround(scale * dpi / DPI_SCALING_LIMIT));
+        scale = static_cast<int>(scale * std::lround(dpi / DPI_SCALING_LIMIT));
     }
 
     return scale;
@@ -423,7 +423,7 @@
   {
     changing_gnome_settings_ = true;
     changing_gnome_settings_timeout_.reset();
-    unsigned integer_scaling = std::max<unsigned>(1, scale);
+    unsigned integer_scaling = std::max<unsigned>(1, std::lround(scale));
     double point_scaling = scale / static_cast<double>(integer_scaling);
     double text_scale_factor = parent_->font_scaling() * point_scaling;
     glib::Variant default_cursor_size(g_settings_get_default_value(gnome_ui_settings_, GNOME_CURSOR_SIZE.c_str()), glib::StealRef());