diff options
Diffstat (limited to 'src/themes')
| -rw-r--r-- | src/themes/coco/coco-theme.c | 12 | ||||
| -rw-r--r-- | src/themes/nodoka/nodoka-theme.c | 12 | ||||
| -rw-r--r-- | src/themes/slider/theme.c | 10 | ||||
| -rw-r--r-- | src/themes/standard/theme.c | 9 |
4 files changed, 31 insertions, 12 deletions
diff --git a/src/themes/coco/coco-theme.c b/src/themes/coco/coco-theme.c index ff76d52..08cfa44 100644 --- a/src/themes/coco/coco-theme.c +++ b/src/themes/coco/coco-theme.c @@ -90,19 +90,13 @@ void set_notification_hints(GtkWindow *nw, GVariant *hints); void notification_tick(GtkWindow *nw, glong remaining); static void create_pie_countdown(WindowData* windata); -#define STRIPE_WIDTH 32 #define WIDTH 300 #define IMAGE_SIZE 32 -#define IMAGE_PADDING 10 -#define SPACER_LEFT 30 +#define IMAGE_PADDING 24 #define PIE_RADIUS 12 #define PIE_WIDTH (2 * PIE_RADIUS) #define PIE_HEIGHT (2 * PIE_RADIUS) -#define BODY_X_OFFSET (IMAGE_SIZE + 8) -#define DEFAULT_ARROW_OFFSET (SPACER_LEFT + 12) -#define DEFAULT_ARROW_HEIGHT 14 -#define DEFAULT_ARROW_WIDTH 22 -#define DEFAULT_ARROW_SKEW -6 +#define BODY_X_OFFSET (IMAGE_SIZE + IMAGE_PADDING) #define BACKGROUND_OPACITY 0.9 #define GRADIENT_CENTER 0.7 @@ -249,6 +243,7 @@ update_shape_region (cairo_surface_t *surface, windata->last_width = windata->width; windata->last_height = windata->height; + gtk_widget_queue_draw (GTK_WIDGET (windata->win)); } static void @@ -463,6 +458,7 @@ create_notification(UrlClickedCb url_clicked) gtk_widget_set_halign (windata->main_hbox, GTK_ALIGN_START); gtk_widget_set_valign (windata->main_hbox, GTK_ALIGN_START); gtk_widget_set_margin_top (windata->main_hbox, 8); + gtk_widget_set_margin_bottom (windata->main_hbox, 8); gtk_widget_set_margin_end (windata->main_hbox, 8); gtk_widget_show (windata->main_hbox); gtk_box_pack_start (GTK_BOX(main_vbox), windata->main_hbox, FALSE, FALSE, 0); diff --git a/src/themes/nodoka/nodoka-theme.c b/src/themes/nodoka/nodoka-theme.c index d478862..4de4d5d 100644 --- a/src/themes/nodoka/nodoka-theme.c +++ b/src/themes/nodoka/nodoka-theme.c @@ -594,6 +594,7 @@ update_shape_region (cairo_surface_t *surface, windata->last_width = windata->width; windata->last_height = windata->height; + gtk_widget_queue_draw (GTK_WIDGET (windata->win)); } static void @@ -747,6 +748,13 @@ get_theme_info(char **theme_name, *homepage = g_strdup("https://nodoka.fedorahosted.org/"); } +static void +close_button_clicked_cb(GtkButton* button, GtkWidget* win) +{ + g_object_set_data(G_OBJECT(win), "_user_closed", GINT_TO_POINTER(1)); + gtk_widget_destroy(win); +} + /* Create new notification */ GtkWindow * create_notification(UrlClickedCb url_clicked) @@ -859,8 +867,8 @@ create_notification(UrlClickedCb url_clicked) gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE); gtk_container_set_border_width(GTK_CONTAINER(close_button), 0); gtk_widget_set_size_request(close_button, 24, 24); - g_signal_connect_swapped(G_OBJECT(close_button), "clicked", - G_CALLBACK(gtk_widget_destroy), win); + g_signal_connect(G_OBJECT(close_button), "clicked", + G_CALLBACK(close_button_clicked_cb), win); atkobj = gtk_widget_get_accessible(close_button); atk_action_set_description(ATK_ACTION(atkobj), 0, diff --git a/src/themes/slider/theme.c b/src/themes/slider/theme.c index 4552af0..c75967a 100644 --- a/src/themes/slider/theme.c +++ b/src/themes/slider/theme.c @@ -211,6 +211,7 @@ update_shape_region (cairo_surface_t *surface, windata->last_width = windata->width; windata->last_height = windata->height; + gtk_widget_queue_draw (GTK_WIDGET (windata->win)); } static void paint_window (GtkWidget *widget, @@ -305,6 +306,13 @@ static void on_composited_changed(GtkWidget* window, WindowData* windata) gtk_widget_queue_draw (windata->win); } +static void +close_button_clicked_cb(GtkButton* button, GtkWidget* win) +{ + g_object_set_data(G_OBJECT(win), "_user_closed", GINT_TO_POINTER(1)); + gtk_widget_destroy(win); +} + GtkWindow* create_notification(UrlClickedCb url_clicked) { GtkWidget* win; @@ -399,7 +407,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked) gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE); gtk_container_set_border_width(GTK_CONTAINER(close_button), 0); - g_signal_connect_swapped(G_OBJECT(close_button), "clicked", G_CALLBACK(gtk_widget_destroy), win); + g_signal_connect(G_OBJECT(close_button), "clicked", G_CALLBACK(close_button_clicked_cb), win); atkobj = gtk_widget_get_accessible(close_button); atk_action_set_description(ATK_ACTION(atkobj), 0, diff --git a/src/themes/standard/theme.c b/src/themes/standard/theme.c index 90171c6..b670f5b 100644 --- a/src/themes/standard/theme.c +++ b/src/themes/standard/theme.c @@ -642,6 +642,13 @@ static gboolean activate_link(GtkLabel* label, const char* url, WindowData* wind return TRUE; } +static void +close_button_clicked_cb(GtkButton* button, GtkWidget* win) +{ + g_object_set_data(G_OBJECT(win), "_user_closed", GINT_TO_POINTER(1)); + gtk_widget_destroy(win); +} + GtkWindow* create_notification(UrlClickedCb url_clicked) { GtkWidget* spacer; @@ -754,7 +761,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked) gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE); gtk_container_set_border_width(GTK_CONTAINER(close_button), 0); //gtk_widget_set_size_request(close_button, 20, 20); - g_signal_connect_swapped(G_OBJECT(close_button), "clicked", G_CALLBACK(gtk_widget_destroy), win); + g_signal_connect(G_OBJECT(close_button), "clicked", G_CALLBACK(close_button_clicked_cb), win); atkobj = gtk_widget_get_accessible(close_button); atk_action_set_description(ATK_ACTION(atkobj), 0, |