Skip to content

Commit 69d2e5e

Browse files
author
soheil_h_y
committed
CTabfolder IE issues solved now.
1 parent 499ab9a commit 69d2e5e

File tree

3 files changed

+76
-36
lines changed

3 files changed

+76
-36
lines changed

‎sources/net.sf.j2s.java.org.eclipse.swt/j2sswt/swt-default.css‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -826,13 +826,14 @@ input.text-border {
826826
}
827827
/* Button Container of CTAB */
828828
.ctab-folder-button-area {
829+
min-height:16px;
829830
border-bottom:1px solid gray;
830831
border-left:1px solid gray;
831832
border-right:1px solid gray;
832833
border-top:1px solid gray;
833834
background-color: menu;
834835
padding:1px 1px 1px 1px;
835-
min-height:16px;
836+
_height: 16px;
836837
}
837838

838839
.ctab-item-more{
@@ -938,7 +939,7 @@ input.text-border {
938939
overflow:hidden;
939940
font-family:Arial, sans-serif;
940941
font-size:8pt;
941-
background-color:inherit;
942+
background-color:menu;
942943
}
943944

944945
.ctab-item-attach-noextrapos-left {
@@ -955,7 +956,7 @@ input.text-border {
955956
overflow:hidden;
956957
font-family:Arial, sans-serif;
957958
font-size:8pt;
958-
background-color:inherit;
959+
background-color:menu;
959960
}
960961

961962
.ctab-item-attach-close-left{
@@ -964,20 +965,20 @@ input.text-border {
964965
background-image:url('images/ctab-simple-close.gif');
965966
background-repeat:no-repeat;
966967
background-position:top left;
967-
background-color:inherit;
968+
background-color:menu;
968969
width:15px;
969970
overflow:hidden;
970971
font-family:Arial, sans-serif;
971972
font-size:8pt;
972973
font-family:Arial, sans-serif;
973974
font-size:8pt;
974975
}
975-
976+
.ctab-item-attach-close-left-hover,
976977
.ctab-item-attach-close-left:hover {
977978
background-image:url('images/ctab-simple-close-hover.gif');
978979
background-repeat:no-repeat;
979980
background-position:top left;
980-
background-color:inherit;
981+
background-color:menu;
981982
font-family:Arial, sans-serif;
982983
font-size:8pt;
983984
}
@@ -990,14 +991,14 @@ input.text-border {
990991
background-image:url('images/ctab-simple-close.gif');
991992
background-repeat:no-repeat;
992993
background-position:top right;
993-
background-color:inherit;
994+
background-color:menu;
994995
}
995-
996+
.ctab-item-attach-close-right-hover,
996997
.ctab-item-attach-close-right:hover{
997998
background-image:url('images/ctab-simple-close-hover.gif');
998999
background-repeat:no-repeat;
9991000
background-position:top right;
1000-
background-color:inherit;
1001+
background-color:menu;
10011002
font-family:Arial, sans-serif;
10021003
font-size:8pt;
10031004
}
@@ -1015,7 +1016,7 @@ input.text-border {
10151016
overflow:hidden;
10161017
font-family:Arial, sans-serif;
10171018
font-size:8pt;
1018-
background-color:inherit;
1019+
background-color:menu;
10191020
}
10201021

10211022
.ctab-item-attach-rounded-noextrapos-left {
@@ -1032,7 +1033,7 @@ input.text-border {
10321033
overflow:hidden;
10331034
font-family:Arial, sans-serif;
10341035
font-size:8pt;
1035-
background-color:inherit;
1036+
background-color:menu;
10361037
}
10371038

10381039
.ctab-item-attach-rounded-close-left{
@@ -1041,20 +1042,20 @@ input.text-border {
10411042
background-image:url('images/ctab-simple-close.gif');
10421043
background-repeat:no-repeat;
10431044
background-position:top left;
1044-
background-color:inherit;
1045+
background-color:menu;
10451046
width:15px;
10461047
overflow:hidden;
10471048
font-family:Arial, sans-serif;
10481049
font-size:8pt;
10491050
font-family:Arial, sans-serif;
10501051
font-size:8pt;
10511052
}
1052-
1053+
.ctab-item-attach-rounded-close-left-hover,
10531054
.ctab-item-attach-rounded-close-left:hover {
10541055
background-image:url('images/ctab-simple-close-hover.gif');
10551056
background-repeat:no-repeat;
10561057
background-position:top left;
1057-
background-color:inherit;
1058+
background-color:menu;
10581059
font-family:Arial, sans-serif;
10591060
font-size:8pt;
10601061
}
@@ -1067,14 +1068,14 @@ input.text-border {
10671068
background-image:url('images/ctab-simple-close.gif');
10681069
background-repeat:no-repeat;
10691070
background-position:top right;
1070-
background-color:inherit;
1071+
background-color:menu;
10711072
}
1072-
1073+
.ctab-item-attach-rounded-close-right-hover,
10731074
.ctab-item-attach-rounded-close-right:hover{
10741075
background-image:url('images/ctab-simple-close-hover.gif');
10751076
background-repeat:no-repeat;
10761077
background-position:top right;
1077-
background-color:inherit;
1078+
background-color:menu;
10781079
font-family:Arial, sans-serif;
10791080
font-size:8pt;
10801081
}
@@ -1089,7 +1090,7 @@ input.text-border {
10891090
background-image:url('images/ctab-simple-left-selected.gif');
10901091
background-repeat:no-repeat;
10911092
background-position:top right;
1092-
background-color:inherit;
1093+
background-color:menu;
10931094
}
10941095

10951096
.ctab-item-selected .ctab-item-attach-noextrapos-right {
@@ -1100,7 +1101,7 @@ input.text-border {
11001101
background-image:url('images/ctab-simple-right-selected.gif');
11011102
background-repeat:no-repeat;
11021103
background-position:top right;
1103-
background-color:inherit;
1104+
background-color:menu;
11041105
}
11051106
.ctab-item-selected .ctab-item-attach-default-right{
11061107
float:right;
@@ -1110,9 +1111,9 @@ input.text-border {
11101111
background-image:url('images/ctab-simple-right-close-selected.gif');
11111112
background-repeat:no-repeat;
11121113
background-position:top right;
1113-
background-color:inherit;
1114+
background-color:menu;
11141115
}
1115-
1116+
.ctab-item-selected .ctab-item-attach-default-right-hover,
11161117
.ctab-item-selected .ctab-item-attach-default-right:hover{
11171118
float:right;
11181119
width:15px;
@@ -1121,7 +1122,7 @@ input.text-border {
11211122
background-image:url('images/ctab-simple-right-close-selected-hover.gif');
11221123
background-repeat:no-repeat;
11231124
background-position:top right;
1124-
background-color:inherit;
1125+
background-color:menu;
11251126
}
11261127
/*
11271128
.ctab-item-selected .ctab-item-attach-close-rounded-right{
@@ -1210,8 +1211,10 @@ input.text-border {
12101211
background-image:url('images/ctab-rounded-close-right.gif');
12111212
background-repeat:no-repeat;
12121213
background-position:top right;
1213-
background-color:inherit;
1214+
background-color:menu;
12141215
}
1216+
1217+
.ctab-item-rounded-selected .ctab-item-attach-rounded-default-right-hover,
12151218
.ctab-item-rounded-selected .ctab-item-attach-rounded-default-right:hover{
12161219
float:right;
12171220
width:37px;
@@ -1220,7 +1223,7 @@ input.text-border {
12201223
background-image:url('images/ctab-rounded-close-right-hover.gif');
12211224
background-repeat:no-repeat;
12221225
background-position:top right;
1223-
background-color:inherit;
1226+
background-color:menu;
12241227
}
12251228

12261229
.ctab-item-rounded-selected .ctab-item-attach-rounded-noextrapos-left {
@@ -1232,7 +1235,7 @@ input.text-border {
12321235
background-image:url('images/ctab-rounded-left.gif');
12331236
background-repeat:no-repeat;
12341237
background-position:top left;
1235-
background-color:inherit;
1238+
background-color:menu;
12361239
}
12371240

12381241
.ctab-item-rounded-selected .ctab-item-attach-rounded-noextrapos-right {
@@ -1244,7 +1247,7 @@ input.text-border {
12441247
background-image:url('images/ctab-rounded-right.gif');
12451248
background-repeat:no-repeat;
12461249
background-position:top right;
1247-
background-color:inherit;
1250+
background-color:menu;
12481251
}
12491252

12501253
.ctab-item-rounded-selected .ctab-item-attach-rounded-close-left{
@@ -1253,20 +1256,20 @@ input.text-border {
12531256
background-image:url('images/ctab-simple-close.gif');
12541257
background-repeat:no-repeat;
12551258
background-position:top left;
1256-
background-color:inherit;
1259+
background-color:menu;
12571260
width:37px;
12581261
overflow:hidden;
12591262
font-family:Arial, sans-serif;
12601263
font-size:8pt;
12611264
font-family:Arial, sans-serif;
12621265
font-size:8pt;
12631266
}
1264-
1267+
.ctab-item-rounded-selected .ctab-item-attach-rounded-close-left-hover,
12651268
.ctab-item-rounded-selected .ctab-item-attach-rounded-close-left:hover {
12661269
background-image:url('images/ctab-simple-close-hover.gif');
12671270
background-repeat:no-repeat;
12681271
background-position:top left;
1269-
background-color:inherit;
1272+
background-color:menu;
12701273
font-family:Arial, sans-serif;
12711274
font-size:8pt;
12721275
}
@@ -1279,14 +1282,14 @@ input.text-border {
12791282
background-image:url('images/ctab-simple-close.gif');
12801283
background-repeat:no-repeat;
12811284
background-position:top right;
1282-
background-color:inherit;
1285+
background-color:menu;
12831286
}
1284-
1287+
.ctab-item-rounded-selected .ctab-item-attach-rounded-close-right-hover,
12851288
.ctab-item-rounded-selected .ctab-item-attach-rounded-close-right:hover{
12861289
background-image:url('images/ctab-simple-close-hover.gif');
12871290
background-repeat:no-repeat;
12881291
background-position:top right;
1289-
background-color:inherit;
1292+
background-color:menu;
12901293
font-family:Arial, sans-serif;
12911294
font-size:8pt;
12921295
}

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/custom/CTabFolder.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3376,16 +3376,22 @@ void updateSelection(int index) {
33763376
// boolean before = false;
33773377
int left = -2;
33783378
int x = 2;
3379+
33793380
for (int i = offset; i < items.length; i++) {
33803381
items[i].handle.style.display = "block";
33813382
items[i].handle.style.zIndex = (i + 1) + "";
3383+
33823384
//if (index == i) continue;
33833385
String cssName = items[i].handle.className;
33843386
if (cssName == null) cssName = "";
33853387
int idx = cssName.indexOf(key);
3388+
33863389
if (idx != -1) {
33873390
items[i].handle.className = cssName.substring(0, idx) + cssName.substring(idx + key.length());
3391+
33883392
items[i].rightEl.className = items[i].cssClassForRight();
3393+
Element el = (Element) buttonArea;
3394+
33893395
items[i].handle.style.height = (OS.getContainerHeight(buttonArea) -3) + "px";
33903396
items[i].isSelected = false;
33913397
//items[i].rightEl.style.backgroundColor = "red";
@@ -3395,6 +3401,8 @@ void updateSelection(int index) {
33953401
// before = true;
33963402
}
33973403
}
3404+
3405+
33983406
// int w = OS.getContainerWidth(items[i].handle);
33993407
// Element el = items[i].handle;
34003408
// System.out.println(" ITEMS I " + el.offsetWidth + " " + el.clientWidth + " " + el.scrollWidth);
@@ -3452,7 +3460,6 @@ void updateSelection(int index) {
34523460
//items[index].rightEl.style.backgroundColor = "white";
34533461
CSSStyle s = items[index].handle.style;
34543462
s.width = w + "px";
3455-
System.out.println("xxx S WIDTH : " + s.width + " " + OS.getContainerWidth(items[index].rightEl) + " " + OS.getContainerWidth(items[index].textEl));
34563463
}
34573464
items[index].handle.style.zIndex = (items.length + 1) + "";
34583465
//System.out.println("????");
@@ -4349,6 +4356,12 @@ protected void createHandle () {
43494356
// }
43504357
//borderFrame = (Element) createCSSElement(handle, cssName);
43514358
buttonArea = (Element) createCSSElement(handle, "ctab-folder-button-area");
4359+
4360+
// buttonArea = document.createElement("A");
4361+
// buttonArea.className = "ctab-folder-button-area";
4362+
//
4363+
// handle.appendChild(buttonArea);
4364+
43524365
contentArea = (Element) createCSSElement(handle, "ctab-folder-content-area");
43534366

43544367
// nwCorner = (Element) createCSSElement(handle, roundTheCorners ? "ctab-border-nw" : "no-border");

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/custom/CTabItem.java‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,8 @@ public void setText (String string) {
579579

580580
rightEl = document.createElement("DIV");
581581
rightEl.className = cssClassForRight();
582+
// rightEl.onmousemove = new
583+
// rightEl.onmouseout
582584
handle.appendChild(rightEl);
583585
configureRightEl();
584586
//handle.appendChild(document.createTextNode(string));
@@ -602,7 +604,7 @@ public void setText (String string) {
602604
void configureRightEl() {
603605
// TODO Auto-generated method stub
604606
System.out.println("Show close : " + showClose);
605-
if(showClose)
607+
if(showClose){
606608
rightEl.onclick = new RunnableCompatibility() {
607609
public void run() {
608610
CTabFolderEvent e = new CTabFolderEvent(parent);
@@ -627,6 +629,28 @@ public void run() {
627629

628630
}
629631
};
632+
/*
633+
* IE does not support HOVER on DIVs so this is a workaround !
634+
*/
635+
rightEl.onmouseover = new RunnableCompatibility() {
636+
public void run() {
637+
prepareCloseBtn(true);
638+
rightEl.className = rightEl.className.trim() + "-hover";
639+
640+
}
641+
};
642+
rightEl.onmouseout = new RunnableCompatibility() {
643+
public void run() {
644+
prepareCloseBtn(false);
645+
int idx = rightEl.className.indexOf("-hover");
646+
if(idx >= 0){
647+
rightEl.className = rightEl.className.substring(0, idx);
648+
}
649+
//rightEl.className = rightEl.className;
650+
}
651+
};
652+
653+
}
630654
}
631655
/**
632656
* Sets the receiver's tool tip text to the argument, which
@@ -675,7 +699,7 @@ protected void releaseHandle() {
675699
}
676700
protected void prepareCloseBtn(boolean in){
677701
//rightEl.style.backgroundImage = in ? "url(images/ctab-simple-right-close.png)" : "url(images/ctab-simple-right.gif)";
678-
String key = "ctab-item-attach-close-right";
702+
String key = " ctab-item-attach-close-right";
679703
if(this.isSelected || !parent.showClose){
680704
return;
681705
}
@@ -685,7 +709,7 @@ protected void prepareCloseBtn(boolean in){
685709
rightEl.className.substring(0,idx) + rightEl.className.substring(idx+key.length());
686710
}
687711
if(in){
688-
rightEl.className += " ctab-item-attach-close-right ";
712+
rightEl.className += " ctab-item-attach-close-right";
689713
}
690714
/*
691715
* Workaround for firefox;)

0 commit comments

Comments
 (0)