Update framework (#6912)

Update framework

osu.Android.props

@@ -55,6 +55,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1121.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2019.1122.0" />
   </ItemGroup>
 </Project>

osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/Components/HitCirclePiece.cs

@@ -17,7 +17,9 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles.Components
             Origin = Anchor.Centre;
 
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
+
             CornerRadius = Size.X / 2;
+            CornerExponent = 2;
 
             InternalChild = new RingPiece();
         }

osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPoint.cs

@@ -25,11 +25,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         {
             Origin = Anchor.Centre;
 
-            Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.FollowPoint), _ => new Container
+            Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.FollowPoint), _ => new CircularContainer
             {
                 Masking = true,
                 AutoSizeAxes = Axes.Both,
-                CornerRadius = width / 2,
                 EdgeEffect = new EdgeEffectParameters
                 {
                     Type = EdgeEffectType.Glow,

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs

@@ -16,7 +16,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         {
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
             Masking = true;
+
             CornerRadius = Size.X / 2;
+            CornerExponent = 2;
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/RingPiece.cs

@@ -18,10 +18,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            InternalChild = new Container
+            InternalChild = new CircularContainer
             {
                 Masking = true,
-                CornerRadius = Size.X / 2,
                 BorderThickness = 10,
                 BorderColour = Color4.White,
                 RelativeSizeAxes = Axes.Both,

osu.Game.Tournament/Components/SongBar.cs

@@ -106,6 +106,7 @@ namespace osu.Game.Tournament.Components
                     Width = main_width,
                     Height = TournamentBeatmapPanel.HEIGHT,
                     CornerRadius = TournamentBeatmapPanel.HEIGHT / 2,
+                    CornerExponent = 2,
                     Children = new Drawable[]
                     {
                         new Box
@@ -126,6 +127,7 @@ namespace osu.Game.Tournament.Components
                         {
                             Masking = true,
                             CornerRadius = TournamentBeatmapPanel.HEIGHT / 2,
+                            CornerExponent = 2,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.Both,

osu.Game.Tournament/Components/TournamentBeatmapPanel.cs

@@ -52,6 +52,7 @@ namespace osu.Game.Tournament.Components
             currentMatch.BindTo(ladder.CurrentMatch);
 
             CornerRadius = HEIGHT / 2;
+            CornerExponent = 2;
             Masking = true;
 
             AddRangeInternal(new Drawable[]

osu.Game/Overlays/Comments/DrawableComment.cs

@@ -100,6 +100,7 @@ namespace osu.Game.Overlays.Comments
                                                 Size = new Vector2(avatar_size),
                                                 Masking = true,
                                                 CornerRadius = avatar_size / 2f,
+                                                CornerExponent = 2,
                                             },
                                         }
                                     },

osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
                 new SettingsCheckbox
                 {
                     LabelText = "Performance logging",
-                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.PerformanceLogging)
+                    Bindable = config.GetBindable<bool>(DebugSetting.PerformanceLogging)
                 },
                 new SettingsCheckbox
                 {

osu.Game/Overlays/Volume/MuteButton.cs

@@ -43,6 +43,7 @@ namespace osu.Game.Overlays.Volume
         {
             Content.BorderThickness = 3;
             Content.CornerRadius = HEIGHT / 2;
+            Content.CornerExponent = 2;
 
             Size = new Vector2(width, HEIGHT);
 

osu.Game/Screens/Edit/Components/CircularButton.cs

@@ -20,6 +20,7 @@ namespace osu.Game.Screens.Edit.Components
         {
             base.Update();
             Content.CornerRadius = DrawHeight / 2f;
+            Content.CornerExponent = 2;
         }
     }
 }

osu.Game/Users/Drawables/UpdateableAvatar.cs

@@ -31,6 +31,12 @@ namespace osu.Game.Users.Drawables
             set => base.CornerRadius = value;
         }
 
+        public new float CornerExponent
+        {
+            get => base.CornerExponent;
+            set => base.CornerExponent = value;
+        }
+
         public new EdgeEffectParameters EdgeEffect
         {
             get => base.EdgeEffect;

osu.Game/osu.Game.csproj

@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.1121.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.1122.0" />
     <PackageReference Include="Sentry" Version="1.2.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />

osu.iOS.props

@@ -73,7 +73,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1010.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1121.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2019.1122.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -81,7 +81,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2019.1112.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2019.1122.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />