[gimp/soc-2009-dynamics] Several small fixes.



commit 7f8b34767766d7ce57abfe397805a38afb336838
Author: Alexia Death <alexiadeath gmail com>
Date:   Sat Oct 10 21:28:54 2009 +0300

    Several small fixes.

 app/core/gimpdynamics.c          |   18 +++++++++---------
 app/core/gimpdynamics.h          |    2 +-
 app/paint/gimppaintoptions.c     |    4 ++--
 app/widgets/gimpdynamicseditor.c |    1 -
 4 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/app/core/gimpdynamics.c b/app/core/gimpdynamics.c
index 36e66a4..5482e7a 100644
--- a/app/core/gimpdynamics.c
+++ b/app/core/gimpdynamics.c
@@ -714,7 +714,7 @@ gimp_dynamics_get_property (GObject    *object,
                                  GValue     *value,
                                  GParamSpec *pspec)
 {
-  GimpDynamics *options           = GIMP_DYNAMICS (object);
+  GimpDynamics       *options               = GIMP_DYNAMICS (object);
   GimpDynamicsOutput *opacity_dynamics      = options->opacity_dynamics;
   GimpDynamicsOutput *hardness_dynamics     = options->hardness_dynamics;
   GimpDynamicsOutput *rate_dynamics         = options->rate_dynamics;
@@ -1225,22 +1225,22 @@ gimp_dynamics_get_scale_output_val (GimpDynamicsOutput *output, GimpCoords coord
 }
 
 gboolean
-gimp_dynamics_output_get_enabled(GimpDynamicsOutput *output)
+gimp_dynamics_output_is_enabled(GimpDynamicsOutput *output)
 {
   return (output->pressure || output->velocity || output->direction ||
-         output->tilt      || output->random   || output->fade);
+          output->tilt     || output->random   || output->fade);
 }
 
 gboolean
 gimp_dynamics_input_fade_enabled(GimpDynamics *dynamics)
 {
-  return (dynamics->opacity_dynamics->fade ||
-          dynamics->hardness_dynamics->fade ||
-          dynamics->rate_dynamics->fade ||
-          dynamics->size_dynamics->fade ||
+  return (dynamics->opacity_dynamics->fade      ||
+          dynamics->hardness_dynamics->fade     ||
+          dynamics->rate_dynamics->fade         ||
+          dynamics->size_dynamics->fade         ||
           dynamics->aspect_ratio_dynamics->fade ||
-          dynamics->color_dynamics->fade ||
-          dynamics->jitter_dynamics->fade ||
+          dynamics->color_dynamics->fade        ||
+          dynamics->jitter_dynamics->fade       ||
           dynamics->angle_dynamics->fade);
 
 }
\ No newline at end of file
diff --git a/app/core/gimpdynamics.h b/app/core/gimpdynamics.h
index f5cdfa9..cc4b9af 100644
--- a/app/core/gimpdynamics.h
+++ b/app/core/gimpdynamics.h
@@ -97,7 +97,7 @@ gdouble            gimp_dynamics_get_aspect_output_val (GimpDynamicsOutput *outp
 
 gdouble            gimp_dynamics_get_scale_output_val (GimpDynamicsOutput *output, GimpCoords coords, gdouble fade_point);
 
-gboolean           gimp_dynamics_output_get_enabled (GimpDynamicsOutput *output);
+gboolean           gimp_dynamics_output_is_enabled (GimpDynamicsOutput *output);
 
 gboolean           gimp_dynamics_input_fade_enabled (GimpDynamics *dynamics);
 
diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c
index d47949b..d77db67 100644
--- a/app/paint/gimppaintoptions.c
+++ b/app/paint/gimppaintoptions.c
@@ -599,7 +599,7 @@ gimp_paint_options_get_gradient_color (GimpPaintOptions *paint_options,
 
   dynamics = gimp_context_get_dynamics (GIMP_CONTEXT (paint_options));
 
-  if (gimp_dynamics_output_get_enabled(dynamics->color_dynamics))
+  if (gimp_dynamics_output_is_enabled(dynamics->color_dynamics))
     {
       gimp_gradient_get_color_at (gradient, GIMP_CONTEXT (paint_options),
                                   NULL, grad_point,
@@ -676,7 +676,7 @@ gimp_paint_options_get_brush_mode (GimpPaintOptions *paint_options)
 
   dynamics = gimp_context_get_dynamics (GIMP_CONTEXT (paint_options));
 
-  if (gimp_dynamics_output_get_enabled(dynamics->hardness_dynamics))
+  if (gimp_dynamics_output_is_enabled(dynamics->hardness_dynamics))
     return GIMP_BRUSH_PRESSURE;
 
   return GIMP_BRUSH_SOFT;
diff --git a/app/widgets/gimpdynamicseditor.c b/app/widgets/gimpdynamicseditor.c
index 8812f7d..bbe116e 100644
--- a/app/widgets/gimpdynamicseditor.c
+++ b/app/widgets/gimpdynamicseditor.c
@@ -230,7 +230,6 @@ gimp_dynamics_editor_init (GimpDynamicsEditor *editor)
 {
   GimpDataEditor   *data_editor = GIMP_DATA_EDITOR (editor);
   editor->dynamics_model = g_object_new(GIMP_TYPE_DYNAMICS,
-                                        "name", "Default",
                                         NULL);
 
   GimpDynamics     *dynamics    = editor->dynamics_model;



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