separator: Don't use padding and borders wrongly

[~andy/gtk] / gtk / gtkseparator.c

diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
index 687139fd4a092894562b4d8f8aed375ef3a7c144..8e5bc71612e19d48fd8eecfca1a5991490273525 100644 (file)
--- a/gtk/gtkseparator.c
+++ b/gtk/gtkseparator.c
@@ -12,9 +12,7 @@
  * 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/>.
  */
 
 /*
@@ -33,12 +31,13 @@
 
 /**
  * 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.
  */
 
 
@@ -90,7 +89,9 @@ gtk_separator_class_init (GtkSeparatorClass *class)
   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");
 
@@ -101,6 +102,7 @@ static void
 gtk_separator_init (GtkSeparator *separator)
 {
   GtkSeparatorPrivate *private;
+  GtkStyleContext *context;
 
   separator->priv = G_TYPE_INSTANCE_GET_PRIVATE (separator,
                                                  GTK_TYPE_SEPARATOR,
@@ -110,6 +112,9 @@ gtk_separator_init (GtkSeparator *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
@@ -162,17 +167,10 @@ gtk_separator_get_preferred_size (GtkWidget      *widget,
 {
   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,
@@ -185,11 +183,11 @@ gtk_separator_get_preferred_size (GtkWidget      *widget,
     }
   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;
     }
 }
 
@@ -215,30 +213,22 @@ gtk_separator_draw (GtkWidget *widget,
 {
   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)
@@ -247,8 +237,8 @@ gtk_separator_draw (GtkWidget *widget,
                           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
     {
@@ -258,8 +248,8 @@ gtk_separator_draw (GtkWidget *widget,
                           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);
     }
 
   return FALSE;