Balló György pushed to branch main at Arch Linux / Packaging / Packages / icewm


Commits:
521377e0 by Balló György at 2025-10-16T03:52:48+02:00
upgpkg: 3.9.0-4: Apply a more proper fix for positioning issue with Qt 6.10

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- static-position.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = icewm
        pkgdesc = Window Manager designed for speed, usability, and consistency
        pkgver = 3.9.0
-       pkgrel = 3
+       pkgrel = 4
        url = https://ice-wm.org/
        arch = x86_64
        license = LGPL-2.0-only
@@ -22,6 +22,6 @@ pkgbase = icewm
        source = 
icewm-3.9.0.tar.gz::https://github.com/ice-wm/icewm/archive/refs/tags/3.9.0.tar.gz
        source = static-position.patch
        sha256sums = 
ca755cb024459ade86518f89202b8a92d3cb9957b9a5e17abdbf824f708ad8de
-       sha256sums = 
bb870213a04e95667bac932d5f595cc777a96c34c11ac8d458501cd9d194ef8e
+       sha256sums = 
829e5b02ddc7d9679512f5ce2f20990c48276d7e2f400dff40f89b0c62a1c7b3
 
 pkgname = icewm


=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
 
 pkgname=icewm
 pkgver=3.9.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Window Manager designed for speed, usability, and consistency"
 url="https://ice-wm.org/";
 arch=('x86_64')
@@ -15,13 +15,13 @@ optdepends=('perl: for icewm-menu-xrandr')
 
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ice-wm/icewm/archive/refs/tags/${pkgver}.tar.gz";
         'static-position.patch')
 sha256sums=('ca755cb024459ade86518f89202b8a92d3cb9957b9a5e17abdbf824f708ad8de'
-            'bb870213a04e95667bac932d5f595cc777a96c34c11ac8d458501cd9d194ef8e')
+            '829e5b02ddc7d9679512f5ce2f20990c48276d7e2f400dff40f89b0c62a1c7b3')
 
 prepare() {
        cd "${pkgname}-${pkgver}"
 
-       # Don't move the frame offscreen for static windows with 0,0 (needed 
for Qt 6.10)
-       # https://github.com/bbidulock/icewm/pull/808
+       # Ensure the window is within the screen even if positioned
+       # https://github.com/bbidulock/icewm/pull/809
        # https://bbs.archlinux.org/viewtopic.php?id=309422
        patch -Np1 -i ../static-position.patch
 }


=====================================
static-position.patch
=====================================
@@ -1,27 +1,26 @@
-From e549f2c34279f91b2f5043f0b1498d13711c36db Mon Sep 17 00:00:00 2001
+From 4969b01a5b4c62b3ba3101418f7abd2851ab35e6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]>
-Date: Wed, 15 Oct 2025 19:04:38 +0200
-Subject: [PATCH] Don't move the frame offscreen for static windows with 0,0
+Date: Thu, 16 Oct 2025 03:43:11 +0200
+Subject: [PATCH] Ensure the window is within the screen even if positioned
 
-Some clients like Qt 6.10 sends a static position to the top left corner.
-Moving the position above that causes the title and border to be placed
-out of screen.
+Some clients like Qt 6.10 sends a static position to the top left corner,
+which needs to be moved to fit the window frame to the screen.
 ---
- src/wmmgr.cc | 4 ----
- 1 file changed, 4 deletions(-)
+ src/wmmgr.cc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/src/wmmgr.cc b/src/wmmgr.cc
-index 68cff75e1..353403b9f 100644
+index 68cff75e1..5be700b10 100644
 --- a/src/wmmgr.cc
 +++ b/src/wmmgr.cc
-@@ -1724,10 +1724,6 @@ void YWindowManager::placeWindow(YFrameWindow *frame,
-             posX -= 2 * borderWidth - client->getBorder() - 1;
-         if (gy > 0)
-             posY -= 2 * borderHeight + titleHeight - client->getBorder() - 1;
--        if (gx == 0 && gy == 0 && client->winGravity() == StaticGravity) {
--            posX -= borderWidth;
--            posY -= borderHeight + titleHeight;
--        }
-         posY -= borderOffset;
-     }
+@@ -1907,9 +1907,7 @@ void YWindowManager::manageClient(YFrameClient* client, 
bool mapClient) {
+             posHeight += frame->titleYN();
+         }
  
+-        if (limitPosition &&
+-            !(client->sizeHints() &&
+-              (client->sizeHints()->flags & USPosition)))
++        if (limitPosition)
+         {
+             int mx, my, Mx, My;
+             getWorkArea(frame, &mx, &my, &Mx, &My);



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/icewm/-/commit/521377e04997abef220a1284ddb2269e2697c78f

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/icewm/-/commit/521377e04997abef220a1284ddb2269e2697c78f
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to