maker/UVtools
1
0
Fork 0
mirror of https://github.com/riegera2412/UVtools.git synced 2026-07-09 01:52:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update MSI

Browse Source
This commit is contained in:
Tiago Conceição
2021-02-13 00:07:08 +00:00
parent 9a147e7909
commit a78703662e
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UVtools.InstallerMM/UVtools.InstallerMM.wxs
+2 -2
View File
@@ -308,8 +308,8 @@
<Component Id="owc6F31DEF09608AA645959666A4CB7FBBC" Guid="c94570a5-5bb4-a53f-e12f-9581bddf7d08">
<File Id="owf6F31DEF09608AA645959666A4CB7FBBC" Source="$(var.SourceDir)\mscordaccore.dll" KeyPath="yes" />
</Component>
<Component Id="owc27CF4546F4DEAC5C518305F4CBCBDE8B" Guid="42759aa9-bc58-023f-e7d6-454e105a1d3c">
<File Id="owf27CF4546F4DEAC5C518305F4CBCBDE8B" Source="$(var.SourceDir)\mscordaccore_amd64_amd64_5.0.120.57516.dll" KeyPath="yes" />
<Component Id="owc5F30043C81E98C2C1081E2D19E5EAF68" Guid="ca7139c0-9e2b-1afb-deec-76a162d7b807">
<File Id="owf5F30043C81E98C2C1081E2D19E5EAF68" Source="$(var.SourceDir)\mscordaccore_amd64_amd64_5.0.321.7212.dll" KeyPath="yes" />
</Component>
<Component Id="owc5FC34571A1AE47A011FC6C2A95B00DA6" Guid="2591451e-0fe5-ccad-abf6-1d1097251253">
<File Id="owf5FC34571A1AE47A011FC6C2A95B00DA6" Source="$(var.SourceDir)\mscordbi.dll" KeyPath="yes" />
UVtools.WPF/Windows/ToolWindow.axaml.cs
+4 -7
View File
@@ -542,13 +542,6 @@ namespace UVtools.WPF.Windows
ExpanderHeaderMaxWidth = DescriptionMaxWidth - 40;
Height = MaxHeight;
Position = new PixelPoint(
(int)(App.MainWindow.Position.X + App.MainWindow.Width / 2 - Width / 2),
App.MainWindow.Position.Y + 20
);
DispatcherTimer.Run(() =>
{
if (Math.Max((int)_contentScrollViewer.Extent.Height - (int)_contentScrollViewer.Viewport.Height, 0) == 0)
@@ -556,6 +549,10 @@ namespace UVtools.WPF.Windows
Height = 10;
SizeToContent = SizeToContent.WidthAndHeight;
}
Position = new PixelPoint(
(int)(App.MainWindow.Position.X + App.MainWindow.Width / 2 - Width / 2),
App.MainWindow.Position.Y + 20
);
return false;
}, TimeSpan.FromMilliseconds(2));