upgrade eto *properly*

pull/30/head
Miepee 5 years ago
parent c65e2ba085
commit 8b3623ae07

@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Eto.Platform.Gtk" Version="2.5.11" /> <PackageReference Include="Eto.Platform.Gtk" Version="2.6.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

@ -33,7 +33,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Eto.Platform.Windows" Version="2.5.11" /> <PackageReference Include="Eto.Platform.Windows" Version="2.6.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

@ -73,6 +73,7 @@ namespace Pablo.Controls
} }
using (var bd = disabledImage.Lock()) using (var bd = disabledImage.Lock())
{ {
unsafe unsafe
{ {
var data = (int*)bd.Data; var data = (int*)bd.Data;

@ -636,7 +636,7 @@ namespace AM2RLauncher
settingsLayout.BeginHorizontal(); settingsLayout.BeginHorizontal();
settingsLayout.AddSpace(); settingsLayout.AddSpace();
settingsLayout.AddColumn(null, languageLabel, languageDropDown, autoUpdateAM2RCheck, autoUpdateLauncherCheck, hqMusicPCCheck, hqMusicAndroidCheck, (Control)profileDebugLogCheck ?? new Label(), customEnvVarLabel, (Control)customEnvVarTextBox ?? new Label(), mirrorLabel, mirrorDropDown, customMirrorCheck, customMirrorTextBox, null); settingsLayout.AddColumn(null, languageLabel, languageDropDown, autoUpdateAM2RCheck, autoUpdateLauncherCheck, hqMusicPCCheck, hqMusicAndroidCheck, profileDebugLogCheck, customEnvVarLabel, (Control)customEnvVarTextBox ?? new Label(), mirrorLabel, mirrorDropDown, customMirrorCheck, customMirrorTextBox, null);
settingsLayout.AddSpace(); settingsLayout.AddSpace();
TabPage settingsPage = new TabPage TabPage settingsPage = new TabPage

Loading…
Cancel
Save