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

Remove some rendering code with no effect and warnings

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-06-22 12:56:33 +00:00
parent 15a3315854
commit 0809db9e32
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,6 @@ static void render_released_key (GtkWidget *widget,
static void static void
eek_gtk_keyboard_real_realize (GtkWidget *self) eek_gtk_keyboard_real_realize (GtkWidget *self)
{ {
gtk_widget_set_double_buffered (self, FALSE);
gtk_widget_set_events (self, gtk_widget_set_events (self,
GDK_EXPOSURE_MASK | GDK_EXPOSURE_MASK |
GDK_KEY_PRESS_MASK | GDK_KEY_PRESS_MASK |
@ -118,8 +117,6 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
gtk_widget_get_allocation (self, &allocation); gtk_widget_get_allocation (self, &allocation);
if (!priv->renderer) { if (!priv->renderer) {
GtkStyle *style;
GtkStateType state;
PangoContext *pcontext; PangoContext *pcontext;
EekColor *color; EekColor *color;
@ -131,30 +128,8 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
eek_renderer_set_allocation_size (priv->renderer, eek_renderer_set_allocation_size (priv->renderer,
allocation.width, allocation.width,
allocation.height); allocation.height);
style = gtk_widget_get_style (self);
state = gtk_widget_get_state (self);
color = color_from_gdk_color (&style->text[state]);
eek_renderer_set_default_foreground_color (priv->renderer, color);
eek_color_free (color);
color = color_from_gdk_color (&style->base[state]);
eek_renderer_set_default_background_color (priv->renderer, color);
eek_color_free (color);
} }
/* blank background */
eek_renderer_get_background_color (priv->renderer,
EEK_ELEMENT(priv->keyboard),
&background);
cairo_set_source_rgba (cr,
background.red,
background.green,
background.blue,
background.alpha);
cairo_paint (cr);
eek_renderer_render_keyboard (priv->renderer, cr); eek_renderer_render_keyboard (priv->renderer, cr);
/* redraw pressed key */ /* redraw pressed key */

4
eek/eek-renderer.c
View File

@ -166,8 +166,8 @@ create_keyboard_surface (EekRenderer *renderer)
eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds); eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
keyboard_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, keyboard_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
bounds.width * priv->scale, ceil(bounds.width * priv->scale),
bounds.height * priv->scale); ceil(bounds.height * priv->scale));
data.cr = cairo_create (keyboard_surface); data.cr = cairo_create (keyboard_surface);
data.renderer = renderer; data.renderer = renderer;