From 150ed01c627e49e00a75f8c7b3a8a68e0bfea424 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 May 2021 15:22:55 +0300
Subject: [PATCH] Make NewsSidebar scrollable

---
 osu.Game/Overlays/News/Sidebar/NewsSidebar.cs | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
index d14ad90ef4..9e397e78c8 100644
--- a/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
+++ b/osu.Game/Overlays/News/Sidebar/NewsSidebar.cs
@@ -9,6 +9,7 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.Shapes;
 using osuTK;
 using System.Linq;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.News.Sidebar
 {
@@ -31,30 +32,55 @@ namespace osu.Game.Overlays.News.Sidebar
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background4
                 },
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Y,
+                    Width = OsuScrollContainer.SCROLL_BAR_HEIGHT,
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Colour = colourProvider.Background3,
+                    Alpha = 0.5f
+                },
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding
+                    Padding = new MarginPadding { Right = -3 }, // Compensate for scrollbar margin
+                    Child = new OsuScrollContainer
                     {
-                        Vertical = 20,
-                        Left = 50,
-                        Right = 30
-                    },
-                    Child = new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Spacing = new Vector2(0, 20),
-                        Children = new Drawable[]
+                        RelativeSizeAxes = Axes.Both,
+                        Child = new Container
                         {
-                            new YearsPanel(),
-                            monthsFlow = new FillFlowContainer<MonthSection>
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding { Right = 3 }, // Addeded 3px back
+                            Child = new Container
                             {
-                                AutoSizeAxes = Axes.Y,
                                 RelativeSizeAxes = Axes.X,
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(0, 10)
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding
+                                {
+                                    Vertical = 20,
+                                    Left = 50,
+                                    Right = 30
+                                },
+                                Child = new FillFlowContainer
+                                {
+                                    Direction = FillDirection.Vertical,
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Spacing = new Vector2(0, 20),
+                                    Children = new Drawable[]
+                                    {
+                                        new YearsPanel(),
+                                        monthsFlow = new FillFlowContainer<MonthSection>
+                                        {
+                                            AutoSizeAxes = Axes.Y,
+                                            RelativeSizeAxes = Axes.X,
+                                            Direction = FillDirection.Vertical,
+                                            Spacing = new Vector2(0, 10)
+                                        }
+                                    }
+                                }
                             }
                         }
                     }