Skip to content

Commit 17aab3c

Browse files
author
zhourenjian
committed
1. Wait 10s before Hotspot monitor is enabled
2. Fixed bug that SWT.TOOL Shell is not correctly layout
1 parent 6b6a95a commit 17aab3c

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,11 @@ public void run() {
597597
&& (style & (SWT.TITLE | SWT.MIN | SWT.MAX | SWT.CLOSE)) != 0) {
598598
setSystemMenu();
599599
}
600-
contentHandle = createCSSDiv("shell-content");
600+
String contentCSS = "shell-content";
601+
if ((style & SWT.TOOL) != 0) {
602+
contentCSS += " shell-tool";
603+
}
604+
contentHandle = createCSSDiv(contentCSS);
601605
if (DragAndDrop.class != null) {
602606
DragAndDrop dnd = new DragAndDrop();
603607
dnd.addDragListener(new ShellFrameDND() {
@@ -2403,6 +2407,8 @@ protected boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y
24032407
contentHandle.style.width = (width - dw > 0 ? width - dw : 0) + "px";
24042408
contentHandle.style.top = 3 + "px";
24052409
contentHandle.style.left = 1 + "px";
2410+
width += 4;
2411+
height += 4;
24062412
}
24072413
if ((style & SWT.BORDER) != 0) {
24082414
cx -= 4;

sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Shell.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
/*background-color:navy;*/
3939
z-index:3;
4040
}
41+
.shell-tool {
42+
margin:1px !important;
43+
margin-top:-1px !important;
44+
}
4145
.shell-menu-bar .shell-content {
4246
top:44px;
4347
}

0 commit comments

Comments
 (0)