rpms/gnome-applets/devel keyboard-drawing-redraw.patch, NONE, 1.1 gnome-applets.spec, 1.173, 1.174

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7028

Modified Files:
	gnome-applets.spec 
Added Files:
	keyboard-drawing-redraw.patch 
Log Message:
fix some redraw issues


keyboard-drawing-redraw.patch:
 keyboard-drawing.c |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletion(-)

--- NEW FILE keyboard-drawing-redraw.patch ---
--- control-center-2.15.92/libkbdraw/keyboard-drawing.c.redraw	2006-08-27 22:42:37.000000000 -0400
+++ control-center-2.15.92/libkbdraw/keyboard-drawing.c	2006-08-27 22:54:18.000000000 -0400
@@ -1176,6 +1176,26 @@
 }
 
 static void
+redraw_overlapping_doodads (
+  KeyboardDrawing * drawing,
+  KeyboardDrawingKey * key)
+{
+  GList *list;
+  gboolean do_draw = FALSE;
+
+  for (list = drawing->keyboard_items; list; list = list->next)
+    {
+      KeyboardDrawingItem * item = list->data;
+
+      if (do_draw && item->type == KEYBOARD_DRAWING_ITEM_TYPE_DOODAD)
+	draw_doodad (drawing, (KeyboardDrawingDoodad *) item);
+
+      if (list->data == key)
+        do_draw = TRUE;
+    }
+}
+
+static void
 draw_keyboard_item (
   KeyboardDrawingItem * item,
   KeyboardDrawing * drawing)
@@ -1340,7 +1360,7 @@
   key->pressed = (event->type == GDK_KEY_PRESS);
 
   draw_key (drawing, key);
-
+  redraw_overlapping_doodads (drawing, key);
   invalidate_key_region (drawing, key);
 
   return TRUE;
@@ -1370,7 +1390,9 @@
     if (drawing->keys[i].pressed)
       {
         drawing->keys[i].pressed = FALSE;
+
         draw_key (drawing, drawing->keys + i);
+	redraw_overlapping_doodads (drawing, drawing->keys + i);
         invalidate_key_region (drawing, drawing->keys + i);
       }
 


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gnome-applets.spec	27 Aug 2006 05:06:37 -0000	1.173
+++ gnome-applets.spec	28 Aug 2006 03:38:43 -0000	1.174
@@ -32,7 +32,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.15.90
-Release:  	3%{?dist}
+Release:  	4%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -54,6 +54,8 @@
 Patch18: keyboard-drawing-primary.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=352781
 Patch19: keyboard-drawing-corner.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=353163
+Patch20: keyboard-drawing-redraw.patch
 
 URL:		http://www.gnome.org/
 
@@ -139,7 +141,7 @@
 %patch17 -p1 -b .label-color
 %patch18 -p1 -b .primary
 %patch19 -p1 -b .corner
-
+%patch20 -p1 -b .redraw
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -307,6 +309,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-4.fc6
+- Fix some redraw issues in the keyboard capplet
+
 * Sun Aug 27 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.90-3.fc6
 - More keyboard drawing improvements