Commit 31ebdcf 1 parent ce98054 commit 31ebdcf Copy full SHA for 31ebdcf
File tree 2 files changed +1
-9
lines changed
modules/javafx.graphics/src/main/java
2 files changed +1
-9
lines changed Original file line number Diff line number Diff line change @@ -91,9 +91,6 @@ public InputMethodStateManager(Scene scene) {
91
91
* Add a new Scene to the stack.
92
92
*/
93
93
public void addScene (Scene scene ) {
94
- if (scenes .contains (scene )) {
95
- System .err .println ("Popup scene already present" );
96
- }
97
94
scenes .addFirst (scene );
98
95
updateInputMethodEventEnableState ();
99
96
}
@@ -102,10 +99,6 @@ public void addScene(Scene scene) {
102
99
* Remove a Scene from the stack.
103
100
*/
104
101
public void removeScene (Scene scene ) {
105
- if (scene != scenes .peekFirst ()) {
106
- System .err .println ("Popup scene removed out of order" );
107
- }
108
-
109
102
/**
110
103
* If this scene is going away we should cleanup any composition
111
104
* state. Hiding a window doesn't ensure proper cleanup.
Original file line number Diff line number Diff line change @@ -556,11 +556,11 @@ private void doVisibleChanging(boolean visible) {
556
556
*/
557
557
private void doVisibleChanged (boolean visible ) {
558
558
final Window ownerWindowValue = getOwnerWindow ();
559
+ Scene scene = getScene ();
559
560
if (visible ) {
560
561
rootWindow = getRootWindow (ownerWindowValue );
561
562
562
563
startMonitorOwnerEvents (ownerWindowValue );
563
- Scene scene = getScene ();
564
564
SceneHelper .getInputMethodStateManager (scene ).addScene (scene );
565
565
// currently we consider popup window to be focused when it is
566
566
// visible and its owner window is focused (we need to track
@@ -574,7 +574,6 @@ private void doVisibleChanged(boolean visible) {
574
574
} else {
575
575
// This may generate events so it must be done while we're
576
576
// still monitoring owner events.
577
- Scene scene = getScene ();
578
577
SceneHelper .getInputMethodStateManager (scene ).removeScene (scene );
579
578
stopMonitorOwnerEvents (ownerWindowValue );
580
579
unbindOwnerFocusedProperty (ownerWindowValue );
You can’t perform that action at this time.
0 commit comments