Compare commits

...

3 Commits

Author SHA1 Message Date
Matthias Clasen
e04cdce680 css: Implement light-dark()
This function returns one of two colors, depending on the
colorscheme that is in use.
2024-06-05 07:24:02 -04:00
Matthias Clasen
812b30eb54 Recompute styles when color-scheme changes
Treat a color-scheme change like reloading the theme.
2024-06-05 07:23:34 -04:00
Matthias Clasen
2b5ec9e879 Add a color-scheme setting
This is the desktop-wide prefer-dark/prefer-light setting.
2024-06-05 07:23:34 -04:00
4 changed files with 159 additions and 2 deletions

View File

@@ -46,6 +46,7 @@ typedef enum {
COLOR_TYPE_ALPHA,
COLOR_TYPE_MIX,
COLOR_TYPE_CURRENT_COLOR,
COLOR_TYPE_LIGHT_DARK,
} ColorType;
struct _GtkCssValue
@@ -90,6 +91,12 @@ struct _GtkCssValue
gboolean legacy_srgb;
GtkCssValue *values[1];
} relative;
struct
{
GtkCssValue *color1;
GtkCssValue *color2;
} light_dark;
};
};
@@ -129,7 +136,11 @@ gtk_css_value_color_free (GtkCssValue *color)
if (color->relative.values[i])
gtk_css_value_unref (color->relative.values[i]);
}
break;
case COLOR_TYPE_LIGHT_DARK:
gtk_css_value_unref (color->light_dark.color1);
gtk_css_value_unref (color->light_dark.color2);
break;
case COLOR_TYPE_COLOR:
@@ -270,6 +281,12 @@ gtk_css_value_color_equal (const GtkCssValue *value1,
case COLOR_TYPE_CURRENT_COLOR:
return TRUE;
case COLOR_TYPE_LIGHT_DARK:
return gtk_css_value_equal (value1->light_dark.color1,
value2->light_dark.color1) &&
gtk_css_value_equal (value1->light_dark.color2,
value2->light_dark.color2);
default:
g_assert_not_reached ();
return FALSE;
@@ -494,6 +511,14 @@ gtk_css_value_color_print (const GtkCssValue *value,
g_string_append (string, "currentcolor");
break;
case COLOR_TYPE_LIGHT_DARK:
g_string_append (string, "light-dark(");
gtk_css_value_print (value->light_dark.color1, string);
g_string_append (string, ", ");
gtk_css_value_print (value->light_dark.color2, string);
g_string_append_c (string, ')');
break;
default:
g_assert_not_reached ();
}
@@ -752,6 +777,30 @@ gtk_css_color_value_do_resolve (GtkCssValue *color,
value = gtk_css_value_ref (current);
break;
case COLOR_TYPE_LIGHT_DARK:
{
GtkSettings *settings = gtk_style_provider_get_settings (provider);
int color_scheme;
g_object_get (settings, "gtk-color-scheme", &color_scheme, NULL);
switch (color_scheme)
{
case GTK_COLOR_SCHEME_LIGHT:
value = gtk_css_color_value_do_resolve (color->light_dark.color1, property_id, context, current, cycle_list);
break;
case GTK_COLOR_SCHEME_DARK:
value = gtk_css_color_value_do_resolve (color->light_dark.color2, property_id, context, current, cycle_list);
break;
default:
g_assert_not_reached ();
}
}
break;
default:
value = NULL;
g_assert_not_reached ();
@@ -1007,6 +1056,20 @@ gtk_css_color_value_new_current_color (void)
return gtk_css_value_ref (&current_color);
}
static GtkCssValue *
gtk_css_color_value_new_light_dark (GtkCssValue *color1,
GtkCssValue *color2)
{
GtkCssValue *value;
value = gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
value->type = COLOR_TYPE_LIGHT_DARK;
value->light_dark.color1 = gtk_css_value_ref (color1);
value->light_dark.color2 = gtk_css_value_ref (color2);
return value;
}
/* }}} */
/* {{{ Parsing */
@@ -1031,7 +1094,8 @@ gtk_css_color_value_can_parse (GtkCssParser *parser)
|| gtk_css_parser_has_function (parser, "oklab")
|| gtk_css_parser_has_function (parser, "oklch")
|| gtk_css_parser_has_function (parser, "color")
|| gtk_css_parser_has_function (parser, "color-mix");
|| gtk_css_parser_has_function (parser, "color-mix")
|| gtk_css_parser_has_function (parser, "light-dark");
}
typedef struct
@@ -1179,6 +1243,39 @@ parse_color_number (GtkCssParser *parser,
}
}
static guint
parse_color_color (GtkCssParser *parser,
guint arg,
gpointer data_)
{
ColorFunctionData *data = data_;
switch (arg)
{
case 0:
data->color = gtk_css_color_value_parse (parser);
if (data->color == NULL)
return 0;
return 1;
case 1:
data->color2 = gtk_css_color_value_parse (parser);
if (data->color2 == NULL)
return 0;
return 1;
default:
g_return_val_if_reached (0);
}
}
typedef struct
{
GdkRGBA *rgba;
gboolean use_percentages;
gboolean missing[4];
} ParseRGBAData;
typedef enum
{
COLOR_SYNTAX_DETECTING,
@@ -1916,6 +2013,20 @@ gtk_css_color_value_parse (GtkCssParser *parser)
g_clear_pointer (&data.color1, gtk_css_value_unref);
g_clear_pointer (&data.color2, gtk_css_value_unref);
return value;
}
else if (gtk_css_parser_has_function (parser, "light-dark"))
{
ColorFunctionData data = { NULL, };
if (gtk_css_parser_consume_function (parser, 2, 2, parse_color_color, &data))
value = gtk_css_color_value_new_light_dark (data.color, data.color2);
else
value = NULL;
g_clear_pointer (&data.color, gtk_css_value_unref);
g_clear_pointer (&data.color2, gtk_css_value_unref);
return value;
}
else if (gtk_css_parser_has_function (parser, "lighter"))

View File

@@ -1245,7 +1245,8 @@ typedef enum {
GTK_SYSTEM_SETTING_FONT_NAME,
GTK_SYSTEM_SETTING_FONT_CONFIG,
GTK_SYSTEM_SETTING_DISPLAY,
GTK_SYSTEM_SETTING_ICON_THEME
GTK_SYSTEM_SETTING_ICON_THEME,
GTK_SYSTEM_SETTING_COLOR_SCHEME,
} GtkSystemSetting;
/**
@@ -1880,4 +1881,22 @@ typedef enum {
GTK_FONT_RENDERING_MANUAL,
} GtkFontRendering;
/**
* GtkColorScheme:
* @GTK_COLOR_SCHEME_LIGHT: A light color scheme is used
* @GTK_COLOR_SCHEME_DARK: A dark color scheme is used
*
* Values for the [property@Gtk.Settings:gtk-color-scheme] property
* that indicate what color scheme is used.
*
* This information can be used inside CSS to select appropriate colors
* with the light-dark() function.
*
* Since: 4.16
*/
typedef enum {
GTK_COLOR_SCHEME_LIGHT,
GTK_COLOR_SCHEME_DARK
} GtkColorScheme;
G_END_DECLS

View File

@@ -203,6 +203,7 @@ enum {
PROP_KEYNAV_USE_CARET,
PROP_OVERLAY_SCROLLING,
PROP_FONT_RENDERING,
PROP_COLOR_SCHEME,
NUM_PROPERTIES
};
@@ -977,6 +978,24 @@ gtk_settings_class_init (GtkSettingsClass *class)
GTK_FONT_RENDERING_AUTOMATIC,
GTK_PARAM_READWRITE);
/**
* GtkSettings:gtk-color-scheme:
*
* The used color scheme.
*
* GTK can not determine this on its own and relies on application or
* platform libraries to set this property appropriately.
*
* The used color scheme can affect color selection inside CSS with
* the light-dark() function.
*
* Since: 4.16
*/
pspecs[PROP_COLOR_SCHEME] = g_param_spec_enum ("gtk-color-scheme", NULL, NULL,
GTK_TYPE_COLOR_SCHEME,
GTK_COLOR_SCHEME_LIGHT,
GTK_PARAM_READWRITE);
g_object_class_install_properties (gobject_class, NUM_PROPERTIES, pspecs);
}
@@ -1292,6 +1311,8 @@ gtk_settings_notify (GObject *object,
case PROP_CURSOR_THEME_SIZE:
settings_update_cursor_theme (settings);
break;
case PROP_COLOR_SCHEME:
gtk_system_setting_changed (settings->display, GTK_SYSTEM_SETTING_COLOR_SCHEME);
default:
break;
}

View File

@@ -5018,6 +5018,7 @@ static void
gtk_widget_real_system_setting_changed (GtkWidget *widget,
GtkSystemSetting setting)
{
GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
GtkWidget *child;
if (setting == GTK_SYSTEM_SETTING_DPI ||
@@ -5029,6 +5030,11 @@ gtk_widget_real_system_setting_changed (GtkWidget *widget,
gtk_widget_queue_resize (widget);
}
if (setting == GTK_SYSTEM_SETTING_COLOR_SCHEME)
{
gtk_css_node_invalidate (priv->cssnode, GTK_CSS_CHANGE_SOURCE);
}
for (child = _gtk_widget_get_first_child (widget);
child != NULL;
child = _gtk_widget_get_next_sibling (child))