Skip to content

Commit 7a09227

Browse files
author
abadgirlnoa
committed
添加:全屏提示窗口图片控件支持gif格式动图
1 parent 4254037 commit 7a09227

4 files changed

Lines changed: 35 additions & 6 deletions

File tree

src/Local/Project1.UI/Themes/Project1UIDesignItem.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
Visibility="{TemplateBinding ImageInputVisibility}"/>
183183
<controls:Project1UIInput
184184
Type="FileSelect"
185-
ExtNames="jpg|*.jpg|png|*.png"
185+
ExtNames="jpg|*.jpg|png|*.png|gif|*.gif"
186186
x:Name="a123"
187187
Width="auto"
188188
Height="25"

src/Local/ProjectEye/ProjectEye.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,9 @@
468468
<PackageReference Include="System.Data.SQLite.Linq">
469469
<Version>1.0.112.1</Version>
470470
</PackageReference>
471+
<PackageReference Include="WpfAnimatedGif">
472+
<Version>2.0.0</Version>
473+
</PackageReference>
471474
</ItemGroup>
472475
<ItemGroup>
473476
<Resource Include="FodyWeavers.xml" />

src/Local/ProjectEye/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,5 @@
4949
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
5050
//通过使用 "*",如下所示:
5151
// [assembly: AssemblyVersion("1.0.*")]
52-
[assembly: AssemblyVersion("1.3.5")]
52+
[assembly: AssemblyVersion("1.3.6")]
5353
[assembly: AssemblyFileVersion("1.0.0.1")]

src/Local/ProjectEye/ViewModels/TipViewModel.cs

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
using System.Windows.Documents;
1515
using System.Windows.Input;
1616
using System.Windows.Media;
17+
using System.Windows.Media.Imaging;
18+
using WpfAnimatedGif;
1719

1820
namespace ProjectEye.ViewModels
1921
{
@@ -183,17 +185,41 @@ private void CreateUI()
183185
imageElement.Height = element.Height;
184186
imageElement.Opacity = element.Opacity;
185187
imageElement.Stretch = Stretch.Fill;
188+
189+
186190
try
187191
{
188-
//imageElement.Source = new BitmapImage(new Uri(element.Image, UriKind.RelativeOrAbsolute));
189-
imageElement.Source = BitmapImager.Load(element.Image);
190-
192+
var image = new BitmapImage();
193+
image.BeginInit();
194+
image.UriSource = new Uri(element.Image, UriKind.RelativeOrAbsolute);
195+
image.EndInit();
196+
ImageBehavior.SetAnimatedSource(imageElement, image);
191197
}
192198
catch
193199
{
194200
imageElement.Source = BitmapImager.Load("pack://application:,,,/Project1.UI;component/Assets/Images/sunglasses.png");
195-
//imageElement.Source = new BitmapImage(new Uri("pack://application:,,,/Project1.UI;component/Assets/Images/sunglasses.png", UriKind.RelativeOrAbsolute));
201+
196202
}
203+
204+
//var imageElement = new Image();
205+
//imageElement.HorizontalAlignment = HorizontalAlignment.Left;
206+
//imageElement.VerticalAlignment = VerticalAlignment.Top;
207+
//imageElement.RenderTransform = ttf;
208+
//imageElement.Width = element.Width;
209+
//imageElement.Height = element.Height;
210+
//imageElement.Opacity = element.Opacity;
211+
//imageElement.Stretch = Stretch.Fill;
212+
//try
213+
//{
214+
// //imageElement.Source = new BitmapImage(new Uri(element.Image, UriKind.RelativeOrAbsolute));
215+
// imageElement.Source = BitmapImager.Load(element.Image);
216+
217+
//}
218+
//catch
219+
//{
220+
// imageElement.Source = BitmapImager.Load("pack://application:,,,/Project1.UI;component/Assets/Images/sunglasses.png");
221+
// //imageElement.Source = new BitmapImage(new Uri("pack://application:,,,/Project1.UI;component/Assets/Images/sunglasses.png", UriKind.RelativeOrAbsolute));
222+
//}
197223
container.Children.Add(imageElement);
198224
break;
199225
}

0 commit comments

Comments
 (0)