callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

select the standard tool.

Browse Source 
2004-06-28  Sven Neumann  <sven@gimp.org>

	* app/gui/gui.c (gui_initialize_after_callback): select the
	standard tool.

	* app/tools/tool_manager.c: cosmetics.
This commit is contained in:
Sven Neumann
2004-06-28 13:18:00 +00:00
committed by Sven Neumann
parent 3ec1647d36
commit b9c23cac5d
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-06-28 Sven Neumann <sven@gimp.org>
* app/gui/gui.c (gui_initialize_after_callback): select the
standard tool.
* app/tools/tool_manager.c: cosmetics.
2004-06-28 Michael Natterer <mitch@gimp.org>
* app/tools/gimplevelstool.c: reverted fix for bug #141930. These

4
app/gui/gui.c
View File

@ -35,6 +35,7 @@
#include "core/gimpcontext.h"
#include "core/gimpenvirontable.h"
#include "core/gimpimage.h"
#include "core/gimptoolinfo.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
@ -272,6 +273,9 @@ gui_initialize_after_callback (Gimp *gimp,
}
gimp_tools_init (gimp);
gimp_context_set_tool (gimp_get_user_context (gimp),
gimp_tool_info_get_standard (gimp));
}
static void

14
app/tools/tool_manager.c
View File

@ -150,9 +150,7 @@ tool_manager_select_tool (Gimp *gimp,
if (tool_manager->active_tool)
{
GimpDisplay *gdisp;
gdisp = tool_manager->active_tool->gdisp;
GimpDisplay *gdisp = tool_manager->active_tool->gdisp;
if (! gdisp && GIMP_IS_DRAW_TOOL (tool_manager->active_tool))
gdisp = GIMP_DRAW_TOOL (tool_manager->active_tool)->gdisp;
@ -454,14 +452,12 @@ tool_manager_tool_changed (GimpContext *user_context,
GimpToolInfo *tool_info,
gpointer data)
{
GimpToolManager *tool_manager;
GimpTool *new_tool = NULL;
GimpToolManager *tool_manager = data;
GimpTool *new_tool = NULL;
if (! tool_info)
return;
tool_manager = (GimpToolManager *) data;
/* FIXME: gimp_busy HACK */
if (user_context->gimp->busy)
{
@ -507,9 +503,7 @@ tool_manager_tool_changed (GimpContext *user_context,
tool_manager->active_tool->tool_info &&
tool_manager->active_tool->tool_info->context_props)
{
GimpToolInfo *old_tool_info;
old_tool_info = tool_manager->active_tool->tool_info;
GimpToolInfo *old_tool_info = tool_manager->active_tool->tool_info;
gimp_context_set_parent (GIMP_CONTEXT (old_tool_info->tool_options), NULL);
}