mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zoom: Convert wl_fixed_t directly into floats, to avoid truncation.

Browse Source 
This fixes center point inaccuracy for rotated surfaces. Thanks to
Pekka Paalanen for spotting it.
dev
Scott Moreau 13 years ago committed by Kristian Høgsberg
parent bdc7cd06d1
commit 3f79d661a1
1 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      src/compositor.c

14
src/compositor.c
Unescape View File

@ -2734,24 +2734,24 @@ weston_text_cursor_position_notify(struct weston_surface *surface,
WL_EXPORT void WL_EXPORT void
weston_output_update_zoom(struct weston_output *output, weston_output_update_zoom(struct weston_output *output,
wl_fixed_t fx, wl_fixed_t x,
wl_fixed_t fy, wl_fixed_t y,
uint32_t type) uint32_t type)
{ {
int32_t x, y; float global_x, global_y;
float trans_min, trans_max; float trans_min, trans_max;
if (output->zoom.level >= 1.0) if (output->zoom.level >= 1.0)
return; return;
x = wl_fixed_to_int(fx); global_x = wl_fixed_to_double(x);
y = wl_fixed_to_int(fy); global_y = wl_fixed_to_double(y);
output->zoom.trans_x = output->zoom.trans_x =
(((float)(x - output->x) / output->current->width) * (((global_x - output->x) / output->current->width) *
(output->zoom.level * 2)) - output->zoom.level; (output->zoom.level * 2)) - output->zoom.level;
output->zoom.trans_y = output->zoom.trans_y =
(((float)(y - output->y) / output->current->height) * (((global_y - output->y) / output->current->height) *
(output->zoom.level * 2)) - output->zoom.level; (output->zoom.level * 2)) - output->zoom.level;
if (type == ZOOM_TEXT_CURSOR) { if (type == ZOOM_TEXT_CURSOR) {

Write Preview
Loading…
Cancel
Save