Merge branch 'master' - merge fix

This commit is contained in:
ocornut 2016-12-23 12:15:09 +01:00
parent fdc70456f4
commit bb4d19ff7c

View File

@ -2634,7 +2634,7 @@ static void NavUpdate()
const float move_speed = ImFloor(600 * g.IO.DeltaTime * ImMin(g.IO.DisplayFramebufferScale.x, g.IO.DisplayFramebufferScale.y));
g.NavWindowingTarget->PosFloat += move_delta * move_speed;
g.NavDisableMouseHover = true;
MarkSettingsDirty(g.NavWindowingTarget);
MarkIniSettingsDirty(g.NavWindowingTarget);
}
}