release/0.3.4.164 #7

Merged
Ray merged 2 commits from release/0.3.4.164 into master 2024-07-21 16:13:25 +00:00
5 changed files with 45 additions and 7 deletions

View File

@ -3,9 +3,12 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text.Json;
using System.Threading.Tasks;
using System.Windows.Forms;
using RokettoLaunch.Models;
using RokettoLaunch.Windows.Forms;
using RyzStudio;
using RyzStudio.Windows.Forms;
using RyzStudio.Windows.ThemedForms;
@ -513,7 +516,22 @@ namespace RokettoLaunch
this.CurrentSession.Groups = new List<TileGroupModel>();
foreach (var container in flowLayoutPanel1.Controls.OfType<RyzStudio.Windows.TileForms.TileContainer>())
{
this.CurrentSession.Groups.Add((TileGroupModel)container.Tag);
var newTag = (TileGroupModel)container.Tag;
if (newTag == null)
{
continue;
}
newTag.Items = new List<TileModel>();
foreach (var tile in container.Controls.OfType<TilePanel>())
{
tile.ModelInfo.Position = container.GetCoord(tile);
newTag.Items.Add(tile.ModelInfo);
}
this.CurrentSession.Groups.Add(newTag);
}
var result = GenericResult.Create();
@ -700,7 +718,16 @@ namespace RokettoLaunch
var model = UIControl.GetTag<TileGroupModel>(container);
model.IsExpanded = true;
await AddTileGroups(model);
try
{
var newModel = JsonSerializer.Deserialize<TileGroupModel>(JsonSerializer.Serialize(model));
await AddTileGroups(newModel);
}
catch (Exception)
{
return;
}
_fileSessionManager.HasChanged = true;
}
@ -890,11 +917,22 @@ namespace RokettoLaunch
return;
}
var newModel = new TileModel();
try
{
newModel = JsonSerializer.Deserialize<TileModel>(JsonSerializer.Serialize(tile.ModelInfo));
}
catch (Exception)
{
return;
}
var newCoord = container.GetNextCoord();
var newTile = new RokettoLaunch.Windows.Forms.TilePanel();
newTile.ContextMenuStrip = tileMenu1;
newTile.LoadInfo(tile.ModelInfo);
newTile.LoadInfo(newModel);
container.Add(newTile, newCoord.X, newCoord.Y);

Binary file not shown.

View File

@ -14,7 +14,7 @@
<Copyright>Ray Lam</Copyright>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
<Version>0.3.4.163</Version>
<Version>0.3.4.164</Version>
<EnableNETAnalyzers>False</EnableNETAnalyzers>
<PlatformTarget>x64</PlatformTarget>
<PackageIcon>icon-128.png</PackageIcon>
@ -79,8 +79,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="RyzStudio" Version="8.1.2.249" />
<PackageReference Include="RyzStudio.Windows.Forms" Version="8.1.3.614" />
<PackageReference Include="RyzStudio" Version="8.1.2.324" />
<PackageReference Include="RyzStudio.Windows.Forms" Version="8.1.3.632" />
</ItemGroup>
<ItemGroup>

View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "RokettoLaunch"
#define MyAppVersion "0.3.4.163"
#define MyAppVersion "0.3.4.164"
#define MyAppPublisher "Hi, I'm Ray"
#define MyAppURL "https://www.hiimray.co.uk/software-fizzy-launcher"
#define MyAppExeName "rokettolaunch.exe"