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

Merge remote-tracking branch 'upstream/master' into scaling

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-03-07 10:46:09 +00:00
parent 2770e1769c d4bb9038c5
commit 8ff8e8ac48
24 changed files with 412 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eek/eek-gtk-keyboard.c
View File

@ -99,7 +99,7 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
gtk_widget_get_scale_factor (self));
}
eek_renderer_render_keyboard (priv->renderer, cr, priv->keyboard);
eek_renderer_render_keyboard (priv->renderer, priv->submission, cr, priv->keyboard);
return FALSE;
}

4
eek/eek-renderer.c
View File

@ -191,8 +191,10 @@ render_button_label (cairo_t *cr,
g_object_unref (layout);
}
// FIXME: Pass just the active modifiers instead of entire submission
void
eek_renderer_render_keyboard (EekRenderer *self,
struct submission *submission,
cairo_t *cr,
LevelKeyboard *keyboard)
{
@ -210,7 +212,7 @@ eek_renderer_render_keyboard (EekRenderer *self,
cairo_scale (cr, self->widget_to_layout.scale, self->widget_to_layout.scale);
squeek_draw_layout_base_view(keyboard->layout, self, cr);
squeek_layout_draw_all_changed(keyboard->layout, self, cr);
squeek_layout_draw_all_changed(keyboard->layout, self, cr, submission);
cairo_restore (cr);
}

3
eek/eek-renderer.h
View File

@ -25,6 +25,7 @@
#include <pango/pangocairo.h>
#include "eek-types.h"
#include "src/submission.h"
struct squeek_layout;
@ -63,7 +64,7 @@ cairo_surface_t *eek_renderer_get_icon_surface(const gchar *icon_name,
gint size,
gint scale);
void eek_renderer_render_keyboard (EekRenderer *renderer,
void eek_renderer_render_keyboard (EekRenderer *renderer, struct submission *submission,
cairo_t *cr, LevelKeyboard *keyboard);
void
eek_renderer_free (EekRenderer *self);