Merge remote-tracking branch 'upstream/master' into raw-input-osd

This commit is contained in:
Dean Herbert
2017-06-08 20:41:04 +09:00
49 changed files with 43 additions and 65 deletions

View File

@ -41,4 +41,3 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
}
}
}

View File

@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
set
{
bounding = value;
Invalidate(Invalidation.Geometry);
Invalidate(Invalidation.MiscGeometry);
}
}

View File

@ -33,4 +33,3 @@ namespace osu.Game.Overlays.Settings.Sections.General
}
}
}

View File

@ -22,4 +22,3 @@ namespace osu.Game.Overlays.Settings.Sections
}
}
}

View File

@ -65,7 +65,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
letterboxSettings.ClearTransforms();
letterboxSettings.AutoSizeAxes = isVisible ? Axes.Y : Axes.None;
if(!isVisible)
if (!isVisible)
letterboxSettings.ResizeHeightTo(0, transition_duration, EasingTypes.OutQuint);
};
letterboxing.TriggerChange();

View File

@ -24,4 +24,3 @@ namespace osu.Game.Overlays.Settings.Sections
}
}
}

View File

@ -22,4 +22,3 @@ namespace osu.Game.Overlays.Settings.Sections
}
}
}