diff options
| author | Henri Sara <hesara@vaadin.com> | 2017-09-20 10:59:02 +0300 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-09-26 18:24:43 +0300 |
| commit | 59c79733319c21e2e3402fb5ef9a8db4d0e356fe (patch) | |
| tree | 06e5b7f12be3c14fc5868fffaa24a0d32c60d583 /server | |
| parent | c9d537b26bdec8dde8660e8ead63aeee3bd5fc1c (diff) | |
| download | vaadin-framework-8.1.5.tar.gz vaadin-framework-8.1.5.zip | |
Fix ColorPickerGrid indexing8.1.5
Fixes #9018
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java index 6ab1ac1ccb..e51d03c5e0 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java @@ -38,7 +38,7 @@ public class ColorPickerGrid extends AbstractField<Color> { @Override public void select(int x, int y) { - Color oldValue = colorGrid[x][y]; + Color oldValue = colorGrid[y][x]; ColorPickerGrid.this.x = x; ColorPickerGrid.this.y = y; fireEvent(new ValueChangeEvent<>(ColorPickerGrid.this, oldValue, @@ -195,12 +195,12 @@ public class ColorPickerGrid extends AbstractField<Color> { @Override public Color getValue() { - return colorGrid[x][y]; + return colorGrid[y][x]; } @Override protected void doSetValue(Color color) { - colorGrid[x][y] = color; + colorGrid[y][x] = color; changedColors.put(new Point(x, y), color); sendChangedColors(); } |