graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-18 13:53:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed #define SHADOW 1, it's not a constant value. Use the

Browse source 
2006-05-31  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpcolorscale.c: removed #define SHADOW 1, it's
	not a constant value. Use the GtkRange::trough-border style
	property instead.
This commit is contained in:
Michael Natterer 2006-05-31 10:16:08 +00:00 committed by Michael Natterer
parent 088950c283
commit 2606a93524
2 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-05-31 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpcolorscale.c: removed #define SHADOW 1, it's
not a constant value. Use the GtkRange::trough-border style
property instead.
2006-05-30 Raphaël Quinet <raphael@gimp.org>
* plug-ins/metadata/xmp-parse.c: protect against broken XMP blocks

32
libgimpwidgets/gimpcolorscale.c
View file

@ -34,8 +34,6 @@
#include "gimpcolorscale.h"
#define SHADOW 1
static void gimp_color_scale_destroy (GtkObject *object);
static void gimp_color_scale_size_allocate (GtkWidget *widget,
@ -111,9 +109,14 @@ gimp_color_scale_size_allocate (GtkWidget *widget,
GimpColorScale *scale = GIMP_COLOR_SCALE (widget);
GtkRange *range = GTK_RANGE (widget);
gint focus = 0;
gint trough_border;
gint scale_width;
gint scale_height;
gtk_widget_style_get (widget,
"trough-border", &trough_border,
NULL);
if (GTK_WIDGET_CAN_FOCUS (widget))
{
gint focus_padding = 0;
@ -131,8 +134,8 @@ gimp_color_scale_size_allocate (GtkWidget *widget,
if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
scale_width = range->range_rect.width - 2 * (focus + SHADOW);
scale_height = range->range_rect.height - 2 * (focus + SHADOW);
scale_width = range->range_rect.width - 2 * (focus + trough_border);
scale_height = range->range_rect.height - 2 * (focus + trough_border);
switch (range->orientation)
{
@ -184,6 +187,7 @@ gimp_color_scale_expose (GtkWidget *widget,
GdkRectangle expose_area; /* Relative to widget->allocation */
GdkRectangle area;
gint focus = 0;
gint trough_border;
gint slider_size;
gint x, y;
gint w, h;
@ -205,6 +209,10 @@ gimp_color_scale_expose (GtkWidget *widget,
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
}
gtk_widget_style_get (widget,
"trough-border", &trough_border,
NULL);
if (GTK_WIDGET_CAN_FOCUS (widget))
{
gint focus_padding = 0;
@ -257,8 +265,8 @@ gimp_color_scale_expose (GtkWidget *widget,
case GTK_ORIENTATION_HORIZONTAL:
gdk_draw_rgb_image_dithalign (widget->window,
widget->style->black_gc,
x + SHADOW + slider_size,
y + SHADOW + 1,
x + trough_border + slider_size,
y + trough_border + 1,
scale->width,
scale->height,
GDK_RGB_DITHER_MAX,
@ -270,8 +278,8 @@ gimp_color_scale_expose (GtkWidget *widget,
case GTK_ORIENTATION_VERTICAL:
gdk_draw_rgb_image_dithalign (widget->window,
widget->style->black_gc,
x + SHADOW + 1,
y + SHADOW + slider_size,
x + trough_border + 1,
y + trough_border + slider_size,
scale->width,
scale->height,
GDK_RGB_DITHER_MAX,
@ -296,15 +304,15 @@ gimp_color_scale_expose (GtkWidget *widget,
{
case GTK_ORIENTATION_HORIZONTAL:
area.x = widget->allocation.x + range->slider_start;
area.y = y + SHADOW;
area.y = y + trough_border;
area.width = 2 * slider_size + 1;
area.height = h - 2 * SHADOW;
area.height = h - 2 * trough_border;
break;
case GTK_ORIENTATION_VERTICAL:
area.x = x + SHADOW;
area.x = x + trough_border;
area.y = widget->allocation.y + range->slider_start;
area.width = w - 2 * SHADOW;
area.width = w - 2 * trough_border;
area.height = 2 * slider_size + 1;
break;
}