Show scrollbar in cell diff textbox.

c4stou · Dec 22, 2017 · debcff7 · debcff7
1 parent f3e8f53
commit debcff7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 52 deletions.
diff --git a/ExcelMerge.GUI/Views/DiffExtractionSettingWindow.xaml b/ExcelMerge.GUI/Views/DiffExtractionSettingWindow.xaml
@@ -114,58 +114,6 @@
                         IsChecked="{Binding Setting.AlwaysExpandCellDiff}"/>
             </Grid>
 
-            <Grid Margin="3">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="30*"/>
-                <ColumnDefinition Width="70*"/>
-              </Grid.ColumnDefinitions>
-              <Label Grid.Column="0" 
-                     VerticalAlignment="Center" 
-                     Content="{x:Static props:Resources.Label_SkipFirstBlankColumns}"/>
-              <CheckBox Grid.Column="1" 
-                        VerticalAlignment="Center" 
-                        IsChecked="{Binding Setting.SkipFirstBlankColumns}"/>
-            </Grid>
-
-            <Grid Margin="3">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="30*"/>
-                <ColumnDefinition Width="70*"/>
-              </Grid.ColumnDefinitions>
-              <Label Grid.Column="0"
-                     VerticalAlignment="Center" 
-                     Content="{x:Static props:Resources.Label_TrimLastBlankRows}"/>
-              <CheckBox Grid.Column="1" 
-                        VerticalAlignment="Center"
-                        IsChecked="{Binding Setting.TrimLastBlankRows}"/>
-            </Grid>
-
-            <Grid Margin="3">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="30*"/>
-                <ColumnDefinition Width="70*"/>
-              </Grid.ColumnDefinitions>
-              <Label Grid.Column="0" 
-                     VerticalAlignment="Center"
-                     Content="{x:Static props:Resources.Label_TrimLastBlankColumns}"/>
-              <CheckBox Grid.Column="1" 
-                        VerticalAlignment="Center"
-                        IsChecked="{Binding Setting.TrimLastBlankColumns}"/>
-            </Grid>
-
-            <Grid Margin="3">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="30*"/>
-                <ColumnDefinition Width="70*"/>
-              </Grid.ColumnDefinitions>
-              <Label Grid.Column="0"
-                     VerticalAlignment="Center"
-                     Content="{x:Static props:Resources.Label_NotifyEqual}"/>
-              <CheckBox Grid.Column="1" 
-                        VerticalAlignment="Center" 
-                        IsChecked="{Binding Setting.NotifyEqual}"/>
-            </Grid>
-
           </StackPanel>
         </GroupBox>
 

diff --git a/ExcelMerge.GUI/Views/DiffView.xaml b/ExcelMerge.GUI/Views/DiffView.xaml
@@ -316,6 +316,8 @@
                  GotFocus="ValueTextBox_GotFocus"
                  LostFocus="ValueTextBox_LostFocus"
                  Focusable="True"
+                 VerticalScrollBarVisibility="Auto"
+                 HorizontalScrollBarVisibility="Auto"
                  ScrollViewer.ScrollChanged ="ValuteTextBox_ScrollChanged"
                  />
 
@@ -355,6 +357,8 @@
                  GotFocus="ValueTextBox_GotFocus"
                  LostFocus="ValueTextBox_LostFocus"
                  Focusable="True"
+                 VerticalScrollBarVisibility="Auto"
+                 HorizontalScrollBarVisibility="Auto"
                  ScrollViewer.ScrollChanged ="ValuteTextBox_ScrollChanged"
                  />