mirror of https://github.com/GNOME/gimp.git
Reverted commits for bug #479426, it's NOTABUG.
2007-09-23 Martin Nordholts <martinn@svn.gnome.org> * app/tools/gimprectangleselecttool.c: Reverted commits for bug #479426, it's NOTABUG. svn path=/trunk/; revision=23627
This commit is contained in:
parent
43523e777b
commit
0ad8adf1b5
|
@ -1,3 +1,8 @@
|
||||||
|
2007-09-23 Martin Nordholts <martinn@svn.gnome.org>
|
||||||
|
|
||||||
|
* app/tools/gimprectangleselecttool.c: Reverted commits for
|
||||||
|
bug #479426, it's NOTABUG.
|
||||||
|
|
||||||
2007-09-23 Martin Nordholts <martinn@svn.gnome.org>
|
2007-09-23 Martin Nordholts <martinn@svn.gnome.org>
|
||||||
|
|
||||||
* app/tools/gimprectangleselecttool.c
|
* app/tools/gimprectangleselecttool.c
|
||||||
|
|
|
@ -112,7 +112,6 @@ static void gimp_rect_select_tool_real_select (GimpRectSelectTool *r
|
||||||
gint y,
|
gint y,
|
||||||
gint w,
|
gint w,
|
||||||
gint h);
|
gint h);
|
||||||
static gboolean gimp_rect_select_tool_should_draw (GimpRectSelectTool *rect_select_tool);
|
|
||||||
static void gimp_rect_select_tool_update_option_defaults
|
static void gimp_rect_select_tool_update_option_defaults
|
||||||
(GimpRectSelectTool *rect_select_tool,
|
(GimpRectSelectTool *rect_select_tool,
|
||||||
gboolean ignore_pending);
|
gboolean ignore_pending);
|
||||||
|
@ -245,9 +244,6 @@ gimp_rect_select_tool_draw (GimpDrawTool *draw_tool)
|
||||||
{
|
{
|
||||||
GimpRectSelectTool *rect_sel = GIMP_RECT_SELECT_TOOL (draw_tool);
|
GimpRectSelectTool *rect_sel = GIMP_RECT_SELECT_TOOL (draw_tool);
|
||||||
|
|
||||||
if (! gimp_rect_select_tool_should_draw (rect_sel))
|
|
||||||
return;
|
|
||||||
|
|
||||||
gimp_rectangle_tool_draw (draw_tool);
|
gimp_rectangle_tool_draw (draw_tool);
|
||||||
|
|
||||||
if (rect_sel->round_corners)
|
if (rect_sel->round_corners)
|
||||||
|
@ -587,27 +583,6 @@ gimp_rect_select_tool_real_select (GimpRectSelectTool *rect_select,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
|
||||||
gimp_rect_select_tool_should_draw (GimpRectSelectTool *rect_select_tool)
|
|
||||||
{
|
|
||||||
GimpTool *tool = GIMP_TOOL (rect_select_tool);
|
|
||||||
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (tool->display->shell);
|
|
||||||
|
|
||||||
/* If the tool is active i.e. if we are creating or resizing the
|
|
||||||
* rectangle, always draw it. Otherwise only draw it if selections
|
|
||||||
* are drawn.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (gimp_tool_control_is_active (tool->control))
|
|
||||||
{
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return gimp_display_shell_get_show_selection (shell);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gimp_rect_select_tool_update_option_defaults:
|
* gimp_rect_select_tool_update_option_defaults:
|
||||||
* @crop_tool:
|
* @crop_tool:
|
||||||
|
|
Loading…
Reference in New Issue