summaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorSamuel Bronson <naesten@gmail.com>2011-12-07 12:48:04 (GMT)
committerPat Thoyts <patthoyts@users.sourceforge.net>2011-12-07 12:48:34 (GMT)
commit215d4fdbaa9d32459cc199667970dc7f63d94982 (patch)
tree8f067a4cc9125a3fbfedf881c0b0f81bcd248a41 /git-gui.sh
parentaf867683345838f1adc606618e873ae4387a3c81 (diff)
downloadgit-215d4fdbaa9d32459cc199667970dc7f63d94982.zip
git-215d4fdbaa9d32459cc199667970dc7f63d94982.tar.gz
git-215d4fdbaa9d32459cc199667970dc7f63d94982.tar.bz2
git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming.
It would be better if the 32x32 icon was equivalent to the one used on Windows (in git-gui.ico), but I'm not sure how that would best be done, so I copied this code from gitk instead. Signed-off-by: Samuel Bronson <naesten@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 8d95dda..2c57fb4 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -729,7 +729,10 @@ if {[is_Windows]} {
gitlogo put gray26 -to 5 15 11 16
gitlogo redither
- wm iconphoto . -default gitlogo
+ image create photo gitlogo32 -width 32 -height 32
+ gitlogo32 copy gitlogo -zoom 2 2
+
+ wm iconphoto . -default gitlogo gitlogo32
}
}