brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

StThemeNode: Fix the confusion between border and background

Browse Source 
In d66e7dd49 I got confused between border_texture and
background_texture. The background_texture was being created as normal
but in the one place that it gets drawn I accidentally made it use the
border_material instead. This patch makes it create a
background_material similar to the border_material and uses it to
paint.
This commit is contained in:
Neil Roberts 2010-10-28 21:51:13 +01:00
parent d66e7dd49e
commit 8872913665
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/st/st-theme-node-drawing.c
View File

@ -509,6 +509,8 @@ _st_theme_node_free_drawing_state (StThemeNode *node)
if (node->background_texture != COGL_INVALID_HANDLE) if (node->background_texture != COGL_INVALID_HANDLE)
cogl_handle_unref (node->background_texture); cogl_handle_unref (node->background_texture);
if (node->background_material != COGL_INVALID_HANDLE)
cogl_handle_unref (node->background_material);
if (node->background_shadow_material != COGL_INVALID_HANDLE) if (node->background_shadow_material != COGL_INVALID_HANDLE)
cogl_handle_unref (node->background_shadow_material); cogl_handle_unref (node->background_shadow_material);
if (node->border_texture != COGL_INVALID_HANDLE) if (node->border_texture != COGL_INVALID_HANDLE)
@ -531,6 +533,7 @@ _st_theme_node_init_drawing_state (StThemeNode *node)
int corner_id; int corner_id;
node->background_texture = COGL_INVALID_HANDLE; node->background_texture = COGL_INVALID_HANDLE;
node->background_material = COGL_INVALID_HANDLE;
node->background_shadow_material = COGL_INVALID_HANDLE; node->background_shadow_material = COGL_INVALID_HANDLE;
node->border_shadow_material = COGL_INVALID_HANDLE; node->border_shadow_material = COGL_INVALID_HANDLE;
node->border_texture = COGL_INVALID_HANDLE; node->border_texture = COGL_INVALID_HANDLE;
@ -632,6 +635,7 @@ st_theme_node_render_resources (StThemeNode *node,
{ {
node->background_texture = st_texture_cache_load_file_to_cogl_texture (texture_cache, background_image); node->background_texture = st_texture_cache_load_file_to_cogl_texture (texture_cache, background_image);
node->background_material = _st_create_texture_material (node->background_texture);
if (shadow_spec) if (shadow_spec)
{ {
@ -1120,7 +1124,7 @@ st_theme_node_paint (StThemeNode *node,
&background_box, &background_box,
paint_opacity); paint_opacity);
paint_material_with_opacity (node->border_material, &background_box, paint_opacity); paint_material_with_opacity (node->background_material, &background_box, paint_opacity);
} }
} }
@ -1157,6 +1161,8 @@ st_theme_node_copy_cached_paint_state (StThemeNode *node,
node->border_shadow_material = cogl_handle_ref (other->border_shadow_material); node->border_shadow_material = cogl_handle_ref (other->border_shadow_material);
if (other->background_texture) if (other->background_texture)
node->background_texture = cogl_handle_ref (other->background_texture); node->background_texture = cogl_handle_ref (other->background_texture);
if (other->background_material)
node->background_material = cogl_handle_ref (other->background_material);
if (other->border_texture) if (other->border_texture)
node->border_texture = cogl_handle_ref (other->border_texture); node->border_texture = cogl_handle_ref (other->border_texture);
if (other->border_material) if (other->border_material)

1
src/st/st-theme-node-private.h
View File

@ -77,6 +77,7 @@ struct _StThemeNode {
CoglHandle background_shadow_material; CoglHandle background_shadow_material;
CoglHandle border_shadow_material; CoglHandle border_shadow_material;
CoglHandle background_texture; CoglHandle background_texture;
CoglHandle background_material;
CoglHandle border_texture; CoglHandle border_texture;
CoglHandle border_material; CoglHandle border_material;
CoglHandle corner_material[4]; CoglHandle corner_material[4];