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

MetaMonitorConfig: don't always restore the previous config when opening the laptop lid

Browse Source 
Only do it if the current configuration was actually created
as the result of closing the laptop lid.

https://bugzilla.gnome.org/show_bug.cgi?id=725637
This commit is contained in:
Giovanni Campagna 2014-05-06 19:59:16 +02:00
parent 01cd4b2ba0
commit 2ca2c18c2a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@ struct _MetaMonitorConfig {
GHashTable *configs; GHashTable *configs;
MetaConfiguration *current; MetaConfiguration *current;
gboolean current_is_stored; gboolean current_is_stored;
gboolean current_is_for_laptop_lid;
MetaConfiguration *previous; MetaConfiguration *previous;
GFile *file; GFile *file;
@ -906,6 +907,10 @@ apply_configuration (MetaMonitorConfig *self,
self->current = config; self->current = config;
self->current_is_stored = stored; self->current_is_stored = stored;
/* If true, we'll be overridden at the end of this call
inside turn_off_laptop_display()
*/
self->current_is_for_laptop_lid = FALSE;
if (self->current == self->previous) if (self->current == self->previous)
self->previous = NULL; self->previous = NULL;
@ -1022,8 +1027,16 @@ meta_monitor_config_apply_stored (MetaMonitorConfig *self,
if (self->lid_is_closed && if (self->lid_is_closed &&
stored->n_outputs > 1 && stored->n_outputs > 1 &&
laptop_display_is_on (stored)) laptop_display_is_on (stored))
return apply_configuration (self, make_laptop_lid_config (stored), {
manager, FALSE); if (apply_configuration (self, make_laptop_lid_config (stored),
manager, FALSE))
{
self->current_is_for_laptop_lid = TRUE;
return TRUE;
}
else
return FALSE;
}
else else
return apply_configuration (self, stored, manager, TRUE); return apply_configuration (self, stored, manager, TRUE);
} }
@ -1370,6 +1383,7 @@ turn_off_laptop_display (MetaMonitorConfig *self,
new = make_laptop_lid_config (self->current); new = make_laptop_lid_config (self->current);
apply_configuration (self, new, manager, FALSE); apply_configuration (self, new, manager, FALSE);
self->current_is_for_laptop_lid = TRUE;
} }
static void static void
@ -1389,7 +1403,7 @@ power_client_changed_cb (UpClient *client,
if (is_closed) if (is_closed)
turn_off_laptop_display (self, manager); turn_off_laptop_display (self, manager);
else else if (self->current_is_for_laptop_lid)
meta_monitor_config_restore_previous (self, manager); meta_monitor_config_restore_previous (self, manager);
} }
} }