mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-09 13:29:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix terminal resizing

Browse source 
Get snapping to character grid working again, avoid crashes when attempting
to resize below 1x1 character cell, only redraw when size actually changes.

Also, rename window_get_child_rectangle() to window_get_child_allocation().
This commit is contained in:
Kristian Høgsberg 2011-01-11 10:00:52 -05:00
parent 5fd89d255b
commit da846ca91d
8 changed files with 145 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

20
clients/view.c
View file

@ -57,7 +57,7 @@ struct view {
static void
view_draw(struct view *view)
{
struct rectangle rectangle;
struct rectangle allocation;
cairo_surface_t *surface;
cairo_t *cr;
PopplerPage *page;
@ -65,15 +65,15 @@ view_draw(struct view *view)
window_draw(view->window);
window_get_child_rectangle(view->window, &rectangle);
window_get_child_allocation(view->window, &allocation);
page = poppler_document_get_page(view->document, view->page);
surface = window_get_surface(view->window);
cr = cairo_create(surface);
cairo_rectangle(cr, rectangle.x, rectangle.y,
rectangle.width, rectangle.height);
cairo_rectangle(cr, allocation.x, allocation.y,
allocation.width, allocation.height);
cairo_clip(cr);
cairo_set_source_rgba(cr, 0, 0, 0, 0.8);
@ -81,16 +81,16 @@ view_draw(struct view *view)
cairo_paint(cr);
poppler_page_get_size(page, &width, &height);
doc_aspect = width / height;
window_aspect = (double) rectangle.width / rectangle.height;
window_aspect = (double) allocation.width / allocation.height;
if (doc_aspect < window_aspect)
scale = rectangle.height / height;
scale = allocation.height / height;
else
scale = rectangle.width / width;
cairo_translate(cr, rectangle.x, rectangle.y);
scale = allocation.width / width;
cairo_translate(cr, allocation.x, allocation.y);
cairo_scale(cr, scale, scale);
cairo_translate(cr,
(rectangle.width - width * scale) / 2 / scale,
(rectangle.height - height * scale) / 2 / scale);
(allocation.width - width * scale) / 2 / scale,
(allocation.height - height * scale) / 2 / scale);
cairo_rectangle(cr, 0, 0, width, height);
cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
cairo_set_source_rgb(cr, 1, 1, 1);