From d8d18161702d8b5f58bba851cbd6581900dddf26 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Fri, 19 Dec 2008 14:48:38 +0000 Subject: [PATCH] Whole 'tab' clickable in IE6, fixes #2376 svn changeset:6307/svn branch:trunk --- .../ITMILL/themes/default/accordion/accordion.css | 6 ++---- WebContent/ITMILL/themes/default/styles.css | 6 ++---- .../toolkit/terminal/gwt/client/ui/IAccordion.java | 13 +++++++++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/WebContent/ITMILL/themes/default/accordion/accordion.css b/WebContent/ITMILL/themes/default/accordion/accordion.css index 477562e0df..a21be68c81 100644 --- a/WebContent/ITMILL/themes/default/accordion/accordion.css +++ b/WebContent/ITMILL/themes/default/accordion/accordion.css @@ -18,11 +18,11 @@ font-size: 15px; color: #656d73; border-top: 1px solid #c8cccd; + cursor: pointer; } .i-accordion-item-caption .i-caption { padding: 7px 0 6px 18px; - cursor: pointer; } .i-accordion-item-open .i-accordion-item-caption { @@ -32,12 +32,10 @@ border-bottom-color: #bfc9d4; text-shadow: #fafafa 1px 1px 0; border-bottom: 1px solid #c8cccd; -} - -.i-accordion-item-open .i-accordion-item-caption .i-caption { cursor: default; } + .i-accordion-item-content { position: absolute; overflow: auto; diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css index 54eaef6d22..c848c6e82f 100644 --- a/WebContent/ITMILL/themes/default/styles.css +++ b/WebContent/ITMILL/themes/default/styles.css @@ -21,11 +21,11 @@ font-size: 15px; color: #656d73; border-top: 1px solid #c8cccd; + cursor: pointer; } .i-accordion-item-caption .i-caption { padding: 7px 0 6px 18px; - cursor: pointer; } .i-accordion-item-open .i-accordion-item-caption { @@ -35,12 +35,10 @@ border-bottom-color: #bfc9d4; text-shadow: #fafafa 1px 1px 0; border-bottom: 1px solid #c8cccd; -} - -.i-accordion-item-open .i-accordion-item-caption .i-caption { cursor: default; } + .i-accordion-item-content { position: absolute; overflow: auto; diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java index 41dfae18f9..6a7ad121bb 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java @@ -8,6 +8,7 @@ import java.util.Set; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; +import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.ComplexPanel; import com.google.gwt.user.client.ui.Widget; @@ -328,8 +329,8 @@ public class IAccordion extends ITabsheetBase implements } int captionWidth = caption.getRequiredWidth(); - int padding = Util.measureHorizontalPaddingAndBorder(caption.getElement(), - 18); + int padding = Util.measureHorizontalPaddingAndBorder(caption + .getElement(), 18); return captionWidth + padding; } @@ -358,6 +359,10 @@ public class IAccordion extends ITabsheetBase implements setElement(DOM.createDiv()); caption = new ICaption(null, client); caption.addClickListener(this); + if (BrowserInfo.get().isIE6()) { + DOM.setEventListener(captionNode, this); + DOM.sinkEvents(captionNode, Event.BUTTON_LEFT); + } super.add(caption, captionNode); DOM.appendChild(captionNode, caption.getElement()); DOM.appendChild(getElement(), captionNode); @@ -372,6 +377,10 @@ public class IAccordion extends ITabsheetBase implements updateCaption(tabUidl); } + public void onBrowserEvent(Event event) { + onSelectTab(this); + } + public Element getContainerElement() { return content; } -- 2.39.5