From 60dda66f9beda2f3d8e4782aaa4ee381294173b2 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 28 Jun 2016 22:23:03 +0200 Subject: GTK+-3 pathbar: fix allocation offset for the down slider button We want the down slider button to be linked visually to the rest of the pathbar. https://bugzilla.gnome.org/show_bug.cgi?id=680916 inspired from: https://git.gnome.org/browse/nautilus/commit/src?id=71db3de --- src/caja-pathbar.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c index 6211efc6..3fae370e 100644 --- a/src/caja-pathbar.c +++ b/src/caja-pathbar.c @@ -936,7 +936,7 @@ caja_path_bar_size_allocate (GtkWidget *widget, child_allocation.x -= path_bar->spacing; down_slider_offset = child_allocation.x - widget_allocation.x - path_bar->slider_width; #if GTK_CHECK_VERSION(3,0,0) - down_slider_offset = 0; + down_slider_offset = child_allocation.x - allocation->x - path_bar->slider_width; #else down_slider_offset = border_width; #endif @@ -945,7 +945,7 @@ caja_path_bar_size_allocate (GtkWidget *widget, { down_slider_offset = child_allocation.x - widget_allocation.x; #if GTK_CHECK_VERSION(3,0,0) - down_slider_offset = allocation->width - path_bar->slider_width; + down_slider_offset += child_allocation.width + path_bar->spacing; #else down_slider_offset = allocation->width - border_width - path_bar->slider_width; #endif @@ -971,7 +971,6 @@ caja_path_bar_size_allocate (GtkWidget *widget, gtk_widget_set_child_visible (path_bar->up_slider_button, TRUE); gtk_widget_show_all (path_bar->up_slider_button); - } else { -- cgit v1.2.1