#1785 RSV odd/even rows highlight enhancement

Former-commit-id: 856dfe60

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java

@@ -138,8 +138,6 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
     private Color foregroundSelected, backgroundSelected;
     private Font boldFont, italicFont, bolItalicFont;
 
-    private int rowBatchSize = 1;
-
     private boolean showOddRows = true;
     private boolean showCelIcons = true;
 
@@ -985,8 +983,6 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
         this.spreadsheet.setLineColor(colorRegistry.get(ThemeConstants.COLOR_SQL_RESULT_LINES_NORMAL));
         this.spreadsheet.setLineSelectedColor(colorRegistry.get(ThemeConstants.COLOR_SQL_RESULT_LINES_SELECTED));
 
-        this.rowBatchSize = getPreferenceStore().getInt(DBeaverPreferences.RESULT_SET_ROW_BATCH_SIZE);
-
         this.spreadsheet.recalculateSizes();
     }
 
@@ -1497,10 +1493,7 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
             boolean recordMode = controller.isRecordMode();
             ResultSetRow row = (ResultSetRow) (!recordMode ?  rowElement : colElement);
             DBDAttributeBinding attribute = (DBDAttributeBinding)(!recordMode ?  colElement : rowElement);
-            int rowNumber = row.getVisualNumber();
-            int rowRelativeNumber = rowNumber % (rowBatchSize * 2);
 
-            boolean odd = rowRelativeNumber < rowBatchSize;
             if (row.getState() == ResultSetRow.STATE_ADDED) {
                 return backgroundAdded;
             }
@@ -1516,8 +1509,20 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
             if (attribute.getValueHandler() instanceof DBDValueHandlerComposite) {
                 return backgroundReadOnly;
             }
-            if (!recordMode && odd && showOddRows) {
-                return backgroundOdd;
+            if (!recordMode && showOddRows) {
+                // Determine odd/even row
+                int rowBatchSize = getPreferenceStore().getInt(DBeaverPreferences.RESULT_SET_ROW_BATCH_SIZE);
+                if (rowBatchSize < 1) {
+                    rowBatchSize = 1;
+                }
+
+                int rowNumber = row.getVisualNumber();
+                int rowRelativeNumber = rowNumber % (rowBatchSize * 2);
+
+                boolean odd = rowRelativeNumber < rowBatchSize;
+                if (odd) {
+                    return backgroundOdd;
+                }
             }
 
             if (backgroundNormal == null) {