diff options
| author | culler <culler> | 2019-01-13 19:24:18 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-01-13 19:24:18 (GMT) |
| commit | cd265b13ef5f38b99caf9727279b7a68ccceac2a (patch) | |
| tree | d5cb5ac9886f79b1c35bfd471279253554eb5261 /macosx/tkMacOSXMenubutton.c | |
| parent | 2f5b18681b5ac4100ef19d65ae31babbc0e840b4 (diff) | |
| download | tk-cd265b13ef5f38b99caf9727279b7a68ccceac2a.zip tk-cd265b13ef5f38b99caf9727279b7a68ccceac2a.tar.gz tk-cd265b13ef5f38b99caf9727279b7a68ccceac2a.tar.bz2 | |
Deal with empty menubuttons on the mac.
Diffstat (limited to 'macosx/tkMacOSXMenubutton.c')
| -rw-r--r-- | macosx/tkMacOSXMenubutton.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c index 4df23b4..66bb4dd 100644 --- a/macosx/tkMacOSXMenubutton.c +++ b/macosx/tkMacOSXMenubutton.c @@ -244,7 +244,7 @@ void TkpComputeMenuButtonGeometry(butPtr) register TkMenuButton *butPtr; /* Widget record for menu button. */ { - int width, height, avgWidth, haveImage = 0, haveText = 0; + int width, height, avgWidth, haveImage = 0; int txtWidth, txtHeight; Tk_FontMetrics fm; int highlightWidth = butPtr->highlightWidth > 0 ? butPtr->highlightWidth : 0; @@ -267,6 +267,16 @@ TkpComputeMenuButtonGeometry(butPtr) haveImage = 1; } + /* + * Mac menubuttons do not display correctly with no image and empty text. + */ + + if (haveImage == 0 && strlen(butPtr->text) == 0) { + ckfree(butPtr->text); + butPtr->text = ckalloc(2); + strcpy(butPtr->text, " "); + } + if (haveImage == 0 || butPtr->compound != COMPOUND_NONE) { Tk_FreeTextLayout(butPtr->textLayout); butPtr->textLayout = Tk_ComputeTextLayout(butPtr->tkfont, @@ -277,7 +287,6 @@ TkpComputeMenuButtonGeometry(butPtr) txtHeight = butPtr->textHeight; avgWidth = Tk_TextWidth(butPtr->tkfont, "0", 1); Tk_GetFontMetrics(butPtr->tkfont, &fm); - haveText = (txtWidth != 0 && txtHeight != 2); } /* @@ -287,7 +296,7 @@ TkpComputeMenuButtonGeometry(butPtr) * image, because otherwise it is not really a compound button. */ - if (butPtr->compound != COMPOUND_NONE && haveImage && haveText) { + if (butPtr->compound != COMPOUND_NONE && haveImage) { switch ((enum compound) butPtr->compound) { case COMPOUND_TOP: case COMPOUND_BOTTOM: { |