* 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/>.
*/
/*
#include "config.h"
-#include "gtkorientable.h"
+#include "gtkorientableprivate.h"
#include "gtkseparator.h"
#include "gtkprivate.h"
#include "gtkintl.h"
/**
* SECTION:gtkseparator
- * @Short_description: Base class for GtkHSeparator and GtkVSeparator
+ * @Short_description: A separator widget
* @Title: GtkSeparator
*
- * The GtkSeparator widget is the base class for #GtkHSeparator and
- * #GtkVSeparator. It can be used in the same way as these, by setting
- * the "orientation" property suitably.
+ * GtkSeparator is a horizontal or vertical separator widget, depending on the
+ * value of the #GtkOrientable:orientation property, used to group the widgets within a
+ * window. It displays a line with a shadow to make it appear sunken into the
+ * interface.
*/
widget_class->get_preferred_width = gtk_separator_get_preferred_width;
widget_class->get_preferred_height = gtk_separator_get_preferred_height;
- widget_class->draw = gtk_separator_draw;
+ widget_class->draw = gtk_separator_draw;
+
+ gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_SEPARATOR);
g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
gtk_separator_init (GtkSeparator *separator)
{
GtkSeparatorPrivate *private;
+ GtkStyleContext *context;
separator->priv = G_TYPE_INSTANCE_GET_PRIVATE (separator,
GTK_TYPE_SEPARATOR,
gtk_widget_set_has_window (GTK_WIDGET (separator), FALSE);
private->orientation = GTK_ORIENTATION_HORIZONTAL;
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (separator));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_SEPARATOR);
}
static void
{
case PROP_ORIENTATION:
private->orientation = g_value_get_enum (value);
+ _gtk_orientable_set_style_classes (GTK_ORIENTABLE (object));
gtk_widget_queue_resize (GTK_WIDGET (object));
break;
default:
{
GtkSeparator *separator = GTK_SEPARATOR (widget);
GtkSeparatorPrivate *private = separator->priv;
- GtkStyle *style;
+ GtkStyleContext *context;
+ GtkStateFlags state;
+ GtkBorder border;
gboolean wide_sep;
gint sep_width;
gint sep_height;
- style = gtk_widget_get_style (widget);
+ context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (widget);
+ gtk_style_context_get_border (context, state, &border);
+
gtk_widget_style_get (widget,
"wide-separators", &wide_sep,
"separator-width", &sep_width,
}
else if (orientation == GTK_ORIENTATION_VERTICAL)
{
- *minimum = *natural = wide_sep ? sep_height : style->ythickness;
+ *minimum = *natural = wide_sep ? sep_height : border.top;
}
else
{
- *minimum = *natural = wide_sep ? sep_width : style->xthickness;
+ *minimum = *natural = wide_sep ? sep_width : border.left;
}
}
}
static gboolean
-gtk_separator_draw (GtkWidget *widget,
- cairo_t *cr)
+gtk_separator_draw (GtkWidget *widget,
+ cairo_t *cr)
{
GtkSeparator *separator = GTK_SEPARATOR (widget);
GtkSeparatorPrivate *private = separator->priv;
- GtkStateType state;
- GtkStyle *style;
- GdkWindow *window;
+ GtkStateFlags state;
+ GtkStyleContext *context;
+ GtkBorder padding;
gboolean wide_separators;
gint separator_width;
gint separator_height;
int width, height;
- style = gtk_widget_get_style (widget);
+ context = gtk_widget_get_style_context (widget);
gtk_widget_style_get (widget,
"wide-separators", &wide_separators,
"separator-width", &separator_width,
"separator-height", &separator_height,
NULL);
- window = gtk_widget_get_window (widget);
- state = gtk_widget_get_state (widget);
+ state = gtk_widget_get_state_flags (widget);
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_height (widget);
+ gtk_style_context_get_padding (context, state, &padding);
+
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (wide_separators)
- gtk_paint_box (style, cr,
- gtk_widget_get_state (widget), GTK_SHADOW_ETCHED_OUT,
- widget, "hseparator",
- 0, (height - separator_height) / 2,
- width, separator_height);
+ gtk_render_frame (context, cr,
+ 0, (height - separator_height) / 2,
+ width, separator_height);
else
- gtk_paint_hline (style, cr,
- gtk_widget_get_state (widget),
- widget, "hseparator",
- 0, width - 1,
- (height - style->ythickness) / 2);
+ gtk_render_line (context, cr,
+ 0, (height - padding.top) / 2,
+ width - 1, (height - padding.top) / 2);
}
else
{
if (wide_separators)
- gtk_paint_box (style, cr,
- gtk_widget_get_state (widget), GTK_SHADOW_ETCHED_OUT,
- widget, "vseparator",
- (width - separator_width) / 2, 0,
- separator_width, height);
+ gtk_render_frame (context, cr,
+ (width - separator_width) / 2, 0,
+ separator_width, height);
else
- gtk_paint_vline (style, cr,
- gtk_widget_get_state (widget),
- widget, "vseparator",
- 0, height - 1,
- (width - style->xthickness) / 2);
+ gtk_render_line (context, cr,
+ (width - padding.left) / 2, 0,
+ (width - padding.left) / 2, height - 1);
}
return FALSE;
* Return value: a new #GtkSeparator.
*
* Since: 3.0
- **/
+ */
GtkWidget *
gtk_separator_new (GtkOrientation orientation)
{
projects / ~andy / gtk / blobdiff