From f077ae5ae0c82012ba55d5ebfa20347aaac0cfba Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Tue, 3 Jun 2008 13:48:31 +0000
Subject: [PATCH] More for #959 (tab scrolling)

svn changeset:4734/svn branch:trunk
---
 .../ITMILL/themes/default/tabsheet/img/next.png | Bin 442 -> 444 bytes
 .../ITMILL/themes/default/tabsheet/img/prev.png | Bin 446 -> 447 bytes
 .../ITMILL/themes/default/tabsheet/tabsheet.css |  11 +++++------
 .../terminal/gwt/client/ui/ITabsheet.java       |  14 +++++++++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/next.png b/WebContent/ITMILL/themes/default/tabsheet/img/next.png
index 99418be185cea73d4bd38d34188d6683841ded31..0d07f3ffa907a2ec29f55d804570632c1afa970f 100644
GIT binary patch
delta 237
zcmV<J022SY1H1!}7YZf_0{{R3>Dj9nks-u?3_Aw|fbCNN006j2L_t(2&*jtE4uUWc
z1<>gNlttXDRZ(%*q5uDTLYms)fy8I+(@jp&Y0|j>z+@uyC}IHp9P?aer`d+bT`nf+
ze!lE7E4NL1o{u$Wteo2RyzXPpK<15un~7v$9b6X?sGWx@Q7aF}1VrZHj3V`LLBJ+h
z0NURKTN9`$XdOUn0tWE|ZSDaQz;8g4t27yI$Z$i3SLC_X-+a{IiiV}GRaokS8m_@$
naa`3hQnl1o%@tCRa=QEm{>^{sb8%9=00000NkvXXu0mjfpucTZ

delta 235
zcmV<H02Kec1G)o{7YZ8)0{{R3Q9Zw8ks-u?1|KmuMI5>S006d0L_t(2&$ZIo4uUWc
z1<>gNlttXDRZ(%*q5uDTLYms)fy5X3bd!^Gn$86PCKI725d-MwnCCLPEOtEZaxqJf
z%XODoxo_I@er-8p<=nRC^PF-9GH)C_Oe72I;J%7L9XwQt+ITo8ATkeE6sd<B0yY6w
z(2fSSCQwt*I)K&$4B`*k+yf+l|9~b}X)@f9;f4&a$aAX^zGQG8VS}{_8$7Auoe#Fe
l^(rI1N?os9`vhsC%U`%AR9E|1hgARo002ovPDHLkV1gcpW7hxx

diff --git a/WebContent/ITMILL/themes/default/tabsheet/img/prev.png b/WebContent/ITMILL/themes/default/tabsheet/img/prev.png
index 2916761d657cf71437e85b088f2b22cb2349cb5c..783acf54c857dc56ce032d4d4d1c186b07448f58 100644
GIT binary patch
delta 216
zcmV;}04M*x1HS{17YZf_0{{R3>Dj9nks-tr3_B)B>HQ4=006s5L_t(2&*jsR_#A&$
zo^EmyhJ?8Qz(mT`C}sekIf)99pJtmV>2f*A_VZ<zS+zCoc|O(=W7X8Q=XD=P3`AiZ
z+;l8T>)^VGLGC=%sa$zDroeL#XXKfO3j&$|Xnz+P8=$cPlnT)19uRd8UG{(k@GCHi
zT%{-&O@?bS+?bj?x3+)rQG+WQmbxsFVW|&txCVp8aaGGn)iPH#S4d9E>GB)cE`VJ)
S&ct;90000<MNUMnLSTZbDO`X6

delta 215
zcmV;|04V>z1HJ>07YZ8)0{{R3Q9Zw8ks-tr1|cLHUE?eO006p4L_t(2&$ZH#_#A&w
zo^EmyhA<ZZm`J%A#SGvxCs85t(`*wZT`nite!lE7tG1>+&&N7qteV>Pyzb+OfhdfF
zn~p_k9b6YN$eo8el`9X&6nO68j6CyjK|m7#?O&m>0U8@XsQ_*60a5qRWe-RIzXGGk
zRf>YqWVj~7jj73VYy0Cb8Qe$MU?VHT1`l$0=YuVAy~;_iGS@5DK2DnG@*7Q$RLec$
R&v5_%002ovPDHLkV1k7jTaEw#

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;
-- 
2.39.5