From 0747124fc414b23a56613618120ed24e043cf126 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Jun 17 2009 12:11:24 +0000 Subject: - Fix clicking on a different tab doesn't update the scrollbar (#489386) --- diff --git a/nautilus-2.23.x-tab-update-scrollbar.patch b/nautilus-2.23.x-tab-update-scrollbar.patch new file mode 100644 index 0000000..30fcc44 --- /dev/null +++ b/nautilus-2.23.x-tab-update-scrollbar.patch @@ -0,0 +1,43 @@ +From fd4cf364ed323bdbec3cc83e34c58da01457ee45 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Tue, 13 Jan 2009 15:48:37 +0000 +Subject: When calculating bounds, don't ignore visible but unmapped items, becase + +2009-01-13 Alexander Larsson + + * libnautilus-private/nautilus-icon-container.c: + (get_icon_bounds_for_canvas_bounds): + When calculating bounds, don't ignore visible but unmapped items, becase + the root item is unmapped with the canvas, but we want to report the + same bounds independently on the canvas mapped state. + This caused problems when the canvas was unmapped due to being on an + invisible notebook page navigation tabs case, causing the + scrollbars to become invisible. (#542396) + + +svn path=/trunk/; revision=14857 +--- +diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c +index 99dcf3b..6597e8e 100644 +--- a/libnautilus-private/nautilus-icon-container.c ++++ b/libnautilus-private/nautilus-icon-container.c +@@ -888,7 +888,7 @@ get_icon_bounds_for_canvas_bounds (EelCanvasGroup *group, + for (list = group->item_list; list; list = list->next) { + child = list->data; + +- if (child->object.flags & EEL_CANVAS_ITEM_MAPPED) { ++ if (child->object.flags & EEL_CANVAS_ITEM_VISIBLE) { + set = TRUE; + if (!NAUTILUS_IS_ICON_CANVAS_ITEM (child) || + usage == BOUNDS_USAGE_FOR_DISPLAY) { +@@ -920,7 +920,7 @@ get_icon_bounds_for_canvas_bounds (EelCanvasGroup *group, + for (; list; list = list->next) { + child = list->data; + +- if (!(child->object.flags & EEL_CANVAS_ITEM_MAPPED)) ++ if (!(child->object.flags & EEL_CANVAS_ITEM_VISIBLE)) + continue; + + if (!NAUTILUS_IS_ICON_CANVAS_ITEM (child) || +-- +cgit v0.8.2 diff --git a/nautilus.spec b/nautilus.spec index 2ff7d59..d07cd61 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -19,7 +19,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME Version: 2.24.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2 @@ -106,6 +106,10 @@ Patch18: nautilus_new_windows_after_mount.patch # Dragging Files via NFS share moves instead of copy Patch19: nautilus-2.26.1-dnd-not-recurse.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=542396 +# Clicking on a different tab doesn't update the scrollbar +Patch20: nautilus-2.23.x-tab-update-scrollbar.patch + %description Nautilus integrates access to files, applications, media, Internet-based resources and the Web. Nautilus delivers a dynamic and @@ -146,6 +150,7 @@ for writing nautilus extensions. %patch17 -p0 -b .symlink %patch18 -p0 -b .new-windows %patch19 -p1 -b .dnd-recurse +%patch20 -p1 -b .tab-update-scrollbar %build @@ -274,6 +279,9 @@ fi %changelog +* Wed Jun 17 2009 Tomas Bzatek - 2.24.2-4 +- Fix clicking on a different tab doesn't update the scrollbar (#489386) + * Mon Apr 6 2009 Tomas Bzatek - 2.24.2-3 - Fix dragging files via NFS moves instead of copy (#456515)