renderer: Render label directly
This commit is contained in:
		@ -424,7 +424,7 @@ render_key (EekRenderer *self,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    /* render label */
 | 
					    /* render label */
 | 
				
			||||||
    layout = pango_cairo_create_layout (cr);
 | 
					    layout = pango_cairo_create_layout (cr);
 | 
				
			||||||
    eek_renderer_render_key_label (self, layout, key);
 | 
					    eek_renderer_real_render_key_label (self, layout, key);
 | 
				
			||||||
    pango_layout_get_extents (layout, NULL, &extents);
 | 
					    pango_layout_get_extents (layout, NULL, &extents);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    cairo_save (cr);
 | 
					    cairo_save (cr);
 | 
				
			||||||
@ -689,7 +689,6 @@ eek_renderer_class_init (EekRendererClass *klass)
 | 
				
			|||||||
    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
 | 
					    GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
 | 
				
			||||||
    GParamSpec        *pspec;
 | 
					    GParamSpec        *pspec;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    klass->render_key_label = eek_renderer_real_render_key_label;
 | 
					 | 
				
			||||||
    klass->render_key_outline = eek_renderer_real_render_key_outline;
 | 
					    klass->render_key_outline = eek_renderer_real_render_key_outline;
 | 
				
			||||||
    klass->render_key = eek_renderer_real_render_key;
 | 
					    klass->render_key = eek_renderer_real_render_key;
 | 
				
			||||||
    klass->render_keyboard = eek_renderer_real_render_keyboard;
 | 
					    klass->render_keyboard = eek_renderer_real_render_keyboard;
 | 
				
			||||||
@ -932,18 +931,6 @@ eek_renderer_create_pango_layout (EekRenderer  *renderer)
 | 
				
			|||||||
    return pango_layout_new (priv->pcontext);
 | 
					    return pango_layout_new (priv->pcontext);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					 | 
				
			||||||
eek_renderer_render_key_label (EekRenderer *renderer,
 | 
					 | 
				
			||||||
                               PangoLayout *layout,
 | 
					 | 
				
			||||||
                               EekKey      *key)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    g_return_if_fail (EEK_IS_RENDERER(renderer));
 | 
					 | 
				
			||||||
    g_return_if_fail (EEK_IS_KEY(key));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    EEK_RENDERER_GET_CLASS(renderer)->
 | 
					 | 
				
			||||||
        render_key_label (renderer, layout, key);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
eek_renderer_render_key_outline (EekRenderer *renderer,
 | 
					eek_renderer_render_key_outline (EekRenderer *renderer,
 | 
				
			||||||
                                 cairo_t     *cr,
 | 
					                                 cairo_t     *cr,
 | 
				
			||||||
 | 
				
			|||||||
@ -37,10 +37,6 @@ struct _EekRendererClass
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    GObjectClass parent_class;
 | 
					    GObjectClass parent_class;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void             (* render_key_label)   (EekRenderer *self,
 | 
					 | 
				
			||||||
                                             PangoLayout *layout,
 | 
					 | 
				
			||||||
                                             EekKey      *key);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    void             (* render_key_outline) (EekRenderer *self,
 | 
					    void             (* render_key_outline) (EekRenderer *self,
 | 
				
			||||||
                                             cairo_t     *cr,
 | 
					                                             cairo_t     *cr,
 | 
				
			||||||
                                             EekKey      *key,
 | 
					                                             EekKey      *key,
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user