diff options
| author | Daniel Stone <daniels@collabora.com> | 2022-01-17 13:58:16 +0000 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2022-03-31 17:15:55 +0000 |
| commit | 3a298b0b05c015682e4da129bed1bb85e5bb7a86 (patch) | |
| tree | 6f7ee1eae8f379cd1c723da8dcf2b1be15b5b421 /kiosk-shell | |
| parent | b77c2374ee81f058e5f4ea20b43614b878236fbb (diff) | |
| download | weston-3a298b0b05c015682e4da129bed1bb85e5bb7a86.tar.gz | |
shell: Rename weston_solid_color_surface to weston_curtain_params
The name implied that it was a surface in and of itself, rather than
parameters used by a helper to create a surface and view.
Rename it now that we have weston_curtain as a name, and clean up
initialisers.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to 'kiosk-shell')
| -rw-r--r-- | kiosk-shell/kiosk-shell.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kiosk-shell/kiosk-shell.c b/kiosk-shell/kiosk-shell.c index 9f2c1fa6..245cde86 100644 --- a/kiosk-shell/kiosk-shell.c +++ b/kiosk-shell/kiosk-shell.c @@ -484,7 +484,7 @@ kiosk_shell_output_recreate_background(struct kiosk_shell_output *shoutput) struct weston_output *output = shoutput->output; struct weston_config_section *shell_section = NULL; uint32_t bg_color = 0x0; - struct weston_solid_color_surface solid_surface = {}; + struct weston_curtain_params curtain_params = {}; if (shoutput->background_view) weston_surface_destroy(shoutput->background_view->surface); @@ -498,15 +498,15 @@ kiosk_shell_output_recreate_background(struct kiosk_shell_output *shoutput) weston_config_section_get_color(shell_section, "background-color", &bg_color, 0x00000000); - solid_surface.r = ((bg_color >> 16) & 0xff) / 255.0; - solid_surface.g = ((bg_color >> 8) & 0xff) / 255.0; - solid_surface.b = ((bg_color >> 0) & 0xff) / 255.0; + curtain_params.r = ((bg_color >> 16) & 0xff) / 255.0; + curtain_params.g = ((bg_color >> 8) & 0xff) / 255.0; + curtain_params.b = ((bg_color >> 0) & 0xff) / 255.0; - solid_surface.get_label = kiosk_shell_background_surface_get_label; - solid_surface.surface_committed = NULL; - solid_surface.surface_private = NULL; + curtain_params.get_label = kiosk_shell_background_surface_get_label; + curtain_params.surface_committed = NULL; + curtain_params.surface_private = NULL; - shoutput->background_view = weston_curtain_create(ec, &solid_surface, + shoutput->background_view = weston_curtain_create(ec, &curtain_params, output->x, output->y, output->width, output->height); |