* 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/>.
*/
/*
gint *natural);
static gboolean gtk_separator_draw (GtkWidget *widget,
cairo_t *cr);
-static AtkObject *gtk_separator_get_accessible (GtkWidget *widget);
G_DEFINE_TYPE_WITH_CODE (GtkSeparator, gtk_separator, GTK_TYPE_WIDGET,
widget_class->get_preferred_height = gtk_separator_get_preferred_height;
widget_class->draw = gtk_separator_draw;
- widget_class->get_accessible = gtk_separator_get_accessible;
+
+ gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_SEPARATOR);
g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
{
GtkSeparator *separator = GTK_SEPARATOR (widget);
GtkSeparatorPrivate *private = separator->priv;
- GtkStyleContext *context;
- GtkStateFlags state;
- GtkBorder border;
gboolean wide_sep;
gint sep_width;
gint sep_height;
- 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 : border.top;
+ *minimum = *natural = wide_sep ? sep_height : 1;
}
else
{
- *minimum = *natural = wide_sep ? sep_width : border.left;
+ *minimum = *natural = wide_sep ? sep_width : 1;
}
}
{
GtkSeparator *separator = GTK_SEPARATOR (widget);
GtkSeparatorPrivate *private = separator->priv;
- GtkStateFlags state;
GtkStyleContext *context;
- GtkBorder padding;
gboolean wide_separators;
gint separator_width;
gint separator_height;
int width, height;
- 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);
- state = gtk_widget_get_state_flags (widget);
+ context = gtk_widget_get_style_context (widget);
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_height (widget);
- gtk_style_context_get_padding (context, state, &padding);
-
- gtk_style_context_save (context);
- gtk_style_context_set_state (context, state);
-
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (wide_separators)
width, separator_height);
else
gtk_render_line (context, cr,
- 0, (height - padding.top) / 2,
- width - 1, (height - padding.top) / 2);
+ 0, height / 2,
+ width - 1, height / 2);
}
else
{
separator_width, height);
else
gtk_render_line (context, cr,
- (width - padding.left) / 2, 0,
- (width - padding.left) / 2, height - 1);
+ width / 2, 0,
+ width / 2, height - 1);
}
- gtk_style_context_restore (context);
-
return FALSE;
}
-static AtkObject *
-gtk_separator_get_accessible (GtkWidget *widget)
-{
- AtkObject *obj;
-
- obj = GTK_WIDGET_CLASS (gtk_separator_parent_class)->get_accessible (widget);
-
- atk_object_set_role (obj, ATK_ROLE_SEPARATOR);
-
- return obj;
-}
-
/**
* gtk_separator_new:
* @orientation: the separator's orientation.