Merge lp://staging/~jassmith/unity/unity.mm-options into lp://staging/unity

You hit my rule of three, same code in three places should be a simple method:

int get_monitor(bool use_primary)
{
  UScreen *uscreen = UScreen::GetDefault();
  if (use_primary)
    return uscreen->GetPrimaryMonitor();
  else
    return uscreen->GetMonitorWithMouse();
}

  // ... then
  auto monitor_geo = uscreen->GetMonitorGeometry(get_monitor(use_primary));

Thanks for the updates.

Can you please open a bug (or ask design to do so for a FFe?)

bugs are 950136 and 946104

387 +nux::ObjectPtr<Launcher> Controller::Impl::CurrentLauncher()
388 +{
389 + nux::ObjectPtr<Launcher> result;
390 + int best = std::max<int> (launchers.size() - 1, MonitorWithMouse());
391 + if (best >= 0)
392 + result = launchers[best];
393 + return result;
394 +}

This is causing that the right-most monitor is always used for keyboard navigation, while the MonitorWithMouse is actually ignored.

Using std::min of course fixes the issue.

Also, there are some autopilot tests failing when using this in multimonitor (some of them should be related to the problem above).