diff options
| -rw-r--r-- | NEWS | 14 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | geyes/src/geyes.c | 21 |
3 files changed, 29 insertions, 8 deletions
@@ -1,3 +1,17 @@ +### mate-applets 1.28.1 + + * Compute screen height properly when not in X11 + * Remove GtkSourceView dependency as we no longer use it + * Replace GtkSourceView with GtkTextView + * Do not call x11 functions when not in x11 + * ci: try to fix cannot load such file -- faraday/net_http (LoadError) + * ci: use pip3 install not pip install for Travis + * CI: sudo was not used in prior attempt + * CI: 3ed try to fix start of jobs + * CI: 2nd attempt to fix start of builds + * ci: fix starting the builds as per error message + * CI: travis fixes needed elsewhere also needed here + ### mate-applets 1.28.0 * update translations diff --git a/configure.ac b/configure.ac index 9233c8f6..30be9a04 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl *************************************************************************** dnl *** configure.in for MATE-APPLETS *** dnl *************************************************************************** -AC_INIT([mate-applets], [1.28.0], [https://github.com/mate-desktop/mate-applets/issues], +AC_INIT([mate-applets], [1.28.1], [https://github.com/mate-desktop/mate-applets/issues], [mate-applets], [https://mate-desktop.org]) AC_PREREQ(2.59) diff --git a/geyes/src/geyes.c b/geyes/src/geyes.c index a8337447..76c86d65 100644 --- a/geyes/src/geyes.c +++ b/geyes/src/geyes.c @@ -132,10 +132,15 @@ timer_cb (EyesApplet *eyes_applet) { GdkDisplay *display; GdkSeat *seat; - gint x, y, dx, dy; + gint x, y; gint pupil_x, pupil_y; gsize i; +#ifdef ENABLE_IN_PROCESS + GtkAllocation allocation; +#else int applet_x,applet_y; + gint dx, dy; +#endif display = gtk_widget_get_display (GTK_WIDGET (eyes_applet->applet)); seat = gdk_display_get_default_seat (display); @@ -148,18 +153,20 @@ timer_cb (EyesApplet *eyes_applet) gdk_seat_get_pointer (seat), &x, &y, NULL); + /*correct for the positon of each eye, this is done differently in-process or out*/ #ifdef ENABLE_IN_PROCESS - gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET(eyes_applet->applet)), - &applet_x, &applet_y); + gtk_widget_get_allocation(GTK_WIDGET(eyes_applet->eyes[i]), &allocation); + x -= i * allocation.width; + /*eyes are always drawn in a horizontal row + *so we don't need to correct anything in the value of y + */ #else - applet_x = 0; - applet_y = 0; -#endif gtk_widget_translate_coordinates (eyes_applet->eyes[i], gtk_widget_get_toplevel(eyes_applet->eyes[i]), - -applet_x, -applet_y, &dx, &dy); + 0, 0, &dx, &dy); x -= dx; y -= dy; +#endif if ((x != eyes_applet->pointer_last_x[i]) || (y != eyes_applet->pointer_last_y[i])) { |