brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

legacy-monitor-config: Fix primary output state

Browse Source 
The MetaOutput::is_primary state was not correctly managed in two cases:

 * for tiled monitors, the primary state got overridden when setting
   the preferred resolution
 * for laptop lid, it was not set if the laptop panel happened to be
   the first output

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl 2017-01-16 18:38:28 +08:00
parent 0fd9c00580
commit 7fc6b8a746
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backends/meta-monitor-config.c
View File

@ -987,8 +987,18 @@ make_laptop_lid_config (MetaConfiguration *reference)
break; break;
} }
} }
if (!has_primary) if (!has_primary)
new->outputs[0].is_primary = TRUE; {
for (i = 0; i < new->n_outputs; i++)
{
if (new->outputs[i].enabled)
{
new->outputs[i].is_primary = TRUE;
break;
}
}
}
return new; return new;
} }
@ -1079,6 +1089,11 @@ find_primary_output (MetaOutput *outputs,
best_width = 0; best_height = 0; best_width = 0; best_height = 0;
for (i = 0; i < n_outputs; i++) for (i = 0; i < n_outputs; i++)
{ {
if (outputs[i].tile_info.group_id &&
(outputs[i].tile_info.loc_h_tile != 0 ||
outputs[i].tile_info.loc_v_tile != 0))
continue;
if (outputs[i].preferred_mode->width * outputs[i].preferred_mode->height > if (outputs[i].preferred_mode->width * outputs[i].preferred_mode->height >
best_width * best_height) best_width * best_height)
{ {
@ -1211,13 +1226,13 @@ config_one_tiled_group (MetaOutput *outputs,
outputs[j].tile_info.loc_v_tile != vt) outputs[j].tile_info.loc_v_tile != vt)
continue; continue;
if (ht == 0 && vt == 0 && is_primary)
config->outputs[j].is_primary = TRUE;
init_config_from_preferred_mode (&config->outputs[j], &outputs[j]); init_config_from_preferred_mode (&config->outputs[j], &outputs[j]);
config->outputs[j].rect.x = cur_x; config->outputs[j].rect.x = cur_x;
config->outputs[j].rect.y = cur_y; config->outputs[j].rect.y = cur_y;
if (ht == 0 && vt == 0 && is_primary)
config->outputs[j].is_primary = TRUE;
*output_configured_bitmap |= (1 << j); *output_configured_bitmap |= (1 << j);
cur_y += outputs[j].tile_info.tile_h; cur_y += outputs[j].tile_info.tile_h;
if (vt == 0) if (vt == 0)