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

Keep around an "active_display" member in GimpImageWindow

Browse Source 
And add gimp_image_window_set_active_display(). Call the new function
when creating a shell. Will all be done by the means of a GimpContext
later, but is a step to get rid of FIXME hacks.
This commit is contained in:
Michael Natterer
2009-09-23 18:22:50 +02:00
parent 03fcc99bbf
commit a82169ee13
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/display/gimpdisplayshell.c
View File

@ -807,6 +807,10 @@ gimp_display_shell_new (GimpDisplay *display,
shell->popup_manager = popup_manager;
shell->display_factory = display_factory;
/* FIXME image window */
gimp_image_window_set_active_display (GIMP_IMAGE_WINDOW (shell),
display);
if (display->image)
{
options = shell->options;

19
app/display/gimpimagewindow.c
View File

@ -348,12 +348,29 @@ gimp_image_window_style_set (GtkWidget *widget,
/* public functions */
void
gimp_image_window_set_active_display (GimpImageWindow *window,
GimpDisplay *display)
{
g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
g_return_if_fail (GIMP_IS_DISPLAY (display));
if (display == window->active_display)
return;
if (window->active_display)
{
}
window->active_display = display;
}
GimpDisplay *
gimp_image_window_get_active_display (GimpImageWindow *window)
{
g_return_val_if_fail (GIMP_IS_IMAGE_WINDOW (window), NULL);
return GIMP_DISPLAY_SHELL (window)->display;
return window->active_display;
}
void

4
app/display/gimpimagewindow.h
View File

@ -36,6 +36,8 @@ struct _GimpImageWindow
{
GimpWindow parent_instance;
GimpDisplay *active_display;
GimpUIManager *menubar_manager;
GtkWidget *main_vbox;
@ -53,6 +55,8 @@ struct _GimpImageWindowClass
GType gimp_image_window_get_type (void) G_GNUC_CONST;
void gimp_image_window_set_active_display (GimpImageWindow *window,
GimpDisplay *display);
GimpDisplay * gimp_image_window_get_active_display (GimpImageWindow *window);
void gimp_image_window_set_fullscreen (GimpImageWindow *window,