fixed password display

SulfuricAcidH2SO4 · Feb 27, 2024 · aafa4ec · aafa4ec
1 parent 85789f7
commit aafa4ec
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/Orderly/Views/Pages/DashboardPage.xaml b/Orderly/Views/Pages/DashboardPage.xaml
@@ -309,29 +309,40 @@
                                                 <DataTemplate>
                                                     <Expander>
                                                         <Expander.Header>
-                                                            <DockPanel LastChildFill="True">
-                                                                <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+                                                            <Grid>
+                                                                <Grid.ColumnDefinitions>
+                                                                    <ColumnDefinition />
+                                                                    <ColumnDefinition Width="auto" />
+                                                                </Grid.ColumnDefinitions>
+                                                                <Grid VerticalAlignment="Center">
+                                                                    <Grid.ColumnDefinitions>
+                                                                        <ColumnDefinition />
+                                                                        <ColumnDefinition Width="auto" />
+                                                                        <ColumnDefinition />
+                                                                        <ColumnDefinition />
+                                                                    </Grid.ColumnDefinitions>
                                                                     <ui:TextBox
-                                                                        Width="150"
+                                                                        HorizontalAlignment="Stretch"
                                                                         IsEnabled="{Binding IsEditing}"
                                                                         PlaceholderEnabled="True"
                                                                         PlaceholderText="Service Name"
                                                                         Text="{Binding ServiceName}" />
                                                                     <Border
+                                                                        Grid.Column="1"
                                                                         Width="2"
                                                                         Margin="10,0"
                                                                         VerticalAlignment="Stretch"
                                                                         Background="{DynamicResource CardBackgroundFillColorDefaultBrush}" />
                                                                     <ui:TextBox
-                                                                        Width="245"
+                                                                        Grid.Column="2"
                                                                         FontStyle="Italic"
                                                                         IsEnabled="{Binding IsEditing}"
                                                                         Opacity=".5"
                                                                         PlaceholderEnabled="True"
                                                                         PlaceholderText="Username..."
                                                                         Text="{Binding Username}" />
                                                                     <ui:PasswordBox
-                                                                        Width="200"
+                                                                        Grid.Column="3"
                                                                         Margin="10,0"
                                                                         helpers:PasswordHelper.Attach="True"
                                                                         helpers:PasswordHelper.Password="{Binding Password, Mode=TwoWay}"
@@ -341,6 +352,7 @@
                                                                         PlaceholderEnabled="True"
                                                                         PlaceholderText="Password..." />
                                                                     <Button
+                                                                        Grid.Column="4"
                                                                         Background="Transparent"
                                                                         BorderThickness="0"
                                                                         Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=DataContext.ViewModel.GeneratePasswordCommand}"
@@ -360,8 +372,11 @@
                                                                         Visibility="{Binding IsEditing, Converter={StaticResource BoolToVisibilityConverter}}">
                                                                         <ui:SymbolIcon Symbol="Checkmark28" />
                                                                     </Button>
-                                                                </StackPanel>
-                                                                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                                                                </Grid>
+                                                                <StackPanel
+                                                                    Grid.Column="1"
+                                                                    HorizontalAlignment="Right"
+                                                                    Orientation="Horizontal">
                                                                     <Button
                                                                         x:Name="btnEdit"
                                                                         Padding="5"
@@ -431,7 +446,7 @@
                                                                         </ToggleButton.Style>
                                                                     </ToggleButton>
                                                                 </StackPanel>
-                                                            </DockPanel>
+                                                            </Grid>
                                                         </Expander.Header>
                                                     </Expander>
                                                 </DataTemplate>