Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commiteb52b0f

Browse files
authored
添加booru支持 (#733)
* import imouto* 添加booru支持* 简化图片帧大小计算* 添加tab图* 释放ZoomableImage* 优化作品信息页面
1 parent9bd0437 commiteb52b0f

File tree

60 files changed

+474
-573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+474
-573
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "src/Mako"]
22
path=src/Mako
33
url=https://github.com/Pixeval/Mako.git
4+
[submodule "src/Imouto"]
5+
path=src/Imouto
6+
url=https://github.com/Pixeval/Imouto.git

‎Pixeval.sln

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio Version 17
43
VisualStudioVersion =17.0.31808.319
@@ -52,9 +51,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mako", "src\Mako\Mako\Mako.
5251
EndProject
5352
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="Mako.SourceGen","src\Mako\Mako.SourceGen\Mako.SourceGen.csproj","{95ED5199-BCAA-28FB-CA2E-DA7045372C67}"
5453
EndProject
55-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="Misaki","src\Mako\Misaki\Misaki\Misaki.csproj","{2EFAF198-50C1-E7E5-0318-BAEB05704636}"
54+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="CoreApi","CoreApi","{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
5655
EndProject
57-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Mako","Mako","{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
56+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="Imouto.BooruParser","src\Imouto\Imouto.BooruParser\Imouto.BooruParser.csproj","{4E8C12D3-007F-B270-CB87-E7BA873E5739}"
5857
EndProject
5958
Global
6059
GlobalSection(SolutionConfigurationPlatforms) =preSolution
@@ -156,18 +155,18 @@ Global
156155
{95ED5199-BCAA-28FB-CA2E-DA7045372C67}.Release|x64.Build.0=Release|Any CPU
157156
{95ED5199-BCAA-28FB-CA2E-DA7045372C67}.Release|x86.ActiveCfg=Release|Any CPU
158157
{95ED5199-BCAA-28FB-CA2E-DA7045372C67}.Release|x86.Build.0=Release|Any CPU
159-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Debug|arm64.ActiveCfg=Debug|Any CPU
160-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Debug|arm64.Build.0=Debug|Any CPU
161-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Debug|x64.ActiveCfg=Debug|Any CPU
162-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Debug|x64.Build.0=Debug|Any CPU
163-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Debug|x86.ActiveCfg=Debug|Any CPU
164-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Debug|x86.Build.0=Debug|Any CPU
165-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Release|arm64.ActiveCfg=Release|Any CPU
166-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Release|arm64.Build.0=Release|Any CPU
167-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Release|x64.ActiveCfg=Release|Any CPU
168-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Release|x64.Build.0=Release|Any CPU
169-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Release|x86.ActiveCfg=Release|Any CPU
170-
{2EFAF198-50C1-E7E5-0318-BAEB05704636}.Release|x86.Build.0=Release|Any CPU
158+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Debug|arm64.ActiveCfg=Debug|Any CPU
159+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Debug|arm64.Build.0=Debug|Any CPU
160+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Debug|x64.ActiveCfg=Debug|Any CPU
161+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Debug|x64.Build.0=Debug|Any CPU
162+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Debug|x86.ActiveCfg=Debug|Any CPU
163+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Debug|x86.Build.0=Debug|Any CPU
164+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Release|arm64.ActiveCfg=Release|Any CPU
165+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Release|arm64.Build.0=Release|Any CPU
166+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Release|x64.ActiveCfg=Release|Any CPU
167+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Release|x64.Build.0=Release|Any CPU
168+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Release|x86.ActiveCfg=Release|Any CPU
169+
{4E8C12D3-007F-B270-CB87-E7BA873E5739}.Release|x86.Build.0=Release|Any CPU
171170
EndGlobalSection
172171
GlobalSection(SolutionProperties) =preSolution
173172
HideSolutionNode =FALSE
@@ -178,7 +177,7 @@ Global
178177
{BE94830A-603A-4C95-9FAC-1B69CE8ABA47} ={1663D266-BE8A-4035-BE44-AB6D2BAFE62A}
179178
{11FDCB3F-2117-6C52-B102-4FA79F891494} ={02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
180179
{95ED5199-BCAA-28FB-CA2E-DA7045372C67} ={02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
181-
{2EFAF198-50C1-E7E5-0318-BAEB05704636} ={02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
180+
{4E8C12D3-007F-B270-CB87-E7BA873E5739} ={02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
182181
EndGlobalSection
183182
GlobalSection(ExtensibilityGlobals) =postSolution
184183
SolutionGuid ={C5C0040E-8F07-4F3A-A4D8-AE760A819615}

‎nuget.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<clear></clear>
55
<addkey="NuGet official package source"value="https://api.nuget.org/v3/index.json" />
66
<addkey="CommunityToolkit-Labs"value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
77
<!--<add key="Pixeval.Extensions" value="C:\WorkSpace\Pixeval.Extensions\src\output" />-->
8+
<addkey="Misaki"value="C:\WorkSpace\Misaki\Misaki\bin\Release\" />
89
</packageSources>
910
</configuration>

‎src/Imouto

SubmoduleImouto added at9a63e02

‎src/Mako

‎src/Pixeval.Controls/AdvancedItemsView/AdvancedItemsView.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,17 +292,17 @@ private void ScrollView_PointerWheelChanged(object sender, PointerRoutedEventArg
292292
}
293293
else
294294
{
295-
varrate=currentPoint.Properties.MouseWheelDelta*ScrollRate;
295+
varrate=currentPoint.Properties.MouseWheelDelta*2*(ScrollRateis0?5:ScrollRate);
296296
_=scrollViewswitch
297297
{
298298
{
299299
ComputedVerticalScrollMode:ScrollingScrollMode.Disabled,
300300
ComputedHorizontalScrollMode:ScrollingScrollMode.Enabled
301-
}=>scrollView.AddScrollVelocity(new(-rate,0),new(0.99f)),
301+
}=>scrollView.AddScrollVelocity(new(-rate,0),new(0.999f)),
302302
{
303303
ComputedVerticalScrollMode:ScrollingScrollMode.Enabled,
304304
ComputedHorizontalScrollMode:ScrollingScrollMode.Disabled
305-
}=>scrollView.AddScrollVelocity(new(0,-rate),new(0.99f)),
305+
}=>scrollView.AddScrollVelocity(new(0,-rate),new(0.999f)),
306306
_=>0
307307
};
308308
}

‎src/Pixeval.Controls/C.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
usingSystem;
55
usingSystem.Collections;
6+
usingSystem.Collections.Generic;
67
usingSystem.Globalization;
78
usingSystem.Linq;
89
usingSystem.Runtime.CompilerServices;
@@ -45,6 +46,10 @@ public static class C
4546

4647
publicstaticboolIsZeroD(doublevalue)=>value<double.Epsilon;
4748

49+
publicstaticVisibilityIsPositiveToVisibility(intvalue)=>value>0?Visibility.Visible:Visibility.Collapsed;
50+
51+
publicstaticVisibilityIsDefaultTimeOffsetToVisibility(DateTimeOffsetvalue)=>value==default?Visibility.Collapsed:Visibility.Visible;
52+
4853
publicstaticboolIsNotZero(intvalue)=>valueis not0;
4954

5055
publicstaticboolIsNotZeroL(longvalue)=>valueis not0;

‎src/Pixeval.Controls/Windowing/NavigationViewTag.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Symbol is null
5858
publicoverridestringToString()=>Header;
5959
}
6060

61-
publicsealedpartialclassNavigationViewTag<TPage>(stringheader,object?parameter=null):NavigationViewTag(header,typeof(TPage),parameter);
61+
publicpartialclassNavigationViewTag<TPage>(stringheader,object?parameter=null):NavigationViewTag(header,typeof(TPage),parameter);
6262

6363
public sealed partialclass NavigationViewTag<TPage,TParam>(stringheader,TParamparameter):NavigationViewTag(header,typeof(TPage),parameter)
6464
{

‎src/Pixeval.Controls/Windowing/TabPage.xaml.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public void AddPage(NavigationViewTag viewModel)
5353
{
5454
varframe=newFrame
5555
{
56+
// TabViewItem不在视觉树上，而Content在，加个Frame方便找到NavigationViewTag
5657
Tag=viewModel,
5758
Background=Application.Current.Resources["LayerFillColorDefaultBrush"].To<Brush>()
5859
};
@@ -66,6 +67,18 @@ public void AddPage(NavigationViewTag viewModel)
6667
Tag=viewModel,
6768
Content=frame
6869
};
70+
viewModel.PropertyChanged+=(sender,args)=>
71+
{
72+
switch(args.PropertyName)
73+
{
74+
casenameof(viewModel.Header):
75+
tabViewItem.Header=string.IsNullOrEmpty(viewModel.Header)?" ":viewModel.Header;
76+
break;
77+
casenameof(viewModel.IconSource):
78+
tabViewItem.IconSource=viewModel.IconSource??newImageIconSource{ImageSource=WindowFactory.IconImageSource};
79+
break;
80+
}
81+
};
6982
TabView.TabItems.Add(tabViewItem);
7083
TabView.SelectedItem=tabViewItem;
7184
}

‎src/Pixeval.Controls/ZoomableImage/ZoomableImage.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public void CompleteDisposal()
9797
{
9898
IsDisposed=true;
9999
CanvasControl.Draw-=CanvasControlOnDraw;
100+
CanvasControl.RemoveFromVisualTree();
100101
_token.TryCancelDispose();
101102
foreach(varframein_frames)
102103
frame.Dispose();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp