summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-05-22 21:13:01 +0200
committerStefano Karapetsas <[email protected]>2015-06-17 22:19:23 +0200
commitc8717310ca41b783f71c55ead7e57dcd9dc5625e (patch)
tree44defa8fa9032d06c762cc31833e1527f7376518
parent62e14a1cdf3836da8c3ebfde39f5239a5dec4753 (diff)
downloadmate-notification-daemon-c8717310ca41b783f71c55ead7e57dcd9dc5625e.tar.bz2
mate-notification-daemon-c8717310ca41b783f71c55ead7e57dcd9dc5625e.tar.xz
GTK3: Fix positioning notifications with long text
Closes https://github.com/mate-desktop/mate-notification-daemon/pull/52
Diffstat
-rw-r--r--src/daemon/daemon.c21
-rw-r--r--src/daemon/stack.c8
-rw-r--r--src/themes/coco/coco-theme.c6
-rw-r--r--src/themes/nodoka/nodoka-theme.c6
-rw-r--r--src/themes/slider/theme.c6
-rw-r--r--src/themes/standard/theme.c6
6 files changed, 53 insertions, 0 deletions
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index a73ca93..62d7b04 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -53,6 +53,7 @@
#define MAX_NOTIFICATIONS 20
+#define WIDTH 400
#define IMAGE_SIZE 48
#define IDLE_SECONDS 30
#define NOTIFICATION_BUS_NAME "org.freedesktop.Notifications"
@@ -130,12 +131,32 @@ static void monitor_notification_source_windows(NotifyDaemon* daemon, NotifyTime
G_DEFINE_TYPE(NotifyDaemon, notify_daemon, G_TYPE_OBJECT);
+#if GTK_CHECK_VERSION (3, 0, 0)
+static void
+notify_daemon_get_preferred_width (GtkWidget *widget,
+ gint *min_width,
+ gint *nat_width)
+{
+ if (nat_width != NULL) {
+ *nat_width = WIDTH;
+ }
+}
+#endif
+
static void notify_daemon_class_init(NotifyDaemonClass* daemon_class)
{
GObjectClass* object_class = G_OBJECT_CLASS(daemon_class);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (daemon_class);
+#endif
+
object_class->finalize = notify_daemon_finalize;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ widget_class->get_preferred_width = notify_daemon_get_preferred_width;
+#endif
+
g_type_class_add_private(daemon_class, sizeof(NotifyDaemonPrivate));
}
diff --git a/src/daemon/stack.c b/src/daemon/stack.c
index 97e328a..a60f2b2 100644
--- a/src/daemon/stack.c
+++ b/src/daemon/stack.c
@@ -301,7 +301,11 @@ notify_stack_shift_notifications (NotifyStack *stack,
GtkRequisition req;
if (nw == NULL || nw2 != nw) {
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_get_preferred_size (GTK_WIDGET (nw2), NULL, &req);
+#else
gtk_widget_size_request (GTK_WIDGET (nw2), &req);
+#endif
translate_coordinates (stack->location,
&workarea,
@@ -362,7 +366,11 @@ void notify_stack_add_window(NotifyStack* stack, GtkWindow* nw, gboolean new_not
GtkRequisition req;
gint x, y;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_get_preferred_size(GTK_WIDGET(nw), NULL, &req);
+#else
gtk_widget_size_request(GTK_WIDGET(nw), &req);
+#endif
notify_stack_shift_notifications(stack, nw, NULL, req.width, req.height + NOTIFY_STACK_SPACING, &x, &y);
theme_move_notification(nw, x, y);
diff --git a/src/themes/coco/coco-theme.c b/src/themes/coco/coco-theme.c
index 584c3a6..389fc9f 100644
--- a/src/themes/coco/coco-theme.c
+++ b/src/themes/coco/coco-theme.c
@@ -471,6 +471,9 @@ create_notification(UrlClickedCb url_clicked)
gtk_box_pack_start(GTK_BOX(vbox), windata->summary_label, FALSE, FALSE, 0);
gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_line_wrap_mode (GTK_LABEL (windata->summary_label), PANGO_WRAP_WORD_CHAR);
+#endif
atkobj = gtk_widget_get_accessible(windata->summary_label);
atk_object_set_description(atkobj, "Notification summary text.");
@@ -479,6 +482,9 @@ create_notification(UrlClickedCb url_clicked)
gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, FALSE, FALSE, 0);
gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_line_wrap_mode (GTK_LABEL (windata->body_label), PANGO_WRAP_WORD_CHAR);
+#endif
g_signal_connect(G_OBJECT(windata->body_label), "activate-link",
G_CALLBACK(activate_link), windata);
diff --git a/src/themes/nodoka/nodoka-theme.c b/src/themes/nodoka/nodoka-theme.c
index 3d2a597..5b6c309 100644
--- a/src/themes/nodoka/nodoka-theme.c
+++ b/src/themes/nodoka/nodoka-theme.c
@@ -822,6 +822,9 @@ create_notification(UrlClickedCb url_clicked)
gtk_box_pack_start(GTK_BOX(hbox), windata->summary_label, TRUE, TRUE, 0);
gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_line_wrap_mode (GTK_LABEL (windata->summary_label), PANGO_WRAP_WORD_CHAR);
+#endif
atkobj = gtk_widget_get_accessible(windata->summary_label);
atk_object_set_description(atkobj, "Notification summary text.");
@@ -868,6 +871,9 @@ create_notification(UrlClickedCb url_clicked)
gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_line_wrap_mode (GTK_LABEL (windata->body_label), PANGO_WRAP_WORD_CHAR);
+#endif
g_signal_connect(G_OBJECT(windata->body_label), "activate-link",
G_CALLBACK(activate_link), windata);
diff --git a/src/themes/slider/theme.c b/src/themes/slider/theme.c
index 7335760..c0a4a8c 100644
--- a/src/themes/slider/theme.c
+++ b/src/themes/slider/theme.c
@@ -671,6 +671,9 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_box_pack_start(GTK_BOX(vbox), windata->summary_label, TRUE, TRUE, 0);
gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_line_wrap_mode (GTK_LABEL (windata->summary_label), PANGO_WRAP_WORD_CHAR);
+#endif
atkobj = gtk_widget_get_accessible(windata->summary_label);
atk_object_set_description(atkobj, "Notification summary text.");
@@ -694,6 +697,9 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_line_wrap_mode (GTK_LABEL (windata->body_label), PANGO_WRAP_WORD_CHAR);
+#endif
g_signal_connect_swapped(G_OBJECT(windata->body_label), "activate-link", G_CALLBACK(windata->url_clicked), win);
atkobj = gtk_widget_get_accessible(windata->body_label);
diff --git a/src/themes/standard/theme.c b/src/themes/standard/theme.c
index f68d2b9..295c241 100644
--- a/src/themes/standard/theme.c
+++ b/src/themes/standard/theme.c
@@ -718,6 +718,9 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_box_pack_start(GTK_BOX(hbox), windata->summary_label, TRUE, TRUE, 0);
gtk_misc_set_alignment(GTK_MISC(windata->summary_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->summary_label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_line_wrap_mode (GTK_LABEL (windata->summary_label), PANGO_WRAP_WORD_CHAR);
+#endif
atkobj = gtk_widget_get_accessible(windata->summary_label);
atk_object_set_description(atkobj, "Notification summary text.");
@@ -770,6 +773,9 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
gtk_misc_set_alignment(GTK_MISC(windata->body_label), 0, 0);
gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_label_set_line_wrap_mode (GTK_LABEL (windata->body_label), PANGO_WRAP_WORD_CHAR);
+#endif
g_signal_connect(G_OBJECT(windata->body_label), "activate-link", G_CALLBACK(activate_link), windata);
atkobj = gtk_widget_get_accessible(windata->body_label);
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-11 14:47:01 +0000