Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

steamcompmgr: Handle maybe dropdowns better + resolve override transients after finding a first transient

Browse source 
Fixes regressions in TES:IV Oblivion launcher + Zwei launchers
This commit is contained in:
Joshua Ashton 2022-03-24 18:34:11 +00:00
parent 6d0c84d163
commit e4a517b4b8
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/steamcompmgr.cpp
View file

@ -1977,7 +1977,9 @@ win_skip_taskbar_and_pager( win *w )
static bool static bool
win_maybe_a_dropdown( win *w ) win_maybe_a_dropdown( win *w )
{ {
return ( w->maybe_a_dropdown || win_is_override_redirect( w ) ) && !win_is_useless( w ); bool valid_maybe_a_dropdown =
w->maybe_a_dropdown && ( ( !w->is_dialog || win_skip_taskbar_and_pager( w ) ) && ( w->skipPager || w->skipTaskbar ) );
return ( valid_maybe_a_dropdown || win_is_override_redirect( w ) ) && !win_is_useless( w );
} }
/* Returns true if a's focus priority > b's. /* Returns true if a's focus priority > b's.
@ -2092,7 +2094,7 @@ found:;
} }
} }
auto resolveTransientOverrides = [&]() auto resolveTransientOverrides = [&](bool maybe)
{ {
// Do some searches to find transient links to override redirects too. // Do some searches to find transient links to override redirects too.
while ( true ) while ( true )
@ -2101,9 +2103,10 @@ found:;
for ( win *candidate : vecPossibleFocusWindows ) for ( win *candidate : vecPossibleFocusWindows )
{ {
bool is_dropdown = maybe ? win_maybe_a_dropdown( candidate ) : win_is_override_redirect( candidate );
if ( ( !override_focus || candidate != override_focus ) && candidate != focus && if ( ( !override_focus || candidate != override_focus ) && candidate != focus &&
( ( !override_focus && candidate->transientFor == focus->id ) || ( override_focus && candidate->transientFor == override_focus->id ) ) && ( ( !override_focus && candidate->transientFor == focus->id ) || ( override_focus && candidate->transientFor == override_focus->id ) ) &&
win_maybe_a_dropdown( candidate ) ) is_dropdown)
{ {
bFoundTransient = true; bFoundTransient = true;
override_focus = candidate; override_focus = candidate;
@ -2138,8 +2141,6 @@ found:;
if ( bFoundTransient == false ) if ( bFoundTransient == false )
break; break;
} }
resolveTransientOverrides();
} }
if ( !override_focus && focus ) if ( !override_focus && focus )
@ -2165,7 +2166,7 @@ found:;
} }
} }
resolveTransientOverrides(); resolveTransientOverrides( false );
} }
if ( focus ) if ( focus )
@ -2217,7 +2218,7 @@ found:;
} }
found2:; found2:;
resolveTransientOverrides(); resolveTransientOverrides( true );
} }
out->overrideWindow = override_focus; out->overrideWindow = override_focus;