summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2016-06-28 22:23:03 +0200
committerraveit65 <[email protected]>2016-07-14 16:15:12 +0200
commit60dda66f9beda2f3d8e4782aaa4ee381294173b2 (patch)
treeac6faa9afb327de5876df06e1d58190369e94bb5 /src
parent0c487078ad79809e60242a7cb4035756fce4b95e (diff)
downloadcaja-60dda66f9beda2f3d8e4782aaa4ee381294173b2.tar.bz2
caja-60dda66f9beda2f3d8e4782aaa4ee381294173b2.tar.xz
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
Diffstat (limited to 'src')
-rw-r--r--src/caja-pathbar.c5
1 files 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
{