dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bill Skaggs <weskaggs@primate.ucdavis.edu> 

* app/display/gimpdisplayshell.[ch]
	* app/display/gimpdisplay.c: factor out duplicated
	code for configuring display shell.

svn path=/branches/weskaggs/; revision=25031
This commit is contained in:
William Skaggs 2008-03-04 16:40:39 +00:00
parent a4c0af770f
commit 785e1534e3
4 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-04 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/display/gimpdisplayshell.[ch]
* app/display/gimpdisplay.c: factor out duplicated
code for configuring display shell.
2008-03-03 Bill Skaggs <weskaggs@primate.ucdavis.edu> 2008-03-03 Bill Skaggs <weskaggs@primate.ucdavis.edu>
Merge 24892:25025 from trunk. Merge 24892:25025 from trunk.

2
app/display/gimpdisplay.c
View File

@ -659,7 +659,7 @@ gimp_display_reconnect (GimpDisplay *display,
gimp_display_connect (display, image); gimp_display_connect (display, image);
if (image->gimp->scratch_image == old_image) if (image->gimp->scratch_image == old_image)
gimp_display_shell_reconfigure_from_scratch (GIMP_DISPLAY_SHELL (display->shell)); gimp_display_shell_configure (GIMP_DISPLAY_SHELL (display->shell));
g_object_unref (old_image); g_object_unref (old_image);

22
app/display/gimpdisplayshell.c
View File

@ -1093,27 +1093,9 @@ gimp_display_shell_new (GimpDisplay *display,
/* show everything *******************************************************/ /* show everything *******************************************************/
if (shell->options->show_rulers) gimp_display_shell_configure (shell);
{
gtk_widget_show (shell->origin);
gtk_widget_show (shell->hrule);
gtk_widget_show (shell->vrule);
}
gtk_widget_show (GTK_WIDGET (shell->canvas)); gtk_widget_show (GTK_WIDGET (shell->canvas));
if (shell->options->show_scrollbars)
{
gtk_widget_show (shell->vsb);
gtk_widget_show (shell->hsb);
gtk_widget_show (shell->zoom_button);
gtk_widget_show (shell->quick_mask_button);
gtk_widget_show (shell->nav_ebox);
}
if (shell->options->show_statusbar)
gtk_widget_show (shell->statusbar);
gtk_widget_show (main_vbox); gtk_widget_show (main_vbox);
filter = gimp_display_shell_filter_new (shell, filter = gimp_display_shell_filter_new (shell,
@ -1135,7 +1117,7 @@ gimp_display_shell_new (GimpDisplay *display,
} }
void void
gimp_display_shell_reconfigure_from_scratch (GimpDisplayShell *shell) gimp_display_shell_configure (GimpDisplayShell *shell)
{ {
Gimp *gimp; Gimp *gimp;
GimpDisplayConfig *display_config; GimpDisplayConfig *display_config;

2
app/display/gimpdisplayshell.h
View File

@ -258,7 +258,7 @@ void gimp_display_shell_set_highlight (GimpDisplayShell *shell,
void gimp_display_shell_set_mask (GimpDisplayShell *shell, void gimp_display_shell_set_mask (GimpDisplayShell *shell,
GimpDrawable *mask, GimpDrawable *mask,
GimpChannelType color); GimpChannelType color);
void gimp_display_shell_reconfigure_from_scratch (GimpDisplayShell *shell); void gimp_display_shell_configure (GimpDisplayShell *shell);
#endif /* __GIMP_DISPLAY_SHELL_H__ */ #endif /* __GIMP_DISPLAY_SHELL_H__ */