s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'add-frame-rendering' into 'master'

Browse Source 
Add frame rendering, fix style sheet to show key borders

See merge request Librem5/squeekboard!123
This commit is contained in:
Dorota Czaplejewicz
2019-08-05 21:20:36 +00:00
parent cbdd72a4b6 6bbd8f6006
commit c1482c2377
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/style.css
View File

@ -7,7 +7,8 @@
.key { .key {
color: #deddda; color: #deddda;
background: #464448; background: #464448;
border-width: 0.5px; border-style: solid;
border-width: 1px;
border-color: #5e5c64; border-color: #5e5c64;
border-radius: 2px; border-radius: 2px;
} }

6
eek/eek-renderer.c
View File

@ -162,6 +162,10 @@ render_keyboard_surface (EekRenderer *renderer)
data.cr, data.cr,
0, 0, 0, 0,
priv->allocation_width, priv->allocation_height); 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_save (data.cr);
cairo_scale (data.cr, priv->scale, priv->scale); cairo_scale (data.cr, priv->scale, priv->scale);
@ -204,6 +208,8 @@ render_key_outline (EekRenderer *renderer,
gtk_render_background (priv->key_context, gtk_render_background (priv->key_context,
cr, 0, 0, bounds.width, bounds.height); 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); gtk_style_context_set_state(priv->key_context, GTK_STATE_FLAG_NORMAL);
} }