[gimp/soc-2009-dynamics] Actually use the paint option's "use-fade" property again



commit 135090c57ff9d42505a2d4d5484e19d850af48c2
Author: Michael Natterer <mitch gimp org>
Date:   Tue Oct 13 19:32:37 2009 +0200

    Actually use the paint option's "use-fade" property again
    
    ...and remove gimp_dynamics_input_fade_enabled(). Looks cleaner
    now so must be right ;)

 app/core/gimpdynamics.c      |   13 -------------
 app/core/gimpdynamics.h      |    8 +++-----
 app/paint/gimppaintoptions.c |    4 +++-
 3 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/app/core/gimpdynamics.c b/app/core/gimpdynamics.c
index 4b1ad8f..64a7765 100644
--- a/app/core/gimpdynamics.c
+++ b/app/core/gimpdynamics.c
@@ -357,19 +357,6 @@ gimp_dynamics_get_standard (void)
   return standard_dynamics;
 }
 
-gboolean
-gimp_dynamics_input_fade_enabled (GimpDynamics *dynamics)
-{
-  return (dynamics->opacity_output->use_fade      ||
-          dynamics->hardness_output->use_fade     ||
-          dynamics->rate_output->use_fade         ||
-          dynamics->size_output->use_fade         ||
-          dynamics->aspect_ratio_output->use_fade ||
-          dynamics->color_output->use_fade        ||
-          dynamics->jitter_output->use_fade       ||
-          dynamics->angle_output->use_fade);
-}
-
 
 /*  private functions  */
 
diff --git a/app/core/gimpdynamics.h b/app/core/gimpdynamics.h
index 63ceb6d..c865d52 100644
--- a/app/core/gimpdynamics.h
+++ b/app/core/gimpdynamics.h
@@ -52,12 +52,10 @@ struct _GimpDynamicsClass
 };
 
 
-GType      gimp_dynamics_get_type           (void) G_GNUC_CONST;
+GType      gimp_dynamics_get_type     (void) G_GNUC_CONST;
 
-GimpData * gimp_dynamics_new                (const gchar  *name);
-GimpData * gimp_dynamics_get_standard       (void);
-
-gboolean   gimp_dynamics_input_fade_enabled (GimpDynamics *dynamics);
+GimpData * gimp_dynamics_new          (const gchar  *name);
+GimpData * gimp_dynamics_get_standard (void);
 
 
 #endif  /*  __GIMP_DYNAMICS_H__  */
diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c
index 38187d0..ca00406 100644
--- a/app/paint/gimppaintoptions.c
+++ b/app/paint/gimppaintoptions.c
@@ -528,7 +528,7 @@ gimp_paint_options_get_fade (GimpPaintOptions *paint_options,
 
   fade_options = paint_options->fade_options;
 
-  if (gimp_dynamics_input_fade_enabled (gimp_context_get_dynamics (GIMP_CONTEXT (paint_options))))
+  if (fade_options->use_fade)
     {
       gdouble fade_out = 0.0;
       gdouble unit_factor;
@@ -538,11 +538,13 @@ gimp_paint_options_get_fade (GimpPaintOptions *paint_options,
         case GIMP_UNIT_PIXEL:
           fade_out = fade_options->fade_length;
           break;
+
         case GIMP_UNIT_PERCENT:
           fade_out = (MAX (gimp_image_get_width  (image),
                            gimp_image_get_height (image)) *
                       fade_options->fade_length / 100);
           break;
+
         default:
           {
             gdouble xres;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]