From nobody Mon Jul 21 02:13:41 2025 X-Original-To: dev-commits-src-branches@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 4blkTf3z5rz61xT1; Mon, 21 Jul 2025 02:13:42 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4blkTf00Zyz3Mlf; Mon, 21 Jul 2025 02:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753064022; 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=CKVgpoW9zBVT0TG9HrNQ+Z2YFPqyM8STwhv1HqXZS0I=; b=YYRAWbrt4Ty92QPRmZwk+zWTRcdd0oEzNAsFOvqWWy4luXgVCPT8ymk2VLeM2YDyMwVMmy BjzBEV6rRnyJ9sTh9fb9TvoJDPEY6uG2Qv3jFZgsq0LOGZlAS2ABJTCD8z2B/8vz3qPwLV 5k83RgKwQAVEC0Gam9YAfepycmZu5xzi3HM2cQ13Hl9KdetDClThj3oH1g1zP5LL4Vl+f9 Wk8OF9yVBhqFxXgd2hHTg33U+hzoOPFGfQQpHa2RxNIPW6OBd5KwIFklhh/hWrCz+Ly1M5 3YVTfMy6rfsv0ERBua7oTi3jmDZ4oDtkZgP4QN5f/+HsEeL5sOUbAScmazD0Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753064022; 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=CKVgpoW9zBVT0TG9HrNQ+Z2YFPqyM8STwhv1HqXZS0I=; b=SJILcYOBoReZ9CaKi9si/JjcDznirIhhVEJJQKx3LMB3MBiru3nyS/957xhqCJeMxn8X+b LPI6b8XZhqwGlCy2xxGse0nYw8LZI04W9f6AwsKXrz2Q2n+bYx++mTXw5+EFVYHRJ0x7A/ uQOIZAKkXb/HUKVG8uPny+NfPDCatIpVldOl9LXkdIe7g7roiaR/Tc+7f0PTi50EcJKDKF 5dEsngonHjwxIFU9R6Fa6l5sR2W2/E2zo2EyLKCJ4ge3YdQ4l4ttLL72r7MO/I4aiz8w34 TL/D2YfU0hQy61S0Gw0MkQZ61jbfup2p7974HR0YKqaAWTZ1hzBR5gQsJztApA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753064022; a=rsa-sha256; cv=none; b=H5MZ+h+c2s2edYQ8eMDSvznARLemVuNUPzCevXVPQkP7BKI9O6CXe9JRahUbwHGEygMxJ5 5lDze9ziHo5Q1Zd/XJd69SSHTe3p4IzUrFa31TNFU4HxZZ5ijfRXw43Hq9h/B1pvbeF3JV D66N0qxbtdSfvwnMB9ClcSHlib9tp2pbhQkErf1lXkrqj+wgOgh5j3ndglKhyoaI55LP2B 7CgDMXGG1Q+dpIuQhEckjn7O/tHOdQk6bAB4KtD2EBCXxDHyxWyKG0bUgMRTIs9jxlucbl Uanrw2PTIwiRdeCKwfXHJlTS+qS2CpbM1QTRHza6QTaNEB/aye7kwYVLOz2sOA== 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 4blkTd6kBbzfgZ; Mon, 21 Jul 2025 02:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56L2Dfmp013410; Mon, 21 Jul 2025 02:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56L2DfHq013407; Mon, 21 Jul 2025 02:13:41 GMT (envelope-from git) Date: Mon, 21 Jul 2025 02:13:41 GMT Message-Id: <202507210213.56L2DfHq013407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9e09ab407983 - stable/14 - loader: Fix orb position List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e09ab407983bcda008d4047f33e7de68d1d1c41 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9e09ab407983bcda008d4047f33e7de68d1d1c41 commit 9e09ab407983bcda008d4047f33e7de68d1d1c41 Author: Emmanuel Vadot AuthorDate: 2025-01-07 08:57:57 +0000 Commit: Kyle Evans CommitDate: 2025-07-21 02:12:24 +0000 loader: Fix orb position Fix the orb position to be aligned with the menu Reviewed by: imp, tsoome Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 1b4e1171315398decb1ad3fceffcacf29cff218b) --- stand/lua/drawer.lua | 4 ++-- stand/lua/gfx-orb.lua | 2 +- stand/lua/gfx-orbbw.lua | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 8c4307220642..1bf741b2373e 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -470,9 +470,9 @@ logodefs = { } brand_position = {x = 2, y = 1} -logo_position = {x = 46, y = 4} +logo_position = {x = 40, y = 10} menu_position = {x = 5, y = 10} -frame_size = {w = 42, h = 14} +frame_size = {w = 39, h = 14} default_shift = {x = 0, y = 0} shift = default_shift diff --git a/stand/lua/gfx-orb.lua b/stand/lua/gfx-orb.lua index 00f4aeb3bceb..cd834a2d6b8e 100644 --- a/stand/lua/gfx-orb.lua +++ b/stand/lua/gfx-orb.lua @@ -45,7 +45,7 @@ return { " .---.....----.\027[m", }, requires_color = true, - shift = {x = 2, y = 3}, + shift = {x = 2, y = -1}, image = "/boot/images/freebsd-logo-rev.png", image_rl = 15 } diff --git a/stand/lua/gfx-orbbw.lua b/stand/lua/gfx-orbbw.lua index 93ffd2366196..a97174a6a5a4 100644 --- a/stand/lua/gfx-orbbw.lua +++ b/stand/lua/gfx-orbbw.lua @@ -44,6 +44,6 @@ return { " .-- `--.", " .---.....----.", }, - shift = {x = 2, y = 4}, + shift = {x = 2, y = -1}, } }