mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: 优化滚动条位置

Browse source
This commit is contained in:
刘旭 2022-05-26 13:49:00 +08:00
commit b44f2d4446
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Magpie.App/HomePage.xaml
View file

@ -20,7 +20,7 @@
<TextBlock Grid.Row="0" Text="Magpie" Style="{StaticResource PageHeaderTextStyle}" />
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" Padding="0,0,40,0">
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<controls:SettingsGroup MyHeader="激活">
<controls:Setting MyHeader="快捷键" Description="自定义进入和退出全屏的快捷键" HorizontalAlignment="Stretch" HorizontalContentAlignment="Left">

2
src/Magpie.App/MainPage.xaml
View file

@ -57,6 +57,6 @@
</muxc:NavigationViewItem>
</muxc:NavigationView.FooterMenuItems>
<Frame x:Name="ContentFrame" Margin="40,40,40,0" />
<Frame x:Name="ContentFrame" Margin="40,40,0,0" />
</muxc:NavigationView>
</Page>

4
src/Magpie.App/SettingsGroup.cpp
View file

@ -15,14 +15,14 @@ using namespace Windows::UI::Xaml::Automation::Peers;
namespace winrt::Magpie::App::Controls::implementation {
DependencyProperty SettingsGroup::MyHeaderProperty = DependencyProperty::Register(
const DependencyProperty SettingsGroup::MyHeaderProperty = DependencyProperty::Register(
L"MyHeader",
xaml_typename<hstring>(),
xaml_typename<Magpie::App::Controls::SettingsGroup>(),
PropertyMetadata(box_value(L""), &SettingsGroup::_OnMyHeaderChanged)
);
DependencyProperty SettingsGroup::DescriptionProperty = DependencyProperty::Register(
const DependencyProperty SettingsGroup::DescriptionProperty = DependencyProperty::Register(
L"Description",
xaml_typename<IInspectable>(),
xaml_typename<Magpie::App::Controls::SettingsGroup>(),

6
src/Magpie.App/SettingsGroup.h
View file

@ -22,8 +22,8 @@ namespace winrt::Magpie::App::Controls::implementation
Windows::UI::Xaml::Automation::Peers::AutomationPeer OnCreateAutomationPeer();
static Windows::UI::Xaml::DependencyProperty MyHeaderProperty;
static Windows::UI::Xaml::DependencyProperty DescriptionProperty;
static const Windows::UI::Xaml::DependencyProperty MyHeaderProperty;
static const Windows::UI::Xaml::DependencyProperty DescriptionProperty;
private:
static void _OnMyHeaderChanged(Windows::UI::Xaml::DependencyObject const& sender, Windows::UI::Xaml::DependencyPropertyChangedEventArgs const&);
@ -38,7 +38,7 @@ namespace winrt::Magpie::App::Controls::implementation
Windows::UI::Xaml::Controls::TextBlock _myHeaderPresenter{ nullptr };
Windows::UI::Xaml::Controls::ContentPresenter _descriptionPresenter{ nullptr };
winrt::event_token _isEnabledChangedToken{};
event_token _isEnabledChangedToken{};
static constexpr const wchar_t* _PartMyHeaderPresenter = L"MyHeaderPresenter";
static constexpr const wchar_t* _PartDescriptionPresenter = L"DescriptionPresenter";

2
src/Magpie.App/SettingsPage.xaml
View file

@ -20,7 +20,7 @@
<TextBlock Grid.Row="0" Text="设置" Style="{StaticResource PageHeaderTextStyle}" />
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" Padding="0,0,40,0">
<StackPanel Orientation="Vertical" HorizontalAlignment="Stretch">
<controls:SettingsGroup MyHeader="外观和行为">
<controls:Setting MyHeader="主题" HorizontalAlignment="Stretch" HorizontalContentAlignment="Left">