[gtk+/wip/baedert/drawing: 178/396] notebook: Replace all gadgets with widgets
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/drawing: 178/396] notebook: Replace all gadgets with widgets
- Date: Wed, 19 Jul 2017 11:25:19 +0000 (UTC)
commit 2ff6112d2973765a3958bc4a32ce6f6384c4118d
Author: Timm Bäder <mail baedert org>
Date: Sat May 13 11:38:30 2017 +0200
notebook: Replace all gadgets with widgets
gtk/gtknotebook.c | 945 ++++++++++++++++-------------------------------------
1 files changed, 276 insertions(+), 669 deletions(-)
---
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index af90980..4fd55ed 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -43,9 +43,7 @@
#include "gtkbuildable.h"
#include "gtktypebuiltins.h"
#include "gtkwidgetpath.h"
-#include "gtkboxgadgetprivate.h"
#include "gtkbuiltiniconprivate.h"
-#include "gtkcsscustomgadgetprivate.h"
#include "gtkcssstylepropertyprivate.h"
#include "gtksizerequest.h"
#include "gtkstylecontextprivate.h"
@@ -172,15 +170,14 @@ struct _GtkNotebookPrivate
GtkNotebookDragOperation operation;
GtkNotebookPage *cur_page;
GtkNotebookPage *detached_tab;
- GtkNotebookPage *prelight_tab;
GtkTargetList *source_targets;
GtkWidget *action_widget[N_ACTION_WIDGETS];
- GtkWidget *dnd_window;
+ GtkWidget *dnd_child;
GtkWidget *menu;
- GtkCssGadget *gadget;
- GtkCssGadget *stack_gadget;
- GtkCssGadget *header_gadget;
+ GtkWidget *box;
+ GtkWidget *stack_widget;
+ GtkWidget *header_widget;
GtkWidget *tabs_widget;
GtkWidget *arrow_widget[4];
@@ -213,7 +210,6 @@ struct _GtkNotebookPrivate
guint remove_in_detach : 1;
guint focus_out : 1; /* Flag used by ::move-focus-out implementation */
guint has_scrolled : 1;
- guint in_child : 3;
guint need_timer : 1;
guint show_border : 1;
guint show_tabs : 1;
@@ -288,8 +284,8 @@ enum {
#define GTK_NOTEBOOK_PAGE(_glist_) ((GtkNotebookPage *)(_glist_)->data)
-/* some useful defines for calculating coords */
-#define NOTEBOOK_IS_TAB_LABEL_PARENT(_notebook_,_page_) (gtk_widget_get_parent ((_page_)->tab_label) ==
(GTK_WIDGET (_notebook_)))
+#define NOTEBOOK_IS_TAB_LABEL_PARENT(_notebook_,_page_) \
+ (g_object_get_data (G_OBJECT ((_page_)->tab_label), "notebook") == _notebook_)
struct _GtkNotebookPage
{
@@ -298,7 +294,7 @@ struct _GtkNotebookPage
GtkWidget *menu_label;
GtkWidget *last_focus_child; /* Last descendant of the page that had focus */
- GtkWidget *widget; /* widget used for the tab itself */
+ GtkWidget *tab_widget; /* widget used for the tab itself */
guint default_menu : 1; /* If true, we create the menu label ourself */
guint default_tab : 1; /* If true, we create the tab label ourself */
@@ -355,6 +351,7 @@ static void gtk_notebook_get_property (GObject *object,
GValue *value,
GParamSpec *pspec);
static void gtk_notebook_finalize (GObject *object);
+static void gtk_notebook_dispose (GObject *object);
/*** GtkWidget Methods ***/
static void gtk_notebook_destroy (GtkWidget *widget);
@@ -371,23 +368,14 @@ static void gtk_notebook_size_allocate (GtkWidget *widget,
static void gtk_notebook_snapshot (GtkWidget *widget,
GtkSnapshot *snapshot);
static gboolean gtk_notebook_popup_menu (GtkWidget *widget);
-static gboolean gtk_notebook_enter_notify (GtkWidget *widget,
- GdkEventCrossing *event);
-static gboolean gtk_notebook_leave_notify (GtkWidget *widget,
- GdkEventCrossing *event);
static gboolean gtk_notebook_motion_notify (GtkWidget *widget,
GdkEventMotion *event);
-static gboolean gtk_notebook_focus_in (GtkWidget *widget,
- GdkEventFocus *event);
-static gboolean gtk_notebook_focus_out (GtkWidget *widget,
- GdkEventFocus *event);
static void gtk_notebook_grab_notify (GtkWidget *widget,
gboolean was_grabbed);
static void gtk_notebook_state_flags_changed (GtkWidget *widget,
GtkStateFlags previous_state);
static gboolean gtk_notebook_focus (GtkWidget *widget,
GtkDirectionType direction);
-static void gtk_notebook_style_updated (GtkWidget *widget);
/*** Drag and drop Methods ***/
static void gtk_notebook_drag_begin (GtkWidget *widget,
@@ -459,7 +447,6 @@ static GtkNotebook *gtk_notebook_create_window (GtkNotebook *notebook,
gint x,
gint y);
-/*** Gadget Functions ***/
static void gtk_notebook_measure_tabs (GtkGizmo *gizmo,
GtkOrientation orientation,
gint for_size,
@@ -473,29 +460,8 @@ static void gtk_notebook_allocate_tabs (GtkGizmo *gizmo,
GtkAllocation *out_clip);
static gboolean gtk_notebook_snapshot_tabs (GtkGizmo *gizmo,
GtkSnapshot *snapshot);
-static void gtk_notebook_measure_stack (GtkCssGadget *gadget,
- GtkOrientation orientation,
- gint for_size,
- gint *minimum,
- gint *natural,
- gint *minimum_baseline,
- gint *natural_baseline,
- gpointer data);
-static void gtk_notebook_allocate_stack (GtkCssGadget *gadget,
- const GtkAllocation *allocation,
- int baseline,
- GtkAllocation *out_clip,
- gpointer data);
-static gboolean gtk_notebook_snapshot_stack (GtkCssGadget *gadget,
- GtkSnapshot *snapshot,
- int x,
- int y,
- int width,
- int height,
- gpointer data);
/*** GtkNotebook Private Functions ***/
-static void gtk_notebook_redraw_arrows (GtkNotebook *notebook);
static void gtk_notebook_real_remove (GtkNotebook *notebook,
GList *list);
static void gtk_notebook_update_labels (GtkNotebook *notebook);
@@ -589,6 +555,14 @@ G_DEFINE_TYPE_WITH_CODE (GtkNotebook, gtk_notebook, GTK_TYPE_CONTAINER,
gtk_notebook_buildable_init))
static void
+child_notify (GtkNotebook *notebook,
+ GtkWidget *child,
+ const char *prop_name)
+{
+ gtk_container_child_notify (GTK_CONTAINER (notebook), child, prop_name);
+}
+
+static void
add_tab_bindings (GtkBindingSet *binding_set,
GdkModifierType modifiers,
GtkDirectionType direction)
@@ -694,6 +668,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
gobject_class->set_property = gtk_notebook_set_property;
gobject_class->get_property = gtk_notebook_get_property;
gobject_class->finalize = gtk_notebook_finalize;
+ gobject_class->dispose = gtk_notebook_dispose;
widget_class->destroy = gtk_notebook_destroy;
widget_class->unmap = gtk_notebook_unmap;
@@ -701,15 +676,10 @@ gtk_notebook_class_init (GtkNotebookClass *class)
widget_class->size_allocate = gtk_notebook_size_allocate;
widget_class->snapshot = gtk_notebook_snapshot;
widget_class->popup_menu = gtk_notebook_popup_menu;
- widget_class->enter_notify_event = gtk_notebook_enter_notify;
- widget_class->leave_notify_event = gtk_notebook_leave_notify;
widget_class->motion_notify_event = gtk_notebook_motion_notify;
widget_class->grab_notify = gtk_notebook_grab_notify;
widget_class->state_flags_changed = gtk_notebook_state_flags_changed;
- widget_class->focus_in_event = gtk_notebook_focus_in;
- widget_class->focus_out_event = gtk_notebook_focus_out;
widget_class->focus = gtk_notebook_focus;
- widget_class->style_updated = gtk_notebook_style_updated;
widget_class->drag_begin = gtk_notebook_drag_begin;
widget_class->drag_end = gtk_notebook_drag_end;
widget_class->drag_motion = gtk_notebook_drag_motion;
@@ -1141,7 +1111,6 @@ static void
gtk_notebook_init (GtkNotebook *notebook)
{
GtkNotebookPrivate *priv;
- GtkCssNode *widget_node;
gtk_widget_set_can_focus (GTK_WIDGET (notebook), TRUE);
gtk_widget_set_has_window (GTK_WIDGET (notebook), FALSE);
@@ -1159,7 +1128,6 @@ gtk_notebook_init (GtkNotebook *notebook)
priv->show_border = TRUE;
priv->tab_pos = GTK_POS_TOP;
priv->scrollable = FALSE;
- priv->in_child = ARROW_NONE;
priv->click_child = ARROW_NONE;
priv->need_timer = 0;
priv->child_has_focus = FALSE;
@@ -1186,44 +1154,39 @@ gtk_notebook_init (GtkNotebook *notebook)
gtk_drag_dest_set_track_motion (GTK_WIDGET (notebook), TRUE);
- widget_node = gtk_widget_get_css_node (GTK_WIDGET (notebook));
- priv->gadget = gtk_box_gadget_new_for_node (widget_node,
- GTK_WIDGET (notebook));
- gtk_css_gadget_add_class (priv->gadget, GTK_STYLE_CLASS_FRAME);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->gadget), GTK_ORIENTATION_VERTICAL);
- gtk_box_gadget_set_draw_reverse (GTK_BOX_GADGET (priv->gadget), TRUE);
-
- priv->stack_gadget = gtk_css_custom_gadget_new ("stack",
- GTK_WIDGET (notebook),
- priv->gadget,
- NULL,
- gtk_notebook_measure_stack,
- gtk_notebook_allocate_stack,
- gtk_notebook_snapshot_stack,
- NULL,
- NULL);
- gtk_css_gadget_set_state (priv->stack_gadget, gtk_css_node_get_state (widget_node));
- gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), -1, priv->stack_gadget, TRUE, GTK_ALIGN_FILL);
-
- priv->header_gadget = gtk_box_gadget_new ("header",
- GTK_WIDGET (notebook),
- priv->gadget,
- priv->stack_gadget);
- gtk_css_gadget_add_class (priv->header_gadget, GTK_STYLE_CLASS_TOP);
- gtk_css_gadget_set_state (priv->header_gadget, gtk_css_node_get_state (widget_node));
- gtk_css_gadget_set_visible (priv->header_gadget, FALSE);
- gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), 0, priv->header_gadget, FALSE,
GTK_ALIGN_FILL);
+ priv->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_parent (priv->box, GTK_WIDGET (notebook));
+
+
+ priv->header_widget = g_object_new (GTK_TYPE_BOX,
+ "css-name", "header",
+ NULL);
+ gtk_style_context_add_class (gtk_widget_get_style_context (priv->header_widget),
+ GTK_STYLE_CLASS_TOP);
+ gtk_widget_hide (priv->header_widget);
+ gtk_container_add (GTK_CONTAINER (priv->box), priv->header_widget);
priv->tabs_widget = gtk_gizmo_new ("tabs",
gtk_notebook_measure_tabs,
gtk_notebook_allocate_tabs,
gtk_notebook_snapshot_tabs);
- gtk_box_gadget_insert_widget (GTK_BOX_GADGET (priv->header_gadget), 0, priv->tabs_widget);
- gtk_widget_set_parent (priv->tabs_widget, GTK_WIDGET (notebook));
+ gtk_widget_set_hexpand (priv->tabs_widget, TRUE);
+ gtk_container_add (GTK_CONTAINER (priv->header_widget), priv->tabs_widget);
+
+ priv->stack_widget = gtk_stack_new ();
+ gtk_widget_set_hexpand (priv->stack_widget, TRUE);
+ gtk_widget_set_vexpand (priv->stack_widget, TRUE);
+ gtk_container_add (GTK_CONTAINER (priv->box), priv->stack_widget);
priv->press_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (notebook));
+ gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->press_gesture), 0);
+ gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->press_gesture), GTK_PHASE_CAPTURE);
g_signal_connect (priv->press_gesture, "pressed", G_CALLBACK (gtk_notebook_gesture_pressed), notebook);
g_signal_connect (priv->press_gesture, "released", G_CALLBACK (gtk_notebook_gesture_released), notebook);
+
+
+ gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (notebook)),
+ GTK_STYLE_CLASS_FRAME);
}
static void
@@ -1534,7 +1497,7 @@ gtk_notebook_reorder_tab (GtkNotebook *notebook,
for (element = priv->children, i = 0; element; element = element->next, i++)
{
if (MIN (old_page_num, page_num) <= i && i <= MAX (old_page_num, page_num))
- gtk_widget_child_notify (((GtkNotebookPage *) element->data)->child, "position");
+ child_notify (notebook, ((GtkNotebookPage *) element->data)->child, "position");
}
g_signal_emit (notebook,
notebook_signals[PAGE_REORDERED],
@@ -1648,16 +1611,12 @@ gtk_notebook_get_property (GObject *object,
* gtk_notebook_destroy
* gtk_notebook_map
* gtk_notebook_unmap
- * gtk_notebook_size_allocate
* gtk_notebook_snapshot
* gtk_notebook_scroll
* gtk_notebook_popup_menu
* gtk_notebook_enter_notify
* gtk_notebook_leave_notify
* gtk_notebook_motion_notify
- * gtk_notebook_focus_in
- * gtk_notebook_focus_out
- * gtk_notebook_style_updated
* gtk_notebook_drag_begin
* gtk_notebook_drag_end
* gtk_notebook_drag_failed
@@ -1684,18 +1643,6 @@ gtk_notebook_destroy (GtkWidget *widget)
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv;
- if (priv->action_widget[GTK_PACK_START])
- {
- gtk_widget_unparent (priv->action_widget[GTK_PACK_START]);
- priv->action_widget[GTK_PACK_START] = NULL;
- }
-
- if (priv->action_widget[GTK_PACK_END])
- {
- gtk_widget_unparent (priv->action_widget[GTK_PACK_END]);
- priv->action_widget[GTK_PACK_END] = NULL;
- }
-
if (priv->menu)
gtk_notebook_popup_disable (notebook);
@@ -1716,15 +1663,31 @@ gtk_notebook_finalize (GObject *object)
GtkNotebook *notebook = GTK_NOTEBOOK (object);
GtkNotebookPrivate *priv = notebook->priv;
- g_clear_object (&priv->gadget);
- g_clear_object (&priv->header_gadget);
- g_clear_object (&priv->stack_gadget);
g_clear_object (&priv->press_gesture);
+ gtk_widget_unparent (priv->box);
G_OBJECT_CLASS (gtk_notebook_parent_class)->finalize (object);
}
static void
+gtk_notebook_dispose (GObject *object)
+{
+ GtkNotebook *notebook = GTK_NOTEBOOK (object);
+ GtkNotebookPrivate *priv = notebook->priv;
+ GList *l = priv->children;
+
+ while (l != NULL)
+ {
+ GtkNotebookPage *page = l->data;
+ l = l->next;
+
+ gtk_notebook_remove (GTK_CONTAINER (notebook), page->child);
+ }
+
+ G_OBJECT_CLASS (gtk_notebook_parent_class)->dispose (object);
+}
+
+static void
update_node_ordering (GtkNotebook *notebook)
{
GtkNotebookPrivate *priv = notebook->priv;
@@ -1736,7 +1699,6 @@ update_node_ordering (GtkNotebook *notebook)
if ((reverse_tabs && !priv->tabs_reversed) ||
(!reverse_tabs && priv->tabs_reversed))
{
- gtk_box_gadget_reverse_children (GTK_BOX_GADGET (priv->header_gadget));
gtk_css_node_reverse_children (gtk_widget_get_css_node (priv->tabs_widget));
priv->tabs_reversed = reverse_tabs;
}
@@ -1759,25 +1721,19 @@ gtk_notebook_get_tab_area_position (GtkNotebook *notebook,
if (priv->show_tabs && gtk_notebook_has_current_page (notebook))
{
- GtkAllocation allocation;
+ gtk_widget_get_own_allocation (priv->header_widget, rectangle);
- if (rectangle)
- {
- gtk_css_gadget_get_border_allocation (priv->header_gadget, rectangle, NULL);
- gtk_widget_get_allocation (GTK_WIDGET (notebook), &allocation);
- rectangle->x -= allocation.x;
- rectangle->y -= allocation.y;
- }
+ gtk_widget_translate_coordinates (priv->header_widget,
+ GTK_WIDGET (notebook),
+ rectangle->x, rectangle->y,
+ &rectangle->x, &rectangle->y);
return TRUE;
}
else
{
- if (rectangle)
- {
- rectangle->x = rectangle->y = 0;
- rectangle->width = rectangle->height = 10;
- }
+ rectangle->x = rectangle->y = 0;
+ rectangle->width = rectangle->height = 10;
}
return FALSE;
@@ -1951,12 +1907,12 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook *notebook,
if (!gtk_widget_get_visible (page->tab_label))
gtk_widget_show (page->tab_label);
- gtk_widget_measure (page->widget,
+ gtk_widget_measure (page->tab_widget,
GTK_ORIENTATION_HORIZONTAL,
-1,
&page->requisition.width, NULL,
NULL, NULL);
- gtk_widget_measure (page->widget,
+ gtk_widget_measure (page->tab_widget,
GTK_ORIENTATION_VERTICAL,
page->requisition.width,
&page->requisition.height, NULL,
@@ -2129,8 +2085,8 @@ gtk_notebook_measure_tabs (GtkGizmo *gizmo,
gint *minimum_baseline,
gint *natural_baseline)
{
- GtkWidget *widget = GTK_WIDGET (gtk_widget_get_parent (GTK_WIDGET (gizmo)));
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
+ GtkWidget *widget = gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (gizmo)));
+ GtkNotebook *notebook = GTK_NOTEBOOK (gtk_widget_get_parent (widget));
GtkRequisition tabs_requisition = { 0 };
gtk_notebook_get_preferred_tabs_size (notebook, &tabs_requisition);
@@ -2147,44 +2103,6 @@ gtk_notebook_measure_tabs (GtkGizmo *gizmo,
}
static void
-gtk_notebook_measure_stack (GtkCssGadget *gadget,
- GtkOrientation orientation,
- gint size,
- gint *minimum,
- gint *natural,
- gint *minimum_baseline,
- gint *natural_baseline,
- gpointer unused)
-{
- GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
- GtkNotebookPrivate *priv = notebook->priv;
- GList *children;
- gint child_minimum, child_natural;
-
- *minimum = 0;
- *natural = 0;
-
- for (children = priv->children;
- children;
- children = children->next)
- {
- GtkNotebookPage *page = children->data;
-
- if (gtk_widget_get_visible (page->child))
- {
- gtk_widget_measure (page->child,
- orientation,
- size,
- &child_minimum, &child_natural,
- NULL, NULL);
-
- *minimum = MAX (*minimum, child_minimum);
- *natural = MAX (*natural, child_natural);
- }
- }
-}
-static void
gtk_notebook_measure (GtkWidget *widget,
GtkOrientation orientation,
int for_size,
@@ -2196,11 +2114,11 @@ gtk_notebook_measure (GtkWidget *widget,
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv;
- gtk_css_gadget_get_preferred_size (priv->gadget,
- orientation,
- for_size,
- minimum, natural,
- minimum_baseline, natural_baseline);
+ gtk_widget_measure (priv->box,
+ orientation,
+ for_size,
+ minimum, natural,
+ minimum_baseline, natural_baseline);
}
static void
@@ -2209,39 +2127,13 @@ gtk_notebook_allocate_tabs (GtkGizmo *gizmo,
int baseline,
GtkAllocation *out_clip)
{
- GtkWidget *widget = GTK_WIDGET (gtk_widget_get_parent (GTK_WIDGET (gizmo)));
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
+ GtkWidget *widget = gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (gizmo)));
+ GtkNotebook *notebook = GTK_NOTEBOOK (gtk_widget_get_parent (widget));
gtk_notebook_pages_allocate (notebook, allocation);
}
static void
-gtk_notebook_allocate_stack (GtkCssGadget *gadget,
- const GtkAllocation *allocation,
- int baseline,
- GtkAllocation *out_clip,
- gpointer unused)
-{
- GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
- GtkNotebookPrivate *priv = notebook->priv;
- GList *children;
-
- for (children = priv->children;
- children;
- children = children->next)
- {
- GtkNotebookPage *page = children->data;
-
- if (gtk_widget_get_visible (page->child))
- gtk_widget_size_allocate_with_baseline (page->child, (GtkAllocation *) allocation, baseline);
- }
-
- if (gtk_notebook_has_current_page (notebook))
- gtk_widget_get_clip (priv->cur_page->child, out_clip);
-}
-
-static void
gtk_notebook_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
@@ -2249,35 +2141,12 @@ gtk_notebook_size_allocate (GtkWidget *widget,
GtkNotebookPrivate *priv = notebook->priv;
GtkAllocation clip = *allocation;
- gtk_css_gadget_allocate (priv->gadget,
- allocation,
- gtk_widget_get_allocated_baseline (widget),
- &clip);
+ gtk_widget_size_allocate (priv->box, allocation);
+ gtk_widget_get_clip (priv->box, &clip);
gtk_widget_set_clip (widget, &clip);
}
-static gboolean
-gtk_notebook_snapshot_stack (GtkCssGadget *gadget,
- GtkSnapshot *snapshot,
- int x,
- int y,
- int width,
- int height,
- gpointer unused)
-{
- GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
- GtkNotebookPrivate *priv = notebook->priv;
-
- if (gtk_notebook_has_current_page (notebook))
- gtk_widget_snapshot_child (widget,
- priv->cur_page->child,
- snapshot);
-
- return FALSE;
-}
-
static void
gtk_notebook_snapshot (GtkWidget *widget,
GtkSnapshot *snapshot)
@@ -2285,17 +2154,13 @@ gtk_notebook_snapshot (GtkWidget *widget,
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv;
- gtk_css_gadget_snapshot (priv->gadget, snapshot);
-
- if (priv->operation == DRAG_OPERATION_REORDER)
- gtk_widget_snapshot (priv->cur_page->widget, snapshot);
+ gtk_widget_snapshot_child (widget, priv->box, snapshot);
}
static gboolean
gtk_notebook_show_arrows (GtkNotebook *notebook)
{
GtkNotebookPrivate *priv = notebook->priv;
- gboolean show_arrow = FALSE;
GList *children;
if (!priv->scrollable)
@@ -2306,23 +2171,13 @@ gtk_notebook_show_arrows (GtkNotebook *notebook)
{
GtkNotebookPage *page = children->data;
- if (page->tab_label && !gtk_widget_get_child_visible (page->tab_label))
- show_arrow = TRUE;
+ if (!gtk_widget_get_child_visible (page->tab_widget))
+ return TRUE;
children = children->next;
}
- return show_arrow;
-}
-
-static void
-gtk_notebook_get_arrow_rect (GtkNotebook *notebook,
- GdkRectangle *rectangle,
- GtkNotebookArrow arrow)
-{
- GtkNotebookPrivate *priv = notebook->priv;
-
- gtk_widget_get_border_allocation (priv->arrow_widget[arrow], rectangle);
+ return FALSE;
}
static GtkNotebookArrow
@@ -2333,7 +2188,6 @@ gtk_notebook_get_arrow (GtkNotebook *notebook,
GtkNotebookPrivate *priv = notebook->priv;
GdkRectangle arrow_rect;
gint i;
- gint x0, y0;
if (gtk_notebook_show_arrows (notebook))
{
@@ -2342,13 +2196,13 @@ gtk_notebook_get_arrow (GtkNotebook *notebook,
if (priv->arrow_widget[i] == NULL)
continue;
- gtk_notebook_get_arrow_rect (notebook, &arrow_rect, i);
-
- x0 = x - arrow_rect.x;
- y0 = y - arrow_rect.y;
+ gtk_widget_get_own_allocation (priv->arrow_widget[i], &arrow_rect);
+ gtk_widget_translate_coordinates (priv->arrow_widget[i],
+ GTK_WIDGET (notebook),
+ arrow_rect.x, arrow_rect.y,
+ &arrow_rect.x, &arrow_rect.y);
- if (y0 >= 0 && y0 < arrow_rect.height &&
- x0 >= 0 && x0 < arrow_rect.width)
+ if (gdk_rectangle_contains_point (&arrow_rect, x, y))
return i;
}
}
@@ -2411,7 +2265,6 @@ gtk_notebook_arrow_button_press (GtkNotebook *notebook,
NULL,
left ? STEP_NEXT : STEP_PREV,
TRUE));
- gtk_notebook_redraw_arrows (notebook);
return TRUE;
}
@@ -2419,9 +2272,9 @@ gtk_notebook_arrow_button_press (GtkNotebook *notebook,
static gboolean
gtk_notebook_page_tab_label_is_visible (GtkNotebookPage *page)
{
- return page->tab_label
- && gtk_widget_get_visible (page->tab_label)
- && gtk_widget_get_child_visible (page->tab_label);
+ return page->tab_label &&
+ gtk_widget_is_drawable (page->tab_widget) &&
+ gtk_widget_is_drawable (page->tab_label);
}
static GList*
@@ -2431,11 +2284,9 @@ get_tab_at_pos (GtkNotebook *notebook,
{
GtkNotebookPrivate *priv = notebook->priv;
GtkNotebookPage *page;
- GtkAllocation notebook_allocation, allocation;
+ GtkAllocation allocation;
GList *children;
- gtk_widget_get_allocation (GTK_WIDGET (notebook), ¬ebook_allocation);
-
for (children = priv->children; children; children = children->next)
{
page = children->data;
@@ -2443,11 +2294,11 @@ get_tab_at_pos (GtkNotebook *notebook,
if (!gtk_notebook_page_tab_label_is_visible (page))
continue;
- gtk_widget_get_border_allocation (page->widget, &allocation);
- if ((x >= allocation.x) &&
- (y >= allocation.y) &&
- (x <= (allocation.x + allocation.width)) &&
- (y <= (allocation.y + allocation.height)))
+ gtk_widget_get_own_allocation (page->tab_widget, &allocation);
+ gtk_widget_translate_coordinates (page->tab_widget, GTK_WIDGET (notebook),
+ allocation.x, allocation.y, &allocation.x, &allocation.y);
+
+ if (gdk_rectangle_contains_point (&allocation, x, y))
return children;
}
@@ -2520,7 +2371,7 @@ gtk_notebook_gesture_pressed (GtkGestureMultiPress *gesture,
priv->drag_begin_x = priv->mouse_x;
priv->drag_begin_y = priv->mouse_y;
- gtk_widget_get_margin_allocation (page->widget, &allocation);
+ gtk_widget_get_margin_allocation (page->tab_widget, &allocation);
priv->drag_offset_x = priv->drag_begin_x - allocation.x;
priv->drag_offset_y = priv->drag_begin_y - allocation.y;
@@ -2593,14 +2444,12 @@ stop_scrolling (GtkNotebook *notebook)
}
priv->click_child = ARROW_NONE;
priv->pressed_button = 0;
- gtk_notebook_redraw_arrows (notebook);
}
static GList*
get_drop_position (GtkNotebook *notebook)
{
GtkNotebookPrivate *priv = notebook->priv;
- GtkAllocation notebook_allocation;
GList *children, *last_child;
GtkNotebookPage *page;
gboolean is_rtl;
@@ -2613,8 +2462,6 @@ get_drop_position (GtkNotebook *notebook)
children = priv->children;
last_child = NULL;
- gtk_widget_get_allocation (GTK_WIDGET (notebook), ¬ebook_allocation);
-
while (children)
{
page = children->data;
@@ -2626,7 +2473,7 @@ get_drop_position (GtkNotebook *notebook)
{
GtkAllocation allocation;
- gtk_widget_get_border_allocation (page->widget, &allocation);
+ gtk_widget_get_border_allocation (page->tab_widget, &allocation);
switch (priv->tab_pos)
{
@@ -2665,7 +2512,7 @@ static void
tab_drag_begin (GtkNotebook *notebook,
GtkNotebookPage *page)
{
- gtk_style_context_add_class (gtk_widget_get_style_context (page->widget), GTK_STYLE_CLASS_DND);
+ gtk_style_context_add_class (gtk_widget_get_style_context (page->tab_widget), GTK_STYLE_CLASS_DND);
}
/* This function undoes the reparenting that happens both when drag_window
@@ -2679,11 +2526,11 @@ tab_drag_end (GtkNotebook *notebook,
{
g_object_ref (page->tab_label);
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (page->tab_label)), page->tab_label);
- gtk_widget_set_parent (page->tab_label, page->widget);
+ gtk_widget_set_parent (page->tab_label, page->tab_widget);
g_object_unref (page->tab_label);
}
- gtk_style_context_remove_class (gtk_widget_get_style_context (page->widget), GTK_STYLE_CLASS_DND);
+ gtk_style_context_remove_class (gtk_widget_get_style_context (page->tab_widget), GTK_STYLE_CLASS_DND);
}
static void
@@ -2719,7 +2566,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
for (element = priv->children, i = 0; element; element = element->next, i++)
{
if (MIN (old_page_num, page_num) <= i && i <= MAX (old_page_num, page_num))
- gtk_widget_child_notify (((GtkNotebookPage *) element->data)->child, "position");
+ child_notify (notebook, ((GtkNotebookPage *) element->data)->child, "position");
}
g_signal_emit (notebook,
notebook_signals[PAGE_REORDERED], 0,
@@ -2777,74 +2624,6 @@ gtk_notebook_gesture_released (GtkGestureMultiPress *gesture,
stop_scrolling (notebook);
}
-static void
-update_prelight_tab (GtkNotebook *notebook,
- GtkNotebookPage *page)
-{
- GtkNotebookPrivate *priv = notebook->priv;
-
- if (priv->prelight_tab == page)
- return;
-
- if (priv->prelight_tab)
- gtk_widget_unset_state_flags (priv->prelight_tab->widget, GTK_STATE_FLAG_PRELIGHT);
-
- if (page)
- gtk_widget_set_state_flags (page->widget, GTK_STATE_FLAG_PRELIGHT, TRUE);
-
- priv->prelight_tab = page;
-}
-
-static void
-tab_prelight (GtkNotebook *notebook,
- GdkEvent *event)
-{
- GList *tab;
- gdouble x, y;
-
- if (gdk_event_get_coords (event, &x, &y))
- {
- tab = get_tab_at_pos (notebook, x, y);
- update_prelight_tab (notebook, tab == NULL ? NULL : tab->data);
- }
-}
-
-static gboolean
-gtk_notebook_enter_notify (GtkWidget *widget,
- GdkEventCrossing *event)
-{
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-
- tab_prelight (notebook, (GdkEvent *)event);
-
- return FALSE;
-}
-
-static gboolean
-gtk_notebook_leave_notify (GtkWidget *widget,
- GdkEventCrossing *event)
-{
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
- GtkNotebookPrivate *priv = notebook->priv;
- gdouble x, y;
-
- if (gdk_event_get_coords ((GdkEvent *) event, &x, &y))
- {
- if (priv->prelight_tab != NULL)
- {
- tab_prelight (notebook, (GdkEvent *)event);
- }
-
- if (priv->in_child != ARROW_NONE)
- {
- priv->in_child = ARROW_NONE;
- gtk_notebook_redraw_arrows (notebook);
- }
- }
-
- return FALSE;
-}
-
static GtkNotebookPointerPosition
get_pointer_position (GtkNotebook *notebook)
{
@@ -2934,10 +2713,8 @@ check_threshold (GtkNotebook *notebook,
rectangle.y -= dnd_threshold;
rectangle.height += 2 * dnd_threshold;
- return (current_x < rectangle.x ||
- current_x > rectangle.x + rectangle.width ||
- current_y < rectangle.y ||
- current_y > rectangle.y + rectangle.height);
+ /* The negation here is important! */
+ return !gdk_rectangle_contains_point (&rectangle, current_x, current_y);
}
static gboolean
@@ -2947,11 +2724,10 @@ gtk_notebook_motion_notify (GtkWidget *widget,
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv;
GtkNotebookPage *page;
- GtkNotebookArrow arrow;
- GtkNotebookPointerPosition pointer_position;
page = priv->cur_page;
+
if (!page)
return FALSE;
@@ -2962,18 +2738,9 @@ gtk_notebook_motion_notify (GtkWidget *widget,
stop_scrolling (notebook);
}
- tab_prelight (notebook, (GdkEvent *)event);
-
priv->mouse_x = event->x;
priv->mouse_y = event->y;
- arrow = gtk_notebook_get_arrow (notebook, priv->mouse_x, priv->mouse_y);
- if (arrow != priv->in_child)
- {
- priv->in_child = arrow;
- gtk_notebook_redraw_arrows (notebook);
- }
-
if (priv->pressed_button == 0)
return FALSE;
@@ -2990,9 +2757,10 @@ gtk_notebook_motion_notify (GtkWidget *widget,
if (page->reorderable &&
(priv->operation == DRAG_OPERATION_REORDER ||
- gtk_drag_check_threshold (widget, priv->drag_begin_x, priv->drag_begin_y, priv->mouse_x,
priv->mouse_y)))
+ gtk_drag_check_threshold (widget, priv->drag_begin_x, priv->drag_begin_y,
+ priv->mouse_x, priv->mouse_y)))
{
- pointer_position = get_pointer_position (notebook);
+ GtkNotebookPointerPosition pointer_position = get_pointer_position (notebook);
if (pointer_position != POINTER_BETWEEN &&
gtk_notebook_show_arrows (notebook))
@@ -3018,14 +2786,13 @@ gtk_notebook_motion_notify (GtkWidget *widget,
if (priv->operation != DRAG_OPERATION_REORDER)
{
- gtk_gesture_set_state (priv->press_gesture, GTK_EVENT_SEQUENCE_CLAIMED);
priv->operation = DRAG_OPERATION_REORDER;
tab_drag_begin (notebook, page);
}
}
if (priv->operation == DRAG_OPERATION_REORDER)
- gtk_widget_queue_allocate (widget);
+ gtk_widget_queue_allocate (priv->tabs_widget);
return TRUE;
}
@@ -3044,53 +2811,21 @@ gtk_notebook_grab_notify (GtkWidget *widget,
}
static void
-update_tab_state (GtkNotebook *notebook)
-{
- GtkNotebookPrivate *priv = notebook->priv;
- GtkStateFlags state, tab_state;
- GList *l;
-
- state = gtk_widget_get_state_flags (GTK_WIDGET (notebook));
-
- state = state & ~GTK_STATE_FLAG_FOCUSED;
-
- gtk_css_gadget_set_state (priv->stack_gadget, state);
- gtk_css_gadget_set_state (priv->header_gadget, state);
-
- for (l = priv->children; l; l = l->next)
- {
- GtkNotebookPage *page = l->data;
-
- tab_state = state & ~(GTK_STATE_FLAG_CHECKED | GTK_STATE_FLAG_PRELIGHT);
-
- if (page == priv->cur_page)
- tab_state |= GTK_STATE_FLAG_CHECKED;
- if (page == priv->prelight_tab)
- tab_state |= GTK_STATE_FLAG_PRELIGHT;
-
- gtk_widget_set_state_flags (page->widget, tab_state, TRUE);
- }
-}
-
-static void
update_arrow_state (GtkNotebook *notebook)
{
GtkNotebookPrivate *priv = notebook->priv;
gint i;
- GtkStateFlags state;
gboolean is_rtl, left;
is_rtl = gtk_widget_get_direction (GTK_WIDGET (notebook)) == GTK_TEXT_DIR_RTL;
for (i = 0; i < 4; i++)
{
+ gboolean sensitive = TRUE;
+
if (priv->arrow_widget[i] == NULL)
continue;
- state = gtk_widget_get_state_flags (GTK_WIDGET (notebook));
- state &= ~GTK_STATE_FLAG_FOCUSED;
-
-
left = (ARROW_IS_LEFT (i) && !is_rtl) ||
(!ARROW_IS_LEFT (i) && is_rtl);
@@ -3098,16 +2833,10 @@ update_arrow_state (GtkNotebook *notebook)
!gtk_notebook_search_page (notebook, priv->focus_tab,
left ? STEP_PREV : STEP_NEXT, TRUE))
{
- state |= GTK_STATE_FLAG_INSENSITIVE;
- }
- else if (priv->in_child == i)
- {
- state |= GTK_STATE_FLAG_PRELIGHT;
- if (priv->click_child == i)
- state |= GTK_STATE_FLAG_ACTIVE;
+ sensitive = FALSE;
}
- gtk_widget_set_state_flags (priv->arrow_widget[i], state, TRUE);
+ gtk_widget_set_sensitive (priv->arrow_widget[i], sensitive);
}
}
@@ -3115,37 +2844,8 @@ static void
gtk_notebook_state_flags_changed (GtkWidget *widget,
GtkStateFlags previous_state)
{
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-
- update_tab_state (notebook);
- update_arrow_state (notebook);
-
if (!gtk_widget_is_sensitive (widget))
- stop_scrolling (notebook);
-}
-
-static gboolean
-gtk_notebook_focus_in (GtkWidget *widget,
- GdkEventFocus *event)
-{
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
- GtkNotebookPrivate *priv = notebook->priv;
-
- gtk_widget_queue_draw (priv->tabs_widget);
-
- return FALSE;
-}
-
-static gboolean
-gtk_notebook_focus_out (GtkWidget *widget,
- GdkEventFocus *event)
-{
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
- GtkNotebookPrivate *priv = notebook->priv;
-
- gtk_widget_queue_draw (priv->tabs_widget);
-
- return FALSE;
+ stop_scrolling (GTK_NOTEBOOK (widget));
}
static void
@@ -3153,19 +2853,20 @@ update_arrow_nodes (GtkNotebook *notebook)
{
GtkNotebookPrivate *priv = notebook->priv;
gboolean arrow[4];
- GtkCssImageBuiltinType up_image_type, down_image_type;
+ const char *up_icon_name;
+ const char *down_icon_name;
gint i;
if (priv->tab_pos == GTK_POS_LEFT ||
priv->tab_pos == GTK_POS_RIGHT)
{
- up_image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_UP;
- down_image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN;
+ up_icon_name = "pan-down-symbolic";
+ down_icon_name = "pan-up-symbolic";
}
else
{
- up_image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT;
- down_image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT;
+ up_icon_name = "pan-end-symbolic";
+ down_icon_name = "pan-start-symbolic";
}
gtk_widget_style_get (GTK_WIDGET (notebook),
@@ -3196,11 +2897,9 @@ update_arrow_nodes (GtkNotebook *notebook)
case 1:
if (priv->children)
{
-#if 0
GtkNotebookPage *page = priv->children->data;
- next_widget = page->widget;
+ next_widget = page->tab_widget;
break;
-#endif
}
if (priv->arrow_widget[2])
{
@@ -3225,7 +2924,9 @@ update_arrow_nodes (GtkNotebook *notebook)
break;
}
- priv->arrow_widget[i] = gtk_icon_new ("arrow");
+ priv->arrow_widget[i] = g_object_new (GTK_TYPE_BUTTON,
+ "css-name", "arrow",
+ NULL);
gtk_widget_insert_before (priv->arrow_widget[i], priv->tabs_widget, next_widget);
context = gtk_widget_get_style_context (priv->arrow_widget[i]);
@@ -3237,9 +2938,9 @@ update_arrow_nodes (GtkNotebook *notebook)
}
if (i == ARROW_LEFT_BEFORE || i == ARROW_LEFT_AFTER)
- gtk_icon_set_image (GTK_ICON (priv->arrow_widget[i]), down_image_type);
+ gtk_button_set_icon_name (GTK_BUTTON (priv->arrow_widget[i]), down_icon_name);
else
- gtk_icon_set_image (GTK_ICON (priv->arrow_widget[i]), up_image_type);
+ gtk_button_set_icon_name (GTK_BUTTON (priv->arrow_widget[i]), up_icon_name);
}
else
{
@@ -3253,50 +2954,6 @@ update_arrow_nodes (GtkNotebook *notebook)
}
static void
-gtk_notebook_style_updated (GtkWidget *widget)
-{
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-
- update_arrow_nodes (notebook);
- update_arrow_state (notebook);
-
- GTK_WIDGET_CLASS (gtk_notebook_parent_class)->style_updated (widget);
-}
-
-static gboolean
-on_drag_icon_draw (GtkWidget *widget,
- cairo_t *cr,
- gpointer data)
-{
- GtkWidget *child;
- GtkRequisition requisition;
- GtkStyleContext *context;
-
- child = gtk_bin_get_child (GTK_BIN (widget));
- context = gtk_widget_get_style_context (widget);
-
- gtk_style_context_save (context);
-
- gtk_widget_get_preferred_size (widget,
- &requisition, NULL);
-
- gtk_render_background (context, cr, 0, 0,
- requisition.width,
- requisition.height);
-
- gtk_render_frame (context, cr, 0, 0,
- requisition.width,
- requisition.height);
-
- if (child)
- gtk_container_propagate_draw (GTK_CONTAINER (widget), child, cr);
-
- gtk_style_context_restore (context);
-
- return TRUE;
-}
-
-static void
gtk_notebook_drag_begin (GtkWidget *widget,
GdkDragContext *context)
{
@@ -3321,21 +2978,17 @@ gtk_notebook_drag_begin (GtkWidget *widget,
g_object_ref (tab_label);
gtk_widget_unparent (tab_label);
- priv->dnd_window = gtk_window_new (GTK_WINDOW_POPUP);
- gtk_window_set_screen (GTK_WINDOW (priv->dnd_window),
- gtk_widget_get_screen (widget));
- gtk_container_add (GTK_CONTAINER (priv->dnd_window), tab_label);
- gtk_widget_get_margin_allocation (priv->detached_tab->widget, &allocation);
- gtk_widget_set_size_request (priv->dnd_window,
+ priv->dnd_child = tab_label;
+ gtk_widget_get_own_allocation (priv->dnd_child, &allocation);
+ gtk_widget_set_size_request (priv->dnd_child,
allocation.width,
allocation.height);
- g_object_unref (tab_label);
- g_signal_connect (G_OBJECT (priv->dnd_window), "draw",
- G_CALLBACK (on_drag_icon_draw), notebook);
+ gtk_style_context_add_class (gtk_widget_get_style_context (priv->dnd_child), "background");
- gtk_drag_set_icon_widget (context, priv->dnd_window, -2, -2);
- g_object_set_data (G_OBJECT (priv->dnd_window), "drag-context", context);
+ gtk_drag_set_icon_widget (context, tab_label, -2, -2);
+ g_object_set_data (G_OBJECT (priv->dnd_child), "drag-context", context);
+ g_object_unref (tab_label);
}
static void
@@ -3363,11 +3016,17 @@ gtk_notebook_drag_end (GtkWidget *widget,
priv->rootwindow_drop = FALSE;
}
else if (priv->detached_tab)
- gtk_notebook_switch_page (notebook, priv->detached_tab);
+ {
+ gtk_widget_set_size_request (priv->dnd_child, -1, -1);
+ g_object_ref (priv->dnd_child);
+ gtk_widget_unparent (priv->dnd_child);
+ gtk_widget_set_parent (priv->dnd_child, priv->detached_tab->tab_widget);
+ g_object_unref (priv->dnd_child);
+ gtk_notebook_switch_page (notebook, priv->detached_tab);
+ }
- _gtk_bin_set_child (GTK_BIN (priv->dnd_window), NULL);
- gtk_widget_destroy (priv->dnd_window);
- priv->dnd_window = NULL;
+ gtk_style_context_remove_class (gtk_widget_get_style_context (priv->dnd_child), "background");
+ priv->dnd_child = NULL;
priv->operation = DRAG_OPERATION_NONE;
}
@@ -3444,18 +3103,13 @@ gtk_notebook_drag_motion (GtkWidget *widget,
{
GtkNotebook *notebook = GTK_NOTEBOOK (widget);
GtkNotebookPrivate *priv = notebook->priv;
- GtkAllocation allocation;
GdkRectangle position;
GtkNotebookArrow arrow;
GdkAtom target, tab_target;
GList *tab;
gboolean retval = FALSE;
- gtk_widget_get_allocation (widget, &allocation);
-
- arrow = gtk_notebook_get_arrow (notebook,
- x + allocation.x,
- y + allocation.y);
+ arrow = gtk_notebook_get_arrow (notebook, x, y);
if (arrow != ARROW_NONE)
{
priv->click_child = arrow;
@@ -3500,12 +3154,8 @@ gtk_notebook_drag_motion (GtkWidget *widget,
}
}
- x += allocation.x;
- y += allocation.y;
-
if (gtk_notebook_get_tab_area_position (notebook, &position) &&
- x >= position.x && x <= position.x + position.width &&
- y >= position.y && y <= position.y + position.height &&
+ gdk_rectangle_contains_point (&position, x, y) &&
(tab = get_tab_at_pos (notebook, x, y)))
{
priv->mouse_x = x;
@@ -3598,7 +3248,6 @@ do_detach_tab (GtkNotebook *from,
gint y)
{
GtkNotebookPrivate *to_priv = to->priv;
- GtkAllocation to_allocation;
GtkWidget *tab_label, *menu_label;
gboolean tab_expand, tab_fill, reorderable, detachable;
GList *element;
@@ -3626,9 +3275,8 @@ do_detach_tab (GtkNotebook *from,
gtk_notebook_detach_tab (from, child);
- gtk_widget_get_allocation (GTK_WIDGET (to), &to_allocation);
- to_priv->mouse_x = x + to_allocation.x;
- to_priv->mouse_y = y + to_allocation.y;
+ to_priv->mouse_x = x;
+ to_priv->mouse_y = y;
element = get_drop_position (to);
page_num = g_list_position (to_priv->children, element);
@@ -3886,7 +3534,7 @@ gtk_notebook_remove (GtkContainer *container,
while (list)
{
- gtk_widget_child_notify (((GtkNotebookPage *)list->data)->child, "position");
+ child_notify (notebook, ((GtkNotebookPage *)list->data)->child, "position");
list = list->next;
}
@@ -4257,6 +3905,8 @@ page_visible_cb (GtkWidget *child,
gtk_widget_set_visible (parent, gtk_widget_get_visible (child));
}
+ gtk_widget_set_visible (page->tab_widget, gtk_widget_get_visible (child));
+
if (priv->cur_page == page)
{
if (!gtk_widget_get_visible (child))
@@ -4272,9 +3922,9 @@ page_visible_cb (GtkWidget *child,
if (next)
gtk_notebook_switch_page (notebook, GTK_NOTEBOOK_PAGE (next));
}
- gtk_css_gadget_set_visible (priv->header_gadget, priv->show_tabs && gtk_notebook_has_current_page
(notebook));
+ gtk_widget_set_visible (priv->header_widget, priv->show_tabs && gtk_notebook_has_current_page
(notebook));
}
-
+
if (!gtk_notebook_has_current_page (notebook) && gtk_widget_get_visible (child))
{
gtk_notebook_switch_page (notebook, page);
@@ -4292,16 +3942,15 @@ measure_tab (GtkGizmo *gizmo,
gint *minimum_baseline,
gint *natural_baseline)
{
- GtkWidget *header_widget = gtk_widget_get_parent (GTK_WIDGET (gizmo));
- GtkNotebook *notebook = GTK_NOTEBOOK (gtk_widget_get_parent (header_widget));
+ GtkNotebook *notebook = g_object_get_data (G_OBJECT (gizmo), "notebook");
GtkNotebookPrivate *priv = notebook->priv;
GList *l;
- GtkNotebookPage *page = NULL;;
+ GtkNotebookPage *page = NULL;
for (l = priv->children; l; l = l->next)
{
GtkNotebookPage *p = GTK_NOTEBOOK_PAGE (l);
- if (p->widget == GTK_WIDGET (gizmo))
+ if (p->tab_widget == GTK_WIDGET (gizmo))
{
page = p;
break;
@@ -4323,17 +3972,16 @@ allocate_tab (GtkGizmo *gizmo,
int baseline,
GtkAllocation *out_clip)
{
- GtkWidget *header_widget = gtk_widget_get_parent (GTK_WIDGET (gizmo));
- GtkNotebook *notebook = GTK_NOTEBOOK (gtk_widget_get_parent (header_widget));
+ GtkNotebook *notebook = g_object_get_data (G_OBJECT (gizmo), "notebook");
GtkNotebookPrivate *priv = notebook->priv;
GList *l;
- GtkNotebookPage *page = NULL;;
+ GtkNotebookPage *page = NULL;
GtkAllocation child_allocation;
for (l = priv->children; l; l = l->next)
{
GtkNotebookPage *p = GTK_NOTEBOOK_PAGE (l);
- if (p->widget == GTK_WIDGET (gizmo))
+ if (p->tab_widget == GTK_WIDGET (gizmo))
{
page = p;
break;
@@ -4402,11 +4050,12 @@ gtk_notebook_real_insert_page (GtkNotebook *notebook,
if (priv->tabs_reversed)
gtk_css_node_reverse_children (gtk_widget_get_css_node (priv->tabs_widget));
- page->widget = gtk_gizmo_new ("tab",
- measure_tab,
- allocate_tab,
- NULL);
- gtk_widget_set_parent (page->widget, priv->tabs_widget);
+ page->tab_widget = gtk_gizmo_new ("tab",
+ measure_tab,
+ allocate_tab,
+ NULL);
+ g_object_set_data (G_OBJECT (page->tab_widget), "notebook", notebook);
+ gtk_widget_set_parent (page->tab_widget, priv->tabs_widget);
if (priv->tabs_reversed)
gtk_css_node_reverse_children (gtk_widget_get_css_node (priv->tabs_widget));
@@ -4428,13 +4077,13 @@ gtk_notebook_real_insert_page (GtkNotebook *notebook,
gtk_notebook_menu_item_create (notebook,
g_list_find (priv->children, page));
- /* child visible will be turned on by switch_page below */
- gtk_widget_set_child_visible (child, FALSE);
+ gtk_container_add (GTK_CONTAINER (priv->stack_widget), child);
- gtk_css_node_set_parent (gtk_widget_get_css_node (child), gtk_css_gadget_get_node (priv->stack_gadget));
- gtk_widget_set_parent (child, GTK_WIDGET (notebook));
if (tab_label)
- gtk_widget_set_parent (tab_label, page->widget);
+ {
+ gtk_widget_set_parent (tab_label, page->tab_widget);
+ g_object_set_data (G_OBJECT (page->tab_label), "notebook", notebook);
+ }
gtk_notebook_update_labels (notebook);
@@ -4471,60 +4120,24 @@ gtk_notebook_real_insert_page (GtkNotebook *notebook,
gtk_notebook_switch_focus_tab (notebook, priv->focus_tab);
}
- if (priv->scrollable)
- gtk_notebook_redraw_arrows (notebook);
-
- gtk_widget_child_notify (child, "tab-expand");
- gtk_widget_child_notify (child, "tab-fill");
- gtk_widget_child_notify (child, "tab-label");
- gtk_widget_child_notify (child, "menu-label");
+ child_notify (notebook, child, "tab-expand");
+ child_notify (notebook, child, "tab-fill");
+ child_notify (notebook, child, "tab-label");
+ child_notify (notebook, child, "menu-label");
list = g_list_nth (priv->children, position);
while (list)
{
- gtk_widget_child_notify (((GtkNotebookPage *)list->data)->child, "position");
+ child_notify (notebook, ((GtkNotebookPage *)list->data)->child, "position");
list = list->next;
}
gtk_widget_thaw_child_notify (child);
- /* The page-added handler might have reordered the pages, re-get the position */
- return gtk_notebook_page_num (notebook, child);
-}
-
-/* Private GtkNotebook Functions:
- *
- * gtk_notebook_real_remove
- * gtk_notebook_update_labels
- * gtk_notebook_timer
- * gtk_notebook_set_scroll_timer
- * gtk_notebook_page_compare
- * gtk_notebook_search_page
- */
-static void
-gtk_notebook_redraw_arrows (GtkNotebook *notebook)
-{
- GtkNotebookPrivate *priv = notebook->priv;
-
update_arrow_state (notebook);
- if (gtk_widget_get_mapped (GTK_WIDGET (notebook)) &&
- gtk_notebook_show_arrows (notebook))
- {
- GdkRectangle rect;
- gint i;
-
- for (i = 0; i < 4; i++)
- {
- if (priv->arrow_widget[i] == NULL)
- continue;
-
- gtk_notebook_get_arrow_rect (notebook, &rect, i);
- gtk_widget_queue_draw_area (GTK_WIDGET (notebook),
- rect.x, rect.y,
- rect.width, rect.height);
- }
- }
+ /* The page-added handler might have reordered the pages, re-get the position */
+ return gtk_notebook_page_num (notebook, child);
}
static gboolean
@@ -4651,12 +4264,10 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
{
GdkDragContext *context;
- context = (GdkDragContext *)g_object_get_data (G_OBJECT (priv->dnd_window), "drag-context");
+ context = (GdkDragContext *)g_object_get_data (G_OBJECT (priv->dnd_child), "drag-context");
gtk_drag_cancel (context);
}
}
- if (priv->prelight_tab == list->data)
- update_prelight_tab (notebook, NULL);
if (priv->switch_tab == list)
priv->switch_tab = NULL;
@@ -4673,7 +4284,7 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
gtk_widget_get_visible (GTK_WIDGET (notebook)))
need_resize = TRUE;
- gtk_widget_unparent (page->child);
+ gtk_container_remove (GTK_CONTAINER (priv->stack_widget), page->child);
tab_label = page->tab_label;
if (tab_label)
@@ -4705,15 +4316,13 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
page->last_focus_child = NULL;
}
- gtk_widget_unparent (page->widget);
+ gtk_widget_unparent (page->tab_widget);
g_slice_free (GtkNotebookPage, page);
gtk_notebook_update_labels (notebook);
if (need_resize)
gtk_widget_queue_resize (GTK_WIDGET (notebook));
- if (!destroying && priv->scrollable)
- gtk_notebook_redraw_arrows (notebook);
}
static void
@@ -4741,7 +4350,8 @@ gtk_notebook_update_labels (GtkNotebook *notebook)
if (!page->tab_label)
{
page->tab_label = gtk_label_new (string);
- gtk_widget_set_parent (page->tab_label, page->widget);
+ g_object_set_data (G_OBJECT (page->tab_label), "notebook", notebook);
+ gtk_widget_set_parent (page->tab_label, page->tab_widget);
}
else
gtk_label_set_text (GTK_LABEL (page->tab_label), string);
@@ -4822,8 +4432,8 @@ static gboolean
gtk_notebook_snapshot_tabs (GtkGizmo *gizmo,
GtkSnapshot *snapshot)
{
- GtkWidget *widget = GTK_WIDGET (gtk_widget_get_parent (GTK_WIDGET (gizmo)));
- GtkNotebook *notebook = GTK_NOTEBOOK (widget);
+ GtkWidget *widget = gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (gizmo)));
+ GtkNotebook *notebook = GTK_NOTEBOOK (gtk_widget_get_parent (widget));
GtkNotebookPrivate *priv = notebook->priv;
GtkNotebookPage *page;
GList *children;
@@ -4867,7 +4477,8 @@ gtk_notebook_snapshot_tabs (GtkGizmo *gizmo,
{
page = children->data;
- if (!gtk_widget_get_visible (page->child))
+ if (!gtk_widget_get_visible (page->child) ||
+ page == priv->detached_tab)
continue;
if (!gtk_widget_get_mapped (page->tab_label))
@@ -4890,7 +4501,7 @@ gtk_notebook_snapshot_tabs (GtkGizmo *gizmo,
if (!gtk_notebook_page_tab_label_is_visible (page))
continue;
- gtk_widget_snapshot (page->widget, snapshot);
+ gtk_widget_snapshot_child (GTK_WIDGET (gizmo), page->tab_widget, snapshot);
}
if (children != NULL)
@@ -4913,7 +4524,7 @@ gtk_notebook_snapshot_tabs (GtkGizmo *gizmo,
for (children = other_order; children; children = children->next)
{
page = children->data;
- gtk_widget_snapshot (page->widget, snapshot);
+ gtk_widget_snapshot_child (GTK_WIDGET (gizmo), page->tab_widget, snapshot);
}
g_list_free (other_order);
@@ -4926,22 +4537,20 @@ gtk_notebook_snapshot_tabs (GtkGizmo *gizmo,
if (priv->arrow_widget[i] == NULL)
continue;
- gtk_widget_snapshot (priv->arrow_widget[i], snapshot);
+ gtk_widget_snapshot_child (GTK_WIDGET (gizmo), priv->arrow_widget[i], snapshot);
}
}
if (priv->operation != DRAG_OPERATION_DETACH)
- gtk_widget_snapshot (priv->cur_page->widget, snapshot);
+ gtk_widget_snapshot_child (GTK_WIDGET (gizmo), priv->cur_page->tab_widget, snapshot);
return FALSE;
}
/* Private GtkNotebook Size Allocate Functions:
*
- * gtk_notebook_tab_space
* gtk_notebook_calculate_shown_tabs
* gtk_notebook_calculate_tabs_allocation
- * gtk_notebook_pages_allocate
* gtk_notebook_calc_tabs
*/
static void
@@ -5273,7 +4882,7 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook *notebook,
if (page->tab_label &&
NOTEBOOK_IS_TAB_LABEL_PARENT (notebook, page))
- gtk_widget_set_child_visible (page->tab_label, FALSE);
+ gtk_widget_set_child_visible (page->tab_widget, FALSE);
}
for (children = *last_child; children;
@@ -5284,7 +4893,7 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook *notebook,
if (page->tab_label &&
NOTEBOOK_IS_TAB_LABEL_PARENT (notebook, page))
- gtk_widget_set_child_visible (page->tab_label, FALSE);
+ gtk_widget_set_child_visible (page->tab_widget, FALSE);
}
}
else /* !show_arrows */
@@ -5397,7 +5006,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
break;
}
- gtk_widget_get_margin_allocation (priv->cur_page->widget, &drag_allocation);
+ gtk_widget_get_own_allocation (priv->cur_page->tab_widget, &drag_allocation);
left_x = CLAMP (priv->mouse_x - priv->drag_offset_x,
allocation->x, allocation->x + allocation->width - drag_allocation.width);
top_y = CLAMP (priv->mouse_y - priv->drag_offset_y,
@@ -5539,22 +5148,22 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
{
GtkAllocation fixed_allocation = { priv->drag_window_x, priv->drag_window_y,
child_allocation.width, child_allocation.height };
- gtk_widget_size_allocate (page->widget, &fixed_allocation);
- gtk_widget_get_clip (page->widget, &page_clip);
+ gtk_widget_size_allocate (page->tab_widget, &fixed_allocation);
+ gtk_widget_get_clip (page->tab_widget, &page_clip);
}
else if (page == priv->detached_tab && priv->operation == DRAG_OPERATION_DETACH)
{
/* needs to be allocated at 0,0
* to be shown in the drag window */
GtkAllocation fixed_allocation = { 0, 0, child_allocation.width, child_allocation.height };
- gtk_widget_size_allocate (page->widget, &fixed_allocation);
- gtk_widget_get_clip (page->widget, &page_clip);
+ gtk_widget_size_allocate (page->tab_widget, &fixed_allocation);
+ gtk_widget_get_clip (page->tab_widget, &page_clip);
}
- else
+ else if (gtk_widget_is_drawable (page->tab_widget) &&
+ gtk_widget_is_drawable (page->tab_label))
{
- gtk_widget_size_allocate (page->widget, &child_allocation);
- gtk_widget_get_clip (page->widget, &page_clip);
-
+ gtk_widget_size_allocate (page->tab_widget, &child_allocation);
+ gtk_widget_get_clip (page->tab_widget, &page_clip);
}
/* calculate whether to leave a gap based on reorder operation or not */
@@ -5608,7 +5217,7 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
/* set child visible */
if (page->tab_label)
- gtk_widget_set_child_visible (page->tab_label, TRUE);
+ gtk_widget_set_child_visible (page->tab_widget, TRUE);
}
/* Don't move the current tab past the last position during tabs reordering */
@@ -5679,8 +5288,6 @@ gtk_notebook_pages_allocate (GtkNotebook *notebook,
if (!priv->first_tab)
priv->first_tab = priv->children;
-
- gtk_widget_queue_draw (priv->tabs_widget);
}
static void
@@ -5789,21 +5396,19 @@ gtk_notebook_real_switch_page (GtkNotebook *notebook,
child_has_focus = priv->child_has_focus;
if (priv->cur_page)
- {
- gtk_widget_set_child_visible (priv->cur_page->child, FALSE);
- gtk_widget_unset_state_flags (priv->cur_page->widget, GTK_STATE_FLAG_CHECKED);
- }
+ gtk_widget_unset_state_flags (priv->cur_page->tab_widget, GTK_STATE_FLAG_CHECKED);
priv->cur_page = page;
- gtk_widget_set_state_flags (page->widget, GTK_STATE_FLAG_CHECKED, TRUE);
- gtk_css_gadget_set_visible (priv->header_gadget, priv->show_tabs);
+ gtk_widget_set_state_flags (page->tab_widget, GTK_STATE_FLAG_CHECKED, FALSE);
+ gtk_widget_set_visible (priv->header_widget, priv->show_tabs);
if (!priv->focus_tab ||
priv->focus_tab->data != (gpointer) priv->cur_page)
priv->focus_tab =
g_list_find (priv->children, priv->cur_page);
- gtk_widget_set_child_visible (priv->cur_page->child, TRUE);
+ gtk_stack_set_visible_child (GTK_STACK (priv->stack_widget), priv->cur_page->child);
+ gtk_widget_set_child_visible (priv->cur_page->tab_widget, TRUE);
/* If the focus was on the previous page, move it to the first
* element on the new page, if possible, or if not, to the
@@ -5819,8 +5424,7 @@ gtk_notebook_real_switch_page (GtkNotebook *notebook,
gtk_widget_grab_focus (GTK_WIDGET (notebook));
}
- if (priv->scrollable)
- gtk_notebook_redraw_arrows (notebook);
+ update_arrow_state (notebook);
gtk_widget_queue_resize (GTK_WIDGET (notebook));
g_object_notify_by_pspec (G_OBJECT (notebook), properties[PROP_PAGE]);
@@ -5903,9 +5507,6 @@ gtk_notebook_switch_focus_tab (GtkNotebook *notebook,
priv->focus_tab = new_child;
- if (priv->scrollable)
- gtk_notebook_redraw_arrows (notebook);
-
if (!priv->show_tabs || !priv->focus_tab)
return;
@@ -6500,7 +6101,6 @@ gtk_notebook_set_show_border (GtkNotebook *notebook,
gboolean show_border)
{
GtkNotebookPrivate *priv;
- GtkCssNode *node;
g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
@@ -6508,16 +6108,13 @@ gtk_notebook_set_show_border (GtkNotebook *notebook,
if (priv->show_border != show_border)
{
+ GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (notebook));
priv->show_border = show_border;
- node = gtk_widget_get_css_node (GTK_WIDGET (notebook));
if (show_border)
- gtk_css_node_add_class (node, g_quark_from_static_string (GTK_STYLE_CLASS_FRAME));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME);
else
- gtk_css_node_remove_class (node, g_quark_from_static_string (GTK_STYLE_CLASS_FRAME));
-
- if (gtk_widget_get_visible (GTK_WIDGET (notebook)))
- gtk_widget_queue_resize (GTK_WIDGET (notebook));
+ gtk_style_context_remove_class (context, GTK_STYLE_CLASS_FRAME);
g_object_notify_by_pspec (G_OBJECT (notebook), properties[PROP_SHOW_BORDER]);
}
@@ -6584,14 +6181,14 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
else
gtk_widget_hide (page->tab_label);
}
- gtk_css_gadget_set_visible (priv->header_gadget,
- gtk_notebook_has_current_page (notebook));
+ gtk_widget_set_visible (priv->header_widget,
+ gtk_notebook_has_current_page (notebook));
}
else
{
gtk_widget_set_can_focus (GTK_WIDGET (notebook), TRUE);
gtk_notebook_update_labels (notebook);
- gtk_css_gadget_set_visible (priv->header_gadget, TRUE);
+ gtk_widget_show (priv->header_widget);
}
for (i = 0; i < N_ACTION_WIDGETS; i++)
@@ -6642,44 +6239,61 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook)
for (i = 0; i < G_N_ELEMENTS (tab_pos_names); i++)
{
if (tab_pos == i)
- gtk_css_gadget_add_class (priv->header_gadget, tab_pos_names[i]);
+ gtk_style_context_add_class (gtk_widget_get_style_context (priv->header_widget),
+ tab_pos_names[i]);
else
- gtk_css_gadget_remove_class (priv->header_gadget, tab_pos_names[i]);
+ gtk_style_context_remove_class (gtk_widget_get_style_context (priv->header_widget),
+ tab_pos_names[i]);
}
- gtk_box_gadget_remove_gadget (GTK_BOX_GADGET (priv->gadget), priv->header_gadget);
switch (tab_pos)
{
case GTK_POS_TOP:
+ gtk_widget_set_hexpand (priv->tabs_widget, TRUE);
+ gtk_widget_set_vexpand (priv->tabs_widget, FALSE);
+ gtk_widget_set_hexpand (priv->header_widget, TRUE);
+ gtk_widget_set_vexpand (priv->header_widget, FALSE);
if (priv->show_tabs)
- gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), 0, priv->header_gadget, FALSE,
GTK_ALIGN_FILL);
- gtk_box_gadget_set_draw_reverse (GTK_BOX_GADGET (priv->gadget), TRUE);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->gadget), GTK_ORIENTATION_VERTICAL);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->header_gadget), GTK_ORIENTATION_HORIZONTAL);
+ gtk_box_reorder_child (GTK_BOX (priv->box), priv->header_widget, 0);
+
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), GTK_ORIENTATION_VERTICAL);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->header_widget), GTK_ORIENTATION_HORIZONTAL);
break;
case GTK_POS_BOTTOM:
+ gtk_widget_set_hexpand (priv->tabs_widget, TRUE);
+ gtk_widget_set_vexpand (priv->tabs_widget, FALSE);
+ gtk_widget_set_hexpand (priv->header_widget, TRUE);
+ gtk_widget_set_vexpand (priv->header_widget, FALSE);
if (priv->show_tabs)
- gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), 1, priv->header_gadget, FALSE,
GTK_ALIGN_FILL);
- gtk_box_gadget_set_draw_reverse (GTK_BOX_GADGET (priv->gadget), FALSE);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->gadget), GTK_ORIENTATION_VERTICAL);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->header_gadget), GTK_ORIENTATION_HORIZONTAL);
+ gtk_box_reorder_child (GTK_BOX (priv->box), priv->header_widget, 1);
+
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), GTK_ORIENTATION_VERTICAL);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->header_widget), GTK_ORIENTATION_HORIZONTAL);
break;
case GTK_POS_LEFT:
+ gtk_widget_set_hexpand (priv->tabs_widget, FALSE);
+ gtk_widget_set_vexpand (priv->tabs_widget, TRUE);
+ gtk_widget_set_hexpand (priv->header_widget, FALSE);
+ gtk_widget_set_vexpand (priv->header_widget, TRUE);
if (priv->show_tabs)
- gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), 0, priv->header_gadget, FALSE,
GTK_ALIGN_FILL);
- gtk_box_gadget_set_draw_reverse (GTK_BOX_GADGET (priv->gadget), TRUE);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->gadget), GTK_ORIENTATION_HORIZONTAL);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->header_gadget), GTK_ORIENTATION_VERTICAL);
+ gtk_box_reorder_child (GTK_BOX (priv->box), priv->header_widget, 0);
+
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), GTK_ORIENTATION_HORIZONTAL);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->header_widget), GTK_ORIENTATION_VERTICAL);
break;
case GTK_POS_RIGHT:
+ gtk_widget_set_hexpand (priv->tabs_widget, FALSE);
+ gtk_widget_set_vexpand (priv->tabs_widget, TRUE);
+ gtk_widget_set_hexpand (priv->header_widget, FALSE);
+ gtk_widget_set_vexpand (priv->header_widget, TRUE);
if (priv->show_tabs)
- gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), 1, priv->header_gadget, FALSE,
GTK_ALIGN_FILL);
- gtk_box_gadget_set_draw_reverse (GTK_BOX_GADGET (priv->gadget), FALSE);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->gadget), GTK_ORIENTATION_HORIZONTAL);
- gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->header_gadget), GTK_ORIENTATION_VERTICAL);
+ gtk_box_reorder_child (GTK_BOX (priv->box), priv->header_widget, 1);
+
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), GTK_ORIENTATION_HORIZONTAL);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->header_widget), GTK_ORIENTATION_VERTICAL);
break;
}
@@ -6707,8 +6321,7 @@ gtk_notebook_set_tab_pos (GtkNotebook *notebook,
if (priv->tab_pos != pos)
{
priv->tab_pos = pos;
- if (gtk_widget_get_visible (GTK_WIDGET (notebook)))
- gtk_widget_queue_resize (GTK_WIDGET (notebook));
+ gtk_widget_queue_resize (GTK_WIDGET (notebook));
gtk_notebook_update_tab_pos (notebook);
@@ -6761,8 +6374,7 @@ gtk_notebook_set_scrollable (GtkNotebook *notebook,
update_arrow_nodes (notebook);
update_arrow_state (notebook);
- if (gtk_widget_get_visible (GTK_WIDGET (notebook)))
- gtk_widget_queue_resize (GTK_WIDGET (notebook));
+ gtk_widget_queue_resize (GTK_WIDGET (notebook));
g_object_notify_by_pspec (G_OBJECT (notebook), properties[PROP_SCROLLABLE]);
}
@@ -6941,7 +6553,8 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
{
page->default_tab = FALSE;
page->tab_label = tab_label;
- gtk_widget_set_parent (page->tab_label, page->widget);
+ g_object_set_data (G_OBJECT (page->tab_label), "notebook", notebook);
+ gtk_widget_set_parent (page->tab_label, page->tab_widget);
}
else
{
@@ -6955,7 +6568,8 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
g_snprintf (string, sizeof(string), _("Page %u"),
g_list_position (priv->children, list));
page->tab_label = gtk_label_new (string);
- gtk_widget_set_parent (page->tab_label, page->widget);
+ gtk_widget_set_parent (page->tab_label, page->tab_widget);
+ g_object_set_data (G_OBJECT (page->tab_label), "notebook", notebook);
}
}
@@ -6972,7 +6586,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook,
gtk_widget_queue_resize (GTK_WIDGET (notebook));
}
- gtk_widget_child_notify (child, "tab-label");
+ child_notify (notebook, child, "tab-label");
}
/**
@@ -6996,7 +6610,7 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook,
if (tab_text)
tab_label = gtk_label_new (tab_text);
gtk_notebook_set_tab_label (notebook, child, tab_label);
- gtk_widget_child_notify (child, "tab-label");
+ child_notify (notebook, child, "tab-label");
}
/**
@@ -7104,7 +6718,7 @@ gtk_notebook_set_menu_label (GtkNotebook *notebook,
if (priv->menu)
gtk_notebook_menu_item_create (notebook, list);
- gtk_widget_child_notify (child, "menu-label");
+ child_notify (notebook, child, "menu-label");
}
/**
@@ -7131,7 +6745,7 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook,
gtk_widget_set_valign (menu_label, GTK_ALIGN_CENTER);
}
gtk_notebook_set_menu_label (notebook, child, menu_label);
- gtk_widget_child_notify (child, "menu-label");
+ child_notify (notebook, child, "menu-label");
}
/**
@@ -7187,7 +6801,7 @@ gtk_notebook_child_reordered (GtkNotebook *notebook,
}
if (list->prev)
- sibling = gtk_widget_get_css_node (GTK_NOTEBOOK_PAGE (list->prev)->widget);
+ sibling = gtk_widget_get_css_node (GTK_NOTEBOOK_PAGE (list->prev)->tab_widget);
else if (priv->arrow_widget[ARROW_RIGHT_BEFORE])
sibling = gtk_widget_get_css_node (priv->arrow_widget[ARROW_RIGHT_BEFORE]);
else if (priv->arrow_widget[ARROW_LEFT_BEFORE])
@@ -7196,7 +6810,7 @@ gtk_notebook_child_reordered (GtkNotebook *notebook,
sibling = NULL;
gtk_css_node_insert_after (gtk_widget_get_css_node (priv->tabs_widget),
- gtk_widget_get_css_node (page->widget),
+ gtk_widget_get_css_node (page->tab_widget),
sibling);
gtk_notebook_update_labels (notebook);
gtk_widget_queue_allocate (priv->tabs_widget);
@@ -7228,10 +6842,10 @@ gtk_notebook_set_tab_label_packing (GtkNotebook *notebook,
gtk_widget_freeze_child_notify (child);
page->expand = expand;
- gtk_widget_child_notify (child, "tab-expand");
+ child_notify (notebook, child, "tab-expand");
page->fill = fill;
- gtk_widget_child_notify (child, "tab-fill");
- gtk_widget_child_notify (child, "position");
+ child_notify (notebook, child, "tab-fill");
+ child_notify (notebook, child, "position");
if (priv->show_tabs)
gtk_widget_queue_resize (GTK_WIDGET (notebook));
gtk_widget_thaw_child_notify (child);
@@ -7317,7 +6931,7 @@ gtk_notebook_reorder_child (GtkNotebook *notebook,
for (list = priv->children, i = 0; list; list = list->next, i++)
{
if (MIN (old_pos, position) <= i && i <= MAX (old_pos, position))
- gtk_widget_child_notify (((GtkNotebookPage *) list->data)->child, "position");
+ child_notify (notebook, ((GtkNotebookPage *) list->data)->child, "position");
}
gtk_widget_thaw_child_notify (child);
@@ -7440,12 +7054,12 @@ gtk_notebook_set_tab_reorderable (GtkNotebook *notebook,
{
page->reorderable = reorderable;
if (reorderable)
- gtk_style_context_add_class (gtk_widget_get_style_context (page->widget),
+ gtk_style_context_add_class (gtk_widget_get_style_context (page->tab_widget),
"reorderable-page");
else
- gtk_style_context_remove_class (gtk_widget_get_style_context (page->widget),
+ gtk_style_context_remove_class (gtk_widget_get_style_context (page->tab_widget),
"reorderable-page");
- gtk_widget_child_notify (child, "reorderable");
+ child_notify (notebook, child, "reorderable");
}
}
@@ -7546,7 +7160,7 @@ gtk_notebook_set_tab_detachable (GtkNotebook *notebook,
if (GTK_NOTEBOOK_PAGE (list)->detachable != detachable)
{
GTK_NOTEBOOK_PAGE (list)->detachable = detachable;
- gtk_widget_child_notify (child, "detachable");
+ child_notify (notebook, child, "detachable");
}
}
@@ -7600,11 +7214,7 @@ gtk_notebook_set_action_widget (GtkNotebook *notebook,
priv = notebook->priv;
if (priv->action_widget[pack_type])
- {
- gtk_box_gadget_remove_widget (GTK_BOX_GADGET (priv->header_gadget),
- priv->action_widget[pack_type]);
- gtk_widget_unparent (priv->action_widget[pack_type]);
- }
+ gtk_container_remove (GTK_CONTAINER (priv->header_widget), priv->action_widget[pack_type]);
priv->action_widget[pack_type] = widget;
@@ -7612,17 +7222,14 @@ gtk_notebook_set_action_widget (GtkNotebook *notebook,
{
int pos;
- gtk_css_node_set_parent (gtk_widget_get_css_node (widget),
- gtk_css_gadget_get_node (priv->header_gadget));
-
if (priv->tabs_reversed)
pos = pack_type == GTK_PACK_START ? -1 : 0;
else
pos = pack_type == GTK_PACK_START ? 0 : -1;
- gtk_box_gadget_insert_widget (GTK_BOX_GADGET (priv->header_gadget), pos, widget);
+ gtk_container_add (GTK_CONTAINER (priv->header_widget), widget);
+ gtk_box_reorder_child (GTK_BOX (priv->header_widget), widget, pos);
gtk_widget_set_child_visible (widget, priv->show_tabs);
- gtk_widget_set_parent (widget, GTK_WIDGET (notebook));
}
gtk_widget_queue_resize (GTK_WIDGET (notebook));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
