Merge pull request #30 from haruki-taka8/feature-full-column/row-dime…

…nsion-contraints Full customizability on column/row dimension constraints
haruki-taka8 · Nov 13, 2023 · 6771584 · 6771584
2 parents 613ec83 + d58cb30
commit 6771584
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 6 deletions.
diff --git a/rowsSharp/Model/Preferences/ColumnStyle.cs b/rowsSharp/Model/Preferences/ColumnStyle.cs
@@ -32,12 +32,12 @@ public class ColumnStyle
     /// <summary>
     /// The minimum width of the column
     /// </summary>
-    public double MinWidth { get; set; } = 32;
+    public double MinWidth { get; set; }
 
     /// <summary>
     /// The default maximum width of the column
     /// </summary>
-    public double MaxWidth { get; set; } = double.PositiveInfinity;
+    public double MaxWidth { get; set; }
 
     /// <summary>
     /// The template of the column.

diff --git a/rowsSharp/Model/Preferences/Editor.cs b/rowsSharp/Model/Preferences/Editor.cs
@@ -46,6 +46,11 @@ public class Editor
     /// </summary>
     public double DefaultRowHeight { get; set; } = 33;
 
+    /// <summary>
+    /// Fallback minimum height of a row.
+    /// </summary>
+    public double DefaultMinRowHeight { get; set; }
+
     /// <summary>
     /// Fallback width of a column.
     /// </summary>
@@ -54,6 +59,22 @@ public class Editor
     /// </remarks>
     public double DefaultColumnWidth { get; set; } = 50;
 
+    /// <summary>
+    /// Fallback minimum width of a column.
+    /// </summary>
+    /// <remarks>
+    /// ColumnStyles can override this value on a column-to-column basis.
+    /// </remarks>
+    public double DefaultMinColumnWidth { get; set; } = 25;
+
+    /// <summary>
+    /// Fallback maximum width of a column.
+    /// </summary>
+    /// <remarks>
+    /// ColumnStyles can override this value on a column-to-column basis.
+    /// </remarks>
+    public double DefaultMaxColumnWidth { get; set; }
+
     /// <summary>
     /// Whether scrolling only occurs after the scrollbar has finished moving.
     /// This saves computing resources at an expense of less responsiveness.

diff --git a/rowsSharp/Userdata/Configurations/Configuration.json b/rowsSharp/Userdata/Configurations/Configuration.json
@@ -29,7 +29,10 @@
     "IsAutosaveEnabled": true,
     "AutosaveInterval": 60000,
     "FrozenColumn": 0,
-    "DefaultRowHeight": 33,
+    "DefaultMinRowHeight": 28,
+    "DefaultRowHeight": 34,
+    "DefaultMinColumnWidth": 16,
+    "DefaultMaxColumnWidth": 256,
     "DefaultColumnWidth": 128,
     "IsDeferredScrollingEnabled": false,
     "ColumnStyles": [

diff --git a/rowsSharp/View/DataGridColumn/DataGridColumnFactory.cs b/rowsSharp/View/DataGridColumn/DataGridColumnFactory.cs
@@ -44,8 +44,8 @@ internal static DataGridColumn CreateColumn(int columnIndex, ColumnStyle style,
         column.Binding = binding;
         column.Header = style.Column;
         column.Width = style.Width > 0 ? style.Width : column.Width;
-        column.MinWidth = style.MinWidth;
-        column.MaxWidth = style.MaxWidth;
+        if (style.MinWidth > 0) { column.MinWidth = style.MinWidth; }
+        if (style.MaxWidth > 0) { column.MaxWidth = style.MaxWidth; }
         column.CellStyle = ColumnStyleHelper.GetConditionalFormatting(style.ConditionalFormatting);
 
         return column;

diff --git a/rowsSharp/View/Editor.xaml b/rowsSharp/View/Editor.xaml
@@ -210,12 +210,19 @@
                     VerticalGridLinesBrush="{StaticResource Rows.DataGrid.Grid.Vertical}"
                     HorizontalGridLinesBrush="{StaticResource Rows.DataGrid.Grid.Horizontal}"
                     ScrollViewer.IsDeferredScrollingEnabled="{Binding Preferences.Editor.IsDeferredScrollingEnabled, Mode=OneWay}"
+                    MinColumnWidth="{Binding Preferences.Editor.DefaultMinColumnWidth, Mode=OneTime}"
+                    MaxColumnWidth="{Binding Preferences.Editor.DefaultMaxColumnWidth, Mode=OneTime}"
+                    MinRowHeight="{Binding Preferences.Editor.DefaultMinRowHeight, Mode=OneTime}"
                     ColumnWidth="{Binding Preferences.Editor.DefaultColumnWidth, Mode=OneTime}" RowHeaderWidth="8"
                     RowHeight="{Binding Preferences.Editor.DefaultRowHeight, Mode=OneTime}"                      
                     CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="{Binding Preferences.Editor.CanEdit, Converter={StaticResource InvertBooleanConverter}, Mode=OneWay}"
                     SelectionMode="Extended" SelectionUnit="CellOrRowHeader"
+                    FrozenColumnCount="{Binding Preferences.Editor.FrozenColumn, Mode=OneTime}"
                     CanUserReorderColumns="{Binding Preferences.Editor.CanEdit, Mode=OneWay}"
-				    EnableColumnVirtualization="True" EnableRowVirtualization="True" VirtualizingPanel.ScrollUnit="Pixel">                
+				    EnableColumnVirtualization="True" EnableRowVirtualization="True"
+                    VirtualizingPanel.VirtualizationMode="Recycling"
+                    VirtualizingPanel.IsVirtualizing="True"
+                    VirtualizingPanel.ScrollUnit="Pixel">                
                 <DataGrid.ContextMenu>
                     <ContextMenu DataContext="{Binding PlacementTarget, RelativeSource={x:Static RelativeSource.Self}}">
                         <MenuItem Command="{Binding DataContext.CopyPreview, Mode=OneTime}" Header="Copy image" InputGestureText="Ctrl+Shift+C"/>