gimp r25399 - in trunk: . app/tools

[neo svn gnome org]

Author: neo
Date: Mon Apr  7 19:57:32 2008
New Revision: 25399
URL: http://svn.gnome.org/viewvc/gimp?rev=25399&view=rev

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

	* app/tools/gimprectangletool.[ch]:
	* app/tools/gimptexttool.c removed out 'force-narrow' mode as it
	is hard to use and just looks broken.



Modified:
   trunk/ChangeLog
   trunk/app/tools/gimprectangletool.c
   trunk/app/tools/gimprectangletool.h
   trunk/app/tools/gimptexttool.c

Modified: trunk/app/tools/gimprectangletool.c
==============================================================================
--- trunk/app/tools/gimprectangletool.c	(original)
+++ trunk/app/tools/gimprectangletool.c	Mon Apr  7 19:57:32 2008
@@ -180,15 +180,10 @@
    */
   gboolean                narrow_mode;
 
-  /* Whether to force the rectangle to always be in narrow mode.  This
-   * parameter is especially useful for the text tool, where interior
-   * handles would interfere with the text.
-   */
-  gboolean                force_narrow;
-
-  /* For what scale the handle sizes is calculated. We must cache this so that
-   * we can differentiate between when the tool is resumed because of zoom level
-   * just has changed or because the highlight has just been updated.
+  /* For what scale the handle sizes is calculated. We must cache this
+   * so that we can differentiate between when the tool is resumed
+   * because of zoom level just has changed or because the highlight
+   * has just been updated.
    */
   gdouble                 scale_x_used_for_handle_size_calculations;
   gdouble                 scale_y_used_for_handle_size_calculations;
@@ -890,11 +885,8 @@
 
       gimp_rectangle_tool_update_handle_sizes (rect_tool);
 
-      if (! private->force_narrow)
-        {
-          /* Created rectangles should not be started in narrow-mode*/
-          private->narrow_mode = FALSE;
-        }
+      /* Created rectangles should not be started in narrow-mode*/
+      private->narrow_mode = FALSE;
 
       /* If the rectangle is being modified we want the center on
        * fixed_center to be at the center of the currently existing
@@ -1848,12 +1840,9 @@
                               &visible_rectangle_width,
                               &visible_rectangle_height);
 
-    if (! private->force_narrow)
-      {
-        /* Determine if we are in narrow-mode or not. */
-        private->narrow_mode = (visible_rectangle_width  < NARROW_MODE_THRESHOLD ||
-                                visible_rectangle_height < NARROW_MODE_THRESHOLD);
-      }
+    /* Determine if we are in narrow-mode or not. */
+    private->narrow_mode = (visible_rectangle_width  < NARROW_MODE_THRESHOLD ||
+                            visible_rectangle_height < NARROW_MODE_THRESHOLD);
   }
 
   if (private->narrow_mode)
@@ -4155,29 +4144,3 @@
         break;
     }
 }
-
-/**
- * gimp_rectangle_tool_set_always_narrow:
- *
- * Makes sure that the rectangle is always shown with handles
- * outside.  Mainly intended for use in the text tool, where
- * handles inside interfere with the text.  If this function
- * is called while a rectangle is being shown, the draw tool
- * must first be paused.
- */
-void
-gimp_rectangle_tool_set_force_narrow (GimpRectangleTool *rect_tool,
-                                      gboolean           force_narrow)
-{
-  GimpRectangleToolPrivate *private;
-
-  private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
-
-  private->force_narrow = force_narrow ? TRUE : FALSE;
-
-  if (force_narrow  && ! private->narrow_mode)
-    {
-      private->narrow_mode = TRUE;
-    }
-}
-

Modified: trunk/app/tools/gimprectangletool.h
==============================================================================
--- trunk/app/tools/gimprectangletool.h	(original)
+++ trunk/app/tools/gimprectangletool.h	Mon Apr  7 19:57:32 2008
@@ -142,8 +142,6 @@
 gboolean    gimp_rectangle_tool_point_in_rectangle  (GimpRectangleTool       *rect_tool,
                                                      gdouble                  x,
                                                      gdouble                  y);
-void        gimp_rectangle_tool_set_force_narrow    (GimpRectangleTool       *rect_tool,
-                                                     gboolean                 force_narrow);
 /*  convenience functions  */
 
 void        gimp_rectangle_tool_install_properties  (GObjectClass *klass);

Modified: trunk/app/tools/gimptexttool.c
==============================================================================
--- trunk/app/tools/gimptexttool.c	(original)
+++ trunk/app/tools/gimptexttool.c	Mon Apr  7 19:57:32 2008
@@ -230,8 +230,6 @@
   object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
 
   gimp_rectangle_tool_constructor (object);
-  gimp_rectangle_tool_set_force_narrow (GIMP_RECTANGLE_TOOL (object),
-                                        TRUE);
 
   text_tool = GIMP_TEXT_TOOL (object);
   options   = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);