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

Check for button position more in Rust

Browse Source 
The check against fitting inside the Layout was removed: as an optimization it is unneeded, as the actual search must be optimized to be quick. In addition, the view bounds don't correspond to anything physical as long as negative offsets are allowed.
This commit is contained in:
Dorota Czaplejewicz
2019-08-29 12:19:42 +00:00
committed by David Boddie
parent 2d7dddd505
commit 75992ff13f
4 changed files with 103 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,8 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
struct button_place place = squeek_view_find_key(
view, squeek_button_get_key(head->data)
);
render_pressed_button (self, &place);
if (place.button)
render_pressed_button (self, &place);
}
/* redraw locked key */
@ -128,7 +129,8 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
((EekModifierKey *)head->data)->button
)
);
render_locked_button (self, &place);
if (place.button)
render_locked_button (self, &place);
}
return FALSE;

46
eek/eek-renderer.c
View File

@ -913,14 +913,6 @@ eek_renderer_get_foreground_color (EekRenderer *renderer,
color->alpha = gcolor.alpha;
}
struct _FindKeyByPositionCallbackData {
EekPoint point;
EekPoint origin;
gint angle;
struct squeek_button *button;
};
typedef struct _FindKeyByPositionCallbackData FindKeyByPositionCallbackData;
static gboolean
sign (EekPoint *p1, EekPoint *p2, EekPoint *p3)
{
@ -968,17 +960,6 @@ eek_are_bounds_inside (EekBounds bounds, EekPoint point, EekPoint origin, int32_
return 0;
}
static void
find_button_by_position_row_callback (struct squeek_row *row,
gpointer user_data)
{
FindKeyByPositionCallbackData *data = user_data;
if (data->button) {
return;
}
data->button = squeek_row_find_button_by_position(row, data->point, data->origin);
}
/**
* eek_renderer_find_key_by_position:
* @renderer: The renderer normally used to render the key
@ -994,30 +975,13 @@ eek_renderer_find_button_by_position (EekRenderer *renderer,
gdouble x,
gdouble y)
{
FindKeyByPositionCallbackData data;
g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL);
EekRendererPrivate *priv = eek_renderer_get_instance_private (renderer);
EekBounds bounds = squeek_view_get_bounds (view);
/* Transform from widget coordinates to keyboard coordinates */
x = (x - priv->origin_x)/priv->scale - bounds.x;
y = (y - priv->origin_y)/priv->scale - bounds.y;
if (x < 0 ||
y < 0 ||
x > bounds.width ||
y > bounds.height)
return NULL;
data.point.x = x;
data.point.y = y;
data.origin.x = 0;
data.origin.y = 0;
data.button = NULL;
squeek_view_foreach (view, find_button_by_position_row_callback,
&data);
return data.button;
EekPoint point = {
.x = (x - priv->origin_x)/priv->scale,
.y = (y - priv->origin_y)/priv->scale,
};
return squeek_view_find_button_by_position(view, point);
}