isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

monitor-config-manager: Fallback to closed laptop lid configuration

Browse Source 
When closing the lid of a laptop, we reconfigure all the monitors in order
to update the CRTCs and (if enabled) the global UI scaling factor.

To do this, we try first to reuse the current configuration for the usable
monitors, but if we have only monitor enabled and this one is on the laptop
lid we just end up creating a new configuration where the primary monitor is
the laptop one (as per find_primary_monitor() in MetaMonitorConfigManager),
but ignoring the user parameters.

In case the user selected a different resolution / scaling compared to the
default one, while the laptop lid is closed we might change the monitors
layout, causing applications to rescale or reposition.

To avoid this, when creating the monitors configuration from the current
current state, in case we have only one monitor available and that one is
the laptop panel, let's just reuse this configuration.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1200
This commit is contained in:
Marco Trevisan (Treviño) 2020-04-16 00:28:05 +02:00 committed by Marco Trevisan
parent 65a6c4c361
commit e48516679c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backends/meta-monitor-config-manager.c
View File

@ -446,23 +446,35 @@ MetaMonitorsConfigKey *
meta_create_monitors_config_key_for_current_state (MetaMonitorManager *monitor_manager) meta_create_monitors_config_key_for_current_state (MetaMonitorManager *monitor_manager)
{ {
MetaMonitorsConfigKey *config_key; MetaMonitorsConfigKey *config_key;
MetaMonitorSpec *laptop_monitor_spec;
GList *l; GList *l;
GList *monitor_specs; GList *monitor_specs;
laptop_monitor_spec = NULL;
monitor_specs = NULL; monitor_specs = NULL;
for (l = monitor_manager->monitors; l; l = l->next) for (l = monitor_manager->monitors; l; l = l->next)
{ {
MetaMonitor *monitor = l->data; MetaMonitor *monitor = l->data;
MetaMonitorSpec *monitor_spec; MetaMonitorSpec *monitor_spec;
if (meta_monitor_is_laptop_panel (monitor) && if (meta_monitor_is_laptop_panel (monitor))
is_lid_closed (monitor_manager)) {
laptop_monitor_spec = meta_monitor_get_spec (monitor);
if (is_lid_closed (monitor_manager))
continue; continue;
}
monitor_spec = meta_monitor_spec_clone (meta_monitor_get_spec (monitor)); monitor_spec = meta_monitor_spec_clone (meta_monitor_get_spec (monitor));
monitor_specs = g_list_prepend (monitor_specs, monitor_spec); monitor_specs = g_list_prepend (monitor_specs, monitor_spec);
} }
if (!monitor_specs && laptop_monitor_spec)
{
monitor_specs =
g_list_prepend (NULL, meta_monitor_spec_clone (laptop_monitor_spec));
}
if (!monitor_specs) if (!monitor_specs)
return NULL; return NULL;