gimp r25312 - in trunk: . app/display
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r25312 - in trunk: . app/display
- Date: Sun, 30 Mar 2008 17:09:55 +0100 (BST)
Author: neo
Date: Sun Mar 30 17:09:55 2008
New Revision: 25312
URL: http://svn.gnome.org/viewvc/gimp?rev=25312&view=rev
Log:
2008-03-30 Sven Neumann <sven gimp org>
* app/display/gimpdisplayshell-cursor.[ch]: added new function
gimp_display_shell_unset_cursor().
(gimp_display_shell_real_set_cursor): deal with cursor_type -1
and
change the cursor to the default desktop cursor. Fixes warnings
on
image load.
* app/display/gimpdisplayshell.c (gimp_display_shell_empty):
use gimp_display_shell_unset_cursor().
Modified:
trunk/ChangeLog
trunk/app/display/gimpdisplayshell-cursor.c
trunk/app/display/gimpdisplayshell-cursor.h
trunk/app/display/gimpdisplayshell.c
Modified: trunk/app/display/gimpdisplayshell-cursor.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-cursor.c (original)
+++ trunk/app/display/gimpdisplayshell-cursor.c Sun Mar 30 17:09:55 2008
@@ -67,6 +67,18 @@
}
void
+gimp_display_shell_unset_cursor (GimpDisplayShell *shell)
+{
+ g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+
+ if (! shell->using_override_cursor)
+ {
+ gimp_display_shell_real_set_cursor (shell,
+ (GimpCursorType) -1, 0, 0, FALSE);
+ }
+}
+
+void
gimp_display_shell_set_override_cursor (GimpDisplayShell *shell,
GimpCursorType cursor_type)
{
@@ -213,6 +225,16 @@
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
+ if (cursor_type == (GimpCursorType) -1)
+ {
+ shell->current_cursor = cursor_type;
+
+ if (GTK_WIDGET_DRAWABLE (shell->canvas))
+ gdk_window_set_cursor (shell->canvas->window, NULL);
+
+ return;
+ }
+
if (cursor_type != GIMP_CURSOR_NONE &&
cursor_type != GIMP_CURSOR_BAD)
{
Modified: trunk/app/display/gimpdisplayshell-cursor.h
==============================================================================
--- trunk/app/display/gimpdisplayshell-cursor.h (original)
+++ trunk/app/display/gimpdisplayshell-cursor.h Sun Mar 30 17:09:55 2008
@@ -24,6 +24,7 @@
GimpCursorType cursor_type,
GimpToolCursorType tool_cursor,
GimpCursorModifier modifier);
+void gimp_display_shell_unset_cursor (GimpDisplayShell *shell);
void gimp_display_shell_set_override_cursor (GimpDisplayShell *shell,
GimpCursorType cursor_type);
void gimp_display_shell_unset_override_cursor (GimpDisplayShell *shell);
Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c (original)
+++ trunk/app/display/gimpdisplayshell.c Sun Mar 30 17:09:55 2008
@@ -1286,7 +1286,7 @@
gimp_display_shell_scale_setup (shell);
gimp_display_shell_scaled (shell);
- gdk_window_set_cursor (shell->canvas->window, NULL);
+ gimp_display_shell_unset_cursor (shell);
gimp_statusbar_empty (GIMP_STATUSBAR (shell->statusbar));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]