[gtk+] toolpalette: Update adjustment usage for sealing
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] toolpalette: Update adjustment usage for sealing
- Date: Wed, 5 Jan 2011 13:40:20 +0000 (UTC)
commit beec484964545cbd14da6c1f3c0681a95d691032
Author: Benjamin Otte <otte redhat com>
Date: Wed Jan 5 13:12:17 2011 +0100
toolpalette: Update adjustment usage for sealing
gtk/gtktoolpalette.c | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index 195a43a..e35bf81 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -662,33 +662,35 @@ gtk_tool_palette_size_allocate (GtkWidget *widget,
/* update the scrollbar to match the displayed adjustment */
if (adjustment)
{
- gdouble value;
-
- adjustment->page_increment = page_size * 0.9;
- adjustment->step_increment = page_size * 0.1;
- adjustment->page_size = page_size;
+ gdouble value, lower, upper;
if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation ||
GTK_TEXT_DIR_LTR == direction)
{
- adjustment->lower = 0;
- adjustment->upper = MAX (0, page_start);
+ lower = 0;
+ upper = MAX (0, page_start);
- value = MIN (offset, adjustment->upper - adjustment->page_size);
+ value = MIN (offset, upper - page_size);
gtk_adjustment_clamp_page (adjustment, value, offset + page_size);
}
else
{
- adjustment->lower = page_size - MAX (0, page_start);
- adjustment->upper = page_size;
+ lower = page_size - MAX (0, page_start);
+ upper = page_size;
offset = -offset;
- value = MAX (offset, adjustment->lower);
+ value = MAX (offset, lower);
gtk_adjustment_clamp_page (adjustment, offset, value + page_size);
}
- gtk_adjustment_changed (adjustment);
+ gtk_adjustment_configure (adjustment,
+ value,
+ lower,
+ upper,
+ page_size * 0.1,
+ page_size * 0.9,
+ page_size);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]