Commit1d7f736

zhourenjian

committed

Fixing Shell's focusing issue: Miminizing a Shell object will activate the next Shell object correctly

1 parent54db23c commit1d7f736Copy full SHA for 1d7f736

File tree

+22

-3

lines changed

+22

-3

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2003,6 +2003,7 @@ public void setMinimized (boolean minimized) {`
`2003`	`2003`	`ShelltopShell =Display.getTopShell();`
`2004`	`2004`	`if (topShell !=null) {`
`2005`	`2005`	`topShell.bringToTop();`
	`2006`	`+topShell.forceFocus();`
`2006`	`2007`	`}else`
`2007`	`2008`	`/**`
`2008`	`2009`	`* Return to default title`
`@@ -2205,6 +2206,8 @@ public void run() {`
`2205`	`2206`	`if (display.topBar !=null) {`
`2206`	`2207`	`display.topBar.returnTopMaximized((Shell)shell);`
`2207`	`2208`	`}`
	`2209`	`+toReturn(false);`
	`2210`	`+newHTMLEventWrapper(getEvent()).stopPropagation();`
`2208`	`2211`	`}`
`2209`	`2212`	`};`
`2210`	`2213`	`}`
`@@ -2272,9 +2275,12 @@ public void run() {`
`2272`	`2275`	`publicvoidrun() {`
`2273`	`2276`	`if (isVisible()) {// may be invisible after clicking close button`
`2274`	`2277`	`bringToTop();`
	`2278`	`+forceFocus();`
	`2279`	`+/*`
`2275`	`2280`	`if(contentHandle != null){`
`2276`	`2281`	`OS.SetFocus(contentHandle); //contentHandle.focus();`
`2277`	`2282`	`}`
	`2283`	`+*/`
`2278`	`2284`	`}`
`2279`	`2285`	`toReturn(true);`
`2280`	`2286`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,12 @@`
`41`	`41`	`opacity:0.85;`
`42`	`42`	`filter:Alpha(Opacity=85);`
`43`	`43`	`}`
	`44`	`+*html .shortcut-bar {`
	`45`	`+bottom:-1px;`
	`46`	`+}`
	`47`	`+*html .shortcut-bar-minimized {`
	`48`	`+bottom:-1px;`
	`49`	`+}`
`44`	`50`	`.shortcut-item:hover,a.shortcut-item:hover .shortcut-item-highlight {`
`45`	`51`	`border:1px solid navy;`
`46`	`52`	`background-color:highlight;`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -501,10 +501,17 @@ public void close () {`
`501`	`501`	`taskBar.setMinimized(false);`
`502`	`502`	`taskBar.updateLastModified();`
`503`	`503`	`}`
	`504`	`+ShellnextShell =null;`
	`505`	`+if (parentinstanceofShell) {`
	`506`	`+nextShell = (Shell)parent;`
	`507`	`+}`
`504`	`508`	`closeWidget ();`
`505`		`-ShelltopShell =Display.getTopShell();`
`506`		`-if (topShell !=null && !topShell.isDisposed()) {`
`507`		`-topShell.bringToTop();`
	`509`	`+if (nextShell ==null \|\|nextShell.isDisposed()) {`
	`510`	`+nextShell =Display.getTopShell();`
	`511`	`+}`
	`512`	`+if (nextShell !=null && !nextShell.isDisposed()) {`
	`513`	`+nextShell.bringToTop();`
	`514`	`+nextShell.forceFocus();`
`508`	`515`	`}else`
`509`	`516`	`/**`
`510`	`517`	`* Return to default title`

Comments

(0)