gimp r26083 - in trunk: . app/tools

[neo svn gnome org]

Author: neo
Date: Mon Jul  7 17:58:16 2008
New Revision: 26083
URL: http://svn.gnome.org/viewvc/gimp?rev=26083&view=rev

Log:
2008-07-07  Sven Neumann  <sven gimp org>

	* app/tools/gimppaintoptions-gui.c (tool_has_size_dynamics): 
check
	for tools derived from GimpPaintBrushTool just as we do in
	tool_has_opacity_dynamics().
	(tool_has_hardness_dynamics): enable hardness dynamics for the
	eraser tool (bug #541691).



Modified:
   trunk/ChangeLog
   trunk/app/tools/gimppaintoptions-gui.c

Modified: trunk/app/tools/gimppaintoptions-gui.c
==============================================================================
--- trunk/app/tools/gimppaintoptions-gui.c	(original)
+++ trunk/app/tools/gimppaintoptions-gui.c	Mon Jul  7 17:58:16 2008
@@ -299,10 +299,10 @@
 tool_has_opacity_dynamics (GType tool_type)
 {
   return (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
-          tool_type == GIMP_TYPE_CLONE_TOOL                  ||
-          tool_type == GIMP_TYPE_HEAL_TOOL                   ||
-          tool_type == GIMP_TYPE_PERSPECTIVE_CLONE_TOOL      ||
-          tool_type == GIMP_TYPE_DODGE_BURN_TOOL             ||
+          tool_type == GIMP_TYPE_CLONE_TOOL             ||
+          tool_type == GIMP_TYPE_HEAL_TOOL              ||
+          tool_type == GIMP_TYPE_PERSPECTIVE_CLONE_TOOL ||
+          tool_type == GIMP_TYPE_DODGE_BURN_TOOL        ||
           tool_type == GIMP_TYPE_ERASER_TOOL);
 }
 
@@ -314,6 +314,7 @@
           tool_type == GIMP_TYPE_HEAL_TOOL              ||
           tool_type == GIMP_TYPE_PERSPECTIVE_CLONE_TOOL ||
           tool_type == GIMP_TYPE_CONVOLVE_TOOL          ||
+          tool_type == GIMP_TYPE_ERASER_TOOL            ||
           tool_type == GIMP_TYPE_DODGE_BURN_TOOL        ||
           tool_type == GIMP_TYPE_PAINTBRUSH_TOOL        ||
           tool_type == GIMP_TYPE_SMUDGE_TOOL);
@@ -322,23 +323,21 @@
 static gboolean
 tool_has_rate_dynamics (GType tool_type)
 {
-  return (tool_type == GIMP_TYPE_AIRBRUSH_TOOL ||
-          tool_type == GIMP_TYPE_CONVOLVE_TOOL ||
+  return (tool_type == GIMP_TYPE_AIRBRUSH_TOOL          ||
+          tool_type == GIMP_TYPE_CONVOLVE_TOOL          ||
           tool_type == GIMP_TYPE_SMUDGE_TOOL);
 }
 
 static gboolean
 tool_has_size_dynamics (GType tool_type)
 {
-  return (tool_type == GIMP_TYPE_CLONE_TOOL             ||
+  return (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
+          tool_type == GIMP_TYPE_CLONE_TOOL             ||
           tool_type == GIMP_TYPE_HEAL_TOOL              ||
           tool_type == GIMP_TYPE_PERSPECTIVE_CLONE_TOOL ||
           tool_type == GIMP_TYPE_CONVOLVE_TOOL          ||
           tool_type == GIMP_TYPE_DODGE_BURN_TOOL        ||
-          tool_type == GIMP_TYPE_ERASER_TOOL            ||
-          tool_type == GIMP_TYPE_PAINTBRUSH_TOOL        ||
-          tool_type == GIMP_TYPE_AIRBRUSH_TOOL          ||
-          tool_type == GIMP_TYPE_PENCIL_TOOL);
+          tool_type == GIMP_TYPE_ERASER_TOOL);
 }
 
 static gboolean