color-device: Get temperature from the manager
Instead of passing it to the update function. This decouples the updating from being specifically about the temperature/white point. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3904>
This commit is contained in:
@ -108,9 +108,6 @@ on_device_ready (MetaColorDevice *color_device,
|
||||
gboolean success,
|
||||
MetaColorManager *color_manager)
|
||||
{
|
||||
MetaColorManagerPrivate *priv =
|
||||
meta_color_manager_get_instance_private (color_manager);
|
||||
|
||||
if (!success)
|
||||
{
|
||||
meta_topic (META_DEBUG_COLOR, "Color device '%s' failed to become ready",
|
||||
@ -118,17 +115,14 @@ on_device_ready (MetaColorDevice *color_device,
|
||||
return;
|
||||
}
|
||||
|
||||
meta_color_device_update (color_device, priv->temperature);
|
||||
meta_color_device_update (color_device);
|
||||
}
|
||||
|
||||
static void
|
||||
on_device_changed (MetaColorDevice *color_device,
|
||||
MetaColorManager *color_manager)
|
||||
{
|
||||
MetaColorManagerPrivate *priv =
|
||||
meta_color_manager_get_instance_private (color_manager);
|
||||
|
||||
meta_color_device_update (color_device, priv->temperature);
|
||||
meta_color_device_update (color_device);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -261,7 +255,7 @@ update_device_properties (MetaColorManager *color_manager)
|
||||
if (!meta_color_device_is_ready (color_device))
|
||||
continue;
|
||||
|
||||
meta_color_device_update (color_device, priv->temperature);
|
||||
meta_color_device_update (color_device);
|
||||
}
|
||||
}
|
||||
|
||||
@ -598,6 +592,15 @@ meta_color_manager_get_lcms_context (MetaColorManager *color_manager)
|
||||
return priv->lcms_context;
|
||||
}
|
||||
|
||||
unsigned int
|
||||
meta_color_manager_get_temperature (MetaColorManager *color_manager)
|
||||
{
|
||||
MetaColorManagerPrivate *priv =
|
||||
meta_color_manager_get_instance_private (color_manager);
|
||||
|
||||
return priv->temperature;
|
||||
}
|
||||
|
||||
void
|
||||
meta_color_manager_set_brightness (MetaColorManager *color_manager,
|
||||
int brightness)
|
||||
|
Reference in New Issue
Block a user