X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkadjustment.c;h=f8dda30c4ffbb9cc0a09a81f03abd60bd5070680;hb=cf216d780cb2c889a3bcb5faa825fc1b21af8896;hp=ae5e2926b2e94ddbf4ab91c475d9eb2d459538f1;hpb=38dbb84095dee0fa9f4688e15ebd33591a9a6548;p=~andy%2Fgtk diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index ae5e2926b..f8dda30c4 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.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 . */ /* @@ -52,6 +50,15 @@ */ +struct _GtkAdjustmentPrivate { + gdouble lower; + gdouble upper; + gdouble value; + gdouble step_increment; + gdouble page_increment; + gdouble page_size; +}; + enum { PROP_0, @@ -213,8 +220,8 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class) * GtkAdjustment::changed: * @adjustment: the object which received the signal. * - * Emitted when one or more of the #GtkAdjustment fields have been changed, - * other than the value field. + * Emitted when one or more of the #GtkAdjustment properties have been + * changed, other than the #GtkAdjustment:value property. */ adjustment_signals[CHANGED] = g_signal_new (I_("changed"), @@ -229,7 +236,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class) * GtkAdjustment::value-changed: * @adjustment: the object which received the signal. * - * Emitted when the #GtkAdjustment value field has been changed. + * Emitted when the #GtkAdjustment:value property has been changed. */ adjustment_signals[VALUE_CHANGED] = g_signal_new (I_("value-changed"), @@ -239,17 +246,16 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class) NULL, NULL, _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); + + g_type_class_add_private (class, sizeof (GtkAdjustmentPrivate)); } static void gtk_adjustment_init (GtkAdjustment *adjustment) { - adjustment->value = 0.0; - adjustment->lower = 0.0; - adjustment->upper = 0.0; - adjustment->step_increment = 0.0; - adjustment->page_increment = 0.0; - adjustment->page_size = 0.0; + adjustment->priv = G_TYPE_INSTANCE_GET_PRIVATE (adjustment, + GTK_TYPE_ADJUSTMENT, + GtkAdjustmentPrivate); } static void @@ -259,26 +265,27 @@ gtk_adjustment_get_property (GObject *object, GParamSpec *pspec) { GtkAdjustment *adjustment = GTK_ADJUSTMENT (object); + GtkAdjustmentPrivate *priv = adjustment->priv; switch (prop_id) { case PROP_VALUE: - g_value_set_double (value, adjustment->value); + g_value_set_double (value, priv->value); break; case PROP_LOWER: - g_value_set_double (value, adjustment->lower); + g_value_set_double (value, priv->lower); break; case PROP_UPPER: - g_value_set_double (value, adjustment->upper); + g_value_set_double (value, priv->upper); break; case PROP_STEP_INCREMENT: - g_value_set_double (value, adjustment->step_increment); + g_value_set_double (value, priv->step_increment); break; case PROP_PAGE_INCREMENT: - g_value_set_double (value, adjustment->page_increment); + g_value_set_double (value, priv->page_increment); break; case PROP_PAGE_SIZE: - g_value_set_double (value, adjustment->page_size); + g_value_set_double (value, priv->page_size); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -294,6 +301,7 @@ gtk_adjustment_set_property (GObject *object, { GtkAdjustment *adjustment = GTK_ADJUSTMENT (object); gdouble double_value = g_value_get_double (value); + GtkAdjustmentPrivate *priv = adjustment->priv; switch (prop_id) { @@ -301,19 +309,19 @@ gtk_adjustment_set_property (GObject *object, gtk_adjustment_set_value (adjustment, double_value); break; case PROP_LOWER: - adjustment->lower = double_value; + priv->lower = double_value; break; case PROP_UPPER: - adjustment->upper = double_value; + priv->upper = double_value; break; case PROP_STEP_INCREMENT: - adjustment->step_increment = double_value; + priv->step_increment = double_value; break; case PROP_PAGE_INCREMENT: - adjustment->page_increment = double_value; + priv->page_increment = double_value; break; case PROP_PAGE_SIZE: - adjustment->page_size = double_value; + priv->page_size = double_value; break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -397,7 +405,7 @@ gtk_adjustment_get_value (GtkAdjustment *adjustment) { g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0.0); - return adjustment->value; + return adjustment->priv->value; } /** @@ -406,27 +414,31 @@ gtk_adjustment_get_value (GtkAdjustment *adjustment) * @value: the new value. * * Sets the #GtkAdjustment value. The value is clamped to lie between - * #GtkAdjustment.lower and #GtkAdjustment.upper. + * #GtkAdjustment:lower and #GtkAdjustment:upper. * * Note that for adjustments which are used in a #GtkScrollbar, the effective - * range of allowed values goes from #GtkAdjustment.lower to - * #GtkAdjustment.upper - #GtkAdjustment.page_size. + * range of allowed values goes from #GtkAdjustment:lower to + * #GtkAdjustment:upper - #GtkAdjustment:page_size. */ void gtk_adjustment_set_value (GtkAdjustment *adjustment, gdouble value) { + GtkAdjustmentPrivate *priv; + g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); + priv = adjustment->priv; + /* don't use CLAMP() so we don't end up below lower if upper - page_size * is smaller than lower */ - value = MIN (value, adjustment->upper - adjustment->page_size); - value = MAX (value, adjustment->lower); + value = MIN (value, priv->upper - priv->page_size); + value = MAX (value, priv->lower); - if (value != adjustment->value) + if (value != priv->value) { - adjustment->value = value; + priv->value = value; gtk_adjustment_value_changed (adjustment); } @@ -447,7 +459,7 @@ gtk_adjustment_get_lower (GtkAdjustment *adjustment) { g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0.0); - return adjustment->lower; + return adjustment->priv->lower; } /** @@ -458,16 +470,16 @@ gtk_adjustment_get_lower (GtkAdjustment *adjustment) * Sets the minimum value of the adjustment. * * When setting multiple adjustment properties via their individual - * setters, multiple "changed" signals will be emitted. However, since - * the emission of the "changed" signal is tied to the emission of the - * "GObject::notify" signals of the changed properties, it's possible - * to compress the "changed" signals into one by calling + * setters, multiple #GtkAdjustment::changed signals will be emitted. However, since + * the emission of the #GtkAdjustment::changed signal is tied to the emission of the + * #GObject::notify signals of the changed properties, it's possible + * to compress the #GtkAdjustment::changed signals into one by calling * g_object_freeze_notify() and g_object_thaw_notify() around the * calls to the individual setters. * * Alternatively, using a single g_object_set() for all the properties * to change, or using gtk_adjustment_configure() has the same effect - * of compressing "changed" emissions. + * of compressing #GtkAdjustment::changed emissions. * * Since: 2.14 **/ @@ -477,7 +489,7 @@ gtk_adjustment_set_lower (GtkAdjustment *adjustment, { g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - if (lower != adjustment->lower) + if (lower != adjustment->priv->lower) g_object_set (adjustment, "lower", lower, NULL); } @@ -496,7 +508,7 @@ gtk_adjustment_get_upper (GtkAdjustment *adjustment) { g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0.0); - return adjustment->upper; + return adjustment->priv->upper; } /** @@ -511,7 +523,7 @@ gtk_adjustment_get_upper (GtkAdjustment *adjustment) * property is nonzero. * * See gtk_adjustment_set_lower() about how to compress multiple - * emissions of the "changed" signal when setting multiple adjustment + * emissions of the #GtkAdjustment::changed signal when setting multiple adjustment * properties. * * Since: 2.14 @@ -522,7 +534,7 @@ gtk_adjustment_set_upper (GtkAdjustment *adjustment, { g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - if (upper != adjustment->upper) + if (upper != adjustment->priv->upper) g_object_set (adjustment, "upper", upper, NULL); } @@ -541,7 +553,7 @@ gtk_adjustment_get_step_increment (GtkAdjustment *adjustment) { g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0.0); - return adjustment->step_increment; + return adjustment->priv->step_increment; } /** @@ -552,7 +564,7 @@ gtk_adjustment_get_step_increment (GtkAdjustment *adjustment) * Sets the step increment of the adjustment. * * See gtk_adjustment_set_lower() about how to compress multiple - * emissions of the "changed" signal when setting multiple adjustment + * emissions of the #GtkAdjustment::changed signal when setting multiple adjustment * properties. * * Since: 2.14 @@ -563,7 +575,7 @@ gtk_adjustment_set_step_increment (GtkAdjustment *adjustment, { g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - if (step_increment != adjustment->step_increment) + if (step_increment != adjustment->priv->step_increment) g_object_set (adjustment, "step-increment", step_increment, NULL); } @@ -582,7 +594,7 @@ gtk_adjustment_get_page_increment (GtkAdjustment *adjustment) { g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0.0); - return adjustment->page_increment; + return adjustment->priv->page_increment; } /** @@ -593,7 +605,7 @@ gtk_adjustment_get_page_increment (GtkAdjustment *adjustment) * Sets the page increment of the adjustment. * * See gtk_adjustment_set_lower() about how to compress multiple - * emissions of the "changed" signal when setting multiple adjustment + * emissions of the #GtkAdjustment::changed signal when setting multiple adjustment * properties. * * Since: 2.14 @@ -604,7 +616,7 @@ gtk_adjustment_set_page_increment (GtkAdjustment *adjustment, { g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - if (page_increment != adjustment->page_increment) + if (page_increment != adjustment->priv->page_increment) g_object_set (adjustment, "page-increment", page_increment, NULL); } @@ -623,7 +635,7 @@ gtk_adjustment_get_page_size (GtkAdjustment *adjustment) { g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0.0); - return adjustment->page_size; + return adjustment->priv->page_size; } /** @@ -634,7 +646,7 @@ gtk_adjustment_get_page_size (GtkAdjustment *adjustment) * Sets the page size of the adjustment. * * See gtk_adjustment_set_lower() about how to compress multiple - * emissions of the "changed" signal when setting multiple adjustment + * emissions of the GtkAdjustment::changed signal when setting multiple adjustment * properties. * * Since: 2.14 @@ -645,7 +657,7 @@ gtk_adjustment_set_page_size (GtkAdjustment *adjustment, { g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); - if (page_size != adjustment->page_size) + if (page_size != adjustment->priv->page_size) g_object_set (adjustment, "page-size", page_size, NULL); } @@ -661,9 +673,9 @@ gtk_adjustment_set_page_size (GtkAdjustment *adjustment, * * Sets all properties of the adjustment at once. * - * Use this function to avoid multiple emissions of the "changed" + * Use this function to avoid multiple emissions of the #GtkAdjustment::changed * signal. See gtk_adjustment_set_lower() for an alternative way - * of compressing multiple emissions of "changed" into one. + * of compressing multiple emissions of #GtkAdjustment::changed into one. * * Since: 2.14 **/ @@ -676,11 +688,14 @@ gtk_adjustment_configure (GtkAdjustment *adjustment, gdouble page_increment, gdouble page_size) { + GtkAdjustmentPrivate *priv; gboolean value_changed = FALSE; guint64 old_stamp = adjustment_changed_stamp; g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); + priv = adjustment->priv; + g_object_freeze_notify (G_OBJECT (adjustment)); g_object_set (adjustment, @@ -697,12 +712,12 @@ gtk_adjustment_configure (GtkAdjustment *adjustment, value = MIN (value, upper - page_size); value = MAX (value, lower); - if (value != adjustment->value) + if (value != priv->value) { /* set value manually to make sure "changed" is emitted with the * new value in place and is emitted before "value-changed" */ - adjustment->value = value; + priv->value = value; value_changed = TRUE; } @@ -721,7 +736,7 @@ gtk_adjustment_configure (GtkAdjustment *adjustment, * * Emits a #GtkAdjustment::changed signal from the #GtkAdjustment. * This is typically called by the owner of the #GtkAdjustment after it has - * changed any of the #GtkAdjustment fields other than the value. + * changed any of the #GtkAdjustment properties other than the value. */ void gtk_adjustment_changed (GtkAdjustment *adjustment) @@ -737,7 +752,7 @@ gtk_adjustment_changed (GtkAdjustment *adjustment) * * Emits a #GtkAdjustment::value_changed signal from the #GtkAdjustment. * This is typically called by the owner of the #GtkAdjustment after it has - * changed the #GtkAdjustment value field. + * changed the #GtkAdjustment:value property. */ void gtk_adjustment_value_changed (GtkAdjustment *adjustment) @@ -754,9 +769,9 @@ gtk_adjustment_value_changed (GtkAdjustment *adjustment) * @lower: the lower value. * @upper: the upper value. * - * Updates the #GtkAdjustment #GtkAdjustment.value to ensure that the range + * Updates the #GtkAdjustment:value property to ensure that the range * between @lower and @upper is in the current page (i.e. between - * #GtkAdjustment.value and #GtkAdjustment.value + #GtkAdjustment.page_size). + * #GtkAdjustment:value and #GtkAdjustment:value + #GtkAdjustment:page_size). * If the range is larger than the page size, then only the start of it will * be in the current page. * A #GtkAdjustment::changed signal will be emitted if the value is changed. @@ -766,26 +781,73 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment, gdouble lower, gdouble upper) { + GtkAdjustmentPrivate *priv; 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); + priv = adjustment->priv; + + lower = CLAMP (lower, priv->lower, priv->upper); + upper = CLAMP (upper, priv->lower, priv->upper); need_emission = FALSE; - if (adjustment->value + adjustment->page_size < upper) + if (priv->value + priv->page_size < upper) { - adjustment->value = upper - adjustment->page_size; + priv->value = upper - priv->page_size; need_emission = TRUE; } - if (adjustment->value > lower) + if (priv->value > lower) { - adjustment->value = lower; + priv->value = lower; need_emission = TRUE; } if (need_emission) gtk_adjustment_value_changed (adjustment); } + +/** + * gtk_adjustment_get_minimum_increment: + * @adjustment: a #GtkAdjustment + * + * Gets the smaller of step increment and page increment. + * + * Returns: the minimum increment of @adjustment + * + * Since: 3.2 + */ +gdouble +gtk_adjustment_get_minimum_increment (GtkAdjustment *adjustment) +{ + GtkAdjustmentPrivate *priv; + gdouble minimum_increment; + + g_return_val_if_fail (GTK_IS_ADJUSTMENT (adjustment), 0); + + priv = adjustment->priv; + + if (priv->step_increment != 0 && priv->page_increment != 0) + { + if (ABS (priv->step_increment) < ABS (priv->page_increment)) + minimum_increment = priv->step_increment; + else + minimum_increment = priv->page_increment; + } + else if (priv->step_increment == 0 && priv->page_increment == 0) + { + minimum_increment = 0; + } + else if (priv->step_increment == 0) + { + minimum_increment = priv->page_increment; + } + else + { + minimum_increment = priv->step_increment; + } + + return minimum_increment; +} +