git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] gitk: Fix crash when not using themed widgets
@ 2012-10-07 21:21 Marcus Karlsson
  2012-10-21 22:22 ` Paul Mackerras
  0 siblings, 1 reply; 2+ messages in thread
From: Marcus Karlsson @ 2012-10-07 21:21 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: git, Marcus Karlsson

When configured not to use themed widgets gitk may crash on launch with
a message that says that the image "bm-left disabled bm-left-gray"
doesn't exist. This happens when the left and right arrow buttons are
created.

The crash can be avoided by configuring the buttons differently
depending on whether or not themed widgets are used. If themed widgets
are not used then only set the images to bm-left and bm-right
respectively, and keep the old behavior when themed widgets are used.

The previous behaviour was added in f062e50f to work around a bug in Tk
on OS X where the disabled state did not display properly. The buttons
may still not display correctly, however the workaround added in
f062e50f will still apply if gitk is used with themed widgets.

Make gitk not crash on launch when not using themed widgets.

Signed-off-by: Marcus Karlsson <mk@acc.umu.se>
---
 gitk |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gitk b/gitk
index 379582a..02ffd9b 100755
--- a/gitk
+++ b/gitk
@@ -2182,11 +2182,19 @@ proc makewindow {} {
     image create bitmap bm-right -data $bm_right_data
     image create bitmap bm-right-gray -data $bm_right_data -foreground "#999"
 
-    ${NS}::button .tf.bar.leftbut -image [list bm-left disabled bm-left-gray] \
-	-command goback -state disabled -width 26
+    ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26
+    if {$use_ttk} {
+	.tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray]
+    } else {
+	.tf.bar.leftbut configure -image bm-left
+    }
     pack .tf.bar.leftbut -side left -fill y
-    ${NS}::button .tf.bar.rightbut -image [list bm-right disabled bm-right-gray] \
-	-command goforw -state disabled -width 26
+    ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26
+    if {$use_ttk} {
+	.tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray]
+    } else {
+	.tf.bar.rightbut configure -image bm-right
+    }
     pack .tf.bar.rightbut -side left -fill y
 
     ${NS}::label .tf.bar.rowlabel -text [mc "Row"]
-- 
1.7.10.4

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] gitk: Fix crash when not using themed widgets
  2012-10-07 21:21 [PATCH] gitk: Fix crash when not using themed widgets Marcus Karlsson
@ 2012-10-21 22:22 ` Paul Mackerras
  0 siblings, 0 replies; 2+ messages in thread
From: Paul Mackerras @ 2012-10-21 22:22 UTC (permalink / raw)
  To: Marcus Karlsson; +Cc: git

On Sun, Oct 07, 2012 at 11:21:14PM +0200, Marcus Karlsson wrote:
> When configured not to use themed widgets gitk may crash on launch with
> a message that says that the image "bm-left disabled bm-left-gray"
> doesn't exist. This happens when the left and right arrow buttons are
> created.
> 
> The crash can be avoided by configuring the buttons differently
> depending on whether or not themed widgets are used. If themed widgets
> are not used then only set the images to bm-left and bm-right
> respectively, and keep the old behavior when themed widgets are used.
> 
> The previous behaviour was added in f062e50f to work around a bug in Tk
> on OS X where the disabled state did not display properly. The buttons
> may still not display correctly, however the workaround added in
> f062e50f will still apply if gitk is used with themed widgets.
> 
> Make gitk not crash on launch when not using themed widgets.
> 
> Signed-off-by: Marcus Karlsson <mk@acc.umu.se>

Thanks, applied.

Paul.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-10-21 22:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-07 21:21 [PATCH] gitk: Fix crash when not using themed widgets Marcus Karlsson
2012-10-21 22:22 ` Paul Mackerras

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).