aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/gtkutil.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d09b9de34fa..09b4b3f59a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12015-03-25 Martin Rudalics <rudalics@gmx.at>
2
3 * gtkutil.c (update_theme_scrollbar_width): Don't round up
4 scroll bar width with GTK3 (Bug#20182).
5
12015-03-22 John F Carr <jfc@mit.edu> (tiny change) 62015-03-22 John F Carr <jfc@mit.edu> (tiny change)
2 7
3 * fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with 8 * fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with
diff --git a/src/gtkutil.c b/src/gtkutil.c
index b23d84c8b82..fedaa0f3a2d 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3570,7 +3570,9 @@ update_theme_scrollbar_width (void)
3570 gtk_widget_destroy (wscroll); 3570 gtk_widget_destroy (wscroll);
3571 g_object_unref (G_OBJECT (wscroll)); 3571 g_object_unref (G_OBJECT (wscroll));
3572 w += 2*b; 3572 w += 2*b;
3573#ifndef HAVE_GTK3
3573 if (w < 16) w = 16; 3574 if (w < 16) w = 16;
3575#endif
3574 scroll_bar_width_for_theme = w; 3576 scroll_bar_width_for_theme = w;
3575} 3577}
3576 3578