AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Check if down_button is NULL. This happens when the pathbar button for the

Browse Source 
2007-06-04  Cody Russell  <bratsche@gnome.org>

        * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): Check
        if down_button is NULL.  This happens when the pathbar button
        for the current directory is too large to fit in the
        space, e.g. on Windows for directories named something like
        "My Documents and Settings".


svn path=/trunk/; revision=18030
This commit is contained in:
Cody Russell 2007-06-04 18:17:14 +00:00 committed by Cody Russell
parent 9a63d05e47
commit ea8f3758dd
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-06-04 Cody Russell <bratsche@gnome.org>
* gtk/gtkpathbar.c (gtk_path_bar_scroll_down): Check
if down_button is NULL. This happens when the pathbar button
for the current directory is too large to fit in the
space, e.g. on Windows for directories named something like
"My Documents and Settings".
2007-06-04 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

5
gtk/gtkpathbar.c
View File

@ -722,7 +722,10 @@ gtk_path_bar_scroll_down (GtkWidget *button, GtkPathBar *path_bar)
}
}
space_needed = BUTTON_DATA (down_button->data)->button->allocation.width + path_bar->spacing;
/* We check if down_button might be NULL in cases where the pathbar's horizontal size is smaller
* than the button and it doesn't get displayed. e.g., on Windows it might be "My Documents and Settings"
*/
space_needed = down_button ? BUTTON_DATA (down_button->data)->button->allocation.width : 0 + path_bar->spacing;
if (direction == GTK_TEXT_DIR_RTL)
space_available = path_bar->down_slider_button->allocation.x - GTK_WIDGET (path_bar)->allocation.x;
else