]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkadjustment.c
Clamp size of child to at least 1x1. (#82431, Boris Shingarov.)
[~andy/gtk] / gtk / gtkadjustment.c
index 47d422bc5d815eb305197e8ff71947fa0a8842ec..0c6cf648da91870e58877d20b9740d3abfbbc8b6 100644 (file)
@@ -2,20 +2,30 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #include "gtkadjustment.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
 
@@ -30,28 +40,29 @@ static void gtk_adjustment_class_init (GtkAdjustmentClass *klass);
 static void gtk_adjustment_init       (GtkAdjustment      *adjustment);
 
 
-static gint adjustment_signals[LAST_SIGNAL] = { 0 };
+static guint adjustment_signals[LAST_SIGNAL] = { 0 };
 
 
-guint
-gtk_adjustment_get_type ()
+GtkType
+gtk_adjustment_get_type (void)
 {
-  static guint adjustment_type = 0;
+  static GtkType adjustment_type = 0;
 
   if (!adjustment_type)
     {
-      GtkTypeInfo adjustment_info =
+      static const GtkTypeInfo adjustment_info =
       {
        "GtkAdjustment",
        sizeof (GtkAdjustment),
        sizeof (GtkAdjustmentClass),
        (GtkClassInitFunc) gtk_adjustment_class_init,
        (GtkObjectInitFunc) gtk_adjustment_init,
-       (GtkArgSetFunc) NULL,
-       (GtkArgGetFunc) NULL,
+       /* reserved_1 */ NULL,
+       /* reserved_2 */ NULL,
+        (GtkClassInitFunc) NULL,
       };
 
-      adjustment_type = gtk_type_unique (gtk_data_get_type (), &adjustment_info);
+      adjustment_type = gtk_type_unique (GTK_TYPE_OBJECT, &adjustment_info);
     }
 
   return adjustment_type;
@@ -64,25 +75,23 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
 
   object_class = (GtkObjectClass*) class;
 
+  class->changed = NULL;
+  class->value_changed = NULL;
+
   adjustment_signals[CHANGED] =
     gtk_signal_new ("changed",
                     GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
-                    object_class->type,
+                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkAdjustmentClass, changed),
-                    gtk_signal_default_marshaller,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   adjustment_signals[VALUE_CHANGED] =
     gtk_signal_new ("value_changed",
                     GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
-                    object_class->type,
+                    GTK_CLASS_TYPE (object_class),
                     GTK_SIGNAL_OFFSET (GtkAdjustmentClass, value_changed),
-                    gtk_signal_default_marshaller,
+                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, adjustment_signals, LAST_SIGNAL);
-
-  class->changed = NULL;
-  class->value_changed = NULL;
 }
 
 static void
@@ -97,12 +106,12 @@ gtk_adjustment_init (GtkAdjustment *adjustment)
 }
 
 GtkObject*
-gtk_adjustment_new (gfloat value,
-                   gfloat lower,
-                   gfloat upper,
-                   gfloat step_increment,
-                   gfloat page_increment,
-                   gfloat page_size)
+gtk_adjustment_new (gdouble value,
+                   gdouble lower,
+                   gdouble upper,
+                   gdouble step_increment,
+                   gdouble page_increment,
+                   gdouble page_size)
 {
   GtkAdjustment *adjustment;
 
@@ -117,3 +126,81 @@ gtk_adjustment_new (gfloat value,
 
   return GTK_OBJECT (adjustment);
 }
+
+/**
+ * gtk_adjustment_get_value:
+ * @adjustment: a #GtkAdjustment
+ *
+ * Gets the current value of the adjustment. See
+ * gtk_adjustment_set_value ().
+ *
+ * Return value: The current value of the adjustment.
+ **/
+gdouble
+gtk_adjustment_get_value (GtkAdjustment *adjustment)
+{
+  g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0.);
+
+  return adjustment->value;
+}
+
+void
+gtk_adjustment_set_value (GtkAdjustment        *adjustment,
+                         gdouble               value)
+{
+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+
+  value = CLAMP (value, adjustment->lower, adjustment->upper);
+
+  if (value != adjustment->value)
+    {
+      adjustment->value = value;
+
+      gtk_adjustment_value_changed (adjustment);
+    }
+}
+
+void
+gtk_adjustment_changed (GtkAdjustment        *adjustment)
+{
+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+
+  gtk_signal_emit (GTK_OBJECT (adjustment), adjustment_signals[CHANGED]);
+}
+
+void
+gtk_adjustment_value_changed (GtkAdjustment        *adjustment)
+{
+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+
+  gtk_signal_emit (GTK_OBJECT (adjustment), adjustment_signals[VALUE_CHANGED]);
+}
+
+void
+gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
+                          gdouble        lower,
+                          gdouble        upper)
+{
+  gboolean need_emission;
+
+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
+
+  lower = CLAMP (lower, adjustment->lower, adjustment->upper);
+  upper = CLAMP (upper, adjustment->lower, adjustment->upper);
+
+  need_emission = FALSE;
+
+  if (adjustment->value + adjustment->page_size < upper)
+    {
+      adjustment->value = upper - adjustment->page_size;
+      need_emission = TRUE;
+    }
+  if (adjustment->value > lower)
+    {
+      adjustment->value = lower;
+      need_emission = TRUE;
+    }
+
+  if (need_emission)
+    gtk_adjustment_value_changed (adjustment);
+}