diff options
| author | lukefromdc <[email protected]> | 2018-07-03 15:59:56 -0400 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2018-07-06 23:55:56 -0400 |
| commit | 9de3a86d736f70c4d45550649ba62a935369b146 (patch) | |
| tree | 4f20af425edab6ef24edce6fb77b025e1647405a /applets | |
| parent | 17ac8aab4d139cb917619a3a981300f51b750c17 (diff) | |
| download | mate-panel-9de3a86d736f70c4d45550649ba62a935369b146.tar.bz2 mate-panel-9de3a86d736f70c4d45550649ba62a935369b146.tar.xz | |
Tray: simplify force-redraw, use code that actually works
Prevent most corruption of tray icons and reduce by half incomplete rendering of them, replace a never-built code block that could not be built, and replace (deprecated) direct expose handling with gtk_widget_hide/gtk_widget_show_all
*Note that this is needed for GTK 3.23 but may help remaining icon issues with GTK 3.22 as well and is simpler code in any case
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/notification_area/system-tray/na-tray-child.c | 47 |
1 files changed, 5 insertions, 42 deletions
diff --git a/applets/notification_area/system-tray/na-tray-child.c b/applets/notification_area/system-tray/na-tray-child.c index 6efae8f8..d29da781 100644 --- a/applets/notification_area/system-tray/na-tray-child.c +++ b/applets/notification_area/system-tray/na-tray-child.c @@ -561,48 +561,11 @@ na_tray_child_force_redraw (NaTrayChild *child) if (gtk_widget_get_mapped (widget)) { -#if 1 - /* Sending an ExposeEvent might cause redraw problems if the - * icon is expecting the server to clear-to-background before - * the redraw. It should be ok for GtkStatusIcon or EggTrayIcon. - */ - GdkDisplay *display; - Display *xdisplay; - XEvent xev; - GdkWindow *plug_window; - GtkAllocation allocation; - - display = gtk_widget_get_display (widget); - xdisplay = GDK_DISPLAY_XDISPLAY (display); - - plug_window = gtk_socket_get_plug_window (GTK_SOCKET (child)); - gtk_widget_get_allocation (widget, &allocation); - - xev.xexpose.type = Expose; - xev.xexpose.window = GDK_WINDOW_XID (plug_window); - xev.xexpose.x = 0; - xev.xexpose.y = 0; - xev.xexpose.width = allocation.width; - xev.xexpose.height = allocation.height; - xev.xexpose.count = 0; - - gdk_x11_display_error_trap_push (display); - XSendEvent (xdisplay, - xev.xexpose.window, - False, ExposureMask, - &xev); - /* We have to sync to reliably catch errors from the XSendEvent(), - * since that is asynchronous. - */ - XSync (xdisplay, False); - gdk_x11_display_error_trap_pop_ignored (display); -#else - /* Hiding and showing is the safe way to do it, but can result in more - * flickering. - */ - gdk_window_hide (widget->window); - gdk_window_show (widget->window); -#endif + /* Hiding and showing is the safe way to do it, but can result in more + * flickering. + */ + gtk_widget_hide(widget); + gtk_widget_show_all(widget); } } |