A game framework written with osu! in mind.
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Move custom visuals into basic implementation

+19 -6
+1 -1
osu.Framework/Graphics/Containers/BasicScrollContainer.cs
··· 24 24 25 25 protected override ScrollbarContainer CreateScrollbar(Direction direction) => new BasicScrollbar(direction); 26 26 27 - protected class BasicScrollbar : ScrollbarContainer 27 + protected internal class BasicScrollbar : ScrollbarContainer 28 28 { 29 29 private const float dim_size = 8; 30 30
+3 -5
osu.Framework/Graphics/Containers/RearrangeableListContainer.cs
··· 96 96 /// <summary> 97 97 /// Creates the <see cref="ListScrollContainer"/> for the list of items. 98 98 /// </summary> 99 - protected virtual ListScrollContainer CreateListScrollContainer(ListFillFlowContainer flowContainer) => new ListScrollContainer(flowContainer); 99 + protected abstract ListScrollContainer CreateListScrollContainer(ListFillFlowContainer flowContainer); 100 100 101 101 /// <summary> 102 102 /// Creates the <see cref="Drawable"/> representation of an item. ··· 107 107 108 108 #region ListScrollContainer 109 109 110 - protected class ListScrollContainer : BasicScrollContainer<ListFillFlowContainer> 110 + protected abstract class ListScrollContainer : ScrollContainer<ListFillFlowContainer> 111 111 { 112 112 private const float scroll_trigger_distance = 10; 113 113 private const double max_power = 50; ··· 115 115 private bool autoScrolling; 116 116 private double scrollSpeed; 117 117 118 - public ListScrollContainer(ListFillFlowContainer flowContainer) 118 + protected ListScrollContainer(ListFillFlowContainer flowContainer) 119 119 { 120 120 RelativeSizeAxes = Axes.Both; 121 - ScrollbarOverlapsContent = false; 122 - Padding = new MarginPadding(5); 123 121 124 122 Child = flowContainer.With(d => 125 123 {
+15
osu.Framework/Graphics/UserInterface/BasicRearrangeableListContainer.cs
··· 18 18 19 19 public bool ShowRemoveButton = true; 20 20 21 + protected override ListScrollContainer CreateListScrollContainer(ListFillFlowContainer flowContainer) => new BasicListScrollContainer(flowContainer); 22 + 21 23 protected override DrawableRearrangeableListItem CreateDrawable(BasicRearrangeableItem item) => new BasicDrawableRearrangeableListItem(item) 22 24 { 23 25 UseDragHandle = UseDragHandle, 24 26 ShowRemoveButton = ShowRemoveButton, 25 27 }; 28 + 29 + protected class BasicListScrollContainer : ListScrollContainer 30 + { 31 + public BasicListScrollContainer(ListFillFlowContainer flowContainer) 32 + : base(flowContainer) 33 + { 34 + ScrollbarOverlapsContent = false; 35 + Padding = new MarginPadding(5); 36 + } 37 + 38 + // Todo: This isn't good. 39 + protected override ScrollbarContainer CreateScrollbar(Direction direction) => new BasicScrollContainer<ListFillFlowContainer>.BasicScrollbar(direction); 40 + } 26 41 27 42 public class BasicDrawableRearrangeableListItem : DrawableRearrangeableListItem 28 43 {