Skip to content

Commit

Permalink
Update screenshots
Browse files Browse the repository at this point in the history
  • Loading branch information
Kinnara committed Apr 4, 2020
1 parent dddd3a6 commit 0bb7c04
Show file tree
Hide file tree
Showing 66 changed files with 9 additions and 13 deletions.
6 changes: 1 addition & 5 deletions ModernWpf.SampleApp/ControlPages/WindowPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,16 @@
<ui:DropDownButton.Flyout>
<ui:MenuFlyout Placement="BottomEdgeAlignedLeft">
<MenuItem
Header="866 × 650"
Tag="866,650"
Header="914 × 686"
Click="ResizeWindow" />
<MenuItem
Header="1000 × 750"
Tag="1000,750"
Click="ResizeWindow" />
<MenuItem
Header="1200 × 900"
Tag="1200,900"
Click="ResizeWindow" />
<MenuItem
Header="1500 × 900"
Tag="1500,900"
Click="ResizeWindow" />
</ui:MenuFlyout>
</ui:DropDownButton.Flyout>
Expand Down
2 changes: 1 addition & 1 deletion ModernWpf.SampleApp/ControlPages/WindowPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ private void ResizeWindow(object sender, RoutedEventArgs e)
{
if (e.OriginalSource is MenuItem menuItem)
{
var size = Size.Parse((string)menuItem.Tag);
var size = Size.Parse(((string)menuItem.Header).Replace('×', ','));
Application.Current.MainWindow.Width = size.Width;
Application.Current.MainWindow.Height = size.Height;
}
Expand Down
4 changes: 2 additions & 2 deletions ModernWpf.SampleApp/WindowWithCustomTitleBar.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
mc:Ignorable="d"
Title="Custom Title Bar"
Width="866"
Height="487"
Width="914"
Height="686"
WindowStartupLocation="CenterOwner"
Background="{DynamicResource SystemControlPageBackgroundChromeMediumLowBrush}"
ui:WindowHelper.UseModernWindowStyle="True"
Expand Down
Binary file modified docs/images/AccentColorPalette.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/AppBarButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/AppBarToggleButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/AutoSuggestBox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/Buttons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/Calendar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ColorRamp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ComboBox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/CommandBar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/CommandBarFlyout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ContentDialog.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ContextMenu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ControlPalette1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ControlPalette2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/Controls.Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/Controls.Light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/CustomTitleBar.Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/CustomTitleBar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/DataGrid.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/DatePicker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/DropDownButton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/FlipView.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/Fluent.Ribbon.Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/Fluent.Ribbon.Light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/FluentWPF.Dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/FluentWPF.Light.png
Binary file modified docs/images/Flyout.png
Binary file modified docs/images/HamburgerMenuEx.png
Binary file modified docs/images/HighContrast.png
Binary file modified docs/images/HyperlinkButton.png
Binary file modified docs/images/ItemsRepeater-FlowLayout.png
Binary file modified docs/images/ItemsRepeater-StackLayout.png
Binary file modified docs/images/ItemsRepeater-UniformGridLayout.png
Binary file modified docs/images/ItemsRepeater.png
Binary file modified docs/images/ListBox.png
Binary file modified docs/images/ListView-GridView.png
Binary file modified docs/images/ListView-Grouped.png
Binary file modified docs/images/ListView-MultiSelect.png
Binary file modified docs/images/MahApps.Dark.png
Binary file modified docs/images/MahApps.Light.png
Binary file modified docs/images/MahApps.png
Binary file modified docs/images/Menu.png
Binary file modified docs/images/Nighttime.png
Binary file modified docs/images/NumberBox.png
Binary file modified docs/images/PageTransitions.png
Binary file modified docs/images/PasswordBox.png
Binary file modified docs/images/PersonPicture.png
Binary file modified docs/images/PowerShell.png
Binary file modified docs/images/Progress.png
Binary file modified docs/images/RadioButtons.png
Binary file modified docs/images/RadioMenuItem.png
Binary file modified docs/images/RatingControl.png
Binary file modified docs/images/SimpleStackPanel.png
Binary file modified docs/images/SimpleTimePicker.png
Binary file modified docs/images/Slider.png
Binary file modified docs/images/SplitButton.png
Binary file modified docs/images/TabControl.png
Binary file modified docs/images/TextBox.png
Binary file modified docs/images/TextContextMenu.png
Binary file modified docs/images/ToggleSwitch.png
Binary file modified docs/images/TreeView.png
4 changes: 2 additions & 2 deletions samples/MahAppsSample/ControlPages/ControlsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</ui:Flyout>
</Page.Resources>

<ui:SimpleStackPanel
<sc:NonClippingStackPanel
Orientation="Horizontal"
Spacing="40"
Margin="24,0,24,50">
Expand Down Expand Up @@ -259,5 +259,5 @@
Maximum="100" />
</sc:NonClippingStackPanel>

</ui:SimpleStackPanel>
</sc:NonClippingStackPanel>
</Page>
6 changes: 3 additions & 3 deletions samples/SamplesCommon/NonClippingStackPanel.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Windows;
using System.Windows.Controls;
using ModernWpf.Controls;
using System.Windows;
using System.Windows.Media;

namespace SamplesCommon
{
public class NonClippingStackPanel : StackPanel
public class NonClippingStackPanel : SimpleStackPanel
{
protected override Geometry GetLayoutClip(Size layoutSlotSize)
{
Expand Down

0 comments on commit 0bb7c04

Please sign in to comment.