From nobody Thu Jan 09 07:12:04 2025 X-Original-To: dev-commits-src-main@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 4YTGF06vy4z5kDjh; Thu, 09 Jan 2025 07:12:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YTGF03sc4z4Nkm; Thu, 9 Jan 2025 07:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736406724; 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=y5uQ8W5DFiYGsQvZAfuGcfzdlYEY2roZ+draCSxjG7o=; b=obywb7TbwCgmaqPASdgBaiqhU4rJz3Dojrp1aha7lu3DwYDK7TsYthuDIaWJrPmddcMS9e mfLR+282JD6OViqwIDs4QYxfUr+yqd0Kg6JfHp6oVzY3KibdE29ECxjHiXJJ/hxx+E3T9u 1sdjY8w9bp3fEo3B4BaVZ2MGCXe5VS3yxbVtyAnzpw+ZZBwVeK9gHadF39Wl3n+dyEM165 SaH4GRUGVaBbImp3TmegqfpvmJlO/W+A6WBJmWLYNuaZ67xY+klRnIYIdOvVN4Avy1GLfO WXBhcJXKPJRAy8nNR7k5DMbFbg4shxGgIQfbKwdcnJ5DZgCNS7BkFl3cftdVcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736406724; 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=y5uQ8W5DFiYGsQvZAfuGcfzdlYEY2roZ+draCSxjG7o=; b=RQwZGHV90DuKS45BmK3gyEpvNsr6Pmyn5CbWgI8vnWV45YryuMInTDzIEKAzVqOxNkhtCj 4auJQKw0CZUp9fSq/ZhYYhlIe79s44suzjrMpny+6xq0xEvpFI1xyoCHnAJaYfbpOdwZJL fp8ROPERpNINypDevq4NkXO36RTSVHoerAyTKWWuDbwWwZVJZrNP2dU4XGdauBBB2Kf0n4 Ahv6OU8mskRmjO/zU8EqfP2XXA6HEoMLVbCY3ABSi6UdafXndRtXHPrqK5KDW2JPLxmZ6C iVwUFh4nGjbfF4Idi/u6+wWPkn8lGUcV1SvlUnm2nVpgdWXODFJIJQPLxDWRkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736406724; a=rsa-sha256; cv=none; b=hovrxc6s8F1fQzDfFdle5PrXpt0w1lC2jjZtCgeXHljTOraaGx8EUQ76PUGmPA2gLav92f po+9eJOwdJoRyz0Tt9SwBIKWgLCoIms7I9FmbDPbA+kiGxXih9GFYeTYQ2M0NfWpX9aGNs 0N25ghKYrfZ1ztJgot7Srfvw8wF4sIssCOYj94MswQUK+rVtlB9l1rNoxsyvexMm4AG6XJ 3EyZ3yoGvtLpUs6GTRttvc+jFGMwOxL9i6utjbTX1EsdRixECT7EOH3FRDLntElDMXtTfg 2FVNK9Dt9lzK7qpo2ZNUx3wpkkQrQIcvn1Sy3Qp7KQOwGHh3YMQR2X1JXxz/bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YTGF03NgYzp8; Thu, 09 Jan 2025 07:12:04 +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 5097C4T3082784; Thu, 9 Jan 2025 07:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5097C4Vf082781; Thu, 9 Jan 2025 07:12:04 GMT (envelope-from git) Date: Thu, 9 Jan 2025 07:12:04 GMT Message-Id: <202501090712.5097C4Vf082781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 1b4e11713153 - main - loader: Fix orb position List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b4e1171315398decb1ad3fceffcacf29cff218b Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=1b4e1171315398decb1ad3fceffcacf29cff218b commit 1b4e1171315398decb1ad3fceffcacf29cff218b Author: Emmanuel Vadot AuthorDate: 2025-01-07 08:57:57 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-09 07:13:05 +0000 loader: Fix orb position Fix the orb position to be aligned with the menu Differential Revision: https://reviews.freebsd.org/D48353 Reviewed by: imp, tsoome Sponsored by: Beckhoff Automation GmbH & Co. KG --- 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 e55702ffee6c..2d04e29ac462 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}, } }