diff --git a/src/Magpie.App/AboutPage.cpp b/src/Magpie.App/AboutPage.cpp deleted file mode 100644 index f04d9128..00000000 --- a/src/Magpie.App/AboutPage.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include "pch.h" -#include "AboutPage.h" -#if __has_include("AboutPage.g.cpp") -#include "AboutPage.g.cpp" -#endif -#include "Win32Utils.h" -#include "CommonSharedConstants.h" - -namespace winrt::Magpie::App::implementation { - -void AboutPage::VersionTextBlock_DoubleTapped(IInspectable const&, Input::DoubleTappedRoutedEventArgs const&) { - // 按住 Alt 键双击版本号即可启用开发者模式 - if (!_viewModel.IsDeveloperMode() && (GetAsyncKeyState(VK_MENU) & 0x8000)) { - _viewModel.IsDeveloperMode(true); - - const hstring message = ResourceLoader::GetForCurrentView(CommonSharedConstants::APP_RESOURCE_MAP_ID) - .GetString(L"About_DeveloperModeEnabled"); - Application::Current().as().RootPage().ShowToast(message); - } -} - -void AboutPage::BugReportButton_Click(IInspectable const&, RoutedEventArgs const&) { - Win32Utils::ShellOpen(L"https://github.com/Blinue/Magpie/issues/new?assignees=&labels=bug&template=01_bug.yaml"); -} - -void AboutPage::FeatureRequestButton_Click(IInspectable const&, RoutedEventArgs const&) { - Win32Utils::ShellOpen(L"https://github.com/Blinue/Magpie/issues/new?assignees=&labels=enhancement&template=03_request.yaml"); -} - -void AboutPage::DiscussionsButton_Click(IInspectable const&, RoutedEventArgs const&) { - Win32Utils::ShellOpen(L"https://github.com/Blinue/Magpie/discussions"); -} - -} diff --git a/src/Magpie.App/AboutPage.h b/src/Magpie.App/AboutPage.h deleted file mode 100644 index 93358e8c..00000000 --- a/src/Magpie.App/AboutPage.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once -#include "AboutPage.g.h" - -namespace winrt::Magpie::App::implementation { - -struct AboutPage : AboutPageT { - Magpie::App::AboutViewModel ViewModel() const noexcept { - return _viewModel; - } - - void VersionTextBlock_DoubleTapped(IInspectable const&, Input::DoubleTappedRoutedEventArgs const&); - - void BugReportButton_Click(IInspectable const&, RoutedEventArgs const&); - void FeatureRequestButton_Click(IInspectable const&, RoutedEventArgs const&); - void DiscussionsButton_Click(IInspectable const&, RoutedEventArgs const&); - -private: - Magpie::App::AboutViewModel _viewModel; -}; - -} - -namespace winrt::Magpie::App::factory_implementation { - -struct AboutPage : AboutPageT { -}; - -} diff --git a/src/Magpie.App/AboutPage.idl b/src/Magpie.App/AboutPage.idl deleted file mode 100644 index c40c0a4a..00000000 --- a/src/Magpie.App/AboutPage.idl +++ /dev/null @@ -1,10 +0,0 @@ -namespace Magpie.App { - runtimeclass AboutPage : Windows.UI.Xaml.Controls.Page { - AboutPage(); - - AboutViewModel ViewModel { get; }; - - // https://github.com/microsoft/microsoft-ui-xaml/issues/7579 - void UnloadObject(Windows.UI.Xaml.DependencyObject object); - } -} diff --git a/src/Magpie.App/AboutPage.xaml b/src/Magpie.App/AboutPage.xaml deleted file mode 100644 index 00ba67b7..00000000 --- a/src/Magpie.App/AboutPage.xaml +++ /dev/null @@ -1,186 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.5x - 0.75x - - 1.25x - 1.5x - 2x - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Magpie.App/RootPage.cpp b/src/Magpie.App/RootPage.cpp index c497e246..1a039205 100644 --- a/src/Magpie.App/RootPage.cpp +++ b/src/Magpie.App/RootPage.cpp @@ -32,410 +32,23 @@ namespace winrt::Magpie::App::implementation { static constexpr uint32_t FIRST_PROFILE_ITEM_IDX = 4; RootPage::RootPage() { - _themeChangedRevoker = AppSettings::Get().ThemeChanged(auto_revoke, [this](Theme) { _UpdateTheme(); }); - _colorValuesChangedRevoker = _uiSettings.ColorValuesChanged( - auto_revoke, { this, &RootPage::_UISettings_ColorValuesChanged }); - - _displayInformation = DisplayInformation::GetForCurrentView(); - _dpiChangedRevoker = _displayInformation.DpiChanged( - auto_revoke, [this](DisplayInformation const&, IInspectable const&) { _UpdateIcons(false); }); - - ProfileService& profileService = ProfileService::Get(); - _profileAddedRevoker = profileService.ProfileAdded( - auto_revoke, { this, &RootPage::_ProfileService_ProfileAdded }); - _profileRenamedRevoker = profileService.ProfileRenamed( - auto_revoke, { this, &RootPage::_ProfileService_ProfileRenamed }); - _profileRemovedRevoker = profileService.ProfileRemoved( - auto_revoke, { this, &RootPage::_ProfileService_ProfileRemoved }); - _profileMovedRevoker = profileService.ProfileMoved( - auto_revoke, { this, &RootPage::_ProfileService_ProfileReordered }); - // 设置 Language 属性帮助 XAML 选择合适的字体，比如繁体中文使用 Microsoft JhengHei UI，日语使用 Yu Gothic UI Language(LocalizationService::Get().Language()); } RootPage::~RootPage() { - ContentDialogHelper::CloseActiveDialog(); - - // 不手动置空会内存泄露 - // 似乎是 XAML Islands 的 bug？ - ContentFrame().Content(nullptr); - // 每次主窗口关闭都清理 AppXReader 的缓存 - AppXReader::ClearCache(); } void RootPage::InitializeComponent() { RootPageT::InitializeComponent(); - _UpdateTheme(false); - const Win32Utils::OSVersion& osVersion = Win32Utils::GetOSVersion(); if (osVersion.Is22H2OrNewer()) { // Win11 22H2+ 使用系统的 Mica 背景 MUXC::BackdropMaterial::SetApplyToRootOrPageBackground(*this, true); } - - IVector navMenuItems = RootNavigationView().MenuItems(); - for (const Profile& profile : AppSettings::Get().Profiles()) { - MUXC::NavigationViewItem item; - item.Content(box_value(profile.name)); - // 用于占位 - item.Icon(FontIcon()); - _LoadIcon(item, profile); - - navMenuItems.InsertAt(navMenuItems.Size() - 1, item); - } -} - -void RootPage::Loaded(IInspectable const&, RoutedEventArgs const&) { - // 消除焦点框 - IsTabStop(true); - Focus(FocusState::Programmatic); - IsTabStop(false); - - // 设置 NavigationView 内的 Tooltip 的主题 - XamlUtils::UpdateThemeOfTooltips(RootNavigationView(), ActualTheme()); -} - -void RootPage::NavigationView_SelectionChanged( - MUXC::NavigationView const&, - MUXC::NavigationViewSelectionChangedEventArgs const& args -) { - auto contentFrame = ContentFrame(); - - if (args.IsSettingsSelected()) { - contentFrame.Navigate(xaml_typename()); - } else { - IInspectable selectedItem = args.SelectedItem(); - if (!selectedItem) { - contentFrame.Content(nullptr); - return; - } - - IInspectable tag = selectedItem.as().Tag(); - if (tag) { - hstring tagStr = unbox_value(tag); - Interop::TypeName typeName; - if (tagStr == L"Home") { - typeName = xaml_typename(); - } else if (tagStr == L"ScalingModes") { - typeName = xaml_typename(); - } else if (tagStr == L"About") { - typeName = xaml_typename(); - } else { - typeName = xaml_typename(); - } - - contentFrame.Navigate(typeName); - } else { - // 缩放配置页面 - MUXC::NavigationView nv = RootNavigationView(); - uint32_t index; - if (nv.MenuItems().IndexOf(nv.SelectedItem(), index)) { - contentFrame.Navigate(xaml_typename(), box_value((int)index - 4)); - } - } - } -} - -void RootPage::NavigationView_PaneOpening(MUXC::NavigationView const&, IInspectable const&) { - if (Win32Utils::GetOSVersion().IsWin11()) { - // Win11 中 Tooltip 自动适应主题 - return; - } - - XamlUtils::UpdateThemeOfTooltips(*this, ActualTheme()); - - // UpdateThemeOfTooltips 中使用的 hack 会使 NavigationViewItem 在展开时不会自动删除 Tooltip - // 因此这里手动删除 - const MUXC::NavigationView& nv = RootNavigationView(); - for (const IInspectable& item : nv.MenuItems()) { - ToolTipService::SetToolTip(item.as(), nullptr); - } - for (const IInspectable& item : nv.FooterMenuItems()) { - ToolTipService::SetToolTip(item.as(), nullptr); - } } -void RootPage::NavigationView_PaneClosing(MUXC::NavigationView const&, MUXC::NavigationViewPaneClosingEventArgs const&) { - XamlUtils::UpdateThemeOfTooltips(*this, ActualTheme()); -} - -void RootPage::NavigationView_DisplayModeChanged(MUXC::NavigationView const& nv, MUXC::NavigationViewDisplayModeChangedEventArgs const&) { - bool isExpanded = nv.DisplayMode() == MUXC::NavigationViewDisplayMode::Expanded; - nv.IsPaneToggleButtonVisible(!isExpanded); - if (isExpanded) { - nv.IsPaneOpen(true); - } - - // !!! HACK !!! - // 使导航栏的可滚动区域不会覆盖标题栏 - FrameworkElement menuItemsScrollViewer = nv.as() - .GetTemplateChild(L"MenuItemsScrollViewer").as(); - menuItemsScrollViewer.Margin({ 0,isExpanded ? TitleBar().ActualHeight() : 0.0,0,0}); - - XamlUtils::UpdateThemeOfTooltips(*this, ActualTheme()); -} - -fire_and_forget RootPage::NavigationView_ItemInvoked(MUXC::NavigationView const&, MUXC::NavigationViewItemInvokedEventArgs const& args) { - if (args.InvokedItemContainer() == NewProfileNavigationViewItem()) { - const UINT dpi = (UINT)std::lroundf(_displayInformation.LogicalDpi()); - const bool isLightTheme = ActualTheme() == ElementTheme::Light; - _newProfileViewModel.PrepareForOpen(dpi, isLightTheme, Dispatcher()); - - // 同步调用 ShowAt 有时会失败 - co_await Dispatcher().TryRunAsync(CoreDispatcherPriority::Normal, [this]() { - NewProfileFlyout().ShowAt(NewProfileNavigationViewItem()); - }); - } -} - -void RootPage::ComboBox_DropDownOpened(IInspectable const&, IInspectable const&) const { - XamlUtils::UpdateThemeOfXamlPopups(XamlRoot(), ActualTheme()); -} - -void RootPage::NewProfileConfirmButton_Click(IInspectable const&, RoutedEventArgs const&) { - _newProfileViewModel.Confirm(); - NewProfileFlyout().Hide(); -} - -void RootPage::NewProfileNameTextBox_KeyDown(IInspectable const&, Input::KeyRoutedEventArgs const& args) { - if (args.Key() == VirtualKey::Enter && _newProfileViewModel.IsConfirmButtonEnabled()) { - NewProfileConfirmButton_Click(nullptr, nullptr); - } -} - -void RootPage::NavigateToAboutPage() { - MUXC::NavigationView nv = RootNavigationView(); - nv.SelectedItem(nv.FooterMenuItems().GetAt(0)); -} - -fire_and_forget RootPage::ShowToast(const hstring& message) { - // !!! HACK !!! - // 重用 TeachingTip 有一个 bug: 前一个 Toast 正在消失时新的 Toast 不会显示。为了 - // 规避它，我们每次都创建新的 TeachingTip，但要保留旧对象的引用，因为播放动画时销毁 - // 会导致崩溃。oldToastTeachingTip 的生存期可确保动画播放完毕。 - MUXC::TeachingTip oldToastTeachingTip = ToastTeachingTip(); - if (oldToastTeachingTip) { - UnloadObject(oldToastTeachingTip); - } - - weak_ref weakTeachingTip; - { - // 创建新的 TeachingTip - MUXC::TeachingTip newTeachingTip = FindName(L"ToastTeachingTip").as(); - ToastTextBlock().Text(message); - newTeachingTip.IsOpen(true); - - // !!! HACK !!! - // 我们不想要 IsLightDismissEnabled，因为它会阻止用户和其他控件交互，但我们也不想要关闭按钮，于是 - // 手动隐藏它。我们必须在模板加载完成后再做这些，但 TeachingTip 没有 Opening 事件，于是有了又一个 - // workaround: 监听 ToastTextBlock 的 LayoutUpdated 事件，它在 TeachingTip 显示前必然会被引发。 - ToastTextBlock().LayoutUpdated([weak(weak_ref(newTeachingTip))](IInspectable const&, IInspectable const&) { - auto toastTeachingTip = weak.get(); - if (!toastTeachingTip) { - return; - } - - IControlProtected protectedAccessor = toastTeachingTip.as(); - - // 隐藏关闭按钮 - if (DependencyObject closeButton = protectedAccessor.GetTemplateChild(L"AlternateCloseButton")) { - closeButton.as().Visibility(Visibility::Collapsed); - } - - // 减小 Flyout 尺寸 - if (DependencyObject container = protectedAccessor.GetTemplateChild(L"TailOcclusionGrid")) { - container.as().MinWidth(0.0); - } - }); - - weakTeachingTip = newTeachingTip; - } - - auto weakThis = get_weak(); - CoreDispatcher dispatcher = Dispatcher(); - // 显示时长固定 2 秒 - co_await 2s; - co_await dispatcher; - - if (weakThis.get()) { - MUXC::TeachingTip curTeachingTip = ToastTeachingTip(); - if (curTeachingTip == weakTeachingTip.get()) { - // 如果已经显示新的 Toast 则无需关闭，因为 newTeachingTip 已被卸载（但仍在生存期内） - curTeachingTip.IsOpen(false); - } - } -} - -static Color Win32ColorToWinRTColor(COLORREF color) { - return { 255, GetRValue(color), GetGValue(color), GetBValue(color) }; -} - -// 来自 https://learn.microsoft.com/en-us/windows/apps/desktop/modernize/apply-windows-themes#know-when-dark-mode-is-enabled -static bool IsColorLight(const Color& clr) { - return 5 * clr.G + 2 * clr.R + clr.B > 8 * 128; -} - -void RootPage::_UpdateTheme(bool updateIcons) { - Theme theme = AppSettings::Get().Theme(); - - bool isDarkTheme = FALSE; - if (theme == Theme::System) { - // 前景色是亮色表示当前是深色主题 - isDarkTheme = IsColorLight(_uiSettings.GetColorValue(UIColorType::Foreground)); - } else { - isDarkTheme = theme == Theme::Dark; - } - - if (IsLoaded() && (ActualTheme() == ElementTheme::Dark) == isDarkTheme) { - // 无需切换 - return; - } - - if (!Win32Utils::GetOSVersion().Is22H2OrNewer()) { - const Windows::UI::Color bkgColor = Win32ColorToWinRTColor( - isDarkTheme ? CommonSharedConstants::DARK_TINT_COLOR : CommonSharedConstants::LIGHT_TINT_COLOR); - Background(SolidColorBrush(bkgColor)); - } - - ElementTheme newTheme = isDarkTheme ? ElementTheme::Dark : ElementTheme::Light; - RequestedTheme(newTheme); - - XamlUtils::UpdateThemeOfXamlPopups(XamlRoot(), newTheme); - XamlUtils::UpdateThemeOfTooltips(*this, newTheme); - - if (updateIcons && IsLoaded()) { - _UpdateIcons(true); - } -} - -fire_and_forget RootPage::_LoadIcon(MUXC::NavigationViewItem const& item, const Profile& profile) { - weak_ref weakRef(item); - - bool preferLightTheme = ActualTheme() == ElementTheme::Light; - bool isPackaged = profile.isPackaged; - std::wstring path = profile.pathRule; - CoreDispatcher dispatcher = Dispatcher(); - uint32_t dpi = (uint32_t)std::lroundf(_displayInformation.LogicalDpi()); - - co_await resume_background(); - - std::wstring iconPath; - SoftwareBitmap iconBitmap{ nullptr }; - - if (isPackaged) { - AppXReader reader; - if (reader.Initialize(path)) { - std::variant uwpIcon = - reader.GetIcon((uint32_t)std::ceil(dpi * 16.0 / USER_DEFAULT_SCREEN_DPI), preferLightTheme); - if (uwpIcon.index() == 0) { - iconPath = std::get<0>(uwpIcon); - } else { - iconBitmap = std::get<1>(uwpIcon); - } - } - } else { - iconBitmap = IconHelper::ExtractIconFromExe(path.c_str(), 16, dpi); - } - - co_await dispatcher; - - auto strongRef = weakRef.get(); - if (!strongRef) { - co_return; - } - - if (!iconPath.empty()) { - BitmapIcon icon; - icon.ShowAsMonochrome(false); - icon.UriSource(Uri(iconPath)); - icon.Width(16); - icon.Height(16); - - strongRef.Icon(icon); - } else if (iconBitmap) { - SoftwareBitmapSource imageSource; - co_await imageSource.SetBitmapAsync(iconBitmap); - - MUXC::ImageIcon imageIcon; - imageIcon.Width(16); - imageIcon.Height(16); - imageIcon.Source(imageSource); - - strongRef.Icon(imageIcon); - } else { - FontIcon icon; - icon.Glyph(L"\uECAA"); - strongRef.Icon(icon); - } -} - -fire_and_forget RootPage::_UISettings_ColorValuesChanged(Windows::UI::ViewManagement::UISettings const&, IInspectable const&) { - auto weakThis = get_weak(); - co_await Dispatcher(); - - if (!weakThis.get()) { - co_return; - } - - if (AppSettings::Get().Theme() == Theme::System) { - _UpdateTheme(false); - } - - _UpdateIcons(true); -} - -void RootPage::_UpdateIcons(bool skipDesktop) { - IVector navMenuItems = RootNavigationView().MenuItems(); - const std::vector& profiles = AppSettings::Get().Profiles(); - - for (uint32_t i = 0; i < profiles.size(); ++i) { - if (skipDesktop && !profiles[i].isPackaged) { - continue; - } - - MUXC::NavigationViewItem item = navMenuItems.GetAt(FIRST_PROFILE_ITEM_IDX + i).as(); - _LoadIcon(item, profiles[i]); - } -} - -void RootPage::_ProfileService_ProfileAdded(Profile& profile) { - MUXC::NavigationViewItem item; - item.Content(box_value(profile.name)); - // 用于占位 - item.Icon(FontIcon()); - _LoadIcon(item, profile); - - IVector navMenuItems = RootNavigationView().MenuItems(); - navMenuItems.InsertAt(navMenuItems.Size() - 1, item); - RootNavigationView().SelectedItem(item); -} - -void RootPage::_ProfileService_ProfileRenamed(uint32_t idx) { - RootNavigationView().MenuItems() - .GetAt(FIRST_PROFILE_ITEM_IDX + idx) - .as() - .Content(box_value(AppSettings::Get().Profiles()[idx].name)); -} - -void RootPage::_ProfileService_ProfileRemoved(uint32_t idx) { - MUXC::NavigationView nv = RootNavigationView(); - IVector menuItems = nv.MenuItems(); - nv.SelectedItem(menuItems.GetAt(FIRST_PROFILE_ITEM_IDX - 1)); - menuItems.RemoveAt(FIRST_PROFILE_ITEM_IDX + idx); -} - -void RootPage::_ProfileService_ProfileReordered(uint32_t profileIdx, bool isMoveUp) { - IVector menuItems = RootNavigationView().MenuItems(); - - uint32_t curIdx = FIRST_PROFILE_ITEM_IDX + profileIdx; - uint32_t otherIdx = isMoveUp ? curIdx - 1 : curIdx + 1; - - IInspectable otherItem = menuItems.GetAt(otherIdx); - menuItems.RemoveAt(otherIdx); - menuItems.InsertAt(curIdx, otherItem); -} } diff --git a/src/Magpie.App/RootPage.h b/src/Magpie.App/RootPage.h index 2611f4e9..dc2534c5 100644 --- a/src/Magpie.App/RootPage.h +++ b/src/Magpie.App/RootPage.h @@ -13,63 +13,6 @@ struct RootPage : RootPageT { ~RootPage(); void InitializeComponent(); - - void Loaded(IInspectable const&, RoutedEventArgs const&); - - void NavigationView_SelectionChanged(MUXC::NavigationView const&, MUXC::NavigationViewSelectionChangedEventArgs const& args); - - void NavigationView_PaneOpening(MUXC::NavigationView const&, IInspectable const&); - - void NavigationView_PaneClosing(MUXC::NavigationView const&, MUXC::NavigationViewPaneClosingEventArgs const&); - - void NavigationView_DisplayModeChanged(MUXC::NavigationView const& nv, MUXC::NavigationViewDisplayModeChangedEventArgs const&); - - fire_and_forget NavigationView_ItemInvoked(MUXC::NavigationView const&, MUXC::NavigationViewItemInvokedEventArgs const& args); - - Magpie::App::NewProfileViewModel NewProfileViewModel() const noexcept { - return _newProfileViewModel; - } - - void ComboBox_DropDownOpened(IInspectable const&, IInspectable const&) const; - - void NewProfileConfirmButton_Click(IInspectable const&, RoutedEventArgs const&); - - void NewProfileNameTextBox_KeyDown(IInspectable const&, Input::KeyRoutedEventArgs const& args); - - void NavigateToAboutPage(); - - fire_and_forget ShowToast(const hstring& message); - -private: - void _UpdateTheme(bool updateIcons = true); - - fire_and_forget _LoadIcon(MUXC::NavigationViewItem const& item, const Profile& profile); - - fire_and_forget _UISettings_ColorValuesChanged(Windows::UI::ViewManagement::UISettings const&, IInspectable const&); - - void _UpdateIcons(bool skipDesktop); - - void _ProfileService_ProfileAdded(Profile& profile); - - void _ProfileService_ProfileRenamed(uint32_t idx); - - void _ProfileService_ProfileRemoved(uint32_t idx); - - void _ProfileService_ProfileReordered(uint32_t profileIdx, bool isMoveUp); - - WinRTUtils::EventRevoker _themeChangedRevoker; - - Windows::UI::ViewManagement::UISettings _uiSettings; - Windows::UI::ViewManagement::UISettings::ColorValuesChanged_revoker _colorValuesChangedRevoker; - - Magpie::App::NewProfileViewModel _newProfileViewModel; - WinRTUtils::EventRevoker _profileAddedRevoker; - WinRTUtils::EventRevoker _profileRenamedRevoker; - WinRTUtils::EventRevoker _profileRemovedRevoker; - WinRTUtils::EventRevoker _profileMovedRevoker; - - Windows::Graphics::Display::DisplayInformation _displayInformation{ nullptr }; - Windows::Graphics::Display::DisplayInformation::DpiChanged_revoker _dpiChangedRevoker; }; } diff --git a/src/Magpie.App/RootPage.idl b/src/Magpie.App/RootPage.idl index 767bb447..9427c7bc 100644 --- a/src/Magpie.App/RootPage.idl +++ b/src/Magpie.App/RootPage.idl @@ -1,14 +1,6 @@ namespace Magpie.App { + [default_interface] runtimeclass RootPage : Windows.UI.Xaml.Controls.Page { RootPage(); - - Microsoft.UI.Xaml.Controls.NavigationView RootNavigationView { get; }; - TitleBarControl TitleBar { get; }; - - NewProfileViewModel NewProfileViewModel { get; }; - - void NavigateToAboutPage(); - - void ShowToast(String message); } } diff --git a/src/Magpie.App/RootPage.xaml b/src/Magpie.App/RootPage.xaml index d9d85c13..15243573 100644 --- a/src/Magpie.App/RootPage.xaml +++ b/src/Magpie.App/RootPage.xaml @@ -5,162 +5,16 @@ xmlns:local="using:Magpie.App" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" - Loaded="Loaded" mc:Ignorable="d"> - - - - - - - - - - - 0 - 1,0,0,0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Magpie.App/SettingsPage.cpp b/src/Magpie.App/SettingsPage.cpp deleted file mode 100644 index 19527a30..00000000 --- a/src/Magpie.App/SettingsPage.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "pch.h" -#include "SettingsPage.h" -#if __has_include("SettingsPage.g.cpp") -#include "SettingsPage.g.cpp" -#endif -#include "ComboBoxHelper.h" - -using namespace winrt; -using namespace Windows::UI::Xaml::Input; - -namespace winrt::Magpie::App::implementation { - -void SettingsPage::InitializeComponent() { - SettingsPageT::InitializeComponent(); - - ResourceLoader resourceLoader = - ResourceLoader::GetForCurrentView(L"Microsoft.UI.Xaml/Resources"); - hstring versionStr = resourceLoader.GetString(L"SettingsButtonName"); - SettingsPageFrame().Title(versionStr); -} - -void SettingsPage::ComboBox_DropDownOpened(IInspectable const& sender, IInspectable const&) const { - ComboBoxHelper::DropDownOpened(*this, sender); -} - -} diff --git a/src/Magpie.App/SettingsPage.h b/src/Magpie.App/SettingsPage.h deleted file mode 100644 index b8bbe083..00000000 --- a/src/Magpie.App/SettingsPage.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once -#include "SettingsPage.g.h" - -namespace winrt::Magpie::App::implementation { - -struct SettingsPage : SettingsPageT { - void InitializeComponent(); - - Magpie::App::SettingsViewModel ViewModel() const noexcept { - return _viewModel; - } - - void ComboBox_DropDownOpened(IInspectable const& sender, IInspectable const&) const; - -private: - Magpie::App::SettingsViewModel _viewModel; -}; - -} - -namespace winrt::Magpie::App::factory_implementation { - -struct SettingsPage : SettingsPageT { -}; - -} diff --git a/src/Magpie.App/SettingsPage.idl b/src/Magpie.App/SettingsPage.idl deleted file mode 100644 index baeeea53..00000000 --- a/src/Magpie.App/SettingsPage.idl +++ /dev/null @@ -1,10 +0,0 @@ -namespace Magpie.App { - runtimeclass SettingsPage : Windows.UI.Xaml.Controls.Page { - SettingsPage(); - - SettingsViewModel ViewModel { get; }; - - // https://github.com/microsoft/microsoft-ui-xaml/issues/7579 - void UnloadObject(Windows.UI.Xaml.DependencyObject object); - } -} diff --git a/src/Magpie.App/SettingsPage.xaml b/src/Magpie.App/SettingsPage.xaml deleted file mode 100644 index 2d5af79c..00000000 --- a/src/Magpie.App/SettingsPage.xaml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - -