Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package muffin for openSUSE:Factory checked in at 2023-06-04 00:12:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/muffin (Old) and /work/SRC/openSUSE:Factory/.muffin.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "muffin" Sun Jun 4 00:12:47 2023 rev:28 rq:1090579 version:5.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/muffin/muffin.changes 2021-11-27 00:52:32.654549354 +0100 +++ /work/SRC/openSUSE:Factory/.muffin.new.15902/muffin.changes 2023-06-04 00:12:59.797675367 +0200 @@ -1,0 +2,9 @@ +Fri Jun 2 21:19:04 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- update to 5.2.1: + * Fix window centering calculations, and now include the frame + if there is one. + * constraints: Fix inability to drag c-s-d windows up beyond + their titlebars. + +------------------------------------------------------------------- Old: ---- muffin-5.2.0.tar.gz New: ---- muffin-5.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ muffin.spec ++++++ --- /var/tmp/diff_new_pack.mRc2sO/_old 2023-06-04 00:13:00.453679289 +0200 +++ /var/tmp/diff_new_pack.mRc2sO/_new 2023-06-04 00:13:00.461679337 +0200 @@ -1,7 +1,7 @@ # # spec file for package muffin # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ %define typelib typelib-1_0-Muffin-0_0 %define _lto_cflags %{nil} Name: muffin -Version: 5.2.0 +Version: 5.2.1 Release: 0 Summary: Cinnamon Desktop default window manager License: GPL-2.0-or-later AND MIT ++++++ muffin-5.2.0.tar.gz -> muffin-5.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.2.0/configure.ac new/muffin-5.2.1/configure.ac --- old/muffin-5.2.0/configure.ac 2021-11-15 13:54:50.000000000 +0100 +++ new/muffin-5.2.1/configure.ac 2022-03-07 14:30:57.000000000 +0100 @@ -2,7 +2,7 @@ m4_define([muffin_major_version], [5]) m4_define([muffin_minor_version], [2]) -m4_define([muffin_micro_version], [0]) +m4_define([muffin_micro_version], [1]) m4_define([muffin_version], [muffin_major_version.muffin_minor_version.muffin_micro_version]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.2.0/debian/changelog new/muffin-5.2.1/debian/changelog --- old/muffin-5.2.0/debian/changelog 2021-11-15 13:54:50.000000000 +0100 +++ new/muffin-5.2.1/debian/changelog 2022-03-07 14:30:57.000000000 +0100 @@ -1,3 +1,11 @@ +muffin (5.2.1) una; urgency=medium + + [ Michael Webster ] + * Fix window centering calculations, and now include the frame if there is one. + * constraints: Fix inability to drag c-s-d windows up beyond their titlebars. + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 07 Mar 2022 13:29:30 +0000 + muffin (5.2.0) una; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.2.0/src/core/constraints.c new/muffin-5.2.1/src/core/constraints.c --- old/muffin-5.2.0/src/core/constraints.c 2021-11-15 13:54:50.000000000 +0100 +++ new/muffin-5.2.1/src/core/constraints.c 2022-03-07 14:30:57.000000000 +0100 @@ -1610,13 +1610,10 @@ bottom_amount = info->current.height + info->borders->visible.bottom; vert_amount_onscreen = info->borders->visible.top; } - else if (meta_window_is_client_decorated (window)) + else { - top_amount = vert_amount_onscreen = CSD_TITLEBAR_HEIGHT * scale; /* Hardcoded for now, we don't get this from Gtk */ - bottom_amount = vert_amount_offscreen = MAX ((info->current.height - (vert_amount_onscreen * 2)), 0); + bottom_amount = vert_amount_offscreen; } - else - bottom_amount = vert_amount_offscreen; /* Extend the region, have a helper function handle the constraint, * then return the region to its original size. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.2.0/src/core/keybindings.c new/muffin-5.2.1/src/core/keybindings.c --- old/muffin-5.2.0/src/core/keybindings.c 2021-11-15 13:54:50.000000000 +0100 +++ new/muffin-5.2.1/src/core/keybindings.c 2022-03-07 14:30:57.000000000 +0100 @@ -2664,23 +2664,24 @@ gpointer dummy) { MetaFrameBorders borders; - const MetaMonitorInfo *monitor; - int window_width, window_height; + MetaRectangle work_area, outer_rect; int center_x, center_y; + int x, y; - monitor = meta_screen_get_current_monitor_info (window->screen); + meta_window_get_work_area_current_monitor (window, &work_area); + meta_window_get_input_rect (window, &outer_rect); meta_frame_calc_borders (window->frame, &borders); - window_width = (window->frame ? window->frame->rect.width : window->rect.width); - window_height = (window->frame ? window->frame->rect.height : window->rect.height); + center_x = work_area.x + work_area.width / 2; + center_y = work_area.y + work_area.height / 2; - center_x = monitor->rect.x + monitor->rect.width / 2; - center_y = monitor->rect.y + monitor->rect.height / 2; + x = center_x - (window->rect.width / 2); + y = center_y - (outer_rect.height / 2) + borders.visible.top + borders.invisible.top; meta_window_move_resize (window, TRUE, - center_x + borders.visible.left - window_width / 2, - center_y + borders.visible.top - window_height / 2, + x, + y, window->rect.width, window->rect.height); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/muffin-5.2.0/src/core/place.c new/muffin-5.2.1/src/core/place.c --- old/muffin-5.2.0/src/core/place.c 2021-11-15 13:54:50.000000000 +0100 +++ new/muffin-5.2.1/src/core/place.c 2022-03-07 14:30:57.000000000 +0100 @@ -136,25 +136,19 @@ int *new_x, int *new_y) { - int center_x, center_y; - const MetaMonitorInfo *xi; + int center_x, center_y, monitor_n; + MetaRectangle work_area, outer_rect; - xi = meta_screen_get_current_monitor_info (window->screen); - center_x = *new_x + xi->rect.width / 2; - center_y = *new_y + xi->rect.height / 2; + monitor_n = meta_screen_get_current_monitor (window->screen); - int window_width, window_height; - window_width = window->frame ? window->frame->rect.width : window->rect.width; - window_height = window->frame ? window->frame->rect.height : window->rect.height; + meta_window_get_work_area_for_monitor (window, monitor_n, &work_area); + meta_window_get_input_rect (window, &outer_rect); - if (borders) { - *new_x = center_x + borders->visible.left - window_width / 2; - *new_y = center_y + borders->visible.top - window_height / 2; - } - else { - *new_x = center_x - window_width / 2; - *new_y = center_y - window_height / 2; - } + center_x = work_area.x + work_area.width / 2; + center_y = work_area.y + work_area.height / 2; + + *new_x = center_x - (window->rect.width / 2); + *new_y = center_y - (outer_rect.height / 2) + borders->visible.top + borders->invisible.top; return TRUE; }