Merge branch 'add-frame-rendering' into 'master'
Add frame rendering, fix style sheet to show key borders See merge request Librem5/squeekboard!123
This commit is contained in:
		@ -7,7 +7,8 @@
 | 
			
		||||
.key {
 | 
			
		||||
    color: #deddda;
 | 
			
		||||
    background: #464448;
 | 
			
		||||
    border-width: 0.5px;
 | 
			
		||||
    border-style: solid;
 | 
			
		||||
    border-width: 1px;
 | 
			
		||||
    border-color: #5e5c64;
 | 
			
		||||
    border-radius: 2px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -162,6 +162,10 @@ render_keyboard_surface (EekRenderer *renderer)
 | 
			
		||||
                           data.cr,
 | 
			
		||||
                           0, 0,
 | 
			
		||||
                           priv->allocation_width, priv->allocation_height);
 | 
			
		||||
    gtk_render_frame (priv->scontext,
 | 
			
		||||
                      data.cr,
 | 
			
		||||
                      0, 0,
 | 
			
		||||
                      priv->allocation_width, priv->allocation_height);
 | 
			
		||||
 | 
			
		||||
    cairo_save (data.cr);
 | 
			
		||||
    cairo_scale (data.cr, priv->scale, priv->scale);
 | 
			
		||||
@ -204,6 +208,8 @@ render_key_outline (EekRenderer *renderer,
 | 
			
		||||
 | 
			
		||||
    gtk_render_background (priv->key_context,
 | 
			
		||||
                           cr, 0, 0, bounds.width, bounds.height);
 | 
			
		||||
    gtk_render_frame (priv->key_context,
 | 
			
		||||
                      cr, 0, 0, bounds.width, bounds.height);
 | 
			
		||||
 | 
			
		||||
    gtk_style_context_set_state(priv->key_context, GTK_STATE_FLAG_NORMAL);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user