From 14b9f41c611d656d5be2c16106a7a46423d893d5 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Tue, 27 Jul 2004 23:08:47 +0000 Subject: [PATCH] Patch from Markus Berg to fix bug #123141. 2004-07-28 Richard Hult * drw-break-window.c: Patch from Markus Berg to fix bug #123141. * drwright.c: Remove some cruft. Shorten the warning period a bit. --- typing-break/ChangeLog | 7 +++++++ typing-break/drw-break-window.c | 29 ++++++++++++++++++++++++++--- typing-break/drwright.c | 12 +----------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog index 35d49effa..a366fb26e 100644 --- a/typing-break/ChangeLog +++ b/typing-break/ChangeLog @@ -1,3 +1,10 @@ +2004-07-28 Richard Hult + + * drw-break-window.c: Patch from Markus Berg to fix + bug #123141. + + * drwright.c: Remove some cruft. Shorten the warning period a bit. + 2004-05-02 Richard Hult * drw-monitor.c Raise the threshold for detecting activity, makes diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c index 06c3a0cd6..456bd2f97 100644 --- a/typing-break/drw-break-window.c +++ b/typing-break/drw-break-window.c @@ -141,11 +141,19 @@ drw_break_window_init (DrwBreakWindow *window) GtkWidget *hbox; GtkWidget *frame; GtkWidget *align; + GtkWidget *monitor_box; gchar *str; GtkWidget *outer_vbox; GtkWidget *button_box; gboolean allow_postpone; + gint root_monitor = 0; + GdkScreen *screen = NULL; + GdkRectangle monitor; + gint right_padding; + gint bottom_padding; + + priv = g_new0 (DrwBreakWindowPriv, 1); window->priv = priv; @@ -159,9 +167,12 @@ drw_break_window_init (DrwBreakWindow *window) GTK_WINDOW (window)->type = GTK_WINDOW_POPUP; + screen = gdk_screen_get_default (); + gdk_screen_get_monitor_geometry (screen, root_monitor, &monitor); + gtk_window_set_default_size (GTK_WINDOW (window), - gdk_screen_width (), - gdk_screen_height ()); + gdk_screen_get_width (screen), + gdk_screen_get_height (screen)); gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE); gtk_widget_realize (GTK_WIDGET (window)); @@ -178,7 +189,19 @@ drw_break_window_init (DrwBreakWindow *window) outer_vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (outer_vbox); - gtk_container_add (GTK_CONTAINER (window), outer_vbox); + right_padding = gdk_screen_get_width (screen) - monitor.width - monitor.x; + bottom_padding = gdk_screen_get_height (screen) - monitor.height - monitor.y; + + monitor_box = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_alignment_set_padding (GTK_ALIGNMENT (monitor_box), + monitor.y, + bottom_padding, + monitor.x, + right_padding); + gtk_widget_show (monitor_box); + + gtk_container_add (GTK_CONTAINER (window), monitor_box); + gtk_container_add (GTK_CONTAINER (monitor_box), outer_vbox); gtk_box_pack_start (GTK_BOX (outer_vbox), align, TRUE, TRUE, 0); diff --git a/typing-break/drwright.c b/typing-break/drwright.c index f1cad94ec..a033f6cd9 100644 --- a/typing-break/drwright.c +++ b/typing-break/drwright.c @@ -529,13 +529,6 @@ gconf_notify_cb (GConfClient *client, dr->state = STATE_START; } } -/* else if (!strcmp (entry->key, GCONF_PATH "/warn_time")) { - if (entry->value->type == GCONF_VALUE_INT) { - dr->warn_time = 60 * gconf_value_get_int (entry->value); - dr->state = STATE_START; - } - } -*/ else if (!strcmp (entry->key, GCONF_PATH "/break_time")) { if (entry->value->type == GCONF_VALUE_INT) { dr->break_time = 60 * gconf_value_get_int (entry->value); @@ -936,10 +929,7 @@ drwright_new (void) dr->type_time = 60 * gconf_client_get_int ( client, GCONF_PATH "/type_time", NULL); -/* dr->warn_time = 60 * gconf_client_get_int ( - client, GCONF_PATH /warn_time", NULL); -*/ - dr->warn_time = MIN (dr->type_time / 10, 60*5); + dr->warn_time = MIN (dr->type_time / 12, 60*3); dr->break_time = 60 * gconf_client_get_int ( client, GCONF_PATH "/break_time", NULL);