diff --git a/VK UI3/Controls/BlockControl.xaml b/VK UI3/Controls/BlockControl.xaml index a1f3894..129cb95 100644 --- a/VK UI3/Controls/BlockControl.xaml +++ b/VK UI3/Controls/BlockControl.xaml @@ -73,6 +73,10 @@ + + + + diff --git a/VK UI3/Controls/Blocks/Buttons.xaml b/VK UI3/Controls/Blocks/Buttons.xaml new file mode 100644 index 0000000..acd56a3 --- /dev/null +++ b/VK UI3/Controls/Blocks/Buttons.xaml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/VK UI3/Controls/Blocks/Buttons.xaml.cs b/VK UI3/Controls/Blocks/Buttons.xaml.cs new file mode 100644 index 0000000..8b08e95 --- /dev/null +++ b/VK UI3/Controls/Blocks/Buttons.xaml.cs @@ -0,0 +1,27 @@ +using Microsoft.UI.Xaml.Controls; +using MusicX.Core.Models; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace VK_UI3.Controls.Blocks +{ + + public sealed partial class Buttons : UserControl + { + Block block { get { return DataContext as Block; } } + public Buttons() + { + + this.InitializeComponent(); + + this.DataContextChanged += Buttons_DataContextChanged; + } + + private void Buttons_DataContextChanged(Microsoft.UI.Xaml.FrameworkElement sender, Microsoft.UI.Xaml.DataContextChangedEventArgs args) + { + + + } + } +} diff --git a/VK UI3/Controls/Blocks/MixControl.xaml b/VK UI3/Controls/Blocks/MixControl.xaml index 1ea9d3d..9c91e5a 100644 --- a/VK UI3/Controls/Blocks/MixControl.xaml +++ b/VK UI3/Controls/Blocks/MixControl.xaml @@ -97,21 +97,18 @@ Grid.Row="0" Width="75" Height="75" - Click="Button_Click" + Padding="0" HorizontalAlignment="Center" VerticalAlignment="Center" - + Click="Button_Click" CornerRadius="50"> - + Слушать VK Mix diff --git a/VK UI3/VK UI3.csproj b/VK UI3/VK UI3.csproj index eff0a6a..033e772 100644 --- a/VK UI3/VK UI3.csproj +++ b/VK UI3/VK UI3.csproj @@ -32,6 +32,7 @@ + @@ -176,6 +177,9 @@ MSBuild:Compile + + MSBuild:Compile + MSBuild:Compile diff --git a/VK UI3/Views/MainView.xaml.cs b/VK UI3/Views/MainView.xaml.cs index 48d0926..0ecb63f 100644 --- a/VK UI3/Views/MainView.xaml.cs +++ b/VK UI3/Views/MainView.xaml.cs @@ -48,9 +48,14 @@ public MainView() //OpenMyPage(SectionType.MyListAudio); this.Loaded += MainView_Loaded; + this.Loading += MainView_Loading; } + private void MainView_Loading(FrameworkElement sender, object args) + { + NavWiv.IsPaneOpen = false; + } public void updateAllWithReacreate() { @@ -91,6 +96,7 @@ private void MainView_KeyDown(object sender, KeyRoutedEventArgs e) private void MainView_Loaded(object sender, RoutedEventArgs e) { + NavWiv.IsPaneOpen = false; //OpenMyPage(SectionType.MyListAudio); ContentFrame.Navigated += ContentFrame_Navigated;