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

renderer: Drop unused params

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-12-01 15:36:01 +00:00
parent d415ecf5d0
commit 34fce7395d
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
eek/eek-renderer.c
View File

@ -291,8 +291,7 @@ render_button (EekRenderer *self,
void void
eek_renderer_apply_transformation_for_button (cairo_t *cr, eek_renderer_apply_transformation_for_button (cairo_t *cr,
struct button_place *place, struct button_place *place,
gdouble scale, gdouble scale)
gboolean rotate)
{ {
EekBounds bounds = squeek_button_get_bounds(place->button); EekBounds bounds = squeek_button_get_bounds(place->button);
gdouble s; gdouble s;
@ -300,14 +299,13 @@ eek_renderer_apply_transformation_for_button (cairo_t *cr,
gint angle = squeek_row_get_angle (place->row); gint angle = squeek_row_get_angle (place->row);
cairo_scale (cr, scale, scale); cairo_scale (cr, scale, scale);
if (rotate) {
s = sin (angle * G_PI / 180); s = sin (angle * G_PI / 180);
if (s < 0) if (s < 0)
cairo_translate (cr, 0, - bounds.width * s); cairo_translate (cr, 0, - bounds.width * s);
else else
cairo_translate (cr, bounds.height * s, 0); cairo_translate (cr, bounds.height * s, 0);
cairo_rotate (cr, angle * G_PI / 180); cairo_rotate (cr, angle * G_PI / 180);
}
} }
static void static void
@ -409,7 +407,7 @@ eek_renderer_render_button (EekRenderer *self,
EekBounds bounds; EekBounds bounds;
EekBounds view_bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard)); EekBounds view_bounds = squeek_view_get_bounds (level_keyboard_current(priv->keyboard));
eek_renderer_get_button_bounds (view_bounds, place, &bounds, TRUE); eek_renderer_get_button_bounds (view_bounds, place, &bounds);
cairo_save (cr); cairo_save (cr);
/* Because this function is called separately from the keyboard rendering /* Because this function is called separately from the keyboard rendering
@ -418,7 +416,7 @@ eek_renderer_render_button (EekRenderer *self,
cairo_scale (cr, priv->scale, priv->scale); cairo_scale (cr, priv->scale, priv->scale);
cairo_translate (cr, bounds.x, bounds.y); cairo_translate (cr, bounds.x, bounds.y);
eek_renderer_apply_transformation_for_button (cr, place, scale, TRUE); eek_renderer_apply_transformation_for_button (cr, place, scale);
render_button ( render_button (
self, cr, place->button, self, cr, place->button,
is_pressed, is_pressed,
@ -700,8 +698,7 @@ eek_renderer_get_size (EekRenderer *renderer,
void void
eek_renderer_get_button_bounds (EekBounds view_bounds, eek_renderer_get_button_bounds (EekBounds view_bounds,
struct button_place *place, struct button_place *place,
EekBounds *bounds, EekBounds *bounds)
gboolean rotate)
{ {
gint angle = 0; gint angle = 0;
EekPoint points[4], min, max; EekPoint points[4], min, max;
@ -712,12 +709,6 @@ eek_renderer_get_button_bounds (EekBounds view_bounds,
EekBounds button_bounds = squeek_button_get_bounds(place->button); EekBounds button_bounds = squeek_button_get_bounds(place->button);
EekBounds row_bounds = squeek_row_get_bounds (place->row); EekBounds row_bounds = squeek_row_get_bounds (place->row);
if (!rotate) {
button_bounds.x += view_bounds.x + row_bounds.x;
button_bounds.y += view_bounds.y + row_bounds.y;
*bounds = button_bounds;
return;
}
points[0].x = button_bounds.x; points[0].x = button_bounds.x;
points[0].y = button_bounds.y; points[0].y = button_bounds.y;
points[1].x = points[0].x + button_bounds.width; points[1].x = points[0].x + button_bounds.width;
@ -727,9 +718,8 @@ eek_renderer_get_button_bounds (EekBounds view_bounds,
points[3].x = points[0].x; points[3].x = points[0].x;
points[3].y = points[2].y; points[3].y = points[2].y;
if (rotate) {
angle = squeek_row_get_angle (place->row); angle = squeek_row_get_angle (place->row);
}
min = points[2]; min = points[2];
max = points[0]; max = points[0];

6
eek/eek-renderer.h
View File

@ -61,8 +61,7 @@ void eek_renderer_get_size (EekRenderer *renderer,
gdouble *height); gdouble *height);
void eek_renderer_get_button_bounds (EekBounds view_bounds, void eek_renderer_get_button_bounds (EekBounds view_bounds,
struct button_place *button, struct button_place *button,
EekBounds *bounds, EekBounds *bounds);
gboolean rotate);
gdouble eek_renderer_get_scale (EekRenderer *renderer); gdouble eek_renderer_get_scale (EekRenderer *renderer);
void eek_renderer_set_scale_factor (EekRenderer *renderer, void eek_renderer_set_scale_factor (EekRenderer *renderer,
@ -84,8 +83,7 @@ void eek_renderer_set_border_width (EekRenderer *renderer,
void eek_renderer_apply_transformation_for_button void eek_renderer_apply_transformation_for_button
(cairo_t *cr, (cairo_t *cr,
struct button_place *place, struct button_place *place,
gdouble scale, gdouble scale);
gboolean rotate);
struct transformation struct transformation
eek_renderer_get_transformation (EekRenderer *renderer); eek_renderer_get_transformation (EekRenderer *renderer);