Changeset 14380

Timestamp:

07/30/10 13:05:48 (6 weeks ago)

Author:

risto.yrjana@…

Message:

simplified client-side layout

Location:

incubator/Stepper

Files:

• WebContent/WEB-INF/lib/vaadin-6.2.2.jar (deleted)
• WebContent/WEB-INF/lib/vaadin-6.4.1.jar (added)
• src/org/vaadin/risto/stepper/AbstractStepper.java (modified) (1 diff)
• src/org/vaadin/risto/stepper/StepperApplication.java (modified) (5 diffs)
• src/org/vaadin/risto/stepper/widgetset/client/ui/VAbstractStepper.java (modified) (6 diffs)
• src/org/vaadin/risto/stepper/widgetset/public/bullet_arrow_down.png (modified) (previous)
• src/org/vaadin/risto/stepper/widgetset/public/bullet_arrow_up.png (modified) (previous)
• src/org/vaadin/risto/stepper/widgetset/public/stepper.css (modified) (1 diff)

incubator/Stepper/src/org/vaadin/risto/stepper/AbstractStepper.java

@@ -11 +11 @@
 
 /**
- * Abstract base class for all stepper types. Handles value communicatio between
- * the server and client.
+ * Abstract base class for all stepper types. Handles value communication
+ * between the server and client.
  * 
  * 

incubator/Stepper/src/org/vaadin/risto/stepper/StepperApplication.java

@@ -19 +19 @@
 
 public class StepperApplication extends Application {
+
+    private static final long serialVersionUID = 3840548109739501675L;
     private Window mainWindow;
 
@@ -48 +50 @@
         intStepper.setValue(1);
         intStepper.setStepAmount(1);
-        intStepper.setCaption("IntStepper");
+        intStepper.setCaption("IntStepper, step 1");
 
         FloatStepper floatStepper = new FloatStepper();
@@ -54 +56 @@
         floatStepper.setStepAmount(1.222f);
         floatStepper.setNumberOfDecimals(3);
-        floatStepper.setCaption("FloatStepper");
+        floatStepper.setCaption("FloatStepper, step 1.222");
 
         DateStepper dateStepper = new DateStepper();
@@ -60 +62 @@
         dateStepper.setStepField(VDateStepper.DateStepField.DAY);
         dateStepper.setStepAmount(1);
-        dateStepper.setCaption("DateStepper");
+        dateStepper.setCaption("DateStepper, step 1 day");
 
         Layout intStepperLayout = getStepperLayout(intStepper);
@@ -72 +74 @@
         panel.addComponent(infoLabel);
         panel.addComponent(stepperLayout);
+
         mainLayout.addComponent(panel);
         mainLayout.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);

incubator/Stepper/src/org/vaadin/risto/stepper/widgetset/client/ui/VAbstractStepper.java

@@ -15 +15 @@
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Anchor;
+import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.VerticalPanel;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.Paintable;
@@ -28 +27 @@
  * 
  */
-public abstract class VAbstractStepper extends HorizontalPanel implements
-        Paintable, ValueChangeHandler<String> {
+public abstract class VAbstractStepper extends FlowPanel implements Paintable,
+        ValueChangeHandler<String> {
 
     /** Set the tagname used to statically resolve widget from UIDL. */
@@ -94 +93 @@
         uidlId = uidl.getId();
 
-        this.immediate = uidl.getBooleanAttribute("immediate");
+        immediate = uidl.getBooleanAttribute("immediate");
 
         if (!uidl.getBooleanAttribute("disabled")) {
@@ -113 +112 @@
      * Check if the given value is valid instance of this type. If this returns
      * true, {@link #getIncreasedValue(String)} and
-     * {@link #getDecreasedValue(String)} must be able to compute a result.
+     * {@link #getDecreasedValue(String)} must be able to compute a result from
+     * this value.
      * 
      * @param value
@@ -199 +199 @@
      * 
      */
-    public class UpDown extends VerticalPanel implements ClickHandler,
+    public class UpDown extends FlowPanel implements ClickHandler,
             MouseDownHandler, MouseUpHandler, MouseOverHandler, MouseOutHandler {
 
-        private Button buttonUp;
-        private Button buttonDown;
+        private Anchor buttonUp;
+        private Anchor buttonDown;
         private final VAbstractStepper stepper;
         private MouseDownTimer mouseDownTimerUp;
@@ -213 +213 @@
             // buttonDown = new Button("&darr;");
 
-            this.setSpacing(0);
-            this.setBorderWidth(0);
-
-            buttonUp = new Button();
+            // setSpacing(0);
+            // setBorderWidth(0);
+
+            setStyleName("updown");
+
+            buttonUp = new Anchor();
             buttonUp.addStyleName("up");
 
-            buttonDown = new Button();
+            buttonDown = new Anchor();
             buttonDown.addStyleName("down");
 

incubator/Stepper/src/org/vaadin/risto/stepper/widgetset/public/stepper.css

@@ -1 @@
-.v-stepper .up {
-        background: transparent url("bullet_arrow_up.png") no-repeat center center;
+.v-stepper {
+        position: relative;
+}
+
+.v-stepper .updown {
+        position: absolute;
+        top: 2px;
+        right: 1px;
+        margin: 0 1px;
+}
+
+.v-stepper .up,
+.v-stepper .down {
         padding: 0px 1px;
         margin: 0;
         width: 16px;
-        height: 12px;
+        height: 10px;
+        display: block;
+        outline: none;
+}
+
+.v-stepper .up {
+        background: transparent url("bullet_arrow_up.png") no-repeat center center;
+        padding-top: 2px;
 }
 
 .v-stepper .down {
         background: transparent url("bullet_arrow_down.png") no-repeat center center;
-        padding: 0px 1px;
-        margin: 0;
-        width: 16px;
-        height: 12px;
 }
 
-.v-ie .v-stepper .up {
-        height: 11px;
+.v-ie7 .v-stepper .updown {
+        margin-top: 2px;
 }
 
-.v-ie .v-stepper .down {
-        height: 11px;
+.v-ie7 .v-stepper .up,
+.v-ie7 .v-stepper .down {
+        line-height: 8px;
+        height: 8px;
 }
+
+.v-ie8 .v-stepper .updown {
+        top: 1px;
+}