From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 23 Feb 2012 07:23:40 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into layoutperformance
X-Git-Tag: 7.0.0.alpha2~434^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=541e653a9ed7281d0bd2c2da0c2fef9291b6c391;p=vaadin-framework.git

Merge remote branch 'origin/master' into layoutperformance

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
---

541e653a9ed7281d0bd2c2da0c2fef9291b6c391
diff --cc src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
index 357711d2f4,3fe3516f1c..dd2a2d3e93
--- a/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
@@@ -4,9 -4,9 +4,10 @@@
  
  package com.vaadin.terminal.gwt.client.ui.label;
  
 +import com.google.gwt.dom.client.Style.Display;
  import com.google.gwt.user.client.Event;
  import com.google.gwt.user.client.ui.HTML;
+ import com.vaadin.terminal.gwt.client.ApplicationConnection;
  import com.vaadin.terminal.gwt.client.BrowserInfo;
  import com.vaadin.terminal.gwt.client.Util;
  import com.vaadin.terminal.gwt.client.VTooltip;
@@@ -15,6 -15,10 +16,8 @@@ public class VLabel extends HTML 
  
      public static final String CLASSNAME = "v-label";
      private static final String CLASSNAME_UNDEFINED_WIDTH = "v-label-undef-w";
 -
 -    private int verticalPaddingBorder = 0;
 -    private int horizontalPaddingBorder = 0;
++    
+     private ApplicationConnection connection;
  
      public VLabel() {
          super();
@@@ -36,17 -40,25 +39,20 @@@
              event.stopPropagation();
              return;
          }
+         if (connection != null) {
+             connection.handleWidgetTooltipEvent(event, this);
+         }
      }
  
 -    @Override
 -    public void setHeight(String height) {
 -        verticalPaddingBorder = Util.setHeightExcludingPaddingAndBorder(this,
 -                height, verticalPaddingBorder);
 -    }
 -
      @Override
      public void setWidth(String width) {
 -        horizontalPaddingBorder = Util.setWidthExcludingPaddingAndBorder(this,
 -                width, horizontalPaddingBorder);
 +        super.setWidth(width);
          if (width == null || width.equals("")) {
              setStyleName(getElement(), CLASSNAME_UNDEFINED_WIDTH, true);
 +            getElement().getStyle().setDisplay(Display.INLINE_BLOCK);
          } else {
              setStyleName(getElement(), CLASSNAME_UNDEFINED_WIDTH, false);
 +            getElement().getStyle().clearDisplay();
          }
      }