update osu verrsion

Flutterish · Apr 24, 2023 · 7c1ba39 · 7c1ba39
1 parent 27ad948
commit 7c1ba39
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 39 deletions.
diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/DrawableTag.cs b/osu.Game.Rulesets.RurusettoAddon/UI/DrawableTag.cs
@@ -25,7 +25,9 @@ public DrawableTag ( LocalisableString tag, Colour4 colour, bool solid, float he
 					Text = tag,
 					Anchor = Anchor.CentreLeft,
 					Origin = Anchor.CentreLeft
-				}
+				},
+				Anchor = Anchor.CentreLeft,
+				Origin = Anchor.CentreLeft
 			} );
 
 			Masking = true;
@@ -52,7 +54,9 @@ public DrawableTag ( LocalisableString tag, Colour4 colour, bool solid, float he
 					Text = tag,
 					Anchor = Anchor.CentreLeft,
 					Origin = Anchor.CentreLeft
-				}
+				},
+				Anchor = Anchor.CentreLeft,
+				Origin = Anchor.CentreLeft
 			} );
 		}
 	}

diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/Overlay/CategorisedTabControlOverlayHeader.cs b/osu.Game.Rulesets.RurusettoAddon/UI/Overlay/CategorisedTabControlOverlayHeader.cs
@@ -43,33 +43,33 @@ public Bindable<Tcategory> CurrentCategory {
     }
 
     protected CategorisedTabControlOverlayHeader () {
+        new Container {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Depth = -1,
+            Children = new Drawable[] {
+                categoryControlBackground = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                categoryControlContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding { Horizontal = ContentSidePadding },
+                    Child = CategoryControl = CreateCategoryControl().With(control =>
+                    {
+                        control.Current = CurrentCategory;
+                    })
+                }
+            }
+        };
         HeaderInfo.Add( new FillFlowContainer {
             RelativeSizeAxes = Axes.X,
             AutoSizeAxes = Axes.Y,
             Direction = FillDirection.Vertical,
             Children = new Drawable[]
             {
-                new Container {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Depth = -1,
-                    Children = new Drawable[] {
-                        categoryControlBackground = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        categoryControlContainer = new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Padding = new MarginPadding { Horizontal = ContentSidePadding },
-                            Child = CategoryControl = CreateCategoryControl().With(control =>
-                            {
-                                control.Current = CurrentCategory;
-                            })
-                        }
-                    }
-                },
                 new Container {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,

diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/Users/DrawableRurusettoUser.cs b/osu.Game.Rulesets.RurusettoAddon/UI/Users/DrawableRurusettoUser.cs
@@ -107,7 +107,7 @@ private void makeShort () {
 		isTall = false;
 
 		if ( verifiedDrawable != null ) {
-			( (Container<Drawable>)verifiedDrawable.Parent ).Remove( verifiedDrawable );
+			( (Container<Drawable>)verifiedDrawable.Parent ).Remove( verifiedDrawable, false );
 		}
 
 		if ( isVerified ) {
@@ -124,7 +124,7 @@ private void makeTall () {
 		isTall = true;
 
 		if ( verifiedDrawable != null ) {
-			( (Container<Drawable>)verifiedDrawable.Parent )!.Remove( verifiedDrawable );
+			( (Container<Drawable>)verifiedDrawable.Parent )!.Remove( verifiedDrawable, false );
 		}
 
 		if ( isVerified ) {
@@ -170,21 +170,21 @@ protected override void LoadComplete () {
 	public LocalisableString TooltipText => usernameText;
 
 	protected override bool OnClick ( ClickEvent e ) {
-		//if ( !string.IsNullOrWhiteSpace( profile?.OsuUsername ) && ProfileOverlay != null && OnlineAPI != null ) {
-		//	var request = new GetUserRequest( profile.OsuUsername );
-		//	request.Success += v => {
-		//		ProfileOverlay.ShowUser( v );
-		//	};
-		//	request.Failure += v => {
-		//		// :(
-		//	};
-		//	OnlineAPI.PerformAsync( request );
-		//}
-
-		if ( user.HasProfile ) {
-			user.RequestDetail( profile => Overlay.Header.NavigateTo( user, profile.Username, perserveCategories: true ) );
+		if ( !string.IsNullOrWhiteSpace( profile?.OsuUsername ) && ProfileOverlay != null && OnlineAPI != null ) {
+			var request = new GetUserRequest( profile.OsuUsername );
+			request.Success += v => {
+				ProfileOverlay.ShowUser( v );
+			};
+			request.Failure += v => {
+				// :(
+			};
+			OnlineAPI.PerformAsync( request );
 		}
 
+		//if ( user.HasProfile ) {
+		//	user.RequestDetail( profile => Overlay.Header.NavigateTo( user, profile.Username, perserveCategories: true ) );
+		//}
+
 		return true;
 	}
 }
diff --git a/osu.Game.Rulesets.RurusettoAddon/osu.Game.Rulesets.RurusettoAddon.csproj b/osu.Game.Rulesets.RurusettoAddon/osu.Game.Rulesets.RurusettoAddon.csproj
@@ -18,6 +18,6 @@
     <None Remove="Resources\Textures\oh_no.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2022.927.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.419.0" />
   </ItemGroup>
 </Project>