forked from AuroraMiddleware/gtk
Always initialize child-visible to FALSE, otherwise we may end up with the
2005-05-06 Matthias Clasen <mclasen@redhat.com> * gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always initialize child-visible to FALSE, otherwise we may end up with the wrong page visible initially. (#302283, Patrik Fimml) * gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders appear insensitive in insensitive treeviews.
This commit is contained in:
parent
0ffbe85cc4
commit
1d50b80aed
14
ChangeLog
14
ChangeLog
@ -1,3 +1,17 @@
|
||||
2005-05-06 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
|
||||
initialize child-visible to FALSE, otherwise we may end up
|
||||
with the wrong page visible initially. (#302283, Patrik Fimml)
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
|
||||
appear insensitive in insensitive treeviews.
|
||||
|
||||
2005-05-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtktoolbar.c: Fix a typo in the docs. (#303024,
|
||||
Morten Welinder)
|
||||
|
||||
2005-05-06 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtk.symbols:
|
||||
|
@ -1,3 +1,17 @@
|
||||
2005-05-06 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
|
||||
initialize child-visible to FALSE, otherwise we may end up
|
||||
with the wrong page visible initially. (#302283, Patrik Fimml)
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
|
||||
appear insensitive in insensitive treeviews.
|
||||
|
||||
2005-05-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtktoolbar.c: Fix a typo in the docs. (#303024,
|
||||
Morten Welinder)
|
||||
|
||||
2005-05-06 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtk.symbols:
|
||||
|
@ -1,3 +1,17 @@
|
||||
2005-05-06 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtknotebook.c (gtk_notebook_insert_page_menu): Always
|
||||
initialize child-visible to FALSE, otherwise we may end up
|
||||
with the wrong page visible initially. (#302283, Patrik Fimml)
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_draw_arrow): Make expanders
|
||||
appear insensitive in insensitive treeviews.
|
||||
|
||||
2005-05-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtktoolbar.c: Fix a typo in the docs. (#303024,
|
||||
Morten Welinder)
|
||||
|
||||
2005-05-06 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtk.symbols:
|
||||
|
@ -4371,10 +4371,8 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
|
||||
if (!notebook->first_tab)
|
||||
notebook->first_tab = notebook->children;
|
||||
|
||||
if (!notebook->cur_page)
|
||||
gtk_widget_set_child_visible (child, TRUE);
|
||||
else
|
||||
gtk_widget_set_child_visible (child, FALSE);
|
||||
/* child visible will be turned on by switch_page below */
|
||||
gtk_widget_set_child_visible (child, FALSE);
|
||||
|
||||
if (tab_label)
|
||||
{
|
||||
|
@ -3236,12 +3236,15 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
|
||||
|
||||
/* see if we are near the edge. */
|
||||
offset = y - (visible_rect.y + 2 * SCROLL_EDGE_SIZE);
|
||||
g_print ("offset1 %d\n", offset);
|
||||
if (offset > 0)
|
||||
{
|
||||
offset = y - (visible_rect.y + visible_rect.height - 2 * SCROLL_EDGE_SIZE);
|
||||
g_print ("offset2 %d\n", offset);
|
||||
if (offset < 0)
|
||||
return;
|
||||
}
|
||||
g_print ("offset3 %d\n", offset);
|
||||
|
||||
value = CLAMP (tree_view->priv->vadjustment->value + offset, 0.0,
|
||||
tree_view->priv->vadjustment->upper - tree_view->priv->vadjustment->page_size);
|
||||
@ -8318,7 +8321,11 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
|
||||
area.width = expander_size + 2;
|
||||
area.height = MAX (CELL_HEIGHT (node, vertical_separator), (expander_size - vertical_separator));
|
||||
|
||||
if (node == tree_view->priv->button_pressed_node)
|
||||
if (GTK_WIDGET_STATE (tree_view) == GTK_STATE_INSENSITIVE)
|
||||
{
|
||||
state = GTK_STATE_INSENSITIVE;
|
||||
}
|
||||
else if (node == tree_view->priv->button_pressed_node)
|
||||
{
|
||||
if (x >= area.x && x <= (area.x + area.width) &&
|
||||
y >= area.y && y <= (area.y + area.height))
|
||||
|
Loading…
Reference in New Issue
Block a user