dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gimp/app/display/gimpdisplayshell-items.c

136 lines
4.2 KiB
C
Raw Normal View History

app: start an infrastructure where the shell keeps around its canvas items - Invalidate the proper area when an item gets added or removed. - Draw the kept canvas items instead of calling a draw tool function. - The draw tool now sets its item on the shell.
2010-09-30 04:12:01 +08:00
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpdisplayshell-items.c
* Copyright (C) 2010 Michael Natterer <mitch@gimp.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "display-types.h"
app: add a software cursor canvas item and use it to draw the sw cursor. Almost every aspect of the old code was ugly and hard to read, this is so much nicer...
2010-10-03 03:56:36 +08:00
#include "gimpcanvascursor.h"
app: add a canvas grid item class and use it to draw the grid Remove gimp_display_shell_draw_grid().
2010-10-03 02:57:40 +08:00
#include "gimpcanvasgrid.h"
app: add a layer boundary canvas item class and use it to draw the layer boundary. Remove a lot of stuff that was there only to draw the boundary before: - remvoe all layer boundary stuff from the selection code - remove gimp_display_shell_draw_layer() - remove enum values GIMP_SELECTION_LAYER_ON,OFF from core-enums.h - remove all lines calling gimp_image_selection_control() with the removed enum values - remove gimp_layer_boundary()
2010-10-03 06:28:40 +08:00
#include "gimpcanvaslayerboundary.h"
app: add an "update" signal to GimpCanvasItem which gets emitted when the item wants to be redrawn: - Emit "update" it when any item property changes - Groups connect to their children and forward "update" for them - The shell connects to its group of canvas items and exposed the affected area - Remove gimp_display_shell_expose_item() - Move all the shell's item group code into gimpdisplayshell-items.c
2010-10-01 23:13:00 +08:00
#include "gimpcanvasproxygroup.h"
app: start an infrastructure where the shell keeps around its canvas items - Invalidate the proper area when an item gets added or removed. - Draw the kept canvas items instead of calling a draw tool function. - The draw tool now sets its item on the shell.
2010-09-30 04:12:01 +08:00
#include "gimpdisplayshell.h"
#include "gimpdisplayshell-expose.h"
#include "gimpdisplayshell-items.h"
app: add an "update" signal to GimpCanvasItem which gets emitted when the item wants to be redrawn: - Emit "update" it when any item property changes - Groups connect to their children and forward "update" for them - The shell connects to its group of canvas items and exposed the affected area - Remove gimp_display_shell_expose_item() - Move all the shell's item group code into gimpdisplayshell-items.c
2010-10-01 23:13:00 +08:00
/* local function prototypes */
static void gimp_display_shell_item_update (GimpCanvasItem *item,
GdkRegion *region,
GimpDisplayShell *shell);
/* public functions */
void
gimp_display_shell_items_init (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
shell->canvas_item = gimp_canvas_group_new (shell);
app: remove gimp_display_shell_draw_vectors() which is the last bit of non-item drawing of stuff that is not somehow the image itself... wheee! This involves reverting commit 6bce0641d4a92877310705819696afd9d38f82d2 and adding back all the vectors handlers that were in gimpdisplayshell-callbacks.c before. Change the callbacks to manage proxy items for all the image's vectors.
2010-10-08 07:03:56 +08:00
shell->vectors = gimp_canvas_proxy_group_new (shell);
gimp_display_shell_add_item (shell, shell->vectors);
g_object_unref (shell->vectors);
app: add a canvas grid item class and use it to draw the grid Remove gimp_display_shell_draw_grid().
2010-10-03 02:57:40 +08:00
shell->grid = gimp_canvas_grid_new (shell, NULL);
g_object_set (shell->grid, "grid-style", TRUE, NULL);
gimp_display_shell_add_item (shell, shell->grid);
g_object_unref (shell->grid);
app: add an "update" signal to GimpCanvasItem which gets emitted when the item wants to be redrawn: - Emit "update" it when any item property changes - Groups connect to their children and forward "update" for them - The shell connects to its group of canvas items and exposed the affected area - Remove gimp_display_shell_expose_item() - Move all the shell's item group code into gimpdisplayshell-items.c
2010-10-01 23:13:00 +08:00
shell->guides = gimp_canvas_proxy_group_new (shell);
gimp_display_shell_add_item (shell, shell->guides);
g_object_unref (shell->guides);
shell->sample_points = gimp_canvas_proxy_group_new (shell);
gimp_display_shell_add_item (shell, shell->sample_points);
g_object_unref (shell->sample_points);
app: add a layer boundary canvas item class and use it to draw the layer boundary. Remove a lot of stuff that was there only to draw the boundary before: - remvoe all layer boundary stuff from the selection code - remove gimp_display_shell_draw_layer() - remove enum values GIMP_SELECTION_LAYER_ON,OFF from core-enums.h - remove all lines calling gimp_image_selection_control() with the removed enum values - remove gimp_layer_boundary()
2010-10-03 06:28:40 +08:00
shell->layer_boundary = gimp_canvas_layer_boundary_new (shell);
gimp_canvas_item_set_visible (shell->layer_boundary, FALSE);
gimp_display_shell_add_item (shell, shell->layer_boundary);
g_object_unref (shell->layer_boundary);
app: add a software cursor canvas item and use it to draw the sw cursor. Almost every aspect of the old code was ugly and hard to read, this is so much nicer...
2010-10-03 03:56:36 +08:00
shell->cursor = gimp_canvas_cursor_new (shell);
gimp_canvas_item_set_visible (shell->cursor, FALSE);
gimp_display_shell_add_item (shell, shell->cursor);
g_object_unref (shell->cursor);
app: add an "update" signal to GimpCanvasItem which gets emitted when the item wants to be redrawn: - Emit "update" it when any item property changes - Groups connect to their children and forward "update" for them - The shell connects to its group of canvas items and exposed the affected area - Remove gimp_display_shell_expose_item() - Move all the shell's item group code into gimpdisplayshell-items.c
2010-10-01 23:13:00 +08:00
g_signal_connect (shell->canvas_item, "update",
G_CALLBACK (gimp_display_shell_item_update),
shell);
}
void
gimp_display_shell_items_free (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
if (shell->canvas_item)
{
g_signal_handlers_disconnect_by_func (shell->canvas_item,
gimp_display_shell_item_update,
shell);
g_object_unref (shell->canvas_item);
shell->canvas_item = NULL;
app: add a layer boundary canvas item class and use it to draw the layer boundary. Remove a lot of stuff that was there only to draw the boundary before: - remvoe all layer boundary stuff from the selection code - remove gimp_display_shell_draw_layer() - remove enum values GIMP_SELECTION_LAYER_ON,OFF from core-enums.h - remove all lines calling gimp_image_selection_control() with the removed enum values - remove gimp_layer_boundary()
2010-10-03 06:28:40 +08:00
shell->grid = NULL;
shell->guides = NULL;
shell->sample_points = NULL;
shell->layer_boundary = NULL;
shell->cursor = NULL;
app: add an "update" signal to GimpCanvasItem which gets emitted when the item wants to be redrawn: - Emit "update" it when any item property changes - Groups connect to their children and forward "update" for them - The shell connects to its group of canvas items and exposed the affected area - Remove gimp_display_shell_expose_item() - Move all the shell's item group code into gimpdisplayshell-items.c
2010-10-01 23:13:00 +08:00
}
}
app: start an infrastructure where the shell keeps around its canvas items - Invalidate the proper area when an item gets added or removed. - Draw the kept canvas items instead of calling a draw tool function. - The draw tool now sets its item on the shell.
2010-09-30 04:12:01 +08:00
void
gimp_display_shell_add_item (GimpDisplayShell *shell,
GimpCanvasItem *item)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
gimp_canvas_group_add_item (GIMP_CANVAS_GROUP (shell->canvas_item), item);
}
void
gimp_display_shell_remove_item (GimpDisplayShell *shell,
GimpCanvasItem *item)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
gimp_canvas_group_remove_item (GIMP_CANVAS_GROUP (shell->canvas_item), item);
}
app: add an "update" signal to GimpCanvasItem which gets emitted when the item wants to be redrawn: - Emit "update" it when any item property changes - Groups connect to their children and forward "update" for them - The shell connects to its group of canvas items and exposed the affected area - Remove gimp_display_shell_expose_item() - Move all the shell's item group code into gimpdisplayshell-items.c
2010-10-01 23:13:00 +08:00
/* private functions */
static void
gimp_display_shell_item_update (GimpCanvasItem *item,
GdkRegion *region,
GimpDisplayShell *shell)
{
gimp_display_shell_expose_region (shell, region);
}