diff options
author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-02-11 19:51:20 +0200 |
---|---|---|
committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-02-12 02:51:30 +0200 |
commit | 1c2ee2c51fc6a48a1f6e94c7ff1c8905767d8653 (patch) | |
tree | f3709b544aaea55d7c77f77adbd3088cc1ba0492 | |
parent | 35eb11dbd60edfef6fa00d85a8b80537c57aeb66 (diff) | |
download | metacity-1c2ee2c51fc6a48a1f6e94c7ff1c8905767d8653.tar.gz |
libmetacity: remove meta_theme_get_theme_type
-rw-r--r-- | libmetacity/meta-theme.c | 6 | ||||
-rw-r--r-- | libmetacity/meta-theme.h | 2 | ||||
-rw-r--r-- | src/ui/frames.c | 20 |
3 files changed, 1 insertions, 27 deletions
diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c index 48a83c9c..76db5882 100644 --- a/libmetacity/meta-theme.c +++ b/libmetacity/meta-theme.c @@ -282,12 +282,6 @@ meta_theme_set_titlebar_font (MetaTheme *theme, theme->titlebar_font = pango_font_description_copy (titlebar_font); } -MetaThemeType -meta_theme_get_theme_type (MetaTheme *theme) -{ - return theme->type; -} - gchar * meta_theme_get_name (MetaTheme *theme) { diff --git a/libmetacity/meta-theme.h b/libmetacity/meta-theme.h index cb708205..0a78b771 100644 --- a/libmetacity/meta-theme.h +++ b/libmetacity/meta-theme.h @@ -163,8 +163,6 @@ void meta_theme_set_composited (MetaTheme void meta_theme_set_titlebar_font (MetaTheme *theme, const PangoFontDescription *titlebar_font); -MetaThemeType meta_theme_get_theme_type (MetaTheme *theme); - gchar *meta_theme_get_name (MetaTheme *theme); MetaFrameStyle *meta_theme_get_frame_style (MetaTheme *theme, diff --git a/src/ui/frames.c b/src/ui/frames.c index 2162ed92..a7bd8d89 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -2532,7 +2532,6 @@ meta_frames_draw (GtkWidget *widget, { MetaUIFrame *frame; MetaFrames *frames; - MetaTheme *current; CachedPixels *pixels; cairo_region_t *region; cairo_rectangle_int_t clip; @@ -2554,25 +2553,8 @@ meta_frames_draw (GtkWidget *widget, populate_cache (frames, frame); - current = meta_theme_get_current (); - - if (meta_theme_get_theme_type (current) == META_THEME_TYPE_METACITY) - { - MetaFrameGeometry fgeom; - - meta_frames_calc_geometry (frames, frame, &fgeom); - - region = get_visible_region (frames, frame, &fgeom, fgeom.width, fgeom.height); - - gdk_cairo_region (cr, region); - cairo_clip(cr); - } - else - { - region = cairo_region_create_rectangle (&clip); - } - pixels = get_cache (frames, frame); + region = cairo_region_create_rectangle (&clip); cached_pixels_draw (pixels, cr, region); |