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

color-device: Maybe update brightness from profile when updating

Browse Source 
Some profiles have brightness metadata that also needs to be applied.
Make sure this happens.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2165>
This commit is contained in:
Jonas Ådahl 2021-12-06 11:51:22 +01:00
parent 71009779c8
commit b7d3c9e3c5
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backends/meta-color-device.c
View File

@ -1087,7 +1087,7 @@ meta_color_device_get_assigned_profile (MetaColorDevice *color_device)
} }
void void
meta_color_device_update_gamma (MetaColorDevice *color_device, meta_color_device_update (MetaColorDevice *color_device,
unsigned int temperature) unsigned int temperature)
{ {
MetaColorProfile *color_profile; MetaColorProfile *color_profile;
@ -1111,6 +1111,22 @@ meta_color_device_update_gamma (MetaColorDevice *color_device,
meta_color_profile_get_id (color_profile), meta_color_profile_get_id (color_profile),
temperature); temperature);
if (meta_monitor_is_laptop_panel (monitor))
{
const char *brightness_profile;
brightness_profile =
meta_color_profile_get_brightness_profile (color_profile);
if (brightness_profile)
{
meta_topic (META_DEBUG_COLOR,
"Setting brightness to %s%% from brightness profile",
brightness_profile);
meta_color_manager_set_brightness (color_device->color_manager,
atoi (brightness_profile));
}
}
lut_size = meta_monitor_get_gamma_lut_size (monitor); lut_size = meta_monitor_get_gamma_lut_size (monitor);
lut = meta_color_profile_generate_gamma_lut (color_profile, lut = meta_color_profile_generate_gamma_lut (color_profile,
temperature, temperature,

2
src/backends/meta-color-device.h
View File

@ -62,7 +62,7 @@ MetaColorProfile * meta_color_device_generate_profile_finish (MetaColorDevice *
META_EXPORT_TEST META_EXPORT_TEST
gboolean meta_color_device_is_ready (MetaColorDevice *color_device); gboolean meta_color_device_is_ready (MetaColorDevice *color_device);
void meta_color_device_update_gamma (MetaColorDevice *color_device, void meta_color_device_update (MetaColorDevice *color_device,
unsigned int temperature); unsigned int temperature);
#endif /* META_COLOR_DEVICE_H */ #endif /* META_COLOR_DEVICE_H */

6
src/backends/meta-color-manager.c
View File

@ -109,7 +109,7 @@ on_device_ready (MetaColorDevice *color_device,
return; return;
} }
meta_color_device_update_gamma (color_device, priv->temperature); meta_color_device_update (color_device, priv->temperature);
} }
static void static void
@ -119,7 +119,7 @@ on_device_changed (MetaColorDevice *color_device,
MetaColorManagerPrivate *priv = MetaColorManagerPrivate *priv =
meta_color_manager_get_instance_private (color_manager); meta_color_manager_get_instance_private (color_manager);
meta_color_device_update_gamma (color_device, priv->temperature); meta_color_device_update (color_device, priv->temperature);
} }
static char * static char *
@ -282,7 +282,7 @@ update_all_gamma (MetaColorManager *color_manager)
if (!meta_color_device_is_ready (color_device)) if (!meta_color_device_is_ready (color_device))
continue; continue;
meta_color_device_update_gamma (color_device, priv->temperature); meta_color_device_update (color_device, priv->temperature);
} }
} }