From: "Johannes Sixt via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: mark <mlevedahl@gmail.com>, Johannes Sixt <j6t@kdbg.org>,
Johannes Sixt <j6t@kdbg.org>
Subject: [PATCH v2 6/6] gitk: move UI for generic colors above diff colors
Date: Wed, 12 Aug 2026 13:16:21 +0000 [thread overview]
Message-ID: <36590e857d3c9a83b17f32b5790df2bd6c1cb588.1786540582.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2194.v2.git.1786540582.gitgitgadget@gmail.com>
From: Johannes Sixt <j6t@kdbg.org>
The selection and link colors apply not only to the diff panel, but also
to the the commit list. Move these right after the generic background
and text color options.
The color for marked lines is only used in the diff panel, hence, leave
it below the diff color options.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
gitk-git/gitk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index d4c229a3c0..9506739c50 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -11840,6 +11840,12 @@ proc prefspage_colors {notebook} {
fg fgcolor {} \
[mc "Main text"] \
[mc "choose main text color"] \
+ selbg selectbgcolor {} \
+ [mc "Selected text background"] \
+ [mc "choose background color of selected text"] \
+ linkfg linkfgcolor {} \
+ [mc "Link text"] \
+ [mc "choose color of link text"] \
diffold diffcolors 0 \
[mc "Old line text"] \
[mc "choose text color of old lines"] \
@@ -11858,12 +11864,6 @@ proc prefspage_colors {notebook} {
markbg markbgcolor {} \
[mc "Marked line background"] \
[mc "choose background color of marked lines"] \
- selbg selectbgcolor {} \
- [mc "Selected text background"] \
- [mc "choose background color of selected text"] \
- linkfg linkfgcolor {} \
- [mc "Link text"] \
- [mc "choose color of link text"] \
]
foreach {uielem colorvar idx label title} $coloruielems {
--
gitgitgadget
prev parent reply other threads:[~2026-08-12 13:16 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-06 6:40 [PATCH 0/5] gitk: make color preferences visually more pleasing and better usable Johannes Sixt via GitGitGadget
2026-08-06 6:40 ` [PATCH 1/5] gitk: set intitial colors of swatches using the available helper Johannes Sixt via GitGitGadget
2026-08-07 14:36 ` mark
2026-08-06 6:40 ` [PATCH 2/5] gitk: condense repetitive code around color buttons into foreach loops Johannes Sixt via GitGitGadget
2026-08-07 14:37 ` mark
2026-08-06 6:40 ` [PATCH 3/5] gitk: show color preferences on the button instead of the label Johannes Sixt via GitGitGadget
2026-08-07 14:37 ` mark
2026-08-08 9:33 ` Johannes Sixt
2026-08-06 6:40 ` [PATCH 4/5] gitk: use more natural language for labels of color preferences Johannes Sixt via GitGitGadget
2026-08-06 6:40 ` [PATCH 5/5] gitk: avoid constructing dialog titles from text pieces Johannes Sixt via GitGitGadget
2026-08-07 14:37 ` mark
2026-08-08 10:00 ` Johannes Sixt
2026-08-08 14:55 ` Mark Levedahl
2026-08-09 7:27 ` Johannes Sixt
2026-08-08 16:32 ` Junio C Hamano
2026-08-09 7:04 ` Johannes Sixt
2026-08-12 13:16 ` [PATCH v2 0/6] gitk: make color preferences visually more pleasing and better usable Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` [PATCH v2 1/6] gitk: set intitial colors of swatches using the available helper Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` [PATCH v2 2/6] gitk: condense repetitive code around color buttons into foreach loops Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` [PATCH v2 3/6] gitk: show color preferences on the button instead of the label Johannes Sixt via GitGitGadget
2026-08-13 17:00 ` Mark Levedahl
2026-08-12 13:16 ` [PATCH v2 4/6] gitk: use more natural language for labels of color preferences Johannes Sixt via GitGitGadget
2026-08-13 17:00 ` Mark Levedahl
2026-08-13 19:35 ` Johannes Sixt
2026-08-13 20:11 ` Mark Levedahl
2026-08-12 13:16 ` [PATCH v2 5/6] gitk: avoid constructing dialog titles from text pieces Johannes Sixt via GitGitGadget
2026-08-12 13:16 ` Johannes Sixt via GitGitGadget [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=36590e857d3c9a83b17f32b5790df2bd6c1cb588.1786540582.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=mlevedahl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.