Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from trunk:

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

        Merge from trunk:

        * 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".  (#389603)


svn path=/branches/gtk-2-10/; revision=18032
This commit is contained in:
Cody Russell
2007-06-04 18:21:04 +00:00
committed by Cody Russell
parent 7f330fe2dc
commit 484d13e313
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2007-06-04 Cody Russell <bratsche@gnome.org>
Merge from trunk:
* 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". (#389603)
2007-06-01 Michael Natterer <mitch@imendio.com>
Merge from trunk:

5
gtk/gtkpathbar.c
View File

@@ -707,7 +707,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