h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-11 17:52:56 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-screen-offsetting-on-scaling

Browse Source
This commit is contained in:
Dean Herbert 2021-08-22 02:28:06 +09:00 committed by GitHub
commit 77f3668751
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -110,15 +110,15 @@ namespace osu.Game.Overlays.Chat
EdgeEffect = new EdgeEffectParameters EdgeEffect = new EdgeEffectParameters
{ {
Roundness = 1, Roundness = 1,
Offset = new Vector2(0, 3), Radius = 1,
Radius = 3,
Colour = Color4.Black.Opacity(0.3f), Colour = Color4.Black.Opacity(0.3f),
Offset = new Vector2(0, 1),
Type = EdgeEffectType.Shadow, Type = EdgeEffectType.Shadow,
}, },
Child = new Container Child = new Container
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Y = 3, Y = 0,
Masking = true, Masking = true,
CornerRadius = 4, CornerRadius = 4,
Children = new Drawable[] Children = new Drawable[]

3
osu.Game/Overlays/Settings/SettingsSection.cs
View File

@ -47,7 +47,6 @@ namespace osu.Game.Overlays.Settings
protected SettingsSection() protected SettingsSection()
{ {
Margin = new MarginPadding { Top = margin };
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
@ -80,7 +79,7 @@ namespace osu.Game.Overlays.Settings
Padding = new MarginPadding Padding = new MarginPadding
{ {
Top = margin + border_size, Top = margin + border_size,
Bottom = 10, Bottom = margin + 10,
}, },
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,

3
osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osu.Game.Screens.OnlinePlay.Match.Components; using osu.Game.Screens.OnlinePlay.Match.Components;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
@ -38,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
Textbox.FocusLost = () => expandedFromTextboxFocus.Value = false; Textbox.FocusLost = () => expandedFromTextboxFocus.Value = false;
} }
protected override bool OnHover(HoverEvent e) => true; // use UI mouse cursor.
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();