pidgin/pidgin

Clean up the monitor spanning code a bit

2020-03-26, Gary Kramlich
76d2cb74b9f9
Parents 59b7f06a3c0f
Children eb8436c3aae5
Clean up the monitor spanning code a bit
1 files changed, 15 insertions(+), 11 deletions(-)
  • +15 -11
    pidgin/gtkconv.c
    • --- a/pidgin/gtkconv.c Thu Mar 26 20:28:57 2020 -0500
    +++ b/pidgin/gtkconv.c Thu Mar 26 20:55:18 2020 -0500
    @@ -7812,13 +7812,15 @@
    static gboolean gtk_conv_configure_cb(GtkWidget *w, GdkEventConfigure *event, gpointer data) {
    GdkMonitor *monitor = NULL;
    - GdkRectangle geo;
    - int x, y;
    -
    - if (gtk_widget_get_visible(w))
    - gtk_window_get_position(GTK_WINDOW(w), &x, &y);
    - else
    + GdkRectangle geo, window_geo, intersect_geo;
    +
    + if(!gtk_widget_get_visible(w)) {
    return FALSE; /* carry on normally */
    + }
    +
    + gtk_window_get_position(GTK_WINDOW(w), &window_get.x, &window_get.y);
    + window_get.width = event->width;
    + window_get.height = event->height;
    /* Workaround for GTK+ bug # 169811 - "configure_event" is fired
    * when the window is being maximized */
    @@ -7829,11 +7831,13 @@
    event->window);
    gdk_monitor_get_geometry(monitor, &geo);
    - /* don't save a window that's spanning monitoring */
    - if (x + event->width < geo.x ||
    - y + event->height < geo.y ||
    - x > geo.width ||
    - y > geo.height) {
    + /* now make sure that the window is entirely within the monitor. We do
    + * this by finding the intersection of the window on the monitor, if that
    + * is equal to the window's geometry, then the window is fully contained on
    + * the given monitor.
    + */
    + gdk_rectangle_intersect(&geo, &window_geo, &intersect_geo);
    + if(!gdk_rectangle_equal(&window_geo, &intersect_geo)) {
    return FALSE; /* carry on normally */
    }