* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* SECTION:gtkbox
* @Short_description: A container box
* @Title: GtkBox
- * @See_also: #GtkFrame, #GtkTable, #GtkLayout
+ * @See_also: #GtkFrame, #GtkGrid, #GtkLayout
*
* The GtkBox widget organizes child widgets into a rectangular area.
*
#include "config.h"
#include "gtkbox.h"
+#include "gtkboxprivate.h"
+#include "gtkintl.h"
#include "gtkorientable.h"
-#include "gtksizerequest.h"
-#include "gtktypebuiltins.h"
+#include "gtkorientableprivate.h"
#include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtktypebuiltins.h"
+#include "gtksizerequest.h"
+#include "gtkwidgetpath.h"
+#include "gtkwidgetprivate.h"
+#include "a11y/gtkcontaineraccessible.h"
enum {
GtkOrientation orientation;
gint16 spacing;
- GtkWidgetPath *sibling_path;
guint default_expand : 1;
guint homogeneous : 1;
gint *minimum_height,
gint *natural_height);
+
G_DEFINE_TYPE_WITH_CODE (GtkBox, gtk_box, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
NULL))
GTK_PARAM_READWRITE));
g_type_class_add_private (object_class, sizeof (GtkBoxPrivate));
+
+ gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FILLER);
}
static void
{
case PROP_ORIENTATION:
private->orientation = g_value_get_enum (value);
+ _gtk_orientable_set_style_classes (GTK_ORIENTABLE (box));
gtk_widget_queue_resize (GTK_WIDGET (box));
break;
case PROP_SPACING:
{
CountingData *count = data;
-#if 0
- /* We cannot reliably detect changes in widget visibility */
if (!gtk_widget_get_visible (widget))
return;
-#endif
if (count->widget == widget)
count->found = TRUE;
count->before++;
}
-static guint
-gtk_box_get_visible_position (GtkBox *box,
+static gint
+gtk_box_get_visible_position (GtkBox *box,
GtkWidget *child)
{
CountingData count = { child, FALSE, 0, 0 };
- /* forall iterates in visible order */
- gtk_container_forall (GTK_CONTAINER (box),
- count_widget_position,
- &count);
+ /* foreach iterates in visible order */
+ gtk_container_foreach (GTK_CONTAINER (box),
+ count_widget_position,
+ &count);
+
+ /* the child wasn't found, it's likely an internal child of some
+ * subclass, return -1 to indicate that there is no sibling relation
+ * to the regular box children
+ */
+ if (!count.found)
+ return -1;
- g_assert (count.found);
if (box->priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
gtk_widget_get_direction (GTK_WIDGET (box)) == GTK_TEXT_DIR_RTL)
return count.after;
gtk_box_get_path_for_child (GtkContainer *container,
GtkWidget *child)
{
- GtkWidgetPath *path;
+ GtkWidgetPath *path, *sibling_path;
GtkBox *box;
GtkBoxPrivate *private;
+ GList *list, *children;
box = GTK_BOX (container);
private = box->priv;
- if (private->sibling_path == NULL)
+ path = _gtk_widget_create_path (GTK_WIDGET (container));
+
+ if (gtk_widget_get_visible (child))
{
- GList *list, *children;
- private->sibling_path = gtk_widget_path_new ();
+ gint position;
+
+ sibling_path = gtk_widget_path_new ();
/* get_children works in visible order */
children = gtk_container_get_children (container);
for (list = children; list; list = list->next)
{
-#if 0
- /* We cannot reliably detect changes in widget visibility */
if (!gtk_widget_get_visible (list->data))
- return;
-#endif
- gtk_widget_path_append_for_widget (private->sibling_path, list->data);
+ continue;
+
+ gtk_widget_path_append_for_widget (sibling_path, list->data);
}
+
g_list_free (children);
- }
- path = gtk_widget_path_copy (gtk_widget_get_path (GTK_WIDGET (container)));
- if (gtk_widget_get_visible (child))
- gtk_widget_path_append_with_siblings (path,
- private->sibling_path,
- gtk_box_get_visible_position (box,
- child));
+ position = gtk_box_get_visible_position (box, child);
+
+ if (position >= 0)
+ gtk_widget_path_append_with_siblings (path, sibling_path, position);
+ else
+ gtk_widget_path_append_for_widget (path, child);
+
+ gtk_widget_path_unref (sibling_path);
+ }
else
gtk_widget_path_append_for_widget (path, child);
}
static void
-gtk_box_invalidate_order (GtkBox *box)
+gtk_box_invalidate_order_foreach (GtkWidget *widget)
{
- GtkBoxPrivate *private = box->priv;
-
- if (private->sibling_path != NULL)
- {
- gtk_widget_path_unref (private->sibling_path);
- private->sibling_path = NULL;
+ _gtk_widget_invalidate_style_context (widget, GTK_CSS_CHANGE_POSITION | GTK_CSS_CHANGE_SIBLING_POSITION);
+}
- gtk_container_foreach (GTK_CONTAINER (box),
- (GtkCallback) gtk_widget_reset_style,
- NULL);
- }
+static void
+gtk_box_invalidate_order (GtkBox *box)
+{
+ gtk_container_foreach (GTK_CONTAINER (box),
+ (GtkCallback) gtk_box_invalidate_order_foreach,
+ NULL);
}
static void
gtk_box_invalidate_order (GTK_BOX (widget));
}
+static void
+box_child_visibility_notify_cb (GObject *obj,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ GtkBox *box = user_data;
+
+ gtk_box_invalidate_order (box);
+}
+
static void
gtk_box_pack (GtkBox *box,
GtkWidget *child,
gtk_box_invalidate_order (box);
gtk_widget_set_parent (child, GTK_WIDGET (box));
+ g_signal_connect (child, "notify::visible",
+ G_CALLBACK (box_child_visibility_notify_cb), box);
+
gtk_widget_child_notify (child, "expand");
gtk_widget_child_notify (child, "fill");
gtk_widget_child_notify (child, "padding");
priv->children = g_list_insert_before (priv->children, new_link, child_info);
gtk_widget_child_notify (child, "position");
-
- gtk_box_invalidate_order (box);
-
if (gtk_widget_get_visible (child)
&& gtk_widget_get_visible (GTK_WIDGET (box)))
{
+ gtk_box_invalidate_order (box);
gtk_widget_queue_resize (child);
}
}
pack_type = GTK_PACK_START;
if (child_info->pack != pack_type)
{
- child_info->pack = GTK_PACK_END;
+ child_info->pack = pack_type;
gtk_widget_child_notify (child, "pack-type");
gtk_box_invalidate_order (box);
}
{
gboolean was_visible;
+ g_signal_handlers_disconnect_by_func (widget,
+ box_child_visibility_notify_cb,
+ box);
+
was_visible = gtk_widget_get_visible (widget);
gtk_widget_unparent (widget);
g_list_free (children);
g_free (child);
- gtk_box_invalidate_order (box);
-
/* queue resize regardless of gtk_widget_get_visible (container),
* since that's what is needed by toplevels.
*/
if (was_visible)
{
+ gtk_box_invalidate_order (box);
gtk_widget_queue_resize (GTK_WIDGET (container));
}
projects / ~andy / gtk / blobdiff