Merge branch 'master' into score-recalc

osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs

@@ -103,6 +103,8 @@ namespace osu.Game.Graphics.Containers
         {
         }
 
+        private bool playedPopInSound;
+
         protected override void UpdateState(ValueChangedEvent<Visibility> state)
         {
             switch (state.NewValue)
@@ -110,16 +112,24 @@ namespace osu.Game.Graphics.Containers
                 case Visibility.Visible:
                     if (OverlayActivationMode.Value == OverlayActivation.Disabled)
                     {
+                        // todo: visual/audible feedback that this operation could not complete.
                         State.Value = Visibility.Hidden;
                         return;
                     }
 
                     samplePopIn?.Play();
+                    playedPopInSound = true;
+
                     if (BlockScreenWideMouse && DimMainContent) game?.AddBlockingOverlay(this);
                     break;
 
                 case Visibility.Hidden:
-                    samplePopOut?.Play();
+                    if (playedPopInSound)
+                    {
+                        samplePopOut?.Play();
+                        playedPopInSound = false;
+                    }
+
                     if (BlockScreenWideMouse) game?.RemoveBlockingOverlay(this);
                     break;
             }

osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs

@@ -12,13 +12,13 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Whether any item is currently being dragged. Used to hide other items' drag handles.
         /// </summary>
-        private readonly BindableBool playlistDragActive = new BindableBool();
+        protected readonly BindableBool DragActive = new BindableBool();
 
         protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
 
         protected sealed override RearrangeableListItem<TModel> CreateDrawable(TModel item) => CreateOsuDrawable(item).With(d =>
         {
-            d.PlaylistDragActive.BindTo(playlistDragActive);
+            d.DragActive.BindTo(DragActive);
         });
 
         protected abstract OsuRearrangeableListItem<TModel> CreateOsuDrawable(TModel item);

osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Whether any item is currently being dragged. Used to hide other items' drag handles.
         /// </summary>
-        public readonly BindableBool PlaylistDragActive = new BindableBool();
+        public readonly BindableBool DragActive = new BindableBool();
 
         private Color4 handleColour = Color4.White;
 
@@ -44,8 +44,9 @@ namespace osu.Game.Graphics.Containers
         /// <summary>
         /// Whether the drag handle should be shown.
         /// </summary>
-        protected virtual bool ShowDragHandle => true;
+        protected readonly Bindable<bool> ShowDragHandle = new Bindable<bool>();
 
+        private Container handleContainer;
         private PlaylistItemHandle handle;
 
         protected OsuRearrangeableListItem(TModel item)
@@ -58,8 +59,6 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader]
         private void load()
         {
-            Container handleContainer;
-
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -88,9 +87,12 @@ namespace osu.Game.Graphics.Containers
                 ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
                 RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
             };
+        }
 
-            if (!ShowDragHandle)
-                handleContainer.Alpha = 0;
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            ShowDragHandle.BindValueChanged(show => handleContainer.Alpha = show.NewValue ? 1 : 0, true);
         }
 
         protected override bool OnDragStart(DragStartEvent e)
@@ -98,13 +100,13 @@ namespace osu.Game.Graphics.Containers
             if (!base.OnDragStart(e))
                 return false;
 
-            PlaylistDragActive.Value = true;
+            DragActive.Value = true;
             return true;
         }
 
         protected override void OnDragEnd(DragEndEvent e)
         {
-            PlaylistDragActive.Value = false;
+            DragActive.Value = false;
             base.OnDragEnd(e);
         }
 
@@ -112,7 +114,7 @@ namespace osu.Game.Graphics.Containers
 
         protected override bool OnHover(HoverEvent e)
         {
-            handle.UpdateHoverState(IsDragged || !PlaylistDragActive.Value);
+            handle.UpdateHoverState(IsDragged || !DragActive.Value);
             return base.OnHover(e);
         }
 

osu.Game/Graphics/UserInterface/IconButton.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 iconColour = value;
-                icon.Colour = value;
+                icon.FadeColour(value);
             }
         }
 

osu.Game/Graphics/UserInterface/OsuContextMenu.cs

@@ -26,6 +26,8 @@ namespace osu.Game.Graphics.UserInterface
             };
 
             ItemsContainer.Padding = new MarginPadding { Vertical = DrawableOsuMenuItem.MARGIN_VERTICAL };
+
+            MaxHeight = 250;
         }
 
         [BackgroundDependencyLoader]