Browse Source

Fixes for issues found during review of #6720

 - Don't statically set row height
 - Table.RowGenerator and Table.GeneratedRow made Serializable

svn changeset:20561/svn branch:6.7
tags/6.7.0.beta1
Jonatan Kronqvist 12 years ago
parent
commit
30a10c6e93

+ 5
- 1
WebContent/VAADIN/themes/reindeer/table/table.css View File

@@ -122,7 +122,7 @@
background: #eff0f1;
}
.v-table-generated-row {
background: #dcdee0;
background: #dcdee0;
text-transform: uppercase;
font-size: 10px;
font-weight: bold;
@@ -130,6 +130,10 @@
text-shadow: #f3f5f8 0 1px 0;
line-height: normal;
}
.v-table-generated-row .v-table-cell-content {
padding-top: 1px;
padding-bottom: 2px;
}
.v-table-cell-content:last-child {
border-right-color: transparent;
}

+ 0
- 2
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java View File

@@ -5387,7 +5387,6 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
TableCellElement td = DOM.createTD().cast();
td.setColSpan(colCount);
initCellWithWidget(w, align, style, sorted, td);
td.getStyle().setHeight(getRowHeight(), Unit.PX);
}

private void addSpannedCell(UIDL rowUidl, String text, char align,
@@ -5398,7 +5397,6 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
td.setColSpan(colCount);
initCellWithText(text, align, style, textIsHTML, sorted,
description, td);
td.getStyle().setHeight(getRowHeight(), Unit.PX);
}

@Override

+ 2
- 2
src/com/vaadin/ui/Table.java View File

@@ -4643,7 +4643,7 @@ public class Table extends AbstractSelect implements Action.Container,
*
* Row generators can be used for e.g. summary rows or grouping of items.
*/
public interface RowGenerator {
public interface RowGenerator extends Serializable {
/**
* Called for every row that is painted in the Table. Returning a
* GeneratedRow object will cause the row to be painted based on the
@@ -4677,7 +4677,7 @@ public class Table extends AbstractSelect implements Action.Container,
public GeneratedRow generateRow(Table table, Object itemId);
}

public static class GeneratedRow {
public static class GeneratedRow implements Serializable {
private boolean htmlContentAllowed = false;
private boolean spanColumns = false;
private String[] text = null;

Loading…
Cancel
Save