File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -417,7 +417,8 @@ export class ShellWindow {
417
417
let border = this . border ;
418
418
419
419
const permitted = ( ) => {
420
- return this . ext . focus_window ( ) == this
420
+ return this . actor_exists ( )
421
+ && this . ext . focus_window ( ) == this
421
422
&& ! this . meta . is_fullscreen ( )
422
423
&& ( ! this . is_single_max_screen ( ) || this . is_snap_edge ( ) )
423
424
&& ! this . meta . minimized
@@ -427,16 +428,19 @@ export class ShellWindow {
427
428
if ( this . meta . appears_focused ) {
428
429
border . show ( ) ;
429
430
431
+ // Focus will be re-applied to fix windows moving across workspaces
432
+ let applications = 0
433
+
430
434
// Ensure that the border is shown
431
435
if ( ACTIVE_HINT_SHOW_ID !== null ) GLib . source_remove ( ACTIVE_HINT_SHOW_ID )
432
436
ACTIVE_HINT_SHOW_ID = GLib . timeout_add ( GLib . PRIORITY_DEFAULT , 600 , ( ) => {
433
- if ( ! this . same_workspace ( ) || border . visible || ! permitted ( ) ) {
437
+ if ( applications > 4 && ! this . same_workspace ( ) || ! permitted ( ) ) {
434
438
ACTIVE_HINT_SHOW_ID = null
435
439
return GLib . SOURCE_REMOVE
436
440
}
437
441
442
+ applications += 1
438
443
border . show ( )
439
-
440
444
return GLib . SOURCE_CONTINUE
441
445
} )
442
446
}
You can’t perform that action at this time.
0 commit comments