Merge branch 'master' into fix-beatmap-atttributes-display

ppy · Jul 19, 2024 · a06bcd7 · a06bcd7
2 parents 2ad8eeb + 124bc9c
commit a06bcd7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -85,10 +85,7 @@ private void load()
  SelectionBox = CreateSelectionBox(),
  });
 
- SelectedItems.CollectionChanged += (_, _) =>
- {
- Scheduler.AddOnce(updateVisibility);
- };
+ SelectedItems.BindCollectionChanged((_, _) => Scheduler.AddOnce(updateVisibility), true);
  }
 
  public SelectionBox CreateSelectionBox()

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
@@ -20,6 +20,7 @@
  <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeObjectCreationWhenTypeNotEvident/@EntryIndexedValue">WARNING</s:String>
  <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">WARNING</s:String>
  <s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
+ <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTrailingCommaInMultilineLists/@EntryIndexedValue">DO_NOT_SHOW</s:String>
  <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">WARNING</s:String>
  <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">WARNING</s:String>
  <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=AssignedValueIsNeverUsed/@EntryIndexedValue">HINT</s:String>