fix: Wrapping in header and view data height

qlik-oss · Dec 9, 2022 · b971a1d · b971a1d
1 parent 6ec09c6
commit b971a1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/android/src/main/java/com/qliktrialreactnativestraighttable/TableViewFactory.java b/android/src/main/java/com/qliktrialreactnativestraighttable/TableViewFactory.java
@@ -127,7 +127,7 @@ protected void updateScrollbarBounds() {
   }
 
   protected void updateRowHeights() {
-    tableView.cellContentStyle.themedRowHeight = (tableView.cellContentStyle.getLineHeight() * tableView.cellContentStyle.lineCount) + CellView.PADDING_X_2;
+    tableView.cellContentStyle.themedRowHeight = tableView.cellContentStyle.getLineHeight() + CellView.PADDING_X_2;
     tableView.rowHeight = tableView.cellContentStyle.themedRowHeight;
     tableView.headerHeight = tableView.headerContentStyle.getLineHeight() + CellView.PADDING_X_2;
     tableView.totalsHeight = tableView.cellContentStyle.getLineHeight() + CellView.PADDING_X_2;

diff --git a/android/src/main/java/com/qliktrialreactnativestraighttable/TextWrapper.java b/android/src/main/java/com/qliktrialreactnativestraighttable/TextWrapper.java
@@ -65,7 +65,7 @@ void measureLineCountNoUpdate() {
   }
 
   protected int calculateLineCount() {
-    int width = Math.max(column.width - textView.getPaddingRight() - textView.getPaddingLeft(), 0);
+    int width = Math.max(column.width - textView.getPaddingRight() - textView.getPaddingLeft() - additionalPadding, 0);
     measureTextPaint.setTypeface(textView.getTypeface());
     StaticLayout.Builder builder = StaticLayout.Builder.obtain(textView.getText(), 0, textView.getText().length(), measureTextPaint, width);
     builder.setIncludePad(true);