Merge pull request #110 from lepoco/development

Merge development
lepoco · Mar 20, 2022 · a19300a · a19300a
2 parents 7ba58f4 + 5d389bc
commit a19300a
Show file tree

Hide file tree

Showing 17 changed files with 4,715 additions and 2,060 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -39,13 +39,3 @@ jobs:
 
       - name: Publish
         run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGET_API_KEY}}
-
-      - uses: "marvinpinto/action-automatic-releases@latest"
-          with:
-            repo_token: "${{ secrets.GITHUB_TOKEN }}"
-            automatic_release_tag: "latest"
-            draft: false
-            title: "WPF UI #{{ github.run_number }}"
-            prerelease: true # Make conditional
-            files: |
-              **\*.nupkg
diff --git a/Assets/package.json b/Assets/package.json
@@ -3,6 +3,6 @@
   "name": "wpf-ui",
   "version": "1.1.0",
   "dependencies": {
-    "@fluentui/react-icons": "1.1.152"
+    "@fluentui/react-icons": "1.1.163"
   }
 }
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.2.1</Version>
+    <Version>1.2.2</Version>
     <LangVersion>latest</LangVersion>
     <Authors>lepo.co</Authors>
     <Company>lepo.co</Company>

diff --git a/WPFUI.Demo/Views/Container.xaml b/WPFUI.Demo/Views/Container.xaml
@@ -173,12 +173,12 @@
         <wpfui:Dialog
             x:Name="RootDialog"
             Grid.Row="0"
-            Opened="RootDialog_OnOpened"
-            Closed="RootDialog_OnClosed"
             Grid.RowSpan="2"
             ButtonLeftClick="RootDialog_LeftButtonClick"
             ButtonLeftName="Click me if you can!"
             ButtonRightClick="RootDialog_RightButtonClick"
+            Closed="RootDialog_OnClosed"
+            Opened="RootDialog_OnOpened"
             Show="False">
             <Grid>
                 <StackPanel>

diff --git a/WPFUI.Demo/Views/Pages/Forms.xaml b/WPFUI.Demo/Views/Pages/Forms.xaml
@@ -13,7 +13,7 @@
     mc:Ignorable="d">
 
     <Grid Margin="0,0,18,18">
-        <StackPanel Margin="0,0,0,12">
+        <VirtualizingStackPanel Margin="0,0,0,12">
             <TextBlock
                 Margin="0,0,0,8"
                 FontWeight="Bold"
@@ -72,6 +72,15 @@
             <Label Content="PasswordBox" />
             <PasswordBox Margin="0,0,0,8" />
 
+            <Label Content="wpfui:PasswordBox" />
+            <wpfui:PasswordBox
+                Margin="0,0,0,8"
+                Icon="Password24"
+                PasswordChar="*"
+                PasswordRevealMode="Hidden"
+                Placeholder="Password"
+                ShowRevealButton="True" />
+
             <Label Content="ComboBox" />
             <ComboBox Margin="0,0,0,8">
                 <ComboBoxItem Content="Lorem ipsum" IsSelected="True" />
@@ -178,6 +187,6 @@
                 Text="Calendar" />
 
             <Calendar HorizontalAlignment="Left" />
-        </StackPanel>
+        </VirtualizingStackPanel>
     </Grid>
 </Page>