dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle the widget size dynamically. Hide scrollbars when there's nothing 

2004-08-31  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimppreview.c: handle the widget size dynamically.
	Hide scrollbars when there's nothing to scroll.

	* libgimp/gimpdrawablepreview.c: simplified a lot. The scrollbars
	are handled completely in the GimpPreview widget now.
This commit is contained in:
Sven Neumann 2004-08-31 19:58:25 +00:00 committed by Sven Neumann
parent c6dd571113
commit 43c21e315e
2 changed files with 83 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
libgimp/gimpdrawablepreview.c
View File

@ -34,8 +34,10 @@
#define PREVIEW_SIZE (128)
static void gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass);
static void gimp_drawable_preview_draw_original (GimpPreview *preview);
static void gimp_drawable_preview_class_init (GimpDrawablePreviewClass *klass);
static void gimp_drawable_preview_draw_original (GimpPreview *preview);
static GimpPreviewClass *parent_class = NULL;
@ -115,6 +117,27 @@ gimp_drawable_preview_draw_original (GimpPreview *preview)
g_free (buffer);
}
static void
gimp_drawable_preview_set_drawable (GimpDrawablePreview *drawable_preview,
GimpDrawable *drawable)
{
GimpPreview *preview = GIMP_PREVIEW (drawable_preview);
gint width;
gint height;
drawable_preview->drawable = drawable;
gimp_drawable_mask_bounds (drawable->drawable_id,
&preview->xmin, &preview->ymin,
&preview->xmax, &preview->ymax);
width = preview->xmax - preview->xmin;
height = preview->ymax - preview->ymin;
gtk_widget_set_size_request (GIMP_PREVIEW (preview)->area,
MIN (width, PREVIEW_SIZE),
MIN (height, PREVIEW_SIZE));
}
/**
* gimp_drawable_preview_new:
@ -129,39 +152,13 @@ gimp_drawable_preview_draw_original (GimpPreview *preview)
GtkWidget *
gimp_drawable_preview_new (GimpDrawable *drawable)
{
GimpDrawablePreview *drawable_preview;
GimpPreview *preview;
gint sel_width, sel_height;
GimpDrawablePreview *preview;
g_return_val_if_fail (drawable != NULL, NULL);
drawable_preview = g_object_new (GIMP_TYPE_DRAWABLE_PREVIEW, NULL);
drawable_preview->drawable = drawable;
preview = g_object_new (GIMP_TYPE_DRAWABLE_PREVIEW, NULL);
preview = GIMP_PREVIEW (drawable_preview);
gimp_drawable_mask_bounds (drawable->drawable_id,
&preview->xmin, &preview->ymin,
&preview->xmax, &preview->ymax);
sel_width = preview->xmax - preview->xmin;
sel_height = preview->ymax - preview->ymin;
preview->width = MIN (sel_width, PREVIEW_SIZE);
preview->height = MIN (sel_height, PREVIEW_SIZE);
gtk_range_set_increments (GTK_RANGE (preview->hscr),
1.0,
MIN (preview->width, sel_width));
gtk_range_set_range (GTK_RANGE (preview->hscr),
0, sel_width - preview->width - 1);
gtk_range_set_increments (GTK_RANGE (preview->vscr),
1.0,
MIN (preview->height, sel_height));
gtk_range_set_range (GTK_RANGE (preview->vscr),
0, sel_height - preview->height - 1);
gtk_widget_set_size_request (preview->area,
preview->width, preview->height);
gimp_drawable_preview_set_drawable (preview, drawable);
return GTK_WIDGET (preview);
}
@ -181,46 +178,17 @@ GtkWidget *
gimp_drawable_preview_new_with_toggle (GimpDrawable *drawable,
gboolean *toggle)
{
GimpDrawablePreview *drawable_preview;
GimpPreview *preview;
gint sel_width, sel_height;
GimpDrawablePreview *preview;
g_return_val_if_fail (drawable != NULL, NULL);
g_return_val_if_fail (toggle != NULL, NULL);
drawable_preview = g_object_new (GIMP_TYPE_DRAWABLE_PREVIEW,
"show_update_toggle", TRUE,
"update", *toggle,
NULL);
preview = g_object_new (GIMP_TYPE_DRAWABLE_PREVIEW,
"show_update_toggle", TRUE,
"update", *toggle,
NULL);
drawable_preview->drawable = drawable;
preview = GIMP_PREVIEW (drawable_preview);
gimp_drawable_mask_bounds (drawable->drawable_id,
&preview->xmin, &preview->ymin,
&preview->xmax, &preview->ymax);
sel_width = preview->xmax - preview->xmin;
sel_height = preview->ymax - preview->ymin;
preview->width = MIN (sel_width, PREVIEW_SIZE);
preview->height = MIN (sel_height, PREVIEW_SIZE);
gtk_range_set_increments (GTK_RANGE (preview->hscr),
1.0,
MIN (preview->width, sel_width));
gtk_range_set_range (GTK_RANGE (preview->hscr),
0, sel_width -preview->width - 1);
gtk_range_set_increments (GTK_RANGE (preview->vscr),
1.0,
MIN (preview->height, sel_height));
gtk_range_set_range (GTK_RANGE (preview->vscr),
0, sel_height - preview->height - 1);
gtk_widget_set_size_request (preview->area,
preview->width, preview->height);
g_signal_connect (preview->toggle_update, "toggled",
G_CALLBACK (gimp_toggle_button_update), toggle);
gimp_drawable_preview_set_drawable (preview, drawable);
return GTK_WIDGET (preview);
}

62
libgimpwidgets/gimppreview.c
View File

@ -60,7 +60,9 @@ static gboolean gimp_preview_button_release (GtkWidget *hs,
GimpPreview *preview);
static void gimp_preview_draw (GimpPreview *preview);
static void gimp_preview_area_realize (GtkWidget *widget);
static void gimp_preview_area_size_allocate (GimpPreview *preview);
static void gimp_preview_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation,
GimpPreview *preview);
static void gimp_preview_h_scroll (GtkAdjustment *hadj,
GimpPreview *preview);
static void gimp_preview_v_scroll (GtkAdjustment *vadj,
@ -149,6 +151,9 @@ gimp_preview_init (GimpPreview *preview)
{
GtkWidget *frame;
gtk_table_resize (GTK_TABLE (preview), 3, 2);
gtk_table_set_homogeneous (GTK_TABLE (preview), FALSE);
preview->xoff = 0;
preview->yoff = 0;
preview->in_drag = FALSE;
@ -160,9 +165,6 @@ gimp_preview_init (GimpPreview *preview)
preview->width = preview->xmax - preview->xmin;
preview->height = preview->ymax - preview->ymin;
gtk_table_resize (GTK_TABLE (preview), 3, 2);
gtk_table_set_homogeneous (GTK_TABLE (preview), FALSE);
preview->hadj = gtk_adjustment_new (0, 0, preview->width - 1, 1.0,
preview->width, preview->width);
@ -175,7 +177,6 @@ gimp_preview_init (GimpPreview *preview)
GTK_UPDATE_CONTINUOUS);
gtk_table_attach (GTK_TABLE (preview), preview->hscr, 0,1, 1,2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (preview->hscr);
g_signal_connect (preview->hscr, "button-release-event",
G_CALLBACK (gimp_preview_button_release), preview);
@ -192,7 +193,6 @@ gimp_preview_init (GimpPreview *preview)
GTK_UPDATE_CONTINUOUS);
gtk_table_attach (GTK_TABLE (preview), preview->vscr, 1,2, 0,1,
GTK_FILL, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (preview->vscr);
g_signal_connect (preview->vscr, "button-release-event",
G_CALLBACK (gimp_preview_button_release), preview);
@ -206,7 +206,6 @@ gimp_preview_init (GimpPreview *preview)
gtk_widget_show (frame);
preview->area = gimp_preview_area_new ();
gtk_widget_set_size_request (preview->area, preview->width, preview->height);
gtk_container_add (GTK_CONTAINER (frame), preview->area);
gtk_widget_show (preview->area);
@ -224,9 +223,9 @@ gimp_preview_init (GimpPreview *preview)
G_CALLBACK (gimp_preview_area_realize),
NULL);
g_signal_connect_swapped (preview->area, "size_allocate",
G_CALLBACK (gimp_preview_area_size_allocate),
preview);
g_signal_connect (preview->area, "size_allocate",
G_CALLBACK (gimp_preview_area_size_allocate),
preview);
/* a toggle button to (des)activate the instant preview */
@ -323,8 +322,44 @@ gimp_preview_area_realize (GtkWidget *widget)
}
static void
gimp_preview_area_size_allocate (GimpPreview *preview)
gimp_preview_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation,
GimpPreview *preview)
{
gint width = preview->xmax - preview->xmin;
gint height = preview->ymax - preview->ymin;
preview->width = allocation->width;
preview->height = allocation->height;
if (width > preview->width)
{
gtk_widget_show (preview->hscr);
gtk_range_set_increments (GTK_RANGE (preview->hscr),
1.0, MIN (preview->width, width));
gtk_range_set_range (GTK_RANGE (preview->hscr),
0, width - preview->width - 1);
}
else
{
gtk_widget_hide (preview->hscr);
}
if (height > preview->height)
{
gtk_widget_show (preview->vscr);
gtk_range_set_increments (GTK_RANGE (preview->vscr),
1.0, MIN (preview->height, height));
gtk_range_set_range (GTK_RANGE (preview->vscr),
0, height - preview->height - 1);
}
else
{
gtk_widget_hide (preview->vscr);
}
gimp_preview_draw (preview);
gimp_preview_invalidate (preview);
}
@ -335,7 +370,7 @@ gimp_preview_h_scroll (GtkAdjustment *hadj,
{
preview->xoff = hadj->value;
if (!preview->in_drag)
if (! preview->in_drag)
gimp_preview_draw (preview);
}
@ -345,7 +380,7 @@ gimp_preview_v_scroll (GtkAdjustment *vadj,
{
preview->yoff = vadj->value;
if (!preview->in_drag)
if (! preview->in_drag)
gimp_preview_draw (preview);
}
@ -394,6 +429,7 @@ gimp_preview_area_event (GtkWidget *area,
0, preview->xmax - preview->xmin - preview->width);
yoff = CLAMP (preview->drag_yoff - dy,
0, preview->ymax - preview->ymin - preview->height);
gtk_adjustment_set_value (GTK_ADJUSTMENT (preview->hadj), xoff);
gtk_adjustment_set_value (GTK_ADJUSTMENT (preview->vadj), yoff);