summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-09-02 15:33:45 +0300
committerVaadin Code Review <review@vaadin.com>2015-09-02 13:27:34 +0000
commit724f55912045f67ee77867c84554f2312e784e6e (patch)
tree8e1dcd4a71ecd3071ade2ecaa37c7112368fcc72 /client
parentac66a3d17446571c6ebace16cb3930df44381ad7 (diff)
downloadvaadin-framework-724f55912045f67ee77867c84554f2312e784e6e.tar.gz
vaadin-framework-724f55912045f67ee77867c84554f2312e784e6e.zip
Fix Grid frozen non-editable cell location in Editor (#18750)
Change-Id: I27c7ff5a09b6b42915f37759845cd204983ca223
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/widgets/Grid.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 19fd77e75d..fc8151272d 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -1778,11 +1778,12 @@ public class Grid<T> extends ResizeComposite implements
} else {
cell.addClassName(NOT_EDITABLE_CLASS_NAME);
cell.addClassName(tr.getCells().getItem(i).getClassName());
- // If the focused stylename is present it should not be
- // inherited by the editor cell as it is not useful in the
- // editor and would look broken without additional style
- // rules. This is a bit of a hack.
+ // If the focused or frozen stylename is present it should
+ // not be inherited by the editor cell as it is not useful
+ // in the editor and would look broken without additional
+ // style rules. This is a bit of a hack.
cell.removeClassName(grid.cellFocusStyleName);
+ cell.removeClassName("frozen");
if (column == grid.selectionColumn) {
// Duplicate selection column CheckBox