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

reverted change that was made for bug #490785.

Browse Source 
2007-10-30  Sven Neumann  <sven@gimp.org>

	* app/display/gimpdisplayshell-handlers.c: reverted change that
	was made for bug #490785.

svn path=/trunk/; revision=23989
This commit is contained in:
Sven Neumann
2007-10-30 12:02:19 +00:00
committed by Sven Neumann
parent 81d38532a2
commit c7b4263a85
2 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-10-30 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-handlers.c: reverted change that
was made for bug #490785.
2007-10-30 Sven Neumann <sven@gimp.org> 2007-10-30 Sven Neumann <sven@gimp.org>
Fix drawing of straight lines using the Shift key and a tablet Fix drawing of straight lines using the Shift key and a tablet

75
app/display/gimpdisplayshell-handlers.c
View File

@ -108,6 +108,9 @@ static void gimp_display_shell_nav_size_notify_handler (GObject *c
static void gimp_display_shell_monitor_res_notify_handler (GObject *config, static void gimp_display_shell_monitor_res_notify_handler (GObject *config,
GParamSpec *param_spec, GParamSpec *param_spec,
GimpDisplayShell *shell); GimpDisplayShell *shell);
static void gimp_display_shell_padding_notify_handler (GObject *config,
GParamSpec *param_spec,
GimpDisplayShell *shell);
static void gimp_display_shell_ants_speed_notify_handler (GObject *config, static void gimp_display_shell_ants_speed_notify_handler (GObject *config,
GParamSpec *param_spec, GParamSpec *param_spec,
GimpDisplayShell *shell); GimpDisplayShell *shell);
@ -228,6 +231,23 @@ gimp_display_shell_connect (GimpDisplayShell *shell)
G_CALLBACK (gimp_display_shell_monitor_res_notify_handler), G_CALLBACK (gimp_display_shell_monitor_res_notify_handler),
shell); shell);
g_signal_connect (display_config->default_view,
"notify::padding-mode",
G_CALLBACK (gimp_display_shell_padding_notify_handler),
shell);
g_signal_connect (display_config->default_view,
"notify::padding-color",
G_CALLBACK (gimp_display_shell_padding_notify_handler),
shell);
g_signal_connect (display_config->default_fullscreen_view,
"notify::padding-mode",
G_CALLBACK (gimp_display_shell_padding_notify_handler),
shell);
g_signal_connect (display_config->default_fullscreen_view,
"notify::padding-color",
G_CALLBACK (gimp_display_shell_padding_notify_handler),
shell);
g_signal_connect (image->gimp->config, g_signal_connect (image->gimp->config,
"notify::marching-ants-speed", "notify::marching-ants-speed",
G_CALLBACK (gimp_display_shell_ants_speed_notify_handler), G_CALLBACK (gimp_display_shell_ants_speed_notify_handler),
@ -280,6 +300,12 @@ gimp_display_shell_disconnect (GimpDisplayShell *shell)
g_signal_handlers_disconnect_by_func (image->gimp->config, g_signal_handlers_disconnect_by_func (image->gimp->config,
gimp_display_shell_ants_speed_notify_handler, gimp_display_shell_ants_speed_notify_handler,
shell); shell);
g_signal_handlers_disconnect_by_func (display_config->default_fullscreen_view,
gimp_display_shell_padding_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (display_config->default_view,
gimp_display_shell_padding_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (image->gimp->config, g_signal_handlers_disconnect_by_func (image->gimp->config,
gimp_display_shell_monitor_res_notify_handler, gimp_display_shell_monitor_res_notify_handler,
shell); shell);
@ -599,6 +625,55 @@ gimp_display_shell_monitor_res_notify_handler (GObject *config,
} }
} }
static void
gimp_display_shell_padding_notify_handler (GObject *config,
GParamSpec *param_spec,
GimpDisplayShell *shell)
{
GimpDisplayConfig *display_config;
gboolean fullscreen;
GimpCanvasPaddingMode padding_mode;
GimpRGB padding_color;
display_config = GIMP_DISPLAY_CONFIG (shell->display->image->gimp->config);
fullscreen = gimp_display_shell_get_fullscreen (shell);
/* if the user did not set the padding mode for this display explicitely */
if (! shell->fullscreen_options->padding_mode_set)
{
padding_mode = display_config->default_fullscreen_view->padding_mode;
padding_color = display_config->default_fullscreen_view->padding_color;
if (fullscreen)
{
gimp_display_shell_set_padding (shell, padding_mode, &padding_color);
}
else
{
shell->fullscreen_options->padding_mode = padding_mode;
shell->fullscreen_options->padding_color = padding_color;
}
}
/* if the user did not set the padding mode for this display explicitely */
if (! shell->options->padding_mode_set)
{
padding_mode = display_config->default_view->padding_mode;
padding_color = display_config->default_view->padding_color;
if (fullscreen)
{
shell->options->padding_mode = padding_mode;
shell->options->padding_color = padding_color;
}
else
{
gimp_display_shell_set_padding (shell, padding_mode, &padding_color);
}
}
}
static void static void
gimp_display_shell_ants_speed_notify_handler (GObject *config, gimp_display_shell_ants_speed_notify_handler (GObject *config,
GParamSpec *param_spec, GParamSpec *param_spec,