Skip to content

Commit

Permalink
FileManager+
Browse files Browse the repository at this point in the history
  • Loading branch information
@HeBianGu
HeBianGu committed Jan 5, 2024
1 parent a4fbd40 commit cdd54ae
Show file tree
Hide file tree
Showing 7 changed files with 1,020 additions and 6 deletions.
Binary file added Document/logo.ico
View file
Binary file not shown.
9 changes: 8 additions & 1 deletion Solution/WPF-Control.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.Controls.PagerBox", "..\S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.Controls.Vlc", "..\Source\Controls\H.Controls.Vlc\H.Controls.Vlc.csproj", "{74F3C541-19E8-47D3-9DDE-A1514F7EBF77}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "H.Extensions.Torrent", "..\Source\Extensions\H.Extensions.Torrent\H.Extensions.Torrent.csproj", "{E2AD6EAF-12F7-4A85-AF3E-5AB4370902B2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "H.Extensions.Torrent", "..\Source\Extensions\H.Extensions.Torrent\H.Extensions.Torrent.csproj", "{E2AD6EAF-12F7-4A85-AF3E-5AB4370902B2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6 - Setup", "6 - Setup", "{B78841F3-C873-4D2A-9F5C-B126AC59EFA1}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "H.Setup.FileManager", "..\Source\Setup\H.Setup.FileManager\H.Setup.FileManager.vdproj", "{2FBCB7DF-4468-4F58-ACF4-1CB5C7F12259}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -703,6 +707,8 @@ Global
{E2AD6EAF-12F7-4A85-AF3E-5AB4370902B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2AD6EAF-12F7-4A85-AF3E-5AB4370902B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2AD6EAF-12F7-4A85-AF3E-5AB4370902B2}.Release|Any CPU.Build.0 = Release|Any CPU
{2FBCB7DF-4468-4F58-ACF4-1CB5C7F12259}.Debug|Any CPU.ActiveCfg = Release
{2FBCB7DF-4468-4F58-ACF4-1CB5C7F12259}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -821,6 +827,7 @@ Global
{5566DBA0-F492-4EC0-A199-079933407BDC} = {9E63ED70-6F96-4CB2-8B9D-EAEC77D0548E}
{74F3C541-19E8-47D3-9DDE-A1514F7EBF77} = {9E63ED70-6F96-4CB2-8B9D-EAEC77D0548E}
{E2AD6EAF-12F7-4A85-AF3E-5AB4370902B2} = {09F8FD00-E76A-4D72-AAB4-7FA06DBE12D4}
{2FBCB7DF-4468-4F58-ACF4-1CB5C7F12259} = {B78841F3-C873-4D2A-9F5C-B126AC59EFA1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DF825C3D-F4F4-4E62-BBFF-B42A5E81112F}
Expand Down
10 changes: 10 additions & 0 deletions Source/App/H.App.FileManager/H.App.FileManager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<UseWPF>true</UseWPF>
<ApplicationIcon>logo.ico</ApplicationIcon>
<Product>H文件管理器</Product>
<Description>电脑文件管理器：收藏、评分、标签，图片、视频等</Description>
<AssemblyVersion>1.0.0</AssemblyVersion>
<FileVersion>1.0.0</FileVersion>
<Copyright>Copyright © HeBianGu 2024-2024</Copyright>
<Authors></Authors>
<PackageProjectUrl>https://github.com/HeBianGu</PackageProjectUrl>
<Title>H文件管理器</Title>
<Version>1.0.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion Source/App/H.App.FileManager/Presenter/ImageView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,16 @@
TargetObject="{Binding ElementName=zoomview}" />
</h:MouseTrigger>
</b:Interaction.Triggers>
<Image Source="{Binding Model.Url}">
<Image Source="{Binding Model.Url, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="SourceUpdated">
<h:CallMethodActionEx MethodName="FitToBounds"
TargetObject="{Binding ElementName=zoomview}" />
</b:EventTrigger>
<b:EventTrigger EventName="TargetUpdated">
<h:CallMethodActionEx MethodName="FitToBounds"
TargetObject="{Binding ElementName=zoomview}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</Image>
</h:Zoombox>
Expand Down
10 changes: 9 additions & 1 deletion Source/App/H.App.FileManager/Presenter/VideoView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,20 @@
VerticalAlignment="Center"
Cattach.BottomTemplate="{x:Null}"
UseAutoPlayOnVedioSource="False"
VedioSource="{Binding Model.Url}">
VedioSource="{Binding Model.Url, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}">
<b:Interaction.Triggers>
<b:EventTrigger EventName="ShootCut">
<b:InvokeCommandAction Command="{Binding ShootCutCommand}"
PassEventArgsToCommand="True" />
</b:EventTrigger>
<b:EventTrigger EventName="SourceUpdated">
<h:CallMethodActionEx MethodName="FitToBounds"
TargetObject="{Binding ElementName=zoomview}" />
</b:EventTrigger>
<b:EventTrigger EventName="TargetUpdated">
<h:CallMethodActionEx MethodName="FitToBounds"
TargetObject="{Binding ElementName=zoomview}" />
</b:EventTrigger>
</b:Interaction.Triggers>
</h:VlcPlayer>
</h:Zoombox>
Expand Down
7 changes: 4 additions & 3 deletions Source/Controls/H.Controls.ZoomBox/Zoombox.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2569,8 +2569,9 @@ private void SetScrollBars()
{
if (_content == null || _verticalScrollBar == null || _horizontalScrollBar == null)
return;

Size contentSize = (_content is Viewbox) ? ((Viewbox)_content).Child.DesiredSize : this.RenderSize;
Size contentSize = this.RenderSize;
if (_content is Viewbox viewbox && viewbox.Child != null)
contentSize = viewbox.Child.DesiredSize;

_verticalScrollBar.SmallChange = 10d;
_verticalScrollBar.LargeChange = 10d;
Expand Down Expand Up @@ -3012,7 +3013,7 @@ private void UpdateView(ZoomboxView view, bool allowAnimation, bool allowStackAd

_contentPresenter.RenderTransform = tg;

Size initialContentSize = (_content is Viewbox) && ((Viewbox)_content).Child!= null ? ((Viewbox)_content).Child.DesiredSize : this.RenderSize;
Size initialContentSize = (_content is Viewbox) && ((Viewbox)_content).Child != null ? ((Viewbox)_content).Child.DesiredSize : this.RenderSize;
Size scaledContentSize = new Size(initialContentSize.Width * newRelativeScale, initialContentSize.Height * newRelativeScale);

if (allowAnimation && IsAnimated)
Expand Down
Loading

0 comments on commit cdd54ae

Please sign in to comment.