Tk Source Code

Artifact [d328ab7a]
Login

Artifact d328ab7a2d14dc6e8f78e0d6ff30b6a3fbda3596218725de3eea1a6328e06486:

Attachment "patch.txt" to ticket [82292324] added by cjmcdonald 2018-09-21 16:23:48.
*** tkUnixMenu.c.tk8.6.8	2017-12-06 15:25:08.000000000 +0000
--- tkUnixMenu.c.patched	2018-09-21 10:18:43.989829285 +0100
***************
*** 52,59 ****
  static void		DrawMenuEntryAccelerator(TkMenu *menuPtr,
  			    TkMenuEntry *mePtr, Drawable d, GC gc,
  			    Tk_Font tkfont, const Tk_FontMetrics *fmPtr,
! 			    Tk_3DBorder activeBorder, int x, int y,
! 			    int width, int height, int drawArrow);
  static void		DrawMenuEntryBackground(TkMenu *menuPtr,
  			    TkMenuEntry *mePtr, Drawable d,
  			    Tk_3DBorder activeBorder, Tk_3DBorder bgBorder,
--- 52,59 ----
  static void		DrawMenuEntryAccelerator(TkMenu *menuPtr,
  			    TkMenuEntry *mePtr, Drawable d, GC gc,
  			    Tk_Font tkfont, const Tk_FontMetrics *fmPtr,
! 			    Tk_3DBorder activeBorder, Tk_3DBorder bgBorder,
! 			    int x, int y, int width, int height, int drawArrow);
  static void		DrawMenuEntryBackground(TkMenu *menuPtr,
  			    TkMenuEntry *mePtr, Drawable d,
  			    Tk_3DBorder activeBorder, Tk_3DBorder bgBorder,
***************
*** 481,486 ****
--- 481,487 ----
      Tk_Font tkfont,		/* The precalculated font */
      const Tk_FontMetrics *fmPtr,/* The precalculated metrics */
      Tk_3DBorder activeBorder,	/* The border for an active item */
+     Tk_3DBorder bgBorder,	/* The background border */
      int x,			/* Left coordinate of entry rect */
      int y,			/* Top coordinate of entry rect */
      int width,			/* Width of entry */
***************
*** 510,517 ****
      	points[1].y = points[0].y + CASCADE_ARROW_HEIGHT;
      	points[2].x = points[0].x + CASCADE_ARROW_WIDTH;
      	points[2].y = points[0].y + CASCADE_ARROW_HEIGHT/2;
!     	Tk_Fill3DPolygon(menuPtr->tkwin, d, activeBorder, points, 3,
! 		DECORATION_BORDER_WIDTH,
  	    	(menuPtr->postedCascade == mePtr)
  	    	? TK_RELIEF_SUNKEN : TK_RELIEF_RAISED);
      } else if (mePtr->accelPtr != NULL) {
--- 511,519 ----
      	points[1].y = points[0].y + CASCADE_ARROW_HEIGHT;
      	points[2].x = points[0].x + CASCADE_ARROW_WIDTH;
      	points[2].y = points[0].y + CASCADE_ARROW_HEIGHT/2;
!     	Tk_Fill3DPolygon(menuPtr->tkwin, d,
! 		(mePtr->state == ENTRY_ACTIVE) ? activeBorder : bgBorder,
! 		points, 3, DECORATION_BORDER_WIDTH,
  	    	(menuPtr->postedCascade == mePtr)
  	    	? TK_RELIEF_SUNKEN : TK_RELIEF_RAISED);
      } else if (mePtr->accelPtr != NULL) {
***************
*** 1435,1441 ****
  	DrawMenuEntryLabel(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, adjustedY,
  		width, adjustedHeight);
  	DrawMenuEntryAccelerator(menuPtr, mePtr, d, gc, tkfont, fmPtr,
! 		activeBorder, x, adjustedY, width, adjustedHeight, drawArrow);
  	if (!mePtr->hideMargin) {
  	    if (mePtr->state == ENTRY_ACTIVE) {
  		bgBorder = activeBorder;
--- 1437,1444 ----
  	DrawMenuEntryLabel(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, adjustedY,
  		width, adjustedHeight);
  	DrawMenuEntryAccelerator(menuPtr, mePtr, d, gc, tkfont, fmPtr,
! 		activeBorder, bgBorder, x, adjustedY, width, adjustedHeight,
! 		drawArrow);
  	if (!mePtr->hideMargin) {
  	    if (mePtr->state == ENTRY_ACTIVE) {
  		bgBorder = activeBorder;