From: Marc Englund <marc.englund@itmill.com>
Date: Tue, 3 Jun 2008 13:48:31 +0000 (+0000)
Subject: More for #959 (tab scrolling)
X-Git-Tag: 6.7.0.beta1~4672
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f077ae5ae0c82012ba55d5ebfa20347aaac0cfba;p=vaadin-framework.git

More for #959 (tab scrolling)

svn changeset:4734/svn branch:trunk
---

diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/next.png b/WebContent/ITMILL/themes/default/tabsheet/img/next.png
index 99418be185..0d07f3ffa9 100644
Binary files a/WebContent/ITMILL/themes/default/tabsheet/img/next.png and b/WebContent/ITMILL/themes/default/tabsheet/img/next.png differ
diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/prev.png b/WebContent/ITMILL/themes/default/tabsheet/img/prev.png
index 2916761d65..783acf54c8 100644
Binary files a/WebContent/ITMILL/themes/default/tabsheet/img/prev.png and b/WebContent/ITMILL/themes/default/tabsheet/img/prev.png differ
diff --git a/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css b/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
index 7f7e96c22f..faf79fe0fe 100644
--- a/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
+++ b/WebContent/ITMILL/themes/default/tabsheet/tabsheet.css
@@ -18,7 +18,6 @@
 .i-tabsheet-scroller {
 	white-space: nowrap;
 	text-align: right;
-	overflow: hidden;
 	height: 48px;
 }
 .i-tabsheet-hidetabs .i-tabsheet-scroller {
@@ -28,19 +27,19 @@
 .i-tabsheet-scrollerNext {
 	border: none;
 	width: 12px;
-	height: 27px;
+	height: 38px;
 	position: relative;
 	margin-top: -10px;
-	top: -23px;
+	top: -29px;
 }
 .i-tabsheet-scrollerPrev-disabled,
 .i-tabsheet-scrollerNext-disabled {
 	border: none;
 	width: 12px;
-	height: 27px;
+	height: 38px;
 	position: relative;
 	margin-top: -10px;
-	top: -23px;
+	top: -29px;
 }
 
 .i-tabsheet-scrollerNext,
@@ -51,7 +50,7 @@
 .i-tabsheet-scrollerPrev,
 .i-tabsheet-scrollerPrev-disabled {
 	background: transparent url(img/prev.png) no-repeat bottom left;
-	margin-right: 1px;
+	margin-right: 0px;
 }
 .i-tabsheet-scrollerPrev:hover,
 .i-tabsheet-scrollerNext:hover {
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
index 94fab77fe6..1a46196b99 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -193,6 +193,17 @@ public class ITabsheet extends ITabsheetBase implements
             tb.setVisible(true);
             removeStyleName(CLASSNAME + "-hidetabs");
         }
+
+        // tabs; push or not
+        if (uidl.hasAttribute("width")) {
+            // update width later, in updateTabScroller();
+            DOM.setStyleAttribute(scroller, "width", "1px");
+            DOM.setStyleAttribute(scroller, "overflow", "hidden");
+        } else {
+            DOM.setStyleAttribute(scroller, "width", "");
+            DOM.setStyleAttribute(scroller, "overflow", "visible");
+        }
+
         updateTabScroller();
         waitingForResponse = false;
     }
@@ -306,7 +317,8 @@ public class ITabsheet extends ITabsheetBase implements
      * Layouts the tab-scroller elements, and applies styles.
      */
     private void updateTabScroller() {
-        DOM.setStyleAttribute(scroller, "width", tp.getOffsetWidth() + "px");
+
+        DOM.setStyleAttribute(scroller, "width", getOffsetWidth() + "px");
 
         if (scrollerIndex > tb.getTabCount()) {
             scrollerIndex = 0;