diff options
4 files changed, 12 insertions, 7 deletions
diff --git a/client/src/com/vaadin/client/renderers/ButtonRenderer.java b/client/src/com/vaadin/client/renderers/ButtonRenderer.java index c1952556f9..b173aef60a 100644 --- a/client/src/com/vaadin/client/renderers/ButtonRenderer.java +++ b/client/src/com/vaadin/client/renderers/ButtonRenderer.java @@ -33,6 +33,7 @@ public class ButtonRenderer extends ClickableRenderer<String, Button> { public Button createWidget() { Button b = GWT.create(Button.class); b.addClickHandler(this); + b.setStylePrimaryName("v-nativebutton"); return b; } diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java index 78d1fd4197..d6dfdee3b3 100644 --- a/client/src/com/vaadin/client/widgets/Grid.java +++ b/client/src/com/vaadin/client/widgets/Grid.java @@ -1289,7 +1289,8 @@ public class Grid<T> extends ResizeComposite implements saveButton = new Button(); saveButton.setText("Save"); - saveButton.setStyleName(styleName + "-save"); + saveButton.setStylePrimaryName("v-nativebutton"); + saveButton.addStyleName(styleName + "-save"); saveButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -1302,7 +1303,8 @@ public class Grid<T> extends ResizeComposite implements cancelButton = new Button(); cancelButton.setText("Cancel"); - cancelButton.setStyleName(styleName + "-cancel"); + cancelButton.setStylePrimaryName("v-nativebutton"); + cancelButton.addStyleName(styleName + "-cancel"); cancelButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { diff --git a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java index 310cd357fa..0d51558cd1 100644 --- a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java +++ b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderers.java @@ -25,6 +25,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Grid; import com.vaadin.ui.Grid.SelectionMode; +import com.vaadin.ui.NativeButton; import com.vaadin.ui.renderer.ButtonRenderer; import com.vaadin.ui.renderer.ClickableRenderer.RendererClickEvent; import com.vaadin.ui.renderer.ClickableRenderer.RendererClickListener; @@ -94,7 +95,7 @@ public class WidgetRenderers extends AbstractTestUI { addComponent(grid); - addComponent(new Button("Change column order", + addComponent(new NativeButton("Change column order", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { diff --git a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java index 20fbb12749..5da92b2034 100644 --- a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java @@ -54,7 +54,7 @@ public class WidgetRenderersTest extends MultiBrowserTest { openTestURL(); WebElement button = getGridCell(0, 1).findElement( - By.className("gwt-Button")); + By.className("v-nativebutton")); button.click(); @@ -74,7 +74,8 @@ public class WidgetRenderersTest extends MultiBrowserTest { assertTrue("cell should be focused after focusing", buttonCell.isFocused()); - WebElement button = buttonCell.findElement(By.className("gwt-Button")); + WebElement button = buttonCell.findElement(By + .className("v-nativebutton")); assertNotEquals("Button should not be clicked before click", "Clicked!", button.getText()); @@ -113,14 +114,14 @@ public class WidgetRenderersTest extends MultiBrowserTest { assertTrue(getGridCell(0, 1).isElementPresent( By.className("v-progressbar"))); assertTrue(getGridCell(0, 2).isElementPresent( - By.className("gwt-Button"))); + By.className("v-nativebutton"))); } @Test public void testPropertyIdInEvent() { openTestURL(); WebElement button = getGridCell(0, 3).findElement( - By.className("gwt-Button")); + By.className("v-nativebutton")); button.click(); assertEquals(WidgetRenderers.PROPERTY_ID, button.getText()); } |