Merge branch 'master' into f23

This commit is contained in:
Martin Stransky 2016-04-26 10:52:11 +02:00
commit dcfd6c5b48

View File

@ -594,7 +594,7 @@ diff -up firefox-46.0/widget/gtk/gtk3drawing.c.gtk3-20 firefox-46.0/widget/gtk/g
+ if (widget == MOZ_GTK_SCROLLBAR_HORIZONTAL) { + if (widget == MOZ_GTK_SCROLLBAR_HORIZONTAL) {
+ gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction); + gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction);
+ style = gHorizScrollbar.scroll.style; + style = gHorizScrollbar.scroll.style;
+ } + }
+ else { + else {
+ gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction); + gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction);
+ style = gVertScrollbar.scroll.style; + style = gVertScrollbar.scroll.style;