update to v1.1.0

HandyControlDemo/HandyControlDemo.csproj

@@ -80,5 +80,8 @@
     <Resource Include="Resources\4.jpg" />
     <Resource Include="Resources\5.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\icon-white.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

HandyControlDemo/MainWindow.xaml

@@ -1,20 +1,46 @@
-<Window x:Class="HandyControlDemo.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
-        mc:Ignorable="d"
-        UseLayoutRounding="True"
-        Style="{StaticResource WindowDefaultStyle}"
-        WindowState="Maximized"
-        Title="MainWindow" 
-        Name="MyWindow"
-        d:DesignHeight="800" 
-        d:DesignWidth="1400">
-    <Grid Margin="32" Grid.IsSharedSizeScope="True">
+<controls:WindowBorderless x:Class="HandyControlDemo.MainWindow"
+                           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                           xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
+                           mc:Ignorable="d"
+                           UseLayoutRounding="True"
+                           BorderThickness="1"
+                           BorderBrush="#262e2f"
+                           NoUserAreaBackground="#262e2f"
+                           OtherButtonHoverBrush="#888580"
+                           Style="{StaticResource CustomWindowStyle}"
+                           WindowState="Maximized"
+                           Title="MainWindow" 
+                           Name="MyWindow"
+                           d:DesignHeight="800" 
+                           d:DesignWidth="1400">
+    <controls:WindowBorderless.NoUserContent>
+        <StackPanel Orientation="Horizontal">
+            <Border Margin="10,0,0,0" Width="16" Height="16">
+                <Border.Background>
+                    <ImageBrush ImageSource="Resources/icon-white.png"/>
+                </Border.Background>
+            </Border>
+            <Menu Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Background="Transparent">
+                <MenuItem Foreground="White" Header="File">
+                    <MenuItem Header="New repository" InputGestureText="Ctrl+N"></MenuItem>
+                    <Separator></Separator>
+                    <MenuItem Header="Add local repository"></MenuItem>
+                    <MenuItem Header="Clone repository"></MenuItem>
+                </MenuItem>
+                <MenuItem Foreground="White" Header="Edit"></MenuItem>
+                <MenuItem Foreground="White" Header="View"></MenuItem>
+                <MenuItem Foreground="White" Header="Repository"></MenuItem>
+                <MenuItem Foreground="White" Header="Branch"></MenuItem>
+                <MenuItem Foreground="White" Header="Help"></MenuItem>
+            </Menu>
+        </StackPanel>
+    </controls:WindowBorderless.NoUserContent>
+    <Grid Margin="32,0" Grid.IsSharedSizeScope="True">
         <ScrollViewer>
-            <StackPanel Name="StackPanelMain">
+            <StackPanel Margin="0,10" Name="StackPanelMain">
                 <!--按钮-->
                 <!--<Border Visibility="Collapsed" Style="{StaticResource BorderRegionStyle}">
                     <Grid>
@@ -340,7 +366,7 @@
                     </Grid>
                 </Border>-->
                 <!--图片浏览-->
-                <!--<Border Visibility="Visible" Margin="0,10,0,0" Style="{StaticResource BorderRegionStyle}">
+                <Border Visibility="Visible" Margin="0,10,0,0" Style="{StaticResource BorderRegionStyle}">
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" SharedSizeGroup="Header"/>
@@ -352,7 +378,7 @@
                         </StackPanel>
                         <Button Click="ButtonImageBrowser_OnClick" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="50,5,5,5" Content="点击打开图片浏览器" Style="{StaticResource ButtonPrimary}"></Button>
                     </Grid>
-                </Border>-->
+                </Border>
                 <!--颜色拾取器-->
                 <Border Visibility="Collapsed" Margin="0,10,0,0" Style="{StaticResource BorderRegionStyle}">
                     <Grid>
@@ -876,4 +902,4 @@
             </StackPanel>
         </ScrollViewer>
     </Grid>
-</Window>
+</controls:WindowBorderless>

HandyControlDemo/MainWindow.xaml.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
 using HandyControlDemo.Data.Model;
@@ -299,11 +299,8 @@ namespace HandyControlDemo
         //    StepsExample.Next();
         //}
 
-        //private void ButtonImageBrowser_OnClick(object sender, RoutedEventArgs e)
-        //{
-        //    var window = new ImageBrowser(new Uri("pack://application:,,,/Resources/demo.png"));
-        //    window.Show();
-        //}
+        private void ButtonImageBrowser_OnClick(object sender, RoutedEventArgs e) => 
+            new ImageBrowser(new Uri("pack://application:,,,/Resources/1.jpg")).Show();
 
         private void ColorPicker_OnColorSelected(object sender, FunctionEventArgs<Color> e)
         {