From nobody Thu Oct 19 12:50:26 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SB6yC0qCCz4xQ7f; Thu, 19 Oct 2023 12:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SB6yC0Kvvz4KSV; Thu, 19 Oct 2023 12:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697719827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AS/+IkFvpPnpM7+4OCDf6Qsk74gYU7Vd9c83/L8cHZk=; b=GPyFPk7FB03yxowh2YuHMDmv2QB8HlUi6xs/Db+NPILOsa5Le0cCEu/ywudVc9v/7xLyH/ nk+cCDMIAeSo7Gml0bEcwnJwAFfIDow9RCtIJfKTBpVPmRKweRNEJRGlCVPlpwM0uwaF6/ tLJwcgELSkjYcZ6LZ111axpGtIG/yf4dWEGD2XSAS7iAEm1JCg1JPk1W562RtCtEIi3y02 LGyfdkNr9c/k41qo+B4khU4XnKDHWhN8wQeBhCSIDm4LBWccRfifCEVYMJQd1OD5O/dIop IGyAD4BdtZvOOaSPh0H6tjS18Gm27jusL0oeMvVBrk0fv61Z2M6i9UWcaDFuCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697719827; a=rsa-sha256; cv=none; b=qmGs+LKHgeDdaIoNfz2621REzlQwj8xo/3arnNXaktOaqTEOHk3MY6HbRPEOZo0K0uoyEw 6yWZBOGeFzW6Z0LE9pT3w6rt1Zx9dqHWC+xTXUTB06KFb4M/vvfEiF99CtN8k1NI2IgxHV TqPXMsHtFEM6qYPAw7v7mixo7HzszeS2O+W9vo5Lq9+CMKrqQ4e6ROXtzRAV2pJ6HG5xjB vvBKXaRD5sfJ4MN2Favopz0MiK3/rVbUL7949FESSkPaziykO1EPWd4hMKNJPkc44lAbX7 IXeRt/i2a8nNnBSfCh5FNsryazQvwsw9j75UujBISxrz/lsUc7CqZW7fvf9ymA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697719827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AS/+IkFvpPnpM7+4OCDf6Qsk74gYU7Vd9c83/L8cHZk=; b=nSkJp/mt+UQ8Zxc9MfmcJ9mGrg7PZCxVR/h3QlO0uBIBkc1vESqGSqkSgI66xT3mWlJGgS jQrc8WI+l93O8gfEL1slpNUF97zDBEX4E5UjhwLerOUjyj8kjpz+coR4vitIHrK5DYHhFY x/VVy9dNvcIlJnFHsfYTT2/pTHznx3qxTpNp3UHpTBL9FDWEgQnZeaUblchCXWoEeAwtom 5zelzETIr1WndNgOqWwVrWtDLJZDl0Jq0XcK/3ag6kQNEKzJnsZjF4Z6nD6SAIEbX0WwTv s3eAH8x7qa4ua0u6HulF70JYfwJ4pLCbJdnqPWiL2AzZxpx4vEZaANMbFCSAWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SB6yB6VPbzqXn; Thu, 19 Oct 2023 12:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39JCoQ55021134; Thu, 19 Oct 2023 12:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39JCoQ4a021131; Thu, 19 Oct 2023 12:50:26 GMT (envelope-from git) Date: Thu, 19 Oct 2023 12:50:26 GMT Message-Id: <202310191250.39JCoQ4a021131@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: afd17c07b8b2 - main - x11/lumina-core: Fix new window resize issue List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afd17c07b8b2e1e09713ce788e4b782806dc3108 Auto-Submitted: auto-generated The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=afd17c07b8b2e1e09713ce788e4b782806dc3108 commit afd17c07b8b2e1e09713ce788e4b782806dc3108 Author: Jason W. Bacon AuthorDate: 2023-10-19 12:48:27 +0000 Commit: Jason W. Bacon CommitDate: 2023-10-19 12:48:27 +0000 x11/lumina-core: Fix new window resize issue New windows were sometimes inappropirately resized when near the bottom of the screen. This was due to the erroneous use of setBottom() where moveBottom() was needed to move, rather than resize the window. --- x11/lumina-core/Makefile | 2 +- x11/lumina-core/files/patch-lumina-desktop_LSession.cpp | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/x11/lumina-core/Makefile b/x11/lumina-core/Makefile index 6bc0f8b6d5dc..6e14e5bb0575 100644 --- a/x11/lumina-core/Makefile +++ b/x11/lumina-core/Makefile @@ -1,7 +1,7 @@ PORTNAME= lumina-core DISTVERSIONPREFIX= v DISTVERSION= 1.6.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11 MAINTAINER= jwb@FreeBSD.org diff --git a/x11/lumina-core/files/patch-lumina-desktop_LSession.cpp b/x11/lumina-core/files/patch-lumina-desktop_LSession.cpp index a1246116a3ce..36cdb7a67984 100644 --- a/x11/lumina-core/files/patch-lumina-desktop_LSession.cpp +++ b/x11/lumina-core/files/patch-lumina-desktop_LSession.cpp @@ -112,3 +112,19 @@ if(charge==100){ iconList << "battery-full-charged"; } iconList << "battery-100-charging" << "battery-full-charging" << "battery-charging-100" << "battery-charging-full"; +@@ -644,9 +694,12 @@ void LSession::adjustWindowGeom(WId win, bool maximize + if(DEBUG){ qDebug() << "Y-Diff:" << diff; } + if(diff < 0){ diff = -diff; } //need a positive value + if( (fgeom.height()+ diff)< desk.height()){ +- //just move the window - there is room for it above +- geom.setBottom(desk.bottom()-frame[1]); +- fgeom.setBottom(desk.bottom()); ++ // Just move the window - there is room for it above ++ // FIXME: geom calculations appear to be off ++ // This creates a large gap between the bottom of the new window ++ // and the lower panel ++ geom.moveBottom(desk.bottom()-frame[1]); ++ fgeom.moveBottom(desk.bottom()); + }else if(geom.height() > diff){ //window bigger than the difference + //Need to resize the window - keeping the origin point the same + geom.setHeight( geom.height()-diff-1 ); //shrink it by the difference (need an extra pixel somewhere)