Merge lp://staging/~woodrow-shen/unity-greeter/fix-hidpi-support into lp://staging/unity-greeter

This branch shows merge conflicts - should this have been proposed to lp:unity-greeter/14.04?

In check_hidpi_display you iterate across all the monitors but only check the primary one. Why not just:

screen.get_monitor_geometry(primary, out area)

You have a number of cases where you've used an explicit variable type, e.g. "int num_monitor" where you could just use "var num_monitor" instead.

You have a lot of hardcoded scaling like:

var hidpi = CairoUtils.check_hidpi_display();
scale = (hidpi) ? 2 : 1;

Why not:
scale = CairoUtils.get_hidpi_scale ()

and just define the 2 once in that function?

It otherwise looks pretty good. Thanks Woodrow!

ok, I will re-modify it and re-send proposal to lp:unity-greeter/14.04. You just reject this merge proposal ?

You should update this proposal to apply to trunk and also make one that applies to 14.04 - otherwise users in 15.04 will not have hidpi support. We should also consider making an MP that applies to 14.10. This is easy to do once this is applied to trunk:

$ bzr branch lp:unity-greeter/14.04
$ cd 14.04
$ bzr merge -c <commit> lp:unity-greeter
$ bzr commit
(make merge request)

How does this relate to https://code.launchpad.net/~fourdollars/unity-greeter/add-hidpi-support/+merge/244266? Is one of these obsolete?

Rejecting this MP because it's out of sync and according to https://code.launchpad.net/~fourdollars/unity-greeter/add-hidpi-support/+merge/244266 it should be obsolete.