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

shell: Scale fullscreen surface without cropping them, center on output

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-07-12 12:32:31 -04:00
parent fe89f07e33
commit 240dfeb0fe
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell.c
+18 -4
View File
@@ -1400,7 +1400,7 @@ shell_configure_fullscreen(struct shell_surface *shsurf)
struct weston_output *output = shsurf->fullscreen_output; struct weston_output *output = shsurf->fullscreen_output;
struct weston_surface *surface = shsurf->surface; struct weston_surface *surface = shsurf->surface;
struct weston_matrix *matrix; struct weston_matrix *matrix;
float scale; float scale, output_aspect, surface_aspect, x, y;
if (!shsurf->fullscreen.black_surface) if (!shsurf->fullscreen.black_surface)
shsurf->fullscreen.black_surface = shsurf->fullscreen.black_surface =
@@ -1421,12 +1421,26 @@ shell_configure_fullscreen(struct shell_surface *shsurf)
case WL_SHELL_SURFACE_FULLSCREEN_METHOD_SCALE: case WL_SHELL_SURFACE_FULLSCREEN_METHOD_SCALE:
matrix = &shsurf->fullscreen.transform.matrix; matrix = &shsurf->fullscreen.transform.matrix;
weston_matrix_init(matrix); weston_matrix_init(matrix);
scale = (float)output->current->width/(float)surface->geometry.width;
output_aspect = (float) output->current->width /
(float) output->current->height;
surface_aspect = (float) surface->geometry.width /
(float) surface->geometry.height;
if (output_aspect < surface_aspect)
scale = (float) output->current->width /
(float) surface->geometry.width;
else
scale = (float) output->current->height /
(float) surface->geometry.height;
weston_matrix_scale(matrix, scale, scale, 1); weston_matrix_scale(matrix, scale, scale, 1);
wl_list_remove(&shsurf->fullscreen.transform.link); wl_list_remove(&shsurf->fullscreen.transform.link);
wl_list_insert(surface->geometry.transformation_list.prev, wl_list_insert(&surface->geometry.transformation_list,
&shsurf->fullscreen.transform.link); &shsurf->fullscreen.transform.link);
weston_surface_set_position(surface, output->x, output->y); x = output->x + (output->current->width - surface->geometry.width * scale) / 2;
y = output->y + (output->current->height - surface->geometry.height * scale) / 2;
weston_surface_set_position(surface, x, y);
break; break;
case WL_SHELL_SURFACE_FULLSCREEN_METHOD_DRIVER: case WL_SHELL_SURFACE_FULLSCREEN_METHOD_DRIVER:
if (shell_surface_is_top_fullscreen(shsurf)) { if (shell_surface_is_top_fullscreen(shsurf)) {