@@ -777,7 +777,7 @@ Chrome.prototype = {
777
777
_updateVisibility : function ( ) {
778
778
const monitorsInFullscreen = [ ] ;
779
779
this . _monitors . forEach ( monitor => {
780
- const topWindow = this . getTopWindowOnMonitor ( monitor . index )
780
+ const topWindow = this . _getTopWindowOnMonitor ( monitor . index )
781
781
monitorsInFullscreen [ monitor . index ] = topWindow && topWindow . is_fullscreen ( ) ;
782
782
} ) ;
783
783
@@ -811,21 +811,26 @@ Chrome.prototype = {
811
811
this . _queueUpdateRegions ( ) ;
812
812
} ,
813
813
814
- getTopWindowOnMonitor : function ( monitorIndex ) {
815
- let topWindow = null , topWindowTime = 0 ;
816
- global . get_window_actors ( ) . forEach ( actor => {
817
- const window = actor . meta_window ;
818
- if ( ! window || window . get_monitor ( ) !== monitorIndex ||
819
- window . minimized || ! window . showing_on_its_workspace ( ) ||
820
- window . get_workspace ( ) !== global . workspace_manager . get_active_workspace ( ) )
821
- return ;
822
- if ( window . get_user_time ( ) > topWindowTime ) {
823
- topWindowTime = window . get_user_time ( ) ;
824
- topWindow = window ;
825
- }
826
- } ) ;
814
+ _getTopWindowOnMonitor : function ( monitorIndex ) {
815
+ const focusedWindow = global . display . get_focus_window ( ) ;
816
+ if ( focusedWindow && focusedWindow . get_monitor ( ) === monitorIndex ) {
817
+ return focusedWindow ;
818
+ } else {
819
+ let topWindow = null , topWindowTime = 0 ;
820
+ global . get_window_actors ( ) . forEach ( actor => {
821
+ const window = actor . meta_window ;
822
+ if ( ! window || window . get_monitor ( ) !== monitorIndex ||
823
+ window . minimized || ! window . showing_on_its_workspace ( ) ||
824
+ window . get_workspace ( ) !== global . workspace_manager . get_active_workspace ( ) )
825
+ return ;
826
+ if ( window . get_user_time ( ) > topWindowTime ) {
827
+ topWindowTime = window . get_user_time ( ) ;
828
+ topWindow = window ;
829
+ }
830
+ } ) ;
827
831
828
- return topWindow ;
832
+ return topWindow ;
833
+ }
829
834
} ,
830
835
831
836
_overviewShowing : function ( ) {
0 commit comments