From c838100b0500e238a3310df40e8be95e1a0d708f Mon Sep 17 00:00:00 2001 From: infirit Date: Sun, 26 Jul 2015 01:03:35 +0200 Subject: themes: Rename enable_transparency to composited We really are checking if we have a compositer running so composited fits better. --- src/themes/coco/coco-theme.c | 10 +++++----- src/themes/nodoka/nodoka-theme.c | 14 +++++++------- src/themes/standard/theme.c | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/themes') diff --git a/src/themes/coco/coco-theme.c b/src/themes/coco/coco-theme.c index ef21e00..84f849c 100644 --- a/src/themes/coco/coco-theme.c +++ b/src/themes/coco/coco-theme.c @@ -45,7 +45,7 @@ typedef struct GtkWidget *stripe_spacer; GtkWidget *pie_countdown; - gboolean enable_transparency; + gboolean composited; int width; int height; @@ -124,7 +124,7 @@ static void fill_background(GtkWidget *widget, WindowData *windata, cairo_t *cr) { float alpha; - if (windata->enable_transparency) + if (windata->composited) alpha = BACKGROUND_OPACITY; else alpha = 1.0; @@ -353,7 +353,7 @@ create_notification(UrlClickedCb url_clicked) windata->win = win; windata->rtl = gtk_widget_get_default_direction(); - windata->enable_transparency = FALSE; + windata->composited = FALSE; screen = gtk_window_get_screen(GTK_WINDOW(win)); #if GTK_CHECK_VERSION(3, 0, 0) visual = gdk_screen_get_rgba_visual(screen); @@ -362,7 +362,7 @@ create_notification(UrlClickedCb url_clicked) { gtk_widget_set_visual(win, visual); if (gdk_screen_is_composited(screen)) - windata->enable_transparency = TRUE; + windata->composited = TRUE; } #else colormap = gdk_screen_get_rgba_colormap(screen); @@ -371,7 +371,7 @@ create_notification(UrlClickedCb url_clicked) { gtk_widget_set_colormap(win, colormap); if (gdk_screen_is_composited(screen)) - windata->enable_transparency = TRUE; + windata->composited = TRUE; } #endif diff --git a/src/themes/nodoka/nodoka-theme.c b/src/themes/nodoka/nodoka-theme.c index 9874bbf..f1a9af3 100644 --- a/src/themes/nodoka/nodoka-theme.c +++ b/src/themes/nodoka/nodoka-theme.c @@ -62,7 +62,7 @@ typedef struct ArrowParameters arrow; - gboolean enable_transparency; + gboolean composited; int width; int height; @@ -355,7 +355,7 @@ static void fill_background(GtkWidget *widget, WindowData *windata, cairo_t *cr) { float alpha; - if (windata->enable_transparency) + if (windata->composited) alpha = BACKGROUND_OPACITY; else alpha = 1.0; @@ -390,7 +390,7 @@ draw_stripe(GtkWidget *widget, WindowData *windata, cairo_t *cr) GdkColor bottom_color; float alpha; - if (windata->enable_transparency) + if (windata->composited) alpha = BACKGROUND_OPACITY; else alpha = 1.0; @@ -460,7 +460,7 @@ static void draw_border(GtkWidget *widget, WindowData *windata, cairo_t *cr) { float alpha; - if (windata->enable_transparency) + if (windata->composited) alpha = BACKGROUND_OPACITY; else alpha = 1.0; @@ -713,7 +713,7 @@ create_notification(UrlClickedCb url_clicked) win = gtk_window_new(GTK_WINDOW_POPUP); windata->win = win; - windata->enable_transparency = FALSE; + windata->composited = FALSE; screen = gtk_window_get_screen(GTK_WINDOW(win)); #if GTK_CHECK_VERSION(3, 0, 0) visual = gdk_screen_get_rgba_visual(screen); @@ -722,7 +722,7 @@ create_notification(UrlClickedCb url_clicked) { gtk_widget_set_visual(win, visual); if (gdk_screen_is_composited(screen)) - windata->enable_transparency = TRUE; + windata->composited = TRUE; } #else colormap = gdk_screen_get_rgba_colormap(screen); @@ -731,7 +731,7 @@ create_notification(UrlClickedCb url_clicked) { gtk_widget_set_colormap(win, colormap); if (gdk_screen_is_composited(screen)) - windata->enable_transparency = TRUE; + windata->composited = TRUE; } #endif diff --git a/src/themes/standard/theme.c b/src/themes/standard/theme.c index c7dea12..1b656cd 100644 --- a/src/themes/standard/theme.c +++ b/src/themes/standard/theme.c @@ -43,7 +43,7 @@ typedef struct { GtkWidget* pie_countdown; gboolean has_arrow; - gboolean enable_transparency; + gboolean composited; int point_x; int point_y; @@ -129,7 +129,7 @@ static void fill_background(GtkWidget* widget, WindowData* windata, cairo_t* cr) style = gtk_widget_get_style(widget); background_color = &style->base[GTK_STATE_NORMAL]; - if (windata->enable_transparency) + if (windata->composited) { cairo_set_source_rgba(cr, background_color->red / 65535.0, background_color->green / 65535.0, background_color->blue / 65535.0, BACKGROUND_OPACITY); } @@ -634,7 +634,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked) win = gtk_window_new(GTK_WINDOW_POPUP); windata->win = win; - windata->enable_transparency = FALSE; + windata->composited = FALSE; screen = gtk_window_get_screen(GTK_WINDOW(win)); @@ -648,7 +648,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked) if (gdk_screen_is_composited(screen)) { - windata->enable_transparency = TRUE; + windata->composited = TRUE; } } #else @@ -657,7 +657,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked) if (colormap != NULL && gdk_screen_is_composited(screen)) { gtk_widget_set_colormap(win, colormap); - windata->enable_transparency = TRUE; + windata->composited = TRUE; } #endif -- cgit v1.2.1