Merge branch 'wip/alice/styles' into 'master'

Style updates

See merge request GNOME/sysprof!94
This commit is contained in:
Christian Hergert
2024-06-24 17:14:26 +00:00
4 changed files with 18 additions and 25 deletions

View File

@ -1,26 +1,15 @@
progresscell progress { progresscell progress {
background: @accent_bg_color; background: var(--accent-bg-color);
border-radius: 3px;
border: 1px solid shade(@accent_bg_color, .75);
border-right: none; border-right: none;
} }
progresscell { progresscell {
min-height: 18px; min-height: 18px;
} border-radius: 3px;
progresscell progress:backdrop {
background: @borders;
border-color: shade(@borders, .9);
}
progresscell label:backdrop.in-progress {
color: inherit;
} }
progresscell trough { progresscell trough {
background: alpha(@borders, .5); background: color-mix(in srgb, var(--border-color), transparent);
border: 1px solid @borders;
border-radius: 3px;
} }
progresscell label { progresscell label {
@ -30,7 +19,7 @@ progresscell label {
} }
progresscell label.in-progress { progresscell label.in-progress {
color: @accent_fg_color; color: var(--accent-fg-color);
} }
callgraphview { callgraphview {
@ -50,32 +39,31 @@ callgraphview row:not(:selected) treeexpander expander:checked+box symbol.proces
callgraphview row:not(:selected) treeexpander expander:checked+box symbol.thread, callgraphview row:not(:selected) treeexpander expander:checked+box symbol.thread,
callgraphview row:not(:selected) treeexpander expander:checked+box symbol.root { callgraphview row:not(:selected) treeexpander expander:checked+box symbol.root {
border-radius: 9999px; border-radius: 9999px;
background-color: alpha(currentColor, .05); background-color: color-mix(in srgb, currentColor 5%, transparent);
} }
callgraphview row:not(:selected) treeexpander symbol.context-switch { callgraphview row:not(:selected) treeexpander symbol.context-switch {
border-radius: 9999px; border-radius: 9999px;
background-color: alpha(@warning_color, .1); background-color: color-mix(in srgb, var(--warning-color) 10%, transparent);
} }
callgraphview row:not(:selected) treeexpander symbol.unwindable { callgraphview row:not(:selected) treeexpander symbol.unwindable {
border-radius: 9999px; border-radius: 9999px;
background-color: alpha(@error_color, .1); background-color: color-mix(in srgb, var(--error-color) 10%, transparent);
} }
timeruler { timeruler {
min-height: 24px; min-height: 24px;
font-size: 0.833em; font-size: 0.833em;
color: alpha(currentColor, .8); color: color-mix(in srgb, currentColor 80%, transparent);
} }
timescrubber informative, timescrubber informative,
timescrubber timecode { timescrubber timecode {
border-radius: 7px; border-radius: 7px;
background: @accent_bg_color; background: var(--accent-bg-color);
color: @accent_fg_color; color: var(--accent-fg-color);
padding: 1px 3px; padding: 1px 3px;
margin: 2px 6px; margin: 2px 6px;
box-shadow: 0 2px 8px 2px alpha(black, .27); box-shadow: 0 2px 8px 2px rgb(0 0 0 / 27%);
border: 1px solid shade(@accent_bg_color, .9);
font-feature-settings: "tnum"; font-feature-settings: "tnum";
font-size: .9em; font-size: .9em;
} }
@ -85,7 +73,7 @@ timescrubber timecode {
} }
.navigation-sidebar label.indicator { .navigation-sidebar label.indicator {
color: alpha(currentColor, .5); color: color-mix(in srgb, currentColor, transparent);
border-radius: 50px; border-radius: 50px;
padding: 1px 5px; padding: 1px 5px;
font-feature-settings: 'tnum'; font-feature-settings: 'tnum';

View File

@ -58,6 +58,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_style_context_lookup_color (style_context, "accent_fg_color", &accent_fg_color); gtk_style_context_lookup_color (style_context, "accent_fg_color", &accent_fg_color);
gtk_style_context_lookup_color (style_context, "accent_bg_color", &accent_bg_color); gtk_style_context_lookup_color (style_context, "accent_bg_color", &accent_bg_color);
G_GNUC_END_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_queue_draw (widget);
} }
static SysprofSession * static SysprofSession *

View File

@ -121,6 +121,7 @@
<property name="hexpand">true</property> <property name="hexpand">true</property>
<child> <child>
<object class="SysprofTimeSpanLayer"> <object class="SysprofTimeSpanLayer">
<property name="auto-color">False</property>
<binding name="axis"> <binding name="axis">
<lookup name="selected-time-axis" type="SysprofSession"> <lookup name="selected-time-axis" type="SysprofSession">
<lookup name="session" type="SysprofSessionModelItem"> <lookup name="session" type="SysprofSessionModelItem">

View File

@ -242,6 +242,8 @@ sysprof_progress_cell_init (SysprofProgressCell *self)
gtk_widget_set_parent (GTK_WIDGET (self->progress), GTK_WIDGET (self)); gtk_widget_set_parent (GTK_WIDGET (self->progress), GTK_WIDGET (self));
gtk_widget_set_parent (GTK_WIDGET (self->alt_label), GTK_WIDGET (self)); gtk_widget_set_parent (GTK_WIDGET (self->alt_label), GTK_WIDGET (self));
gtk_widget_set_overflow (GTK_WIDGET (self), GTK_OVERFLOW_HIDDEN);
gtk_accessible_update_property (GTK_ACCESSIBLE (self), gtk_accessible_update_property (GTK_ACCESSIBLE (self),
GTK_ACCESSIBLE_PROPERTY_VALUE_MAX, 1.0, GTK_ACCESSIBLE_PROPERTY_VALUE_MAX, 1.0,
GTK_ACCESSIBLE_PROPERTY_VALUE_MIN, 0.0, GTK_ACCESSIBLE_PROPERTY_VALUE_MIN, 0.0,