sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'general-fixes' into beatmap_framework

Browse Source 
Conflicts:
	osu-framework
This commit is contained in:
Dean Herbert
2016-09-11 02:24:15 +09:00
parent 753a67fb3d 842fb1892f
commit b6bbea392b
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Graphics/Processing/RatioAdjust.cs
View File

@ -12,8 +12,8 @@ namespace osu.Game.Graphics.Processing
protected override void Update()
{
base.Update();
Scale = Parent.ActualSize.Y / 768f;
Size = new Vector2(1 / Scale);
Scale = new Vector2(Parent.ActualSize.Y / 768f);
Size = new Vector2(1 / Scale.X);
}
}
}

2
osu.Game/Graphics/UserInterface/TextBox.cs
View File

@ -70,8 +70,8 @@ namespace osu.Game.Graphics.UserInterface
SizeMode = InheritMode.Y,
Alpha = 0
};
TextContainer.Add(cursor);
TextContainer.Add(cursor);
TextContainer.Add(textFlow);
}