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

Merge branch 'update-icons' into 'master'

Browse Source 
Use an icon for backspace

See merge request Librem5/squeekboard!47
This commit is contained in:
Guido Gunther
2019-07-10 16:57:09 +00:00
parent d006aede6a 1b59c4dad3
commit 10cd93022a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/keyboards/symbols/us.xml
View File

@ -93,7 +93,7 @@
<keysym keyval="43">plus</keysym> <keysym keyval="43">plus</keysym>
</key> </key>
<key keycode="22" name="BKSP"> <key keycode="22" name="BKSP">
<keysym keyval="65288">BackSpace</keysym> <symbol label="⌫" icon="edit-clear-symbolic">backspace</symbol>
</key> </key>
<key keycode="23" name="TAB"> <key keycode="23" name="TAB">
<keysym keyval="65289">Tab</keysym> <keysym keyval="65289">Tab</keysym>

13
eek/eek-renderer.c
View File

@ -494,7 +494,7 @@ render_key (EekRenderer *self,
cairo_surface_t *icon_surface = cairo_surface_t *icon_surface =
eek_renderer_get_icon_surface (self, eek_renderer_get_icon_surface (self,
eek_symbol_get_icon_name (symbol), eek_symbol_get_icon_name (symbol),
MIN(bounds.width, bounds.height) * 0.7); MIN(bounds.width, bounds.height) * 0.5);
if (icon_surface) { if (icon_surface) {
gint width = cairo_image_surface_get_width (icon_surface); gint width = cairo_image_surface_get_width (icon_surface);
gint height = cairo_image_surface_get_height (icon_surface); gint height = cairo_image_surface_get_height (icon_surface);
@ -521,8 +521,15 @@ render_key (EekRenderer *self,
(bounds.height - height * scale) / 2); (bounds.height - height * scale) / 2);
cairo_rectangle (cr, 0, 0, width, height); cairo_rectangle (cr, 0, 0, width, height);
cairo_clip (cr); cairo_clip (cr);
cairo_set_source_surface (cr, icon_surface, 0.0, 0.0); /* Draw the shape of the icon using the foreground color */
cairo_paint (cr); eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground);
cairo_set_source_rgba (cr, foreground.red,
foreground.green,
foreground.blue,
foreground.alpha);
cairo_mask_surface (cr, icon_surface, 0.0, 0.0);
cairo_fill (cr);
cairo_restore (cr); cairo_restore (cr);
return; return;
} }