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

window: let menu and tooltip redraw use widget size

Browse Source 
Menu and tooltip redraw functions were using the surface size directly.
For consistency, make them use the widget size instead, it is the same.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Pekka Paalanen 12 years ago committed by Kristian Høgsberg
parent 61e028c953
commit 0a9686f51c
1 changed files with 6 additions and 8 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
      clients/window.c

14
clients/window.c
Unescape View File

@ -1537,15 +1537,14 @@ tooltip_redraw_handler(struct widget *widget, void *data)
const int32_t r = 3; const int32_t r = 3;
struct tooltip *tooltip = data; struct tooltip *tooltip = data;
int32_t width, height; int32_t width, height;
struct surface *surface = widget->surface;
cr = cairo_create(surface->cairo_surface); cr = cairo_create(widget->surface->cairo_surface);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0); cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
cairo_paint(cr); cairo_paint(cr);
width = surface->allocation.width; width = widget->allocation.width;
height = surface->allocation.height; height = widget->allocation.height;
rounded_rect(cr, 0, 0, width, height, r); rounded_rect(cr, 0, 0, width, height, r);
cairo_set_operator(cr, CAIRO_OPERATOR_OVER); cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
@ -3757,15 +3756,14 @@ menu_redraw_handler(struct widget *widget, void *data)
const int32_t r = 3, margin = 3; const int32_t r = 3, margin = 3;
struct menu *menu = data; struct menu *menu = data;
int32_t width, height, i; int32_t width, height, i;
struct surface *surface = widget->surface;
cr = cairo_create(surface->cairo_surface); cr = cairo_create(widget->surface->cairo_surface);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0); cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
cairo_paint(cr); cairo_paint(cr);
width = surface->allocation.width; width = widget->allocation.width;
height = surface->allocation.height; height = widget->allocation.height;
rounded_rect(cr, 0, 0, width, height, r); rounded_rect(cr, 0, 0, width, height, r);
cairo_set_operator(cr, CAIRO_OPERATOR_OVER); cairo_set_operator(cr, CAIRO_OPERATOR_OVER);

Write Preview
Loading…
Cancel
Save