Don't set the minimum value of the row height.

c4stou · Dec 25, 2017 · 648b00c · 648b00c
1 parent 475a92b
commit 648b00c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 26 deletions.
diff --git a/ExcelMerge.GUI/Settings/ApplicationSetting.cs b/ExcelMerge.GUI/Settings/ApplicationSetting.cs
@@ -193,13 +193,6 @@ public int ColumnWidth
             set { SetProperty(ref columnWidth, value); }
         }
 
-        private int minRowHeight = 20;
-        public int MinRowHeight
-        {
-            get { return minRowHeight; }
-            set { SetProperty(ref minRowHeight, value); }
-        }
-
         private int maxRowHeight = 200;
         public int MaxRowHeight
         {

diff --git a/ExcelMerge.GUI/Views/DiffExtractionSettingWindow.xaml b/ExcelMerge.GUI/Views/DiffExtractionSettingWindow.xaml
@@ -148,21 +148,6 @@
                                   Value="{Binding Setting.ColumnWidth, UpdateSourceTrigger=PropertyChanged}" />
             </Grid>
 
-            <Grid Margin="3">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="20*"/>
-                <ColumnDefinition Width="80*"/>
-              </Grid.ColumnDefinitions>
-              <Label Grid.Column="0" 
-                     VerticalAlignment="Center"
-                     Content="{x:Static props:Resources.Label_MinRowHeight}"/>
-              <xctk:IntegerUpDown Grid.Column="1" 
-                                  Width="100"
-                                  HorizontalAlignment="Left"
-                                  Minimum="20" 
-                                  Value="{Binding Setting.MinRowHeight, UpdateSourceTrigger=PropertyChanged}" />
-            </Grid>
-
             <Grid Margin="3">
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="20*"/>
@@ -242,7 +227,7 @@
                   <StackPanel Orientation="Horizontal" Grid.Column="1">
                     <TextBox Text="{Binding Path=SelectedColor, ElementName=NewColorPicker, Mode=OneWay}" IsReadOnly="True" Width="100" Height="25" Margin="3 0 0 0" />
                     <xctk:ColorPicker x:Name="NewColorPicker" Width="250" Height="25" Margin="3" SelectedColor="AliceBlue"/>
-                    <Button Content="+" Margin="3" Width="50"
+                    <Button Content="+" Margin="0 3 3 3" Width="50"
                         Command="{Binding AddAlternationColorCommand}"
                         CommandParameter="{Binding Path=SelectedColor, ElementName=NewColorPicker}"/>
                   </StackPanel>

diff --git a/ExcelMerge.GUI/Views/EventHandler.cs b/ExcelMerge.GUI/Views/EventHandler.cs
@@ -81,7 +81,6 @@ public void OnApplicationSettingUpdated(IUnityContainer container)
                 grid.SetMaxColumnSize(App.Instance.Setting.ColumnWidth);
                 grid.SetMinColumnSize(App.Instance.Setting.ColumnWidth);
                 grid.SetMaxRowSize(App.Instance.Setting.MaxRowHeight);
-                grid.SetMinRowSize(App.Instance.Setting.MinRowHeight);
                 grid.AllowFlexibleRows = App.Instance.Setting.FitRowHeight;
 
                 DataGridEventDispatcher.DispatchModelUpdateEvent(grid, container);

diff --git a/FastWpfGrid/FastWpfGrid/FastGridControl_Arrange.cs b/FastWpfGrid/FastWpfGrid/FastGridControl_Arrange.cs
@@ -572,8 +572,9 @@ private bool CountVisibleRowHeights()
                 {
                     var cell = _isTransposed ? GetModelCell(col, row) : GetModelCell(row, col);
                     var cellContentHeight = Math.Min(GetCellContentHeight(cell), _rowSizes.MaxSize.Value);
-                    cellContentHeight = Math.Max(cellContentHeight, _rowSizes.MinSize.Value);
-                    _rowSizes.PutSizeOverride(modelRow, cellContentHeight + 2 * CellPaddingVertical + 2 + RowHeightReserve);
+
+                    if (cellContentHeight > _rowSizes.DefaultSize)
+                        _rowSizes.PutSizeOverride(modelRow, cellContentHeight + 2 * CellPaddingVertical + 2 + RowHeightReserve);
                 }
             }
             _rowSizes.BuildIndex();