diff options
| author | Manuel Giraud <manuel@ledu-giraud.fr> | 2022-12-03 22:47:02 +0100 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-12-04 14:43:21 +0200 |
| commit | a51743dbcb793d1c02f1f40b107e752c2a095ab0 (patch) | |
| tree | 6608870dce18cc7b847628bd11eb9943e2432453 /src/xdisp.c | |
| parent | f96a9e10b108237e4aa192eca962ceb0ca07e431 (diff) | |
| download | emacs-a51743dbcb793d1c02f1f40b107e752c2a095ab0.tar.gz | |
Make a boxed menu bar have a shadow at its right end (bug#59778)
* src/xdisp.c (display_menu_bar) [HAVE_X_WINDOWS]: Make a boxed
menu bar have a shadow at its right end in non-toolkit X builds.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index b7333dc1ee6..4e087bc39be 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -26312,9 +26312,8 @@ display_menu_bar (struct window *w) it.first_visible_x = 0; it.last_visible_x = FRAME_PIXEL_WIDTH (f); #elif defined (HAVE_X_WINDOWS) /* X without toolkit. */ - struct window *menu_window; - - menu_window = NULL; + struct window *menu_window = NULL; + struct face *face = FACE_FROM_ID (f, MENU_FACE_ID); if (FRAME_WINDOW_P (f)) { @@ -26324,8 +26323,6 @@ display_menu_bar (struct window *w) init_iterator (&it, menu_window, -1, -1, menu_window->desired_matrix->rows, MENU_FACE_ID); - it.first_visible_x = 0; - it.last_visible_x = FRAME_PIXEL_WIDTH (f); } else #endif /* not USE_X_TOOLKIT and not USE_GTK */ @@ -26379,8 +26376,31 @@ display_menu_bar (struct window *w) /* Compute the total height of the lines. */ compute_line_metrics (&it); + it.glyph_row->full_width_p = true; + it.glyph_row->continued_p = false; + it.glyph_row->truncated_on_left_p = false; + it.glyph_row->truncated_on_right_p = false; #if defined (HAVE_X_WINDOWS) && !defined (USE_X_TOOLKIT) && !defined (USE_GTK) + /* Make a 3D menu bar have a shadow at its right end. */ + extend_face_to_end_of_line (&it); + if (face->box != FACE_NO_BOX) + { + struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA] + + it.glyph_row->used[TEXT_AREA] - 1); + int box_thickness = face->box_vertical_line_width; + last->right_box_line_p = true; + /* Add back the space for the right box line we subtracted in + init_iterator, since the right_box_line_p flag will make the + glyph wider. We actually add only as much space as is + available for the last glyph of the menu bar and whatever + space is left beyond it, since that glyph could be only + partially visible. */ + if (box_thickness > 0) + last->pixel_width += max (0, (box_thickness + - (it.current_x - it.last_visible_x))); + } + /* With the non-toolkit version, modify the menu bar window height accordingly. */ if (FRAME_WINDOW_P (it.f) && menu_window) |