Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

移植 SettingsControls #771

Merged
merged 31 commits into from
Dec 12, 2023
Merged

移植 SettingsControls #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
13be488
feat: 移植 SettingsCard 1
Blinue Dec 3, 2023
587b935
feat: 移植 SettingsCard 2
Blinue Dec 3, 2023
95bee98
feat: 移植 SettingsCard 3
Blinue Dec 4, 2023
8dba6be
feat: 移植 SettingsCard 4
Blinue Dec 4, 2023
8b28a22
feat: 移植 SettingsCard 5
Blinue Dec 4, 2023
5e069ba
feat: 更多设置项迁移到新版 SettingsCard
Blinue Dec 4, 2023
4d1c68e
feat: 添加 IsEqualStateTrigger 和 IsNullStateTrigger
Blinue Dec 5, 2023
4c83669
feat: 移植 ControlSizeTrigger
Blinue Dec 6, 2023
ec44bf2
fix: 修复 SettinsCard 在程序启动时错误展示动画的问题
Blinue Dec 7, 2023
53d4aaa
fix: 修复内存泄露问题
Blinue Dec 7, 2023
8c8fb2b
Merge branch 'render-system' into settings-controls
Blinue Dec 8, 2023
a5fadae
feat: SettingsCard 不再支持宽度较窄时切换到垂直布局
Blinue Dec 9, 2023
c120e4d
Revert "feat: SettingsCard 不再支持宽度较窄时切换到垂直布局"
Blinue Dec 10, 2023
edab456
feat: 只对特定SettingsCard启用自动切换布局的功能
Blinue Dec 10, 2023
82c3d8d
UI: PageFrame 在宽度较小时减小边距
Blinue Dec 10, 2023
61b7517
UI: 使 InfoBar 和 SettingsCard 对齐
Blinue Dec 10, 2023
43669ff
feat: 添加 SettingsExpander
Blinue Dec 10, 2023
c6c43d1
feat: 移植 SettingsExpander 1
Blinue Dec 10, 2023
227cc0d
feat: 移植 SettingsExpander 2
Blinue Dec 11, 2023
46eac25
feat: 移植 SettingsExpander 3
Blinue Dec 11, 2023
fcdf987
feat: 移植 SettingsExpander 4
Blinue Dec 11, 2023
1650e97
feat: 删除旧版控件
Blinue Dec 11, 2023
f265bd9
fix: 修复缩放配置页面崩溃
Blinue Dec 11, 2023
b5568ea
feat: SettingsGroup.Title 改名为 Header
Blinue Dec 11, 2023
793b5b6
UI: 修复裁剪选项禁用状态文字颜色
Blinue Dec 12, 2023
d5abedd
refactor: 优化缩放配置页面布局
Blinue Dec 12, 2023
c63033e
UI: 修复裁剪选项
Blinue Dec 12, 2023
a1ad716
UI: 简化启动参数选项 UI
Blinue Dec 12, 2023
c51b28a
UI: 简化启动参数选项 UI
Blinue Dec 12, 2023
6efaa27
fix: 修复 SettingsExcpander.Items 中的 SettingsCard 对于鼠标点击会错误设置焦点的问题
Blinue Dec 12, 2023
2546d11
chore: 清理
Blinue Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 38 additions & 57 deletions src/Magpie.App/AboutPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,70 +125,51 @@
</StackPanel>
<local:SettingsGroup x:Uid="About_Version_UpdateSettings">
<local:SettingsCard x:Uid="About_Version_UpdateSettings_AutoCheckForUpdates">
<local:SettingsCard.Icon>
<local:SettingsCard.HeaderIcon>
<FontIcon Glyph="&#xECC5;" />
</local:SettingsCard.Icon>
<local:SettingsCard.ActionContent>
<ToggleSwitch x:Uid="ToggleSwitch"
IsOn="{x:Bind ViewModel.IsAutoCheckForUpdates, Mode=TwoWay}" />
</local:SettingsCard.ActionContent>
</local:SettingsCard.HeaderIcon>
<ToggleSwitch x:Uid="ToggleSwitch"
IsOn="{x:Bind ViewModel.IsAutoCheckForUpdates, Mode=TwoWay}" />
</local:SettingsCard>
<local:SettingsCard x:Uid="About_Version_UpdateSettings_CheckForPreviewUpdates">
<local:SettingsCard.Icon>
<local:SettingsCard.HeaderIcon>
<FontIcon Glyph="&#xED56;" />
</local:SettingsCard.Icon>
<local:SettingsCard.ActionContent>
<ToggleSwitch x:Uid="ToggleSwitch"
IsOn="{x:Bind ViewModel.IsCheckForPreviewUpdates, Mode=TwoWay}" />
</local:SettingsCard.ActionContent>
</local:SettingsCard.HeaderIcon>
<ToggleSwitch x:Uid="ToggleSwitch"
IsOn="{x:Bind ViewModel.IsCheckForPreviewUpdates, Mode=TwoWay}" />
</local:SettingsCard>
</local:SettingsGroup>
<local:SettingsGroup x:Uid="About_Feedback">
<Button MinHeight="60"
Click="BugReportButton_Click"
Style="{StaticResource SettingsCardButtonStyle}">
<local:SettingsCard x:Uid="About_Feedback_ReportBug"
Style="{StaticResource ExpanderHeaderSettingStyle}">
<local:SettingsCard.Icon>
<FontIcon Glyph="&#xEBE8;" />
</local:SettingsCard.Icon>
<local:SettingsCard.ActionContent>
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="18"
Glyph="&#xE8A7;" />
</local:SettingsCard.ActionContent>
</local:SettingsCard>
</Button>
<Button MinHeight="60"
Click="FeatureRequestButton_Click"
Style="{StaticResource SettingsCardButtonStyle}">
<local:SettingsCard x:Uid="About_Feedback_RequestFeature"
Style="{StaticResource ExpanderHeaderSettingStyle}">
<local:SettingsCard.Icon>
<FontIcon Glyph="&#xEA80;" />
</local:SettingsCard.Icon>
<local:SettingsCard.ActionContent>
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="18"
Glyph="&#xE8A7;" />
</local:SettingsCard.ActionContent>
</local:SettingsCard>
</Button>
<Button MinHeight="60"
Click="DiscussionsButton_Click"
Style="{StaticResource SettingsCardButtonStyle}">
<local:SettingsCard x:Uid="About_Feedback_Discussion"
Style="{StaticResource ExpanderHeaderSettingStyle}">
<local:SettingsCard.Icon>
<FontIcon Glyph="&#xE8F2;" />
</local:SettingsCard.Icon>
<local:SettingsCard.ActionContent>
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="18"
Glyph="&#xE8A7;" />
</local:SettingsCard.ActionContent>
</local:SettingsCard>
</Button>
<local:SettingsCard x:Uid="About_Feedback_ReportBug"
Click="BugReportButton_Click"
IsClickEnabled="True">
<local:SettingsCard.HeaderIcon>
<FontIcon Glyph="&#xEBE8;" />
</local:SettingsCard.HeaderIcon>
<local:SettingsCard.ActionIcon>
<FontIcon Glyph="&#xE8A7;" />
</local:SettingsCard.ActionIcon>
</local:SettingsCard>
<local:SettingsCard x:Uid="About_Feedback_RequestFeature"
Click="FeatureRequestButton_Click"
IsClickEnabled="True">
<local:SettingsCard.HeaderIcon>
<FontIcon Glyph="&#xEA80;" />
</local:SettingsCard.HeaderIcon>
<local:SettingsCard.ActionIcon>
<FontIcon Glyph="&#xE8A7;" />
</local:SettingsCard.ActionIcon>
</local:SettingsCard>
<local:SettingsCard x:Uid="About_Feedback_Discussion"
Click="DiscussionsButton_Click"
IsClickEnabled="True">
<local:SettingsCard.HeaderIcon>
<FontIcon Glyph="&#xE8F2;" />
</local:SettingsCard.HeaderIcon>
<local:SettingsCard.ActionIcon>
<FontIcon Glyph="&#xE8A7;" />
</local:SettingsCard.ActionIcon>
</local:SettingsCard>
</local:SettingsGroup>
<local:SettingsGroup x:Uid="About_OtherLinks">
<local:WrapPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
Expand Down
8 changes: 8 additions & 0 deletions src/Magpie.App/App.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
namespace Magpie.App {
delegate void SignalDelegate();
}

#include "BoolNegationConverter.idl"
#include "BoolToNegativeVisibilityConverter.idl"
#include "ControlSizeTrigger.idl"
#include "IsEqualStateTrigger.idl"
#include "IsNullStateTrigger.idl"
#include "LoggerHelper.idl"
#include "TextBlockHelper.idl"
#include "WrapPanel.idl"
#include "PageFrame.idl"
#include "SettingsCard.idl"
#include "SettingsExpander.idl"
#include "SettingsGroup.idl"
#include "KeyVisual.idl"
#include "KeyVisualState.idl"
Expand Down
Loading