Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-25 05:58:35 +01:00
Code Issues Projects Releases Wiki Activity

updated dependencies

Browse source
This commit is contained in:
Ellpeck 2020-06-13 03:19:20 +02:00
parent 0a8a3c3660
commit 0ea22435c2
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Demos.Android/Demos.Android.csproj
View file

@ -69,10 +69,10 @@
<None Include="Properties\AndroidManifest.xml" /> <None Include="Properties\AndroidManifest.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Coroutine" Version="1.0.3" /> <PackageReference Include="Coroutine" Version="2.0.0" />
<PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.9" /> <PackageReference Include="MonoGame.Content.Builder" Version="3.7.0.9" />
<PackageReference Include="MonoGame.Framework.Android" Version="3.7.1.189" /> <PackageReference Include="MonoGame.Framework.Android" Version="3.7.1.189" />
<PackageReference Include="TextCopy" Version="3.0.2" /> <PackageReference Include="TextCopy" Version="4.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Demos\Demos.csproj"> <ProjectReference Include="..\Demos\Demos.csproj">

8
Demos/UiDemo.cs
View file

@ -203,7 +203,7 @@ namespace Demos {
// This method is used by the wobbling button (see above) // This method is used by the wobbling button (see above)
// Note that this particular example makes use of the Coroutine package, which is not required but makes demonstration easier // Note that this particular example makes use of the Coroutine package, which is not required but makes demonstration easier
private IEnumerator<IWait> WobbleButton(CustomDrawGroup group) { private IEnumerator<Wait> WobbleButton(CustomDrawGroup group) {
var counter = 0F; var counter = 0F;
while (counter < 4 * Math.PI) { while (counter < 4 * Math.PI) {
// A custom draw group allows the implementation of any sort of custom rendering for all of its child components // A custom draw group allows the implementation of any sort of custom rendering for all of its child components
@ -214,12 +214,12 @@ namespace Demos {
// be a great way to accomplish feedback animations for buttons and so on. // be a great way to accomplish feedback animations for buttons and so on.
group.Transform = Matrix.CreateTranslation((float) Math.Sin(counter / 2) * 10 * group.Scale, 0, 0); group.Transform = Matrix.CreateTranslation((float) Math.Sin(counter / 2) * 10 * group.Scale, 0, 0);
counter += 0.1F; counter += 0.1F;
yield return new WaitSeconds(0.01F); yield return new Wait(0.01F);
} }
group.Transform = Matrix.Identity; group.Transform = Matrix.Identity;
} }
private IEnumerator<IWait> WobbleProgressBar(ProgressBar bar) { private IEnumerator<Wait> WobbleProgressBar(ProgressBar bar) {
var reducing = false; var reducing = false;
while (bar.Root != null) { while (bar.Root != null) {
if (reducing) { if (reducing) {
@ -231,7 +231,7 @@ namespace Demos {
if (bar.CurrentValue >= bar.MaxValue) if (bar.CurrentValue >= bar.MaxValue)
reducing = true; reducing = true;
} }
yield return new WaitSeconds(0.01F); yield return new Wait(0.01F);
} }
} }

2
MLEM.Startup/MLEM.Startup.csproj
View file

@ -16,7 +16,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Coroutine" Version="1.0.3" /> <PackageReference Include="Coroutine" Version="2.0.0" />
<PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189"> <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

2
MLEM.Templates/content/MLEM.Templates.DesktopGL/TemplateNamespace.csproj
View file

@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Contentless" Version="2.0.*" /> <PackageReference Include="Contentless" Version="2.0.*" />
<PackageReference Include="MLEM.Startup" Version="3.3.*" /> <PackageReference Include="MLEM.Startup" Version="4.0.*" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1375-develop" /> <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.0.1375-develop" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1375-develop" /> <PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.0.1375-develop" />
</ItemGroup> </ItemGroup>

2
MLEM.Templates/content/MLEM.Templates.Portable/TemplateNamespace.csproj
View file

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MLEM.Startup" Version="3.3.*" /> <PackageReference Include="MLEM.Startup" Version="4.0.*" />
<PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189"> <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

4
MLEM.Ui/Elements/TextField.cs
View file

@ -210,12 +210,12 @@ namespace MLEM.Ui.Elements {
this.CaretPos = this.text.Length; this.CaretPos = this.text.Length;
} else if (this.Input.IsModifierKeyDown(ModifierKey.Control)) { } else if (this.Input.IsModifierKeyDown(ModifierKey.Control)) {
if (this.Input.IsKeyPressed(Keys.V)) { if (this.Input.IsKeyPressed(Keys.V)) {
var clip = Clipboard.GetText(); var clip = ClipboardService.GetText();
if (clip != null) if (clip != null)
this.InsertText(clip); this.InsertText(clip);
} else if (this.Input.IsKeyPressed(Keys.C)) { } else if (this.Input.IsKeyPressed(Keys.C)) {
// until there is text selection, just copy the whole content // until there is text selection, just copy the whole content
Clipboard.SetText(this.Text); ClipboardService.SetText(this.Text);
} }
} }

2
MLEM.Ui/MLEM.Ui.csproj
View file

@ -18,7 +18,7 @@
<PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189"> <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="TextCopy" Version="3.0.2" /> <PackageReference Include="TextCopy" Version="4.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>