From f134abab73d7015aa71b29e62766b40296a8984c Mon Sep 17 00:00:00 2001 From: Xu <34770031+Blinue@users.noreply.github.com> Date: Thu, 25 Apr 2024 20:22:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=AB=98=E7=BA=A7=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E7=A7=BB=E5=88=B0=E4=B8=BB=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Magpie.App/HomePage.cpp | 5 + src/Magpie.App/HomePage.h | 2 + src/Magpie.App/HomePage.xaml | 86 +++++++- src/Magpie.App/HomeViewModel.cpp | 186 +++++++++++++++++- src/Magpie.App/HomeViewModel.h | 35 ++++ src/Magpie.App/HomeViewModel.idl | 26 ++- src/Magpie.App/Resources.language-de.resw | 48 ++--- src/Magpie.App/Resources.language-en-US.resw | 61 +++--- src/Magpie.App/Resources.language-es.resw | 48 ++--- src/Magpie.App/Resources.language-fr.resw | 48 ++--- src/Magpie.App/Resources.language-hu.resw | 24 +-- src/Magpie.App/Resources.language-id.resw | 44 ++--- src/Magpie.App/Resources.language-it.resw | 48 ++--- src/Magpie.App/Resources.language-ja.resw | 58 +++--- src/Magpie.App/Resources.language-ko.resw | 48 ++--- src/Magpie.App/Resources.language-pt-BR.resw | 48 ++--- src/Magpie.App/Resources.language-ru.resw | 58 +++--- src/Magpie.App/Resources.language-tr.resw | 58 +++--- src/Magpie.App/Resources.language-uk.resw | 48 ++--- src/Magpie.App/Resources.language-vi.resw | 48 ++--- .../Resources.language-zh-Hans.resw | 61 +++--- .../Resources.language-zh-Hant.resw | 48 ++--- src/Magpie.App/SettingsPage.cpp | 2 +- src/Magpie.App/SettingsPage.h | 2 +- src/Magpie.App/SettingsPage.xaml | 71 ------- src/Magpie.App/SettingsViewModel.cpp | 178 ----------------- src/Magpie.App/SettingsViewModel.h | 35 ---- src/Magpie.App/SettingsViewModel.idl | 14 -- 28 files changed, 727 insertions(+), 711 deletions(-) diff --git a/src/Magpie.App/HomePage.cpp b/src/Magpie.App/HomePage.cpp index d8c1fd5f3..477533d35 100644 --- a/src/Magpie.App/HomePage.cpp +++ b/src/Magpie.App/HomePage.cpp @@ -4,6 +4,7 @@ #include "HomePage.g.cpp" #endif #include "XamlUtils.h" +#include "ComboBoxHelper.h" namespace winrt::Magpie::App::implementation { @@ -12,4 +13,8 @@ void HomePage::TimerSlider_Loaded(IInspectable const& sender, RoutedEventArgs co XamlUtils::UpdateThemeOfTooltips(sender.as(), ActualTheme()); } +void HomePage::ComboBox_DropDownOpened(IInspectable const& sender, IInspectable const&) const { + ComboBoxHelper::DropDownOpened(*this, sender); +} + } diff --git a/src/Magpie.App/HomePage.h b/src/Magpie.App/HomePage.h index 1de4f67e8..d47e118e5 100644 --- a/src/Magpie.App/HomePage.h +++ b/src/Magpie.App/HomePage.h @@ -10,6 +10,8 @@ struct HomePage : HomePageT { return _viewModel; } + void ComboBox_DropDownOpened(IInspectable const& sender, IInspectable const&) const; + private: Magpie::App::HomeViewModel _viewModel; }; diff --git a/src/Magpie.App/HomePage.xaml b/src/Magpie.App/HomePage.xaml index 42654cd1a..ce843826c 100644 --- a/src/Magpie.App/HomePage.xaml +++ b/src/Magpie.App/HomePage.xaml @@ -59,7 +59,7 @@ - + @@ -86,7 +86,7 @@ - + - @@ -104,7 +104,7 @@ - @@ -118,16 +118,90 @@ -