Overview
| Artifact ID: | de9ac678934b09e6207e1ac84ca933172a1e6b5b7c9ae247563a244b16facd35 |
|---|---|
| Ticket: | 8229232472e9f94281919ab55b178286d5ad5627 |
| Date: | 2018-09-21 16:23:48 |
| User: | cjmcdonald |
| Artifact Attached: | d328ab7a2d14dc6e8f78e0d6ff30b6a3fbda3596218725de3eea1a6328e06486 |
| Filename: | patch.txt |
| Description: | Patch diff output |
Content:
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69*** 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;
