From: Max Kirillov <max@max630.net>
To: Paul Mackerras <paulus@samba.org>
Cc: git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>,
Thomas Rast <tr@thomasrast.ch>
Subject: [PATCH v2] gitk: make pointer selection visible in highlighted lines
Date: Thu, 28 Nov 2013 23:20:18 +0200 [thread overview]
Message-ID: <20131128212018.GA24615@wheezy.local> (raw)
In-Reply-To: <20131127180601.GA31211@wheezy.local>
Custom tags have higher priority than `sel`, and when they define their
own background, it makes selection invisible. Especially inconvenient
for `filesep` (to select filenames), but also affects other tags.
Use `tag raise` to fix `sel`'s priority.
Also change `omark` tag handling, so that it is created once, together
with others, and then only removed from text rather than deleted. Then
it will not get larger priority than the `sel` tag.
Signed-off-by: Max Kirillov <max@max630.net>
---
Fixed the typo in the comment and selection of text in marked line
gitk | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gitk b/gitk
index 1dd5137..491a1fa 100755
--- a/gitk
+++ b/gitk
@@ -2029,6 +2029,7 @@ proc makewindow {} {
global headctxmenu progresscanv progressitem progresscoords statusw
global fprogitem fprogcoord lastprogupdate progupdatepending
global rprogitem rprogcoord rownumsel numcommits
+ global markbgcolor
global have_tk85 use_ttk NS
global git_version
global worddiff
@@ -2376,6 +2377,8 @@ proc makewindow {} {
$ctext tag conf found -back yellow
$ctext tag conf currentsearchhit -back orange
$ctext tag conf wwrap -wrap word
+ $ctext tag conf omark -background $markbgcolor
+ $ctext tag raise sel
.pwbottom add .bleft
if {!$use_ttk} {
@@ -7439,11 +7442,10 @@ proc getblobline {bf id} {
}
proc mark_ctext_line {lnum} {
- global ctext markbgcolor
+ global ctext
- $ctext tag delete omark
+ $ctext tag remove omark 1.0 end
$ctext tag add omark $lnum.0 "$lnum.0 + 1 line"
- $ctext tag conf omark -background $markbgcolor
$ctext see $lnum.0
}
--
1.8.4.2.1566.g3c1a064
next prev parent reply other threads:[~2013-11-28 21:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-27 18:06 [PATCH] gitk: make pointer selection visible in highlighted lines Max Kirillov
2013-11-27 19:16 ` Thomas Rast
2013-11-27 20:29 ` Eric Sunshine
2013-11-28 21:20 ` Max Kirillov [this message]
2013-12-01 22:41 ` [PATCH v2] " Paul Mackerras
2013-12-02 10:04 ` Stefan Haller
2013-12-03 0:35 ` Max Kirillov
2013-12-11 23:36 ` [RFC] HACK: use anchor mark instead of sel tag Max Kirillov
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=20131128212018.GA24615@wheezy.local \
--to=max@max630.net \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
--cc=sunshine@sunshineco.com \
--cc=tr@thomasrast.ch \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).