diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-11-28 17:00:08 +0200 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2017-02-05 22:50:00 +0200 |
| commit | 047b8d3845d5e64682d2d21eeb2cd4b9422baa4f (patch) | |
| tree | 64350bdb3249747d01e20539c2aa2def2c2253ea | |
| parent | 6e405fc7db9ecc3340aabac13fc4cc42c6f3df42 (diff) | |
| download | metacity-047b8d3845d5e64682d2d21eeb2cd4b9422baa4f.tar.gz | |
libmetacity: add scale to MetaDrawInfo
| -rw-r--r-- | libmetacity/meta-draw-op-private.h | 14 | ||||
| -rw-r--r-- | libmetacity/meta-draw-op.c | 3 | ||||
| -rw-r--r-- | libmetacity/meta-theme-metacity.c | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/libmetacity/meta-draw-op-private.h b/libmetacity/meta-draw-op-private.h index 138ecec4..5ddb81b0 100644 --- a/libmetacity/meta-draw-op-private.h +++ b/libmetacity/meta-draw-op-private.h @@ -77,16 +77,18 @@ typedef enum struct _MetaDrawInfo { + gint scale; + GdkPixbuf *mini_icon; GdkPixbuf *icon; PangoLayout *title_layout; - int title_layout_width; - int title_layout_height; + gint title_layout_width; + gint title_layout_height; - gint left_width; - gint right_width; - gint top_height; - gint bottom_height; + gint left_width; + gint right_width; + gint top_height; + gint bottom_height; gdouble width; gdouble height; diff --git a/libmetacity/meta-draw-op.c b/libmetacity/meta-draw-op.c index edbab269..e2d59ec3 100644 --- a/libmetacity/meta-draw-op.c +++ b/libmetacity/meta-draw-op.c @@ -22,7 +22,6 @@ #include <math.h> #include "meta-draw-op-private.h" -#include "meta-theme-impl-private.h" #define GDK_COLOR_RGB(color) \ ((guint32) (((int)((color).red * 255) << 16) | \ @@ -558,7 +557,7 @@ draw_op_draw_with_env (const MetaDrawOp *op, gdouble rx, ry, rwidth, rheight; cairo_surface_t *surface; - scale = get_window_scaling_factor (); + scale = info->scale; cairo_scale (cr, 1.0 / scale, 1.0 / scale); if (op->data.image.pixbuf) diff --git a/libmetacity/meta-theme-metacity.c b/libmetacity/meta-theme-metacity.c index d39a2ddb..702d0921 100644 --- a/libmetacity/meta-theme-metacity.c +++ b/libmetacity/meta-theme-metacity.c @@ -5358,6 +5358,8 @@ meta_theme_metacity_draw_frame (MetaThemeImpl *impl, pango_layout_get_pixel_extents (title_layout, NULL, &extents); + draw_info.scale = scale; + draw_info.mini_icon = mini_icon; draw_info.icon = icon; draw_info.title_layout = title_layout; |