Merge pull request #358 from jibedoubleve/issue/357

Issue/357
jibedoubleve · Nov 1, 2023 · 11e34b5 · 11e34b5
2 parents 503e960 + 0673d4f
commit 11e34b5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 30 deletions.
diff --git a/src/Lanceur/Views/KeywordsView.xaml b/src/Lanceur/Views/KeywordsView.xaml
@@ -96,31 +96,13 @@
                     </Button>
                 </Grid>
             </Grid>
-            <Border
-                Grid.Column="1"
-                Margin="0"
-                Padding="0"
-                BorderBrush="{StaticResource DialogBorderBrush}"
-                Visibility="{Binding SelectedItem, ElementName=Aliases, Converter={StaticResource NullToVisibilityConverter}}">
-                <DockPanel>
-                    <StackPanel
-                        HorizontalAlignment="Right"
-                        DockPanel.Dock="Bottom"
-                        Orientation="Horizontal">
-                        <Button
-                            x:Name="BtnSaveOrUpdateAlias"
-                            Width="{StaticResource SettingsButtonWidth}"
-                            Margin="{StaticResource SettingsButtonMargin}"
-                            Style="{StaticResource AccentButtonStyle}">
-                            Save or update
-                        </Button>
-                        <Button
-                            x:Name="BtnDeleteAlias"
-                            Width="{StaticResource SettingsButtonWidth}"
-                            Margin="{StaticResource SettingsButtonMargin}">
-                            Delete
-                        </Button>
-                    </StackPanel>
+
+            <Grid Grid.Column="1" Visibility="{Binding SelectedItem, ElementName=Aliases, Converter={StaticResource NullToVisibilityConverter}}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <ScrollViewer>
                     <StackPanel Margin="15">
                         <HeaderedContentControl Header="Names (separate with coma)">
                             <StackPanel>
@@ -215,7 +197,7 @@
                                 </Hyperlink>
                             </TextBlock>
                         </HeaderedContentControl>
-                        <HeaderedContentControl Header="Parameters">
+                        <HeaderedContentControl Header="Additional arguments">
                             <DataGrid
                                 AreRowDetailsFrozen="True"
                                 AutoGenerateColumns="False"
@@ -237,8 +219,27 @@
                             </DataGrid>
                         </HeaderedContentControl>
                     </StackPanel>
-                </DockPanel>
-            </Border>
+                </ScrollViewer>
+                <StackPanel
+                    Grid.Row="1"
+                    HorizontalAlignment="Right"
+                    DockPanel.Dock="Bottom"
+                    Orientation="Horizontal">
+                    <Button
+                        x:Name="BtnSaveOrUpdateAlias"
+                        Width="{StaticResource SettingsButtonWidth}"
+                        Margin="{StaticResource SettingsButtonMargin}"
+                        Style="{StaticResource AccentButtonStyle}">
+                        Save or update
+                    </Button>
+                    <Button
+                        x:Name="BtnDeleteAlias"
+                        Width="{StaticResource SettingsButtonWidth}"
+                        Margin="{StaticResource SettingsButtonMargin}">
+                        Delete
+                    </Button>
+                </StackPanel>
+            </Grid>
         </Grid>
     </Grid>
 </rxui:ReactiveUserControl>
diff --git a/src/Lanceur/Views/SettingsView.xaml b/src/Lanceur/Views/SettingsView.xaml
@@ -11,8 +11,8 @@
     xmlns:vm="clr-namespace:Lanceur.Views"
     x:Name="_self"
     Title="Lanceur"
-    Width="1024"
-    Height="768"
+    Width="1280"
+    Height="960"
     ui:WindowHelper.UseModernWindowStyle="True"
     x:TypeArguments="vm:SettingsViewModel"
     AllowDrop="True"