* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "gtkintl.h"
-#include "gtkpaned.h"
-#include "gtkbindings.h"
-#include "gtksignal.h"
+#include "config.h"
+
#include "gdk/gdkkeysyms.h"
-#include "gtkwindow.h"
+#include "gtkbindings.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
+#include "gtkorientable.h"
+#include "gtkpaned.h"
+#include "gtkwindow.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
enum {
PROP_0,
+ PROP_ORIENTATION,
PROP_POSITION,
- PROP_POSITION_SET
+ PROP_POSITION_SET,
+ PROP_MIN_POSITION,
+ PROP_MAX_POSITION
+};
+
+enum {
+ CHILD_PROP_0,
+ CHILD_PROP_RESIZE,
+ CHILD_PROP_SHRINK
};
enum {
LAST_SIGNAL
};
-static void gtk_paned_class_init (GtkPanedClass *klass);
-static void gtk_paned_init (GtkPaned *paned);
static void gtk_paned_set_property (GObject *object,
guint prop_id,
const GValue *value,
guint prop_id,
GValue *value,
GParamSpec *pspec);
+static void gtk_paned_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_paned_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gtk_paned_finalize (GObject *object);
+
+static void gtk_paned_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void gtk_paned_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
static void gtk_paned_realize (GtkWidget *widget);
static void gtk_paned_unrealize (GtkWidget *widget);
static void gtk_paned_map (GtkWidget *widget);
static void gtk_paned_unmap (GtkWidget *widget);
+static void gtk_paned_state_changed (GtkWidget *widget,
+ GtkStateType previous_state);
static gboolean gtk_paned_expose (GtkWidget *widget,
GdkEventExpose *event);
static gboolean gtk_paned_enter (GtkWidget *widget,
GdkEventCrossing *event);
static gboolean gtk_paned_leave (GtkWidget *widget,
GdkEventCrossing *event);
-static gboolean gtk_paned_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean gtk_paned_button_release (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean gtk_paned_motion (GtkWidget *widget,
- GdkEventMotion *event);
+static gboolean gtk_paned_button_press (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean gtk_paned_button_release (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean gtk_paned_motion (GtkWidget *widget,
+ GdkEventMotion *event);
static gboolean gtk_paned_focus (GtkWidget *widget,
GtkDirectionType direction);
+static gboolean gtk_paned_grab_broken (GtkWidget *widget,
+ GdkEventGrabBroken *event);
static void gtk_paned_add (GtkContainer *container,
GtkWidget *widget);
static void gtk_paned_remove (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
+static void gtk_paned_calc_position (GtkPaned *paned,
+ gint allocation,
+ gint child1_req,
+ gint child2_req);
static void gtk_paned_set_focus_child (GtkContainer *container,
GtkWidget *child);
static void gtk_paned_set_saved_focus (GtkPaned *paned,
GtkWidget *widget);
+static void gtk_paned_set_first_paned (GtkPaned *paned,
+ GtkPaned *first_paned);
static void gtk_paned_set_last_child1_focus (GtkPaned *paned,
GtkWidget *widget);
static void gtk_paned_set_last_child2_focus (GtkPaned *paned,
static gboolean gtk_paned_accept_position (GtkPaned *paned);
static gboolean gtk_paned_cancel_position (GtkPaned *paned);
static gboolean gtk_paned_toggle_handle_focus (GtkPaned *paned);
-static GtkType gtk_paned_child_type (GtkContainer *container);
-
-static GtkContainerClass *parent_class = NULL;
+static GType gtk_paned_child_type (GtkContainer *container);
+static void gtk_paned_grab_notify (GtkWidget *widget,
+ gboolean was_grabbed);
-GtkType
-gtk_paned_get_type (void)
+struct _GtkPanedPrivate
{
- static GtkType paned_type = 0;
-
- if (!paned_type)
- {
- static const GtkTypeInfo paned_info =
- {
- "GtkPaned",
- sizeof (GtkPaned),
- sizeof (GtkPanedClass),
- (GtkClassInitFunc) gtk_paned_class_init,
- (GtkObjectInitFunc) gtk_paned_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
+ GtkOrientation orientation;
+ GtkWidget *saved_focus;
+ GtkPaned *first_paned;
+ guint32 grab_time;
+};
- paned_type = gtk_type_unique (GTK_TYPE_CONTAINER, &paned_info);
- }
-
- return paned_type;
-}
+
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkPaned, gtk_paned, GTK_TYPE_CONTAINER,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
+ NULL))
static guint signals[LAST_SIGNAL] = { 0 };
+
static void
add_tab_bindings (GtkBindingSet *binding_set,
- GdkModifierType modifiers,
- gboolean reverse)
+ GdkModifierType modifiers)
{
gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers,
- "cycle_handle_focus", 1,
- G_TYPE_BOOLEAN, reverse);
+ "toggle-handle-focus", 0);
gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers,
- "cycle_handle_focus", 1,
- G_TYPE_BOOLEAN, reverse);
+ "toggle-handle-focus", 0);
}
static void
GtkScrollType scroll)
{
gtk_binding_entry_add_signal (binding_set, keyval, mask,
- "move_handle", 1,
+ "move-handle", 1,
GTK_TYPE_SCROLL_TYPE, scroll);
}
container_class = (GtkContainerClass *) class;
paned_class = (GtkPanedClass *) class;
- parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
-
object_class->set_property = gtk_paned_set_property;
object_class->get_property = gtk_paned_get_property;
+ object_class->finalize = gtk_paned_finalize;
+ widget_class->size_request = gtk_paned_size_request;
+ widget_class->size_allocate = gtk_paned_size_allocate;
widget_class->realize = gtk_paned_realize;
widget_class->unrealize = gtk_paned_unrealize;
widget_class->map = gtk_paned_map;
widget_class->button_press_event = gtk_paned_button_press;
widget_class->button_release_event = gtk_paned_button_release;
widget_class->motion_notify_event = gtk_paned_motion;
-
+ widget_class->grab_broken_event = gtk_paned_grab_broken;
+ widget_class->grab_notify = gtk_paned_grab_notify;
+ widget_class->state_changed = gtk_paned_state_changed;
+
container_class->add = gtk_paned_add;
container_class->remove = gtk_paned_remove;
container_class->forall = gtk_paned_forall;
container_class->child_type = gtk_paned_child_type;
container_class->set_focus_child = gtk_paned_set_focus_child;
+ container_class->set_child_property = gtk_paned_set_child_property;
+ container_class->get_child_property = gtk_paned_get_child_property;
paned_class->cycle_child_focus = gtk_paned_cycle_child_focus;
paned_class->toggle_handle_focus = gtk_paned_toggle_handle_focus;
paned_class->cycle_handle_focus = gtk_paned_cycle_handle_focus;
paned_class->accept_position = gtk_paned_accept_position;
paned_class->cancel_position = gtk_paned_cancel_position;
-
+
+ g_object_class_override_property (object_class,
+ PROP_ORIENTATION,
+ "orientation");
+
g_object_class_install_property (object_class,
PROP_POSITION,
g_param_spec_int ("position",
- _("Position"),
- _("Position of paned separator in pixels (0 means all the way to the left/top)"),
+ P_("Position"),
+ P_("Position of paned separator in pixels (0 means all the way to the left/top)"),
0,
G_MAXINT,
0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ GTK_PARAM_READWRITE));
+
g_object_class_install_property (object_class,
PROP_POSITION_SET,
- g_param_spec_boolean ("position_set",
- _("Position Set"),
- _("TRUE if the Position property should be used"),
+ g_param_spec_boolean ("position-set",
+ P_("Position Set"),
+ P_("TRUE if the Position property should be used"),
FALSE,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
-
+ GTK_PARAM_READWRITE));
+
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("handle_size",
- _("Handle Size"),
- _("Width of handle"),
+ g_param_spec_int ("handle-size",
+ P_("Handle Size"),
+ P_("Width of handle"),
0,
G_MAXINT,
5,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
+ /**
+ * GtkPaned:min-position:
+ *
+ * The smallest possible value for the position property. This property is derived from the
+ * size and shrinkability of the widget's children.
+ *
+ * Since: 2.4
+ */
+ g_object_class_install_property (object_class,
+ PROP_MIN_POSITION,
+ g_param_spec_int ("min-position",
+ P_("Minimal Position"),
+ P_("Smallest possible value for the \"position\" property"),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READABLE));
- signals [CYCLE_HANDLE_FOCUS] =
- g_signal_new ("cycle_child_focus",
+ /**
+ * GtkPaned:max-position:
+ *
+ * The largest possible value for the position property. This property is derived from the
+ * size and shrinkability of the widget's children.
+ *
+ * Since: 2.4
+ */
+ g_object_class_install_property (object_class,
+ PROP_MAX_POSITION,
+ g_param_spec_int ("max-position",
+ P_("Maximal Position"),
+ P_("Largest possible value for the \"position\" property"),
+ 0,
+ G_MAXINT,
+ G_MAXINT,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkPaned:resize:
+ *
+ * The "resize" child property determines whether the child expands and
+ * shrinks along with the paned widget.
+ *
+ * Since: 2.4
+ */
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_RESIZE,
+ g_param_spec_boolean ("resize",
+ P_("Resize"),
+ P_("If TRUE, the child expands and shrinks along with the paned widget"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkPaned:shrink:
+ *
+ * The "shrink" child property determines whether the child can be made
+ * smaller than its requisition.
+ *
+ * Since: 2.4
+ */
+ gtk_container_class_install_child_property (container_class,
+ CHILD_PROP_SHRINK,
+ g_param_spec_boolean ("shrink",
+ P_("Shrink"),
+ P_("If TRUE, the child can be made smaller than its requisition"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkPaned::cycle-child-focus:
+ * @widget: the object that received the signal
+ * @reversed: whether cycling backward or forward
+ *
+ * The ::cycle-child-focus signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to cycle the focus between the children of the paned.
+ *
+ * The default binding is f6.
+ *
+ * Since: 2.0
+ */
+ signals [CYCLE_CHILD_FOCUS] =
+ g_signal_new (I_("cycle-child-focus"),
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkPanedClass, cycle_child_focus),
G_TYPE_BOOLEAN, 1,
G_TYPE_BOOLEAN);
+ /**
+ * GtkPaned::toggle-handle-focus:
+ * @widget: the object that received the signal
+ *
+ * The ::toggle-handle-focus is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to accept the current position of the handle and then
+ * move focus to the next widget in the focus chain.
+ *
+ * The default binding is Tab.
+ *
+ * Since: 2.0
+ */
signals [TOGGLE_HANDLE_FOCUS] =
- g_signal_new ("toggle_handle_focus",
+ g_signal_new (I_("toggle-handle-focus"),
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkPanedClass, toggle_handle_focus),
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
+ /**
+ * GtkPaned::move-handle:
+ * @widget: the object that received the signal
+ * @scroll_type: a #GtkScrollType
+ *
+ * The ::move-handle signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to move the handle when the user is using key bindings
+ * to move it.
+ *
+ * Since: 2.0
+ */
signals[MOVE_HANDLE] =
- g_signal_new ("move_handle",
+ g_signal_new (I_("move-handle"),
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkPanedClass, move_handle),
G_TYPE_BOOLEAN, 1,
GTK_TYPE_SCROLL_TYPE);
+ /**
+ * GtkPaned::cycle-handle-focus:
+ * @widget: the object that received the signal
+ * @reversed: whether cycling backward or forward
+ *
+ * The ::cycle-handle-focus signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to cycle whether the paned should grab focus to allow
+ * the user to change position of the handle by using key bindings.
+ *
+ * The default binding for this signal is f8.
+ *
+ * Since: 2.0
+ */
signals [CYCLE_HANDLE_FOCUS] =
- g_signal_new ("cycle_handle_focus",
+ g_signal_new (I_("cycle-handle-focus"),
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkPanedClass, cycle_handle_focus),
G_TYPE_BOOLEAN, 1,
G_TYPE_BOOLEAN);
+ /**
+ * GtkPaned::accept-position:
+ * @widget: the object that received the signal
+ *
+ * The ::accept-position signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to accept the current position of the handle when
+ * moving it using key bindings.
+ *
+ * The default binding for this signal is Return or Space.
+ *
+ * Since: 2.0
+ */
signals [ACCEPT_POSITION] =
- g_signal_new ("accept_position",
+ g_signal_new (I_("accept-position"),
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkPanedClass, accept_position),
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
+ /**
+ * GtkPaned::cancel-position:
+ * @widget: the object that received the signal
+ *
+ * The ::cancel-position signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to cancel moving the position of the handle using key
+ * bindings. The position of the handle will be reset to the value prior to
+ * moving it.
+ *
+ * The default binding for this signal is Escape.
+ *
+ * Since: 2.0
+ */
signals [CANCEL_POSITION] =
- g_signal_new ("cancel_position",
+ g_signal_new (I_("cancel-position"),
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkPanedClass, cancel_position),
_gtk_marshal_BOOLEAN__VOID,
G_TYPE_BOOLEAN, 0);
- binding_set = gtk_binding_set_by_class (object_class);
+ binding_set = gtk_binding_set_by_class (class);
/* F6 and friends */
- gtk_binding_entry_add_signal (binding_set,
+ gtk_binding_entry_add_signal (binding_set,
GDK_F6, 0,
- "cycle_child_focus", 1,
+ "cycle-child-focus", 1,
G_TYPE_BOOLEAN, FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_F6, GDK_SHIFT_MASK,
- "cycle_child_focus", 1,
+ "cycle-child-focus", 1,
G_TYPE_BOOLEAN, TRUE);
/* F8 and friends */
gtk_binding_entry_add_signal (binding_set,
GDK_F8, 0,
- "toggle_handle_focus", 0);
+ "cycle-handle-focus", 1,
+ G_TYPE_BOOLEAN, FALSE);
+
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_F8, GDK_SHIFT_MASK,
+ "cycle-handle-focus", 1,
+ G_TYPE_BOOLEAN, TRUE);
- add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
- add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
- add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
+ add_tab_bindings (binding_set, 0);
+ add_tab_bindings (binding_set, GDK_CONTROL_MASK);
+ add_tab_bindings (binding_set, GDK_SHIFT_MASK);
+ add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK);
/* accept and cancel positions */
gtk_binding_entry_add_signal (binding_set,
GDK_Escape, 0,
- "cancel_position", 0);
+ "cancel-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_Return, 0,
- "accept_position", 0);
+ "accept-position", 0);
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_ISO_Enter, 0,
+ "accept-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Enter, 0,
- "accept_position", 0);
+ "accept-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_space, 0,
- "accept_position", 0);
+ "accept-position", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Space, 0,
- "accept_position", 0);
+ "accept-position", 0);
/* move handle */
add_move_binding (binding_set, GDK_Left, 0, GTK_SCROLL_STEP_LEFT);
add_move_binding (binding_set, GDK_KP_Home, 0, GTK_SCROLL_START);
add_move_binding (binding_set, GDK_End, 0, GTK_SCROLL_END);
add_move_binding (binding_set, GDK_KP_End, 0, GTK_SCROLL_END);
+
+ g_type_class_add_private (object_class, sizeof (GtkPanedPrivate));
}
-static GtkType
+static GType
gtk_paned_child_type (GtkContainer *container)
{
if (!GTK_PANED (container)->child1 || !GTK_PANED (container)->child2)
return GTK_TYPE_WIDGET;
else
- return GTK_TYPE_NONE;
+ return G_TYPE_NONE;
}
static void
gtk_paned_init (GtkPaned *paned)
{
- GTK_WIDGET_SET_FLAGS (paned, GTK_NO_WINDOW | GTK_CAN_FOCUS);
-
+ GTK_WIDGET_SET_FLAGS (paned, GTK_NO_WINDOW);
+ gtk_widget_set_can_focus (GTK_WIDGET (paned), TRUE);
+
+ /* We only need to redraw when the handle position moves, which is
+ * independent of the overall allocation of the GtkPaned
+ */
+ gtk_widget_set_redraw_on_allocate (GTK_WIDGET (paned), FALSE);
+
+ paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned, GTK_TYPE_PANED, GtkPanedPrivate);
+
+ paned->priv->orientation = GTK_ORIENTATION_HORIZONTAL;
+ paned->cursor_type = GDK_SB_H_DOUBLE_ARROW;
+
paned->child1 = NULL;
paned->child2 = NULL;
paned->handle = NULL;
paned->last_allocation = -1;
paned->in_drag = FALSE;
- paned->saved_focus = NULL;
paned->last_child1_focus = NULL;
paned->last_child2_focus = NULL;
paned->in_recursion = FALSE;
GParamSpec *pspec)
{
GtkPaned *paned = GTK_PANED (object);
-
+
switch (prop_id)
{
+ case PROP_ORIENTATION:
+ paned->priv->orientation = g_value_get_enum (value);
+ paned->orientation = !paned->priv->orientation;
+
+ if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ paned->cursor_type = GDK_SB_H_DOUBLE_ARROW;
+ else
+ paned->cursor_type = GDK_SB_V_DOUBLE_ARROW;
+
+ /* state_changed updates the cursor */
+ gtk_paned_state_changed (GTK_WIDGET (paned), GTK_WIDGET (paned)->state);
+ gtk_widget_queue_resize (GTK_WIDGET (paned));
+ break;
case PROP_POSITION:
gtk_paned_set_position (paned, g_value_get_int (value));
break;
case PROP_POSITION_SET:
paned->position_set = g_value_get_boolean (value);
- gtk_widget_queue_resize (GTK_WIDGET (paned));
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (paned));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
GParamSpec *pspec)
{
GtkPaned *paned = GTK_PANED (object);
-
+
switch (prop_id)
{
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, paned->priv->orientation);
+ break;
case PROP_POSITION:
g_value_set_int (value, paned->child1_size);
break;
case PROP_POSITION_SET:
g_value_set_boolean (value, paned->position_set);
break;
+ case PROP_MIN_POSITION:
+ g_value_set_int (value, paned->min_position);
+ break;
+ case PROP_MAX_POSITION:
+ g_value_set_int (value, paned->max_position);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
+static void
+gtk_paned_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkPaned *paned = GTK_PANED (container);
+ gboolean old_value, new_value;
+
+ g_assert (child == paned->child1 || child == paned->child2);
+
+ new_value = g_value_get_boolean (value);
+ switch (property_id)
+ {
+ case CHILD_PROP_RESIZE:
+ if (child == paned->child1)
+ {
+ old_value = paned->child1_resize;
+ paned->child1_resize = new_value;
+ }
+ else
+ {
+ old_value = paned->child2_resize;
+ paned->child2_resize = new_value;
+ }
+ break;
+ case CHILD_PROP_SHRINK:
+ if (child == paned->child1)
+ {
+ old_value = paned->child1_shrink;
+ paned->child1_shrink = new_value;
+ }
+ else
+ {
+ old_value = paned->child2_shrink;
+ paned->child2_shrink = new_value;
+ }
+ break;
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ old_value = -1; /* quiet gcc */
+ break;
+ }
+ if (old_value != new_value)
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (container));
+}
+
+static void
+gtk_paned_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkPaned *paned = GTK_PANED (container);
+
+ g_assert (child == paned->child1 || child == paned->child2);
+
+ switch (property_id)
+ {
+ case CHILD_PROP_RESIZE:
+ if (child == paned->child1)
+ g_value_set_boolean (value, paned->child1_resize);
+ else
+ g_value_set_boolean (value, paned->child2_resize);
+ break;
+ case CHILD_PROP_SHRINK:
+ if (child == paned->child1)
+ g_value_set_boolean (value, paned->child1_shrink);
+ else
+ g_value_set_boolean (value, paned->child2_shrink);
+ break;
+ default:
+ GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_paned_finalize (GObject *object)
+{
+ GtkPaned *paned = GTK_PANED (object);
+
+ gtk_paned_set_saved_focus (paned, NULL);
+ gtk_paned_set_first_paned (paned, NULL);
+
+ G_OBJECT_CLASS (gtk_paned_parent_class)->finalize (object);
+}
+
+static void
+gtk_paned_size_request (GtkWidget *widget,
+ GtkRequisition *requisition)
+{
+ GtkPaned *paned = GTK_PANED (widget);
+ GtkRequisition child_requisition;
+
+ requisition->width = 0;
+ requisition->height = 0;
+
+ if (paned->child1 && gtk_widget_get_visible (paned->child1))
+ {
+ gtk_widget_size_request (paned->child1, &child_requisition);
+
+ requisition->height = child_requisition.height;
+ requisition->width = child_requisition.width;
+ }
+
+ if (paned->child2 && gtk_widget_get_visible (paned->child2))
+ {
+ gtk_widget_size_request (paned->child2, &child_requisition);
+
+ if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ requisition->height = MAX (requisition->height,
+ child_requisition.height);
+ requisition->width += child_requisition.width;
+ }
+ else
+ {
+ requisition->width = MAX (requisition->width,
+ child_requisition.width);
+ requisition->height += child_requisition.height;
+ }
+ }
+
+ requisition->width += GTK_CONTAINER (paned)->border_width * 2;
+ requisition->height += GTK_CONTAINER (paned)->border_width * 2;
+
+ if (paned->child1 && gtk_widget_get_visible (paned->child1) &&
+ paned->child2 && gtk_widget_get_visible (paned->child2))
+ {
+ gint handle_size;
+
+ gtk_widget_style_get (widget, "handle-size", &handle_size, NULL);
+
+ if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ requisition->width += handle_size;
+ else
+ requisition->height += handle_size;
+ }
+}
+
+static void
+flip_child (GtkWidget *widget,
+ GtkAllocation *child_pos)
+{
+ gint x = widget->allocation.x;
+ gint width = widget->allocation.width;
+
+ child_pos->x = 2 * x + width - child_pos->x - child_pos->width;
+}
+
+static void
+gtk_paned_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GtkPaned *paned = GTK_PANED (widget);
+ gint border_width = GTK_CONTAINER (paned)->border_width;
+
+ widget->allocation = *allocation;
+
+ if (paned->child1 && gtk_widget_get_visible (paned->child1) &&
+ paned->child2 && gtk_widget_get_visible (paned->child2))
+ {
+ GtkRequisition child1_requisition;
+ GtkRequisition child2_requisition;
+ GtkAllocation child1_allocation;
+ GtkAllocation child2_allocation;
+ GdkRectangle old_handle_pos;
+ gint handle_size;
+
+ gtk_widget_style_get (widget, "handle-size", &handle_size, NULL);
+
+ gtk_widget_get_child_requisition (paned->child1, &child1_requisition);
+ gtk_widget_get_child_requisition (paned->child2, &child2_requisition);
+
+ old_handle_pos = paned->handle_pos;
+
+ if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ gtk_paned_calc_position (paned,
+ MAX (1, widget->allocation.width
+ - handle_size
+ - 2 * border_width),
+ child1_requisition.width,
+ child2_requisition.width);
+
+ paned->handle_pos.x = widget->allocation.x + paned->child1_size + border_width;
+ paned->handle_pos.y = widget->allocation.y + border_width;
+ paned->handle_pos.width = handle_size;
+ paned->handle_pos.height = MAX (1, widget->allocation.height - 2 * border_width);
+
+ child1_allocation.height = child2_allocation.height = MAX (1, (gint) allocation->height - border_width * 2);
+ child1_allocation.width = MAX (1, paned->child1_size);
+ child1_allocation.x = widget->allocation.x + border_width;
+ child1_allocation.y = child2_allocation.y = widget->allocation.y + border_width;
+
+ child2_allocation.x = child1_allocation.x + paned->child1_size + paned->handle_pos.width;
+ child2_allocation.width = MAX (1, widget->allocation.x + widget->allocation.width - child2_allocation.x - border_width);
+
+ if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL)
+ {
+ flip_child (widget, &(child2_allocation));
+ flip_child (widget, &(child1_allocation));
+ flip_child (widget, &(paned->handle_pos));
+ }
+ }
+ else
+ {
+ gtk_paned_calc_position (paned,
+ MAX (1, widget->allocation.height
+ - handle_size
+ - 2 * border_width),
+ child1_requisition.height,
+ child2_requisition.height);
+
+ paned->handle_pos.x = widget->allocation.x + border_width;
+ paned->handle_pos.y = widget->allocation.y + paned->child1_size + border_width;
+ paned->handle_pos.width = MAX (1, (gint) widget->allocation.width - 2 * border_width);
+ paned->handle_pos.height = handle_size;
+
+ child1_allocation.width = child2_allocation.width = MAX (1, (gint) allocation->width - border_width * 2);
+ child1_allocation.height = MAX (1, paned->child1_size);
+ child1_allocation.x = child2_allocation.x = widget->allocation.x + border_width;
+ child1_allocation.y = widget->allocation.y + border_width;
+
+ child2_allocation.y = child1_allocation.y + paned->child1_size + paned->handle_pos.height;
+ child2_allocation.height = MAX (1, widget->allocation.y + widget->allocation.height - child2_allocation.y - border_width);
+ }
+
+ if (gtk_widget_get_mapped (widget) &&
+ (old_handle_pos.x != paned->handle_pos.x ||
+ old_handle_pos.y != paned->handle_pos.y ||
+ old_handle_pos.width != paned->handle_pos.width ||
+ old_handle_pos.height != paned->handle_pos.height))
+ {
+ gdk_window_invalidate_rect (widget->window, &old_handle_pos, FALSE);
+ gdk_window_invalidate_rect (widget->window, &paned->handle_pos, FALSE);
+ }
+
+ if (GTK_WIDGET_REALIZED (widget))
+ {
+ if (gtk_widget_get_mapped (widget))
+ gdk_window_show (paned->handle);
+
+ if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ gdk_window_move_resize (paned->handle,
+ paned->handle_pos.x,
+ paned->handle_pos.y,
+ handle_size,
+ paned->handle_pos.height);
+ }
+ else
+ {
+ gdk_window_move_resize (paned->handle,
+ paned->handle_pos.x,
+ paned->handle_pos.y,
+ paned->handle_pos.width,
+ handle_size);
+ }
+ }
+
+ /* Now allocate the childen, making sure, when resizing not to
+ * overlap the windows
+ */
+ if (gtk_widget_get_mapped (widget) &&
+
+ ((paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
+ paned->child1->allocation.width < child1_allocation.width) ||
+
+ (paned->priv->orientation == GTK_ORIENTATION_VERTICAL &&
+ paned->child1->allocation.height < child1_allocation.height)))
+ {
+ gtk_widget_size_allocate (paned->child2, &child2_allocation);
+ gtk_widget_size_allocate (paned->child1, &child1_allocation);
+ }
+ else
+ {
+ gtk_widget_size_allocate (paned->child1, &child1_allocation);
+ gtk_widget_size_allocate (paned->child2, &child2_allocation);
+ }
+ }
+ else
+ {
+ GtkAllocation child_allocation;
+
+ if (GTK_WIDGET_REALIZED (widget))
+ gdk_window_hide (paned->handle);
+
+ if (paned->child1)
+ gtk_widget_set_child_visible (paned->child1, TRUE);
+ if (paned->child2)
+ gtk_widget_set_child_visible (paned->child2, TRUE);
+
+ child_allocation.x = widget->allocation.x + border_width;
+ child_allocation.y = widget->allocation.y + border_width;
+ child_allocation.width = MAX (1, allocation->width - 2 * border_width);
+ child_allocation.height = MAX (1, allocation->height - 2 * border_width);
+
+ if (paned->child1 && gtk_widget_get_visible (paned->child1))
+ gtk_widget_size_allocate (paned->child1, &child_allocation);
+ else if (paned->child2 && gtk_widget_get_visible (paned->child2))
+ gtk_widget_size_allocate (paned->child2, &child_allocation);
+ }
+}
+
static void
gtk_paned_realize (GtkWidget *widget)
{
paned = GTK_PANED (widget);
widget->window = gtk_widget_get_parent_window (widget);
- gdk_window_ref (widget->window);
+ g_object_ref (widget->window);
attributes.window_type = GDK_WINDOW_CHILD;
attributes.wclass = GDK_INPUT_ONLY;
attributes.y = paned->handle_pos.y;
attributes.width = paned->handle_pos.width;
attributes.height = paned->handle_pos.height;
- attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
- paned->cursor_type);
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_LEAVE_NOTIFY_MASK |
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK);
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_CURSOR;
+ attributes_mask = GDK_WA_X | GDK_WA_Y;
+ if (gtk_widget_is_sensitive (widget))
+ {
+ attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
+ paned->cursor_type);
+ attributes_mask |= GDK_WA_CURSOR;
+ }
paned->handle = gdk_window_new (widget->window,
&attributes, attributes_mask);
gdk_window_set_user_data (paned->handle, paned);
- gdk_cursor_destroy (attributes.cursor);
+ if (attributes_mask & GDK_WA_CURSOR)
+ gdk_cursor_unref (attributes.cursor);
widget->style = gtk_style_attach (widget->style, widget->window);
- if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
- paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
+ if (paned->child1 && gtk_widget_get_visible (paned->child1) &&
+ paned->child2 && gtk_widget_get_visible (paned->child2))
gdk_window_show (paned->handle);
}
if (paned->xor_gc)
{
- gdk_gc_destroy (paned->xor_gc);
+ g_object_unref (paned->xor_gc);
paned->xor_gc = NULL;
}
gtk_paned_set_last_child1_focus (paned, NULL);
gtk_paned_set_last_child2_focus (paned, NULL);
gtk_paned_set_saved_focus (paned, NULL);
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+ gtk_paned_set_first_paned (paned, NULL);
+
+ GTK_WIDGET_CLASS (gtk_paned_parent_class)->unrealize (widget);
}
static void
gdk_window_show (paned->handle);
- GTK_WIDGET_CLASS (parent_class)->map (widget);
+ GTK_WIDGET_CLASS (gtk_paned_parent_class)->map (widget);
}
static void
gdk_window_hide (paned->handle);
- GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+ GTK_WIDGET_CLASS (gtk_paned_parent_class)->unmap (widget);
}
static gboolean
{
GtkPaned *paned = GTK_PANED (widget);
- if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget) &&
- paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
- paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
+ if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget) &&
+ paned->child1 && gtk_widget_get_visible (paned->child1) &&
+ paned->child2 && gtk_widget_get_visible (paned->child2))
{
- GdkRegion *region;
-
- region = gdk_region_rectangle (&paned->handle_pos);
- gdk_region_intersect (region, event->region);
-
- if (!gdk_region_empty (region))
- {
- GtkStateType state;
- GdkRectangle clip;
-
- gdk_region_get_clipbox (region, &clip);
-
- if (gtk_widget_is_focus (widget))
- state = GTK_STATE_SELECTED;
- else if (paned->handle_prelit)
- state = GTK_STATE_PRELIGHT;
- else
- state = GTK_WIDGET_STATE (widget);
-
- gtk_paint_handle (widget->style, widget->window,
- state, GTK_SHADOW_NONE,
- &clip, widget, "paned",
- paned->handle_pos.x, paned->handle_pos.y,
- paned->handle_pos.width, paned->handle_pos.height,
- paned->orientation);
- }
-
- gdk_region_destroy (region);
+ GtkStateType state;
+
+ if (gtk_widget_is_focus (widget))
+ state = GTK_STATE_SELECTED;
+ else if (paned->handle_prelit)
+ state = GTK_STATE_PRELIGHT;
+ else
+ state = GTK_WIDGET_STATE (widget);
+
+ gtk_paint_handle (widget->style, widget->window,
+ state, GTK_SHADOW_NONE,
+ &paned->handle_pos, widget, "paned",
+ paned->handle_pos.x, paned->handle_pos.y,
+ paned->handle_pos.width, paned->handle_pos.height,
+ !paned->priv->orientation);
}
/* Chain up to draw children */
- GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+ GTK_WIDGET_CLASS (gtk_paned_parent_class)->expose_event (widget, event);
return FALSE;
}
+static gboolean
+is_rtl (GtkPaned *paned)
+{
+ if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
+ gtk_widget_get_direction (GTK_WIDGET (paned)) == GTK_TEXT_DIR_RTL)
+ {
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static void
update_drag (GtkPaned *paned)
{
gint pos;
gint handle_size;
gint size;
-
- if (paned->orientation == GTK_ORIENTATION_HORIZONTAL)
+
+ if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ gtk_widget_get_pointer (GTK_WIDGET (paned), &pos, NULL);
+ else
gtk_widget_get_pointer (GTK_WIDGET (paned), NULL, &pos);
+
+ pos -= paned->drag_pos;
+
+ if (is_rtl (paned))
+ {
+ gtk_widget_style_get (GTK_WIDGET (paned),
+ "handle-size", &handle_size,
+ NULL);
+
+ size = GTK_WIDGET (paned)->allocation.width - pos - handle_size;
+ }
else
- gtk_widget_get_pointer (GTK_WIDGET (paned), &pos, NULL);
+ {
+ size = pos;
+ }
- gtk_widget_style_get (GTK_WIDGET (paned), "handle_size", &handle_size, NULL);
+ size -= GTK_CONTAINER (paned)->border_width;
- size = pos - GTK_CONTAINER (paned)->border_width - paned->drag_pos;
size = CLAMP (size, paned->min_position, paned->max_position);
if (size != paned->child1_size)
* excessive cut-and-paste from gtkcontainer.c?
*/
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
- retval = (* GTK_WIDGET_CLASS (parent_class)->focus) (widget, direction);
- GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus (widget, FALSE);
+ retval = GTK_WIDGET_CLASS (gtk_paned_parent_class)->focus (widget, direction);
+ gtk_widget_set_can_focus (widget, TRUE);
return retval;
}
if (!paned->in_drag &&
(event->window == paned->handle) && (event->button == 1))
{
- paned->in_drag = TRUE;
-
/* We need a server grab here, not gtk_grab_add(), since
* we don't want to pass events on to the widget's children */
- gdk_pointer_grab (paned->handle, FALSE,
- GDK_POINTER_MOTION_HINT_MASK
- | GDK_BUTTON1_MOTION_MASK
- | GDK_BUTTON_RELEASE_MASK
- | GDK_ENTER_NOTIFY_MASK
- | GDK_LEAVE_NOTIFY_MASK,
- NULL, NULL,
- event->time);
-
- if (paned->orientation == GTK_ORIENTATION_HORIZONTAL)
- paned->drag_pos = event->y;
- else
+ if (gdk_pointer_grab (paned->handle, FALSE,
+ GDK_POINTER_MOTION_HINT_MASK
+ | GDK_BUTTON1_MOTION_MASK
+ | GDK_BUTTON_RELEASE_MASK
+ | GDK_ENTER_NOTIFY_MASK
+ | GDK_LEAVE_NOTIFY_MASK,
+ NULL, NULL,
+ event->time) != GDK_GRAB_SUCCESS)
+ return FALSE;
+
+ paned->in_drag = TRUE;
+ paned->priv->grab_time = event->time;
+
+ if (paned->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
paned->drag_pos = event->x;
-
+ else
+ paned->drag_pos = event->y;
+
return TRUE;
}
return FALSE;
}
+static gboolean
+gtk_paned_grab_broken (GtkWidget *widget,
+ GdkEventGrabBroken *event)
+{
+ GtkPaned *paned = GTK_PANED (widget);
+
+ paned->in_drag = FALSE;
+ paned->drag_pos = -1;
+ paned->position_set = TRUE;
+
+ return TRUE;
+}
+
+static void
+stop_drag (GtkPaned *paned)
+{
+ paned->in_drag = FALSE;
+ paned->drag_pos = -1;
+ paned->position_set = TRUE;
+ gdk_display_pointer_ungrab (gtk_widget_get_display (GTK_WIDGET (paned)),
+ paned->priv->grab_time);
+}
+
+static void
+gtk_paned_grab_notify (GtkWidget *widget,
+ gboolean was_grabbed)
+{
+ GtkPaned *paned = GTK_PANED (widget);
+
+ if (!was_grabbed && paned->in_drag)
+ stop_drag (paned);
+}
+
+static void
+gtk_paned_state_changed (GtkWidget *widget,
+ GtkStateType previous_state)
+{
+ GtkPaned *paned = GTK_PANED (widget);
+ GdkCursor *cursor;
+
+ if (GTK_WIDGET_REALIZED (paned))
+ {
+ if (gtk_widget_is_sensitive (widget))
+ cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
+ paned->cursor_type);
+ else
+ cursor = NULL;
+
+ gdk_window_set_cursor (paned->handle, cursor);
+
+ if (cursor)
+ gdk_cursor_unref (cursor);
+ }
+}
+
static gboolean
gtk_paned_button_release (GtkWidget *widget,
GdkEventButton *event)
if (paned->in_drag && (event->button == 1))
{
- paned->in_drag = FALSE;
- paned->drag_pos = -1;
- paned->position_set = TRUE;
- gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
- event->time);
+ stop_drag (paned);
+
return TRUE;
}
return FALSE;
}
+#if 0
+/**
+ * gtk_paned_new:
+ * @orientation: the paned's orientation.
+ *
+ * Creates a new #GtkPaned widget.
+ *
+ * Return value: a new #GtkPaned.
+ *
+ * Since: 2.16
+ **/
+GtkWidget *
+gtk_paned_new (GtkOrientation orientation)
+{
+ return g_object_new (GTK_TYPE_PANED,
+ "orientation", orientation,
+ NULL);
+}
+#endif
+
void
gtk_paned_add1 (GtkPaned *paned,
GtkWidget *widget)
gtk_paned_add1 (paned, widget);
else if (!paned->child2)
gtk_paned_add2 (paned, widget);
+ else
+ g_warning ("GtkPaned cannot have more than 2 children\n");
}
static void
gboolean was_visible;
paned = GTK_PANED (container);
- was_visible = GTK_WIDGET_VISIBLE (widget);
+ was_visible = gtk_widget_get_visible (widget);
if (paned->child1 == widget)
{
paned->child1 = NULL;
- if (was_visible && GTK_WIDGET_VISIBLE (container))
- gtk_widget_queue_resize (GTK_WIDGET (container));
+ if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (container));
}
else if (paned->child2 == widget)
{
paned->child2 = NULL;
- if (was_visible && GTK_WIDGET_VISIBLE (container))
- gtk_widget_queue_resize (GTK_WIDGET (container));
+ if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (container));
}
}
g_return_if_fail (GTK_IS_PANED (paned));
+ if (paned->child1_size == position)
+ return;
+
object = G_OBJECT (paned);
if (position >= 0)
* if the total allocation changes at the same time
* as the position, the position set is with reference
* to the new total size. If only the position changes,
- * then clamping will occur in gtk_paned_compute_position()
+ * then clamping will occur in gtk_paned_calc_position()
*/
paned->child1_size = position;
g_object_freeze_notify (object);
g_object_notify (object, "position");
- g_object_notify (object, "position_set");
+ g_object_notify (object, "position-set");
g_object_thaw_notify (object);
- gtk_widget_queue_resize (GTK_WIDGET (paned));
+ gtk_widget_queue_resize_no_redraw (GTK_WIDGET (paned));
+
+#ifdef G_OS_WIN32
+ /* Hacky work-around for bug #144269 */
+ if (paned->child2 != NULL)
+ {
+ gtk_widget_queue_draw (paned->child2);
+ }
+#endif
+}
+
+/**
+ * gtk_paned_get_child1:
+ * @paned: a #GtkPaned widget
+ *
+ * Obtains the first child of the paned widget.
+ *
+ * Return value: first child, or %NULL if it is not set.
+ *
+ * Since: 2.4
+ **/
+GtkWidget *
+gtk_paned_get_child1 (GtkPaned *paned)
+{
+ g_return_val_if_fail (GTK_IS_PANED (paned), NULL);
+
+ return paned->child1;
+}
+
+/**
+ * gtk_paned_get_child2:
+ * @paned: a #GtkPaned widget
+ *
+ * Obtains the second child of the paned widget.
+ *
+ * Return value: second child, or %NULL if it is not set.
+ *
+ * Since: 2.4
+ **/
+GtkWidget *
+gtk_paned_get_child2 (GtkPaned *paned)
+{
+ g_return_val_if_fail (GTK_IS_PANED (paned), NULL);
+
+ return paned->child2;
}
void
gint child1_req,
gint child2_req)
{
- gint old_position;
-
g_return_if_fail (GTK_IS_PANED (paned));
+ gtk_paned_calc_position (paned, allocation, child1_req, child2_req);
+}
+
+static void
+gtk_paned_calc_position (GtkPaned *paned,
+ gint allocation,
+ gint child1_req,
+ gint child2_req)
+{
+ gint old_position;
+ gint old_min_position;
+ gint old_max_position;
+
old_position = paned->child1_size;
+ old_min_position = paned->min_position;
+ old_max_position = paned->max_position;
paned->min_position = paned->child1_shrink ? 0 : child1_req;
paned->max_position = allocation;
if (!paned->child2_shrink)
paned->max_position = MAX (1, paned->max_position - child2_req);
+ paned->max_position = MAX (paned->min_position, paned->max_position);
if (!paned->position_set)
{
if (paned->child1_resize && !paned->child2_resize)
- paned->child1_size = MAX (1, allocation - child2_req);
+ paned->child1_size = MAX (0, allocation - child2_req);
else if (!paned->child1_resize && paned->child2_resize)
paned->child1_size = child1_req;
else if (child1_req + child2_req != 0)
- paned->child1_size = allocation * ((gdouble)child1_req / (child1_req + child2_req));
+ paned->child1_size = allocation * ((gdouble)child1_req / (child1_req + child2_req)) + 0.5;
else
- paned->child1_size = allocation * 0.5;
+ paned->child1_size = allocation * 0.5 + 0.5;
}
else
{
if (paned->child1_resize && !paned->child2_resize)
paned->child1_size += allocation - paned->last_allocation;
else if (!(!paned->child1_resize && paned->child2_resize))
- paned->child1_size = allocation * ((gdouble) paned->child1_size / (paned->last_allocation));
+ paned->child1_size = allocation * ((gdouble) paned->child1_size / (paned->last_allocation)) + 0.5;
}
}
paned->min_position,
paned->max_position);
+ if (paned->child1)
+ gtk_widget_set_child_visible (paned->child1, paned->child1_size != 0);
+
+ if (paned->child2)
+ gtk_widget_set_child_visible (paned->child2, paned->child1_size != allocation);
+
+ g_object_freeze_notify (G_OBJECT (paned));
if (paned->child1_size != old_position)
g_object_notify (G_OBJECT (paned), "position");
+ if (paned->min_position != old_min_position)
+ g_object_notify (G_OBJECT (paned), "min-position");
+ if (paned->max_position != old_max_position)
+ g_object_notify (G_OBJECT (paned), "max-position");
+ g_object_thaw_notify (G_OBJECT (paned));
paned->last_allocation = allocation;
}
static void
gtk_paned_set_saved_focus (GtkPaned *paned, GtkWidget *widget)
{
- if (paned->saved_focus)
- g_object_remove_weak_pointer (G_OBJECT (paned->saved_focus),
- (gpointer *)&(paned->saved_focus));
+ if (paned->priv->saved_focus)
+ g_object_remove_weak_pointer (G_OBJECT (paned->priv->saved_focus),
+ (gpointer *)&(paned->priv->saved_focus));
+
+ paned->priv->saved_focus = widget;
+
+ if (paned->priv->saved_focus)
+ g_object_add_weak_pointer (G_OBJECT (paned->priv->saved_focus),
+ (gpointer *)&(paned->priv->saved_focus));
+}
+
+static void
+gtk_paned_set_first_paned (GtkPaned *paned, GtkPaned *first_paned)
+{
+ if (paned->priv->first_paned)
+ g_object_remove_weak_pointer (G_OBJECT (paned->priv->first_paned),
+ (gpointer *)&(paned->priv->first_paned));
- paned->saved_focus = widget;
+ paned->priv->first_paned = first_paned;
- if (paned->saved_focus)
- g_object_add_weak_pointer (G_OBJECT (paned->saved_focus),
- (gpointer *)&(paned->saved_focus));
+ if (paned->priv->first_paned)
+ g_object_add_weak_pointer (G_OBJECT (paned->priv->first_paned),
+ (gpointer *)&(paned->priv->first_paned));
}
static void
GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (paned));
- if (GTK_WIDGET_TOPLEVEL (toplevel))
+ if (gtk_widget_is_toplevel (toplevel))
return GTK_WINDOW (toplevel)->focus_widget;
return NULL;
}
}
- if (parent_class->set_focus_child)
- (* parent_class->set_focus_child) (container, focus_child);
+ if (GTK_CONTAINER_CLASS (gtk_paned_parent_class)->set_focus_child)
+ GTK_CONTAINER_CLASS (gtk_paned_parent_class)->set_focus_child (container, focus_child);
}
static void
}
}
- /* Walk through the list and expand all the paned widgets. */
+ /* Walk the list and expand all the paned widgets. */
for (list = temp_list; list != NULL; list = list->next)
{
GtkWidget *widget = list->data;
{
GList *cycle_chain = NULL;
GList *list;
-
+
GtkDirectionType direction = reversed? GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD;
/* ignore f6 if the handle is focused */
get_child_panes (GtkWidget *widget,
GList **panes)
{
+ if (!widget || !GTK_WIDGET_REALIZED (widget))
+ return;
+
if (GTK_IS_PANED (widget))
{
GtkPaned *paned = GTK_PANED (widget);
}
else if (GTK_IS_CONTAINER (widget))
{
- gtk_container_foreach (GTK_CONTAINER (widget),
- (GtkCallback)get_child_panes, panes);
+ gtk_container_forall (GTK_CONTAINER (widget),
+ (GtkCallback)get_child_panes, panes);
}
}
GtkPaned **next,
GtkPaned **prev)
{
- GList *all_panes = get_all_panes (paned);
+ GList *all_panes;
GList *this_link;
+ all_panes = get_all_panes (paned);
g_assert (all_panes);
this_link = g_list_find (all_panes, paned);
else
*prev = g_list_last (all_panes)->data;
- if (*next == paned)
- *next = NULL;
-
- if (*prev == paned)
- *prev = NULL;
-
g_list_free (all_panes);
}
{
gint old_position;
gint new_position;
+ gint increment;
enum {
SINGLE_STEP_SIZE = 1,
PAGE_STEP_SIZE = 75
};
- old_position = gtk_paned_get_position (paned);
+ new_position = old_position = gtk_paned_get_position (paned);
+ increment = 0;
switch (scroll)
{
case GTK_SCROLL_STEP_LEFT:
case GTK_SCROLL_STEP_UP:
case GTK_SCROLL_STEP_BACKWARD:
- new_position = old_position - SINGLE_STEP_SIZE;
+ increment = - SINGLE_STEP_SIZE;
break;
case GTK_SCROLL_STEP_RIGHT:
case GTK_SCROLL_STEP_DOWN:
case GTK_SCROLL_STEP_FORWARD:
- new_position = old_position + SINGLE_STEP_SIZE;
+ increment = SINGLE_STEP_SIZE;
break;
case GTK_SCROLL_PAGE_LEFT:
case GTK_SCROLL_PAGE_UP:
case GTK_SCROLL_PAGE_BACKWARD:
- new_position = old_position - PAGE_STEP_SIZE;
+ increment = - PAGE_STEP_SIZE;
break;
case GTK_SCROLL_PAGE_RIGHT:
case GTK_SCROLL_PAGE_DOWN:
case GTK_SCROLL_PAGE_FORWARD:
- new_position = old_position + PAGE_STEP_SIZE;
+ increment = PAGE_STEP_SIZE;
break;
case GTK_SCROLL_START:
case GTK_SCROLL_END:
new_position = paned->max_position;
break;
-
+
default:
- new_position = old_position;
break;
}
+
+ if (increment)
+ {
+ if (is_rtl (paned))
+ increment = -increment;
+
+ new_position = old_position + increment;
+ }
new_position = CLAMP (new_position, paned->min_position, paned->max_position);
{
if (gtk_widget_is_focus (GTK_WIDGET (paned)))
{
- if (paned->saved_focus && GTK_WIDGET_SENSITIVE (paned->saved_focus))
+ if (paned->priv->saved_focus &&
+ gtk_widget_get_sensitive (paned->priv->saved_focus))
{
- gtk_widget_grab_focus (paned->saved_focus);
+ gtk_widget_grab_focus (paned->priv->saved_focus);
}
else
{
}
gtk_paned_set_saved_focus (paned, NULL);
+ gtk_paned_set_first_paned (paned, NULL);
}
}
gtk_paned_cycle_handle_focus (GtkPaned *paned,
gboolean reversed)
{
+ GtkPaned *next, *prev;
+
if (gtk_widget_is_focus (GTK_WIDGET (paned)))
{
- GtkPaned *next, *prev;
GtkPaned *focus = NULL;
+ if (!paned->priv->first_paned)
+ {
+ /* The first_pane has disappeared. As an ad-hoc solution,
+ * we make the currently focused paned the first_paned. To the
+ * user this will seem like the paned cycling has been reset.
+ */
+
+ gtk_paned_set_first_paned (paned, paned);
+ }
+
gtk_paned_find_neighbours (paned, &next, &prev);
- if (reversed && prev)
- focus = prev;
- else if (!reversed && next)
- focus = next;
+ if (reversed && prev &&
+ prev != paned && paned != paned->priv->first_paned)
+ {
+ focus = prev;
+ }
+ else if (!reversed && next &&
+ next != paned && next != paned->priv->first_paned)
+ {
+ focus = next;
+ }
+ else
+ {
+ gtk_paned_accept_position (paned);
+ return TRUE;
+ }
- if (focus)
+ g_assert (focus);
+
+ gtk_paned_set_saved_focus (focus, paned->priv->saved_focus);
+ gtk_paned_set_first_paned (focus, paned->priv->first_paned);
+
+ gtk_paned_set_saved_focus (paned, NULL);
+ gtk_paned_set_first_paned (paned, NULL);
+
+ gtk_widget_grab_focus (GTK_WIDGET (focus));
+
+ if (!gtk_widget_is_focus (GTK_WIDGET (paned)))
{
- gtk_paned_set_saved_focus (focus, paned->saved_focus);
- gtk_paned_set_saved_focus (paned, NULL);
- gtk_widget_grab_focus (GTK_WIDGET (focus));
+ paned->original_position = -1;
+ focus->original_position = gtk_paned_get_position (focus);
+ }
+ }
+ else
+ {
+ GtkContainer *container = GTK_CONTAINER (paned);
+ GtkPaned *focus;
+ GtkPaned *first;
+ GtkPaned *prev, *next;
+ GtkWidget *toplevel;
- if (!gtk_widget_is_focus (GTK_WIDGET (paned)))
+ gtk_paned_find_neighbours (paned, &next, &prev);
+
+ if (container->focus_child == paned->child1)
+ {
+ if (reversed)
{
- paned->original_position = -1;
- focus->original_position = gtk_paned_get_position (focus);
+ focus = prev;
+ first = paned;
+ }
+ else
+ {
+ focus = paned;
+ first = paned;
}
}
-
- return TRUE;
- }
+ else if (container->focus_child == paned->child2)
+ {
+ if (reversed)
+ {
+ focus = paned;
+ first = next;
+ }
+ else
+ {
+ focus = next;
+ first = next;
+ }
+ }
+ else
+ {
+ /* Focus is not inside this paned, and we don't have focus.
+ * Presumably this happened because the application wants us
+ * to start keyboard navigating.
+ */
+ focus = paned;
- return FALSE;
+ if (reversed)
+ first = paned;
+ else
+ first = next;
+ }
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (paned));
+
+ if (GTK_IS_WINDOW (toplevel))
+ gtk_paned_set_saved_focus (focus, GTK_WINDOW (toplevel)->focus_widget);
+ gtk_paned_set_first_paned (focus, first);
+ focus->original_position = gtk_paned_get_position (focus);
+
+ gtk_widget_grab_focus (GTK_WIDGET (focus));
+ }
+
+ return TRUE;
}
static gboolean
gtk_paned_toggle_handle_focus (GtkPaned *paned)
{
+ /* This function/signal has the wrong name. It is called when you
+ * press Tab or Shift-Tab and what we do is act as if
+ * the user pressed Return and then Tab or Shift-Tab
+ */
if (gtk_widget_is_focus (GTK_WIDGET (paned)))
- {
- gtk_paned_accept_position (paned);
- }
- else
- {
- GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (paned));
+ gtk_paned_accept_position (paned);
- if (GTK_IS_WINDOW (toplevel))
- gtk_paned_set_saved_focus (paned, GTK_WINDOW (toplevel)->focus_widget);
-
- gtk_widget_grab_focus (GTK_WIDGET (paned));
- paned->original_position = gtk_paned_get_position (paned);
- }
+ return FALSE;
+}
- return TRUE;
+/**
+ * gtk_paned_get_handle_window:
+ * @panede: a #GtkPaned
+ *
+ * Returns the #GdkWindow of the handle. This function is
+ * useful when handling button or motion events because it
+ * enables the callback to distinguish between the window
+ * of the paned, a child and the handle.
+ *
+ * Return value: the paned's handle window.
+ *
+ * Since: 2.20
+ **/
+GdkWindow *
+gtk_paned_get_handle_window (GtkPaned *paned)
+{
+ g_return_val_if_fail (GTK_IS_PANED (paned), NULL);
+
+ return paned->handle;
}
+
+#define __GTK_PANED_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff