diff options
| author | Sergey Budkin <sergey@vaadin.com> | 2014-11-07 12:38:05 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-11-27 16:11:02 +0000 |
| commit | d9829d6636e046b452fdf6f93194c55db9c3997c (patch) | |
| tree | 02052384adca7df5e83a86ec7b7db9220f9859b1 /client | |
| parent | 551c06548831c05e9519836c1e068011b3a95c40 (diff) | |
| download | vaadin-framework-d9829d6636e046b452fdf6f93194c55db9c3997c.tar.gz vaadin-framework-d9829d6636e046b452fdf6f93194c55db9c3997c.zip | |
One pixel discrepancy in headers and rows border with minimal width (#15118)
Disabled old patch for VTreeTable, which caused the problem.
Change-Id: I3fdf6b0890307b27e32ceff4492cb7d0bfc6b680
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VScrollTable.java | 3 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/VTreeTable.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java index 6c241f1033..14e4c658ad 100644 --- a/client/src/com/vaadin/client/ui/VScrollTable.java +++ b/client/src/com/vaadin/client/ui/VScrollTable.java @@ -5392,6 +5392,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private Map<TableCellElement, TooltipInfo> cellToolTips = new HashMap<TableCellElement, TooltipInfo>(); private boolean isDragging = false; private String rowStyle = null; + protected boolean applyZeroWidthFix = true; private VScrollTableRow(int rowKey) { this.rowKey = rowKey; @@ -5497,7 +5498,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * definition of zero width table cells. Instead, use 1px * and compensate with a negative margin. */ - if (width == 0) { + if (applyZeroWidthFix && width == 0) { wrapperWidth = 1; wrapperStyle.setMarginRight(-1, Unit.PX); } else { diff --git a/client/src/com/vaadin/client/ui/VTreeTable.java b/client/src/com/vaadin/client/ui/VTreeTable.java index 9b7e9702b2..9e5940a2f2 100644 --- a/client/src/com/vaadin/client/ui/VTreeTable.java +++ b/client/src/com/vaadin/client/ui/VTreeTable.java @@ -155,6 +155,8 @@ public class VTreeTable extends VScrollTable { public VTreeTableRow(UIDL uidl, char[] aligns2) { super(uidl, aligns2); + // this fix causes #15118 and doesn't work for treetable anyway + applyZeroWidthFix = false; } @Override |