From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 12 Mar 2010 15:04:39 +0000 (+0000)
Subject: Fix for #4004 PopupDateField - Wrong tabIndex for popup button
X-Git-Tag: 6.7.0.beta1~1934
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7ff037558336e4019d17c146c1766f5082a0e617;p=vaadin-framework.git

Fix for #4004 PopupDateField - Wrong tabIndex for popup button

svn changeset:11837/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index 9b504bc5f3..547af27179 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -60,6 +60,13 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
         }
         calendarToggle.setEnabled(enabled);
 
+        // not a FocusWidget -> needs own tabindex handling
+        if (uidl.hasAttribute("tabindex")) {
+            // Set the same tab index as for the textfield. Tabbing then works
+            // as expected.
+            calendarToggle.setTabIndex(uidl.getIntAttribute("tabindex"));
+        }
+
         if (lastReadOnlyState != readonly) {
             updateWidth();
         }