st: Remove StTable
Alas, the last use of StTable is not gone, so we can finally remove our copy of the widget. https://bugzilla.gnome.org/show_bug.cgi?id=703833
This commit is contained in:
Florian Müllner
parent
d7c0ff5e89
commit
86e04048ff
@ -35,7 +35,6 @@
|
|||||||
<xi:include href="xml/st-bin.xml"/>
|
<xi:include href="xml/st-bin.xml"/>
|
||||||
<xi:include href="xml/st-box-layout.xml"/>
|
<xi:include href="xml/st-box-layout.xml"/>
|
||||||
<xi:include href="xml/st-scroll-view.xml"/>
|
<xi:include href="xml/st-scroll-view.xml"/>
|
||||||
<xi:include href="xml/st-table.xml"/>
|
|
||||||
</chapter>
|
</chapter>
|
||||||
|
|
||||||
<chapter id="styling">
|
<chapter id="styling">
|
||||||
|
|||||||
@ -81,7 +81,6 @@ function init() {
|
|||||||
|
|
||||||
// Miscellaneous monkeypatching
|
// Miscellaneous monkeypatching
|
||||||
_patchContainerClass(St.BoxLayout);
|
_patchContainerClass(St.BoxLayout);
|
||||||
_patchContainerClass(St.Table);
|
|
||||||
|
|
||||||
_patchLayoutClass(Clutter.TableLayout, { row_spacing: 'spacing-rows',
|
_patchLayoutClass(Clutter.TableLayout, { row_spacing: 'spacing-rows',
|
||||||
column_spacing: 'spacing-columns' });
|
column_spacing: 'spacing-columns' });
|
||||||
|
|||||||
@ -64,8 +64,6 @@ st_source_h = \
|
|||||||
st/st-scroll-bar.h \
|
st/st-scroll-bar.h \
|
||||||
st/st-scroll-view.h \
|
st/st-scroll-view.h \
|
||||||
st/st-shadow.h \
|
st/st-shadow.h \
|
||||||
st/st-table.h \
|
|
||||||
st/st-table-child.h \
|
|
||||||
st/st-texture-cache.h \
|
st/st-texture-cache.h \
|
||||||
st/st-theme.h \
|
st/st-theme.h \
|
||||||
st/st-theme-context.h \
|
st/st-theme-context.h \
|
||||||
@ -106,7 +104,6 @@ EXTRA_DIST += \
|
|||||||
|
|
||||||
st_source_private_h = \
|
st_source_private_h = \
|
||||||
st/st-private.h \
|
st/st-private.h \
|
||||||
st/st-table-private.h \
|
|
||||||
st/st-theme-private.h \
|
st/st-theme-private.h \
|
||||||
st/st-theme-node-private.h \
|
st/st-theme-node-private.h \
|
||||||
st/st-theme-node-transition.h
|
st/st-theme-node-transition.h
|
||||||
@ -133,8 +130,6 @@ st_source_c = \
|
|||||||
st/st-scroll-bar.c \
|
st/st-scroll-bar.c \
|
||||||
st/st-scroll-view.c \
|
st/st-scroll-view.c \
|
||||||
st/st-shadow.c \
|
st/st-shadow.c \
|
||||||
st/st-table.c \
|
|
||||||
st/st-table-child.c \
|
|
||||||
st/st-texture-cache.c \
|
st/st-texture-cache.c \
|
||||||
st/st-theme.c \
|
st/st-theme.c \
|
||||||
st/st-theme-context.c \
|
st/st-theme-context.c \
|
||||||
|
|||||||
@ -1,767 +0,0 @@
|
|||||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
||||||
/*
|
|
||||||
* st-table-child.h: Table child implementation
|
|
||||||
*
|
|
||||||
* Copyright 2008, 2009 Intel Corporation.
|
|
||||||
* Copyright 2010 Red Hat, Inc.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms and conditions of the GNU Lesser General Public License,
|
|
||||||
* version 2.1, as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope it will be useful, but WITHOUT ANY
|
|
||||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "st-private.h"
|
|
||||||
#include "st-table-child.h"
|
|
||||||
#include "st-table-private.h"
|
|
||||||
#include "st-enum-types.h"
|
|
||||||
#include <st/st-widget.h>
|
|
||||||
#include <st/st-table.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ClutterChildMeta Implementation
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* SECTION:st-table-child
|
|
||||||
* @short_description: The child property store for #StTable
|
|
||||||
*
|
|
||||||
* The #ClutterChildMeta implementation for the #StTable container widget.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
enum {
|
|
||||||
CHILD_PROP_0,
|
|
||||||
|
|
||||||
CHILD_PROP_COL,
|
|
||||||
CHILD_PROP_ROW,
|
|
||||||
CHILD_PROP_COL_SPAN,
|
|
||||||
CHILD_PROP_ROW_SPAN,
|
|
||||||
CHILD_PROP_X_EXPAND,
|
|
||||||
CHILD_PROP_Y_EXPAND,
|
|
||||||
CHILD_PROP_X_ALIGN,
|
|
||||||
CHILD_PROP_Y_ALIGN,
|
|
||||||
CHILD_PROP_X_FILL,
|
|
||||||
CHILD_PROP_Y_FILL,
|
|
||||||
CHILD_PROP_ALLOCATE_HIDDEN,
|
|
||||||
};
|
|
||||||
|
|
||||||
G_DEFINE_TYPE (StTableChild, st_table_child, CLUTTER_TYPE_CHILD_META);
|
|
||||||
|
|
||||||
static void
|
|
||||||
table_child_set_property (GObject *gobject,
|
|
||||||
guint prop_id,
|
|
||||||
const GValue *value,
|
|
||||||
GParamSpec *pspec)
|
|
||||||
{
|
|
||||||
StTableChild *child = ST_TABLE_CHILD (gobject);
|
|
||||||
StTable *table = ST_TABLE (CLUTTER_CHILD_META(gobject)->container);
|
|
||||||
|
|
||||||
switch (prop_id)
|
|
||||||
{
|
|
||||||
case CHILD_PROP_COL:
|
|
||||||
child->col = g_value_get_int (value);
|
|
||||||
_st_table_update_row_col (table, -1, child->col);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_ROW:
|
|
||||||
child->row = g_value_get_int (value);
|
|
||||||
_st_table_update_row_col (table, child->row, -1);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_COL_SPAN:
|
|
||||||
child->col_span = g_value_get_int (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_ROW_SPAN:
|
|
||||||
child->row_span = g_value_get_int (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_X_EXPAND:
|
|
||||||
child->x_expand = g_value_get_boolean (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_Y_EXPAND:
|
|
||||||
child->y_expand = g_value_get_boolean (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_X_ALIGN:
|
|
||||||
child->x_align = g_value_get_enum (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_Y_ALIGN:
|
|
||||||
child->y_align = g_value_get_enum (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_X_FILL:
|
|
||||||
child->x_fill = g_value_get_boolean (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_Y_FILL:
|
|
||||||
child->y_fill = g_value_get_boolean (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_ALLOCATE_HIDDEN:
|
|
||||||
child->allocate_hidden = g_value_get_boolean (value);
|
|
||||||
clutter_actor_queue_relayout (CLUTTER_ACTOR (table));
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
table_child_get_property (GObject *gobject,
|
|
||||||
guint prop_id,
|
|
||||||
GValue *value,
|
|
||||||
GParamSpec *pspec)
|
|
||||||
{
|
|
||||||
StTableChild *child = ST_TABLE_CHILD (gobject);
|
|
||||||
|
|
||||||
switch (prop_id)
|
|
||||||
{
|
|
||||||
case CHILD_PROP_COL:
|
|
||||||
g_value_set_int (value, child->col);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_ROW:
|
|
||||||
g_value_set_int (value, child->row);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_COL_SPAN:
|
|
||||||
g_value_set_int (value, child->col_span);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_ROW_SPAN:
|
|
||||||
g_value_set_int (value, child->row_span);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_X_EXPAND:
|
|
||||||
g_value_set_boolean (value, child->x_expand);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_Y_EXPAND:
|
|
||||||
g_value_set_boolean (value, child->y_expand);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_X_ALIGN:
|
|
||||||
g_value_set_enum (value, child->x_align);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_Y_ALIGN:
|
|
||||||
g_value_set_enum (value, child->y_align);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_X_FILL:
|
|
||||||
g_value_set_boolean (value, child->x_fill);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_Y_FILL:
|
|
||||||
g_value_set_boolean (value, child->y_fill);
|
|
||||||
break;
|
|
||||||
case CHILD_PROP_ALLOCATE_HIDDEN:
|
|
||||||
g_value_set_boolean (value, child->allocate_hidden);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
st_table_child_class_init (StTableChildClass *klass)
|
|
||||||
{
|
|
||||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
|
||||||
GParamSpec *pspec;
|
|
||||||
|
|
||||||
gobject_class->set_property = table_child_set_property;
|
|
||||||
gobject_class->get_property = table_child_get_property;
|
|
||||||
|
|
||||||
pspec = g_param_spec_int ("col",
|
|
||||||
"Column Number",
|
|
||||||
"The column the widget resides in",
|
|
||||||
0, G_MAXINT,
|
|
||||||
0,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_COL, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_int ("row",
|
|
||||||
"Row Number",
|
|
||||||
"The row the widget resides in",
|
|
||||||
0, G_MAXINT,
|
|
||||||
0,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_ROW, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_int ("row-span",
|
|
||||||
"Row Span",
|
|
||||||
"The number of rows the widget should span",
|
|
||||||
1, G_MAXINT,
|
|
||||||
1,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_ROW_SPAN, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_int ("col-span",
|
|
||||||
"Column Span",
|
|
||||||
"The number of columns the widget should span",
|
|
||||||
1, G_MAXINT,
|
|
||||||
1,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_COL_SPAN, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_boolean ("x-expand",
|
|
||||||
"X Expand",
|
|
||||||
"Whether the child should receive priority "
|
|
||||||
"when the container is allocating spare space "
|
|
||||||
"on the horizontal axis",
|
|
||||||
TRUE,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_X_EXPAND, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_boolean ("y-expand",
|
|
||||||
"Y Expand",
|
|
||||||
"Whether the child should receive priority "
|
|
||||||
"when the container is allocating spare space "
|
|
||||||
"on the vertical axis",
|
|
||||||
TRUE,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_Y_EXPAND, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_enum ("x-align",
|
|
||||||
"X Alignment",
|
|
||||||
"X alignment of the widget within the cell",
|
|
||||||
ST_TYPE_ALIGN,
|
|
||||||
ST_ALIGN_MIDDLE,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_X_ALIGN, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_enum ("y-align",
|
|
||||||
"Y Alignment",
|
|
||||||
"Y alignment of the widget within the cell",
|
|
||||||
ST_TYPE_ALIGN,
|
|
||||||
ST_ALIGN_MIDDLE,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_Y_ALIGN, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_boolean ("x-fill",
|
|
||||||
"X Fill",
|
|
||||||
"Whether the child should be allocated its "
|
|
||||||
"entire available space, or whether it should "
|
|
||||||
"be squashed and aligned.",
|
|
||||||
TRUE,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_X_FILL, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_boolean ("y-fill",
|
|
||||||
"Y Fill",
|
|
||||||
"Whether the child should be allocated its "
|
|
||||||
"entire available space, or whether it should "
|
|
||||||
"be squashed and aligned.",
|
|
||||||
TRUE,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_Y_FILL, pspec);
|
|
||||||
|
|
||||||
pspec = g_param_spec_boolean ("allocate-hidden",
|
|
||||||
"Allocate Hidden",
|
|
||||||
"Whether the child should be allocate even "
|
|
||||||
"if it is hidden",
|
|
||||||
TRUE,
|
|
||||||
ST_PARAM_READWRITE);
|
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, CHILD_PROP_ALLOCATE_HIDDEN, pspec);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
st_table_child_init (StTableChild *self)
|
|
||||||
{
|
|
||||||
self->col_span = 1;
|
|
||||||
self->row_span = 1;
|
|
||||||
|
|
||||||
self->x_align = ST_ALIGN_MIDDLE;
|
|
||||||
self->y_align = ST_ALIGN_MIDDLE;
|
|
||||||
|
|
||||||
self->x_expand = TRUE;
|
|
||||||
self->y_expand = TRUE;
|
|
||||||
|
|
||||||
self->x_fill = TRUE;
|
|
||||||
self->y_fill = TRUE;
|
|
||||||
|
|
||||||
self->allocate_hidden = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static StTableChild*
|
|
||||||
get_child_meta (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
meta = (StTableChild*) clutter_container_get_child_meta (CLUTTER_CONTAINER (table), child);
|
|
||||||
|
|
||||||
return meta;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_col_span:
|
|
||||||
* @table: an #StTable
|
|
||||||
* @child: a #ClutterActor
|
|
||||||
*
|
|
||||||
* Get the column span of the child. Defaults to 1.
|
|
||||||
*
|
|
||||||
* Returns: the column span of the child
|
|
||||||
*/
|
|
||||||
gint
|
|
||||||
st_table_child_get_col_span (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), 0);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->col_span;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_col_span:
|
|
||||||
* @table: An #StTable
|
|
||||||
* @child: An #ClutterActor
|
|
||||||
* @span: The number of columns to span
|
|
||||||
*
|
|
||||||
* Set the column span of the child.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_col_span (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gint span)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
g_return_if_fail (span > 1);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
meta->col_span = span;
|
|
||||||
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_row_span:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
*
|
|
||||||
* Get the row span of the child. Defaults to 1.
|
|
||||||
*
|
|
||||||
* Returns: the row span of the child
|
|
||||||
*/
|
|
||||||
gint
|
|
||||||
st_table_child_get_row_span (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), 0);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->row_span;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_row_span:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
* @span: the number of rows to span
|
|
||||||
*
|
|
||||||
* Set the row span of the child.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_row_span (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gint span)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
g_return_if_fail (span > 1);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
meta->row_span = span;
|
|
||||||
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_x_fill:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
*
|
|
||||||
* Get the x-fill state of the child
|
|
||||||
*
|
|
||||||
* Returns: %TRUE if the child is set to x-fill
|
|
||||||
*/
|
|
||||||
gboolean
|
|
||||||
st_table_child_get_x_fill (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), 0);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->x_fill;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_x_fill:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
* @fill: the fill state
|
|
||||||
*
|
|
||||||
* Set the fill state of the child on the x-axis. This will cause the child to
|
|
||||||
* be allocated the maximum available space.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_x_fill (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean fill)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
meta->x_fill = fill;
|
|
||||||
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_y_fill:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
*
|
|
||||||
* Get the y-fill state of the child
|
|
||||||
*
|
|
||||||
* Returns: %TRUE if the child is set to y-fill
|
|
||||||
*/
|
|
||||||
gboolean
|
|
||||||
st_table_child_get_y_fill (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), 0);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->y_fill;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_y_fill:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
* @fill: the fill state
|
|
||||||
*
|
|
||||||
* Set the fill state of the child on the y-axis. This will cause the child to
|
|
||||||
* be allocated the maximum available space.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_y_fill (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean fill)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
meta->y_fill = fill;
|
|
||||||
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_x_expand:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
*
|
|
||||||
* Get the x-expand property of the child
|
|
||||||
*
|
|
||||||
* Returns: %TRUE if the child is set to x-expand
|
|
||||||
*/
|
|
||||||
gboolean
|
|
||||||
st_table_child_get_x_expand (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), 0);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->x_expand;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_x_expand:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
* @expand: the new value of the x expand child property
|
|
||||||
*
|
|
||||||
* Set x-expand on the child. This causes the column which the child
|
|
||||||
* resides in to be allocated any extra space if the allocation of the table is
|
|
||||||
* larger than the preferred size.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_x_expand (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean expand)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
meta->x_expand = expand;
|
|
||||||
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_y_expand:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
* @expand: the new value of the y-expand child property
|
|
||||||
*
|
|
||||||
* Set y-expand on the child. This causes the row which the child
|
|
||||||
* resides in to be allocated any extra space if the allocation of the table is
|
|
||||||
* larger than the preferred size.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_y_expand (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean expand)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
meta->y_expand = expand;
|
|
||||||
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_y_expand:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
*
|
|
||||||
* Get the y-expand property of the child.
|
|
||||||
*
|
|
||||||
* Returns: %TRUE if the child is set to y-expand
|
|
||||||
*/
|
|
||||||
gboolean
|
|
||||||
st_table_child_get_y_expand (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), 0);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->y_expand;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_x_align:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
*
|
|
||||||
* Get the x-align value of the child
|
|
||||||
*
|
|
||||||
* Returns: An #StAlign value
|
|
||||||
*/
|
|
||||||
StAlign
|
|
||||||
st_table_child_get_x_align (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), 0);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->x_align;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_x_align:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
* @align: A #StAlign value
|
|
||||||
*
|
|
||||||
* Set the alignment of the child within its cell. This will only have an effect
|
|
||||||
* if the the x-fill property is FALSE.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_x_align (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
StAlign align)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
meta->x_align = align;
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_y_align:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
*
|
|
||||||
* Get the y-align value of the child
|
|
||||||
*
|
|
||||||
* Returns: An #StAlign value
|
|
||||||
*/
|
|
||||||
StAlign
|
|
||||||
st_table_child_get_y_align (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), 0);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), 0);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->y_align;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_y_align:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
* @align: A #StAlign value
|
|
||||||
*
|
|
||||||
* Set the value of the y-align property. This will only have an effect if
|
|
||||||
* y-fill value is set to FALSE.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_y_align (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
StAlign align)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
meta->y_align = align;
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_set_allocate_hidden:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
* @value: %TRUE if the actor should be allocated when hidden
|
|
||||||
*
|
|
||||||
* Set whether the child should be allocate even if it is hidden
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
st_table_child_set_allocate_hidden (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean value)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_if_fail (ST_IS_TABLE (table));
|
|
||||||
g_return_if_fail (CLUTTER_IS_ACTOR (child));
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
if (meta->allocate_hidden != value)
|
|
||||||
{
|
|
||||||
meta->allocate_hidden = value;
|
|
||||||
|
|
||||||
clutter_actor_queue_relayout (child);
|
|
||||||
|
|
||||||
g_object_notify (G_OBJECT (meta), "allocate-hidden");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* st_table_child_get_allocate_hidden:
|
|
||||||
* @table: A #StTable
|
|
||||||
* @child: A #ClutterActor
|
|
||||||
*
|
|
||||||
* Determine if the child is allocated even if it is hidden
|
|
||||||
*
|
|
||||||
* Returns: %TRUE if the actor is allocated when hidden
|
|
||||||
*/
|
|
||||||
gboolean
|
|
||||||
st_table_child_get_allocate_hidden (StTable *table,
|
|
||||||
ClutterActor *child)
|
|
||||||
{
|
|
||||||
StTableChild *meta;
|
|
||||||
|
|
||||||
g_return_val_if_fail (ST_IS_TABLE (table), TRUE);
|
|
||||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (child), TRUE);
|
|
||||||
|
|
||||||
meta = get_child_meta (table, child);
|
|
||||||
|
|
||||||
return meta->allocate_hidden;
|
|
||||||
}
|
|
||||||
@ -1,124 +0,0 @@
|
|||||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
||||||
/*
|
|
||||||
* st-table-child.h: Table child implementation
|
|
||||||
*
|
|
||||||
* Copyright 2008, 2009 Intel Corporation.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms and conditions of the GNU Lesser General Public License,
|
|
||||||
* version 2.1, as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope it will be useful, but WITHOUT ANY
|
|
||||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
|
|
||||||
#error "Only <st/st.h> can be included directly.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __ST_TABLE_CHILD_H__
|
|
||||||
#define __ST_TABLE_CHILD_H__
|
|
||||||
|
|
||||||
#include <st/st-types.h>
|
|
||||||
#include <st/st-widget.h>
|
|
||||||
#include <st/st-table.h>
|
|
||||||
#include <clutter/clutter.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
#define ST_TYPE_TABLE_CHILD (st_table_child_get_type ())
|
|
||||||
#define ST_TABLE_CHILD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_TABLE_CHILD, StTableChild))
|
|
||||||
#define ST_IS_TABLE_CHILD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ST_TYPE_TABLE_CHILD))
|
|
||||||
#define ST_TABLE_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ST_TYPE_TABLE_CHILD, StTableChildClass))
|
|
||||||
#define ST_IS_TABLE_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ST_TYPE_TABLE_CHILD))
|
|
||||||
#define ST_TABLE_CHILD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ST_TYPE_TABLE_CHILD, StTableChildClass))
|
|
||||||
|
|
||||||
typedef struct _StTableChild StTableChild;
|
|
||||||
typedef struct _StTableChildClass StTableChildClass;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* StTableChild:
|
|
||||||
*
|
|
||||||
* The contents of the this structure are private and should only be accessed
|
|
||||||
* through the public API.
|
|
||||||
*/
|
|
||||||
struct _StTableChild
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
ClutterChildMeta parent_instance;
|
|
||||||
|
|
||||||
gint col;
|
|
||||||
gint row;
|
|
||||||
gint col_span;
|
|
||||||
gint row_span;
|
|
||||||
StAlign x_align;
|
|
||||||
StAlign y_align;
|
|
||||||
guint allocate_hidden : 1;
|
|
||||||
guint x_expand : 1;
|
|
||||||
guint y_expand : 1;
|
|
||||||
guint x_fill : 1;
|
|
||||||
guint y_fill : 1;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
struct _StTableChildClass
|
|
||||||
{
|
|
||||||
ClutterChildMetaClass parent_class;
|
|
||||||
};
|
|
||||||
|
|
||||||
GType st_table_child_get_type (void) G_GNUC_CONST;
|
|
||||||
|
|
||||||
gint st_table_child_get_col_span (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
void st_table_child_set_col_span (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gint span);
|
|
||||||
gint st_table_child_get_row_span (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
void st_table_child_set_row_span (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gint span);
|
|
||||||
gboolean st_table_child_get_x_fill (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
void st_table_child_set_x_fill (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean fill);
|
|
||||||
gboolean st_table_child_get_y_fill (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
void st_table_child_set_y_fill (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean fill);
|
|
||||||
gboolean st_table_child_get_x_expand (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
void st_table_child_set_x_expand (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean expand);
|
|
||||||
gboolean st_table_child_get_y_expand (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
void st_table_child_set_y_expand (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean expand);
|
|
||||||
StAlign st_table_child_get_x_align (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
void st_table_child_set_x_align (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
StAlign align);
|
|
||||||
StAlign st_table_child_get_y_align (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
void st_table_child_set_y_align (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
StAlign align);
|
|
||||||
void st_table_child_set_allocate_hidden (StTable *table,
|
|
||||||
ClutterActor *child,
|
|
||||||
gboolean value);
|
|
||||||
gboolean st_table_child_get_allocate_hidden (StTable *table,
|
|
||||||
ClutterActor *child);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* __ST_TABLE_H__ */
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
||||||
/*
|
|
||||||
* st-private-private.h: Private declarations for StTable
|
|
||||||
*
|
|
||||||
* Copyright 2007 OpenedHand
|
|
||||||
* Copyright 2009 Intel Corporation.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms and conditions of the GNU Lesser General Public License,
|
|
||||||
* version 2.1, as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope it will be useful, but WITHOUT ANY
|
|
||||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ST_TABLE_PRIVATE_H__
|
|
||||||
#define __ST_TABLE_PRIVATE_H__
|
|
||||||
|
|
||||||
#include "st-table.h"
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
void _st_table_update_row_col (StTable *table,
|
|
||||||
gint row,
|
|
||||||
gint col);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* __ST_TABLE_PRIVATE_H__ */
|
|
||||||
1064
src/st/st-table.c
1064
src/st/st-table.c
File diff suppressed because it is too large
Load Diff
@ -1,90 +0,0 @@
|
|||||||
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
||||||
/*
|
|
||||||
* st-table.h: Table layout widget
|
|
||||||
*
|
|
||||||
* Copyright 2008, 2009 Intel Corporation.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms and conditions of the GNU Lesser General Public License,
|
|
||||||
* version 2.1, as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope it will be useful, but WITHOUT ANY
|
|
||||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
|
|
||||||
#error "Only <st/st.h> can be included directly.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __ST_TABLE_H__
|
|
||||||
#define __ST_TABLE_H__
|
|
||||||
|
|
||||||
#include <st/st-types.h>
|
|
||||||
#include <st/st-widget.h>
|
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
|
||||||
|
|
||||||
/**
|
|
||||||
* StTableChildOptions:
|
|
||||||
* @ST_KEEP_ASPECT_RATIO: whether to respect the widget's aspect ratio
|
|
||||||
* @ST_X_EXPAND: whether to allocate extra space on the widget's x-axis
|
|
||||||
* @ST_Y_EXPAND: whether to allocate extra space on the widget's y-axis
|
|
||||||
* @ST_X_FILL: whether to stretch the child to fill the cell horizontally
|
|
||||||
* @ST_Y_FILL: whether to stretch the child to fill the cell vertically
|
|
||||||
*
|
|
||||||
* Denotes the child properties an StTable child will have.
|
|
||||||
*/
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
ST_KEEP_ASPECT_RATIO = 1 << 0,
|
|
||||||
ST_X_EXPAND = 1 << 1,
|
|
||||||
ST_Y_EXPAND = 1 << 2,
|
|
||||||
ST_X_FILL = 1 << 3,
|
|
||||||
ST_Y_FILL = 1 << 4
|
|
||||||
} StTableChildOptions;
|
|
||||||
|
|
||||||
#define ST_TYPE_TABLE (st_table_get_type ())
|
|
||||||
#define ST_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_TABLE, StTable))
|
|
||||||
#define ST_IS_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ST_TYPE_TABLE))
|
|
||||||
#define ST_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ST_TYPE_TABLE, StTableClass))
|
|
||||||
#define ST_IS_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ST_TYPE_TABLE))
|
|
||||||
#define ST_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ST_TYPE_TABLE, StTableClass))
|
|
||||||
|
|
||||||
typedef struct _StTable StTable;
|
|
||||||
typedef struct _StTablePrivate StTablePrivate;
|
|
||||||
typedef struct _StTableClass StTableClass;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* StTable:
|
|
||||||
*
|
|
||||||
* The contents of this structure is private and should only be accessed using
|
|
||||||
* the provided API.
|
|
||||||
*/
|
|
||||||
struct _StTable
|
|
||||||
{
|
|
||||||
/*< private >*/
|
|
||||||
StWidget parent_instance;
|
|
||||||
|
|
||||||
StTablePrivate *priv;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _StTableClass
|
|
||||||
{
|
|
||||||
StWidgetClass parent_class;
|
|
||||||
};
|
|
||||||
|
|
||||||
GType st_table_get_type (void) G_GNUC_CONST;
|
|
||||||
|
|
||||||
StWidget* st_table_new (void);
|
|
||||||
|
|
||||||
gint st_table_get_row_count (StTable *table);
|
|
||||||
gint st_table_get_column_count (StTable *table);
|
|
||||||
|
|
||||||
G_END_DECLS
|
|
||||||
|
|
||||||
#endif /* __ST_TABLE_H__ */
|
|
||||||
@ -18,7 +18,6 @@ TEST_JS = \
|
|||||||
interactive/inline-style.js \
|
interactive/inline-style.js \
|
||||||
interactive/scrolling.js \
|
interactive/scrolling.js \
|
||||||
interactive/scroll-view-sizing.js \
|
interactive/scroll-view-sizing.js \
|
||||||
interactive/table.js \
|
|
||||||
interactive/test-title.js \
|
interactive/test-title.js \
|
||||||
interactive/transitions.js \
|
interactive/transitions.js \
|
||||||
testcommon/100-200.svg \
|
testcommon/100-200.svg \
|
||||||
|
|||||||
@ -1,57 +0,0 @@
|
|||||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
|
||||||
|
|
||||||
const Clutter = imports.gi.Clutter;
|
|
||||||
const St = imports.gi.St;
|
|
||||||
|
|
||||||
const UI = imports.testcommon.ui;
|
|
||||||
|
|
||||||
function test() {
|
|
||||||
let stage = new Clutter.Stage({ width: 600, height: 600 });
|
|
||||||
UI.init(stage);
|
|
||||||
|
|
||||||
let vbox = new St.BoxLayout({ vertical: true,
|
|
||||||
width: stage.width,
|
|
||||||
height: stage.height,
|
|
||||||
style: 'padding: 10px; '
|
|
||||||
+ 'spacing: 10px;'
|
|
||||||
+ 'font: 15px sans-serif;' });
|
|
||||||
stage.add_actor(vbox);
|
|
||||||
|
|
||||||
function L(text, color) {
|
|
||||||
return new St.Label({ text: text,
|
|
||||||
style: "background: " + color + ";"
|
|
||||||
+ "border: 1px solid rgba(0,0,0,0.5);"
|
|
||||||
+ "padding: 1em;" });
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
let table = new St.Table({ style: "border: 10px solid #888888;"
|
|
||||||
+ "padding: 10px;"
|
|
||||||
+ "spacing-rows: 5px;"
|
|
||||||
+ "spacing-columns: 15px;" });
|
|
||||||
vbox.add(table, { expand: true });
|
|
||||||
|
|
||||||
table.add(L("1", "#ff0000"),
|
|
||||||
{ row: 0, col: 0, col_span: 3 });
|
|
||||||
table.add(L("2", "#00ff00"),
|
|
||||||
{ row: 1, col: 0, row_span: 2 });
|
|
||||||
table.add(L("3", "#0000ff"),
|
|
||||||
{ row: 1, col: 1,
|
|
||||||
x_expand: 0 });
|
|
||||||
table.add(L("4", "#ffff00"),
|
|
||||||
{ row: 1, col: 2,
|
|
||||||
y_expand: 0, y_fill: 0
|
|
||||||
});
|
|
||||||
table.add(L("5", "#ff00ff"),
|
|
||||||
{ row: 2, col: 1, x_expand: 0 });
|
|
||||||
table.add(L("6", "#00ffff"),
|
|
||||||
{ row: 2, col: 2,
|
|
||||||
x_expand: 0, x_fill: 0, x_align: St.Align.END,
|
|
||||||
y_expand: 0, y_fill: 0, y_align: St.Align.END });
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
UI.main(stage);
|
|
||||||
}
|
|
||||||
test();
|
|
||||||
Loading…
Reference in New Issue
Block a user