Mercurial > vim

comparison src/screen.c @ 16894:236c182c6300 v8.1.1448

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1448: statusline is sometimes drawn on top of popup commit https://github.com/vim/vim/commit/988c43310a8dcfad9fbacd110b50ba220227d19a Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 2 14:12:11 2019 +0200 patch 8.1.1448: statusline is sometimes drawn on top of popup Problem: Statusline is sometimes drawn on top of popup. Solution: Redraw popups after the statusline. (Naruhiko Nishino, closes #4468)
author Bram Moolenaar <Bram@vim.org>
date Sun, 02 Jun 2019 14:15:06 +0200
parents ec61b6b79865
children aad59f9fe253
comparison
equal deleted inserted replaced
16893:7277e70d5dab 16894:236c182c6300
821 if (!did_intro) 821 if (!did_intro)
822 maybe_intro_message(); 822 maybe_intro_message();
823 did_intro = TRUE; 823 did_intro = TRUE;
824 824
825 #ifdef FEAT_TEXT_PROP 825 #ifdef FEAT_TEXT_PROP
826 // Display popup windows on top of the others. 826 // Display popup windows on top of the windows.
827 update_popups(); 827 update_popups();
828 #endif 828 #endif
829 829
830 #ifdef FEAT_GUI 830 #ifdef FEAT_GUI
831 /* Redraw the cursor and update the scrollbars when all screen updating is 831 /* Redraw the cursor and update the scrollbars when all screen updating is
985 win_update(wp); 985 win_update(wp);
986 if (wp->w_redr_status) 986 if (wp->w_redr_status)
987 win_redr_status(wp, FALSE); 987 win_redr_status(wp, FALSE);
988 } 988 }
989 989
990 #ifdef FEAT_TEXT_PROP
991 // Display popup windows on top of the others.
992 update_popups();
993 #endif
994
990 update_finish(); 995 update_finish();
991 } 996 }
992 #endif 997 #endif
993 998
994 /* 999 /*
1208 # ifdef FEAT_STL_OPT 1213 # ifdef FEAT_STL_OPT
1209 || *p_stl != NUL || *wp->w_p_stl != NUL 1214 || *p_stl != NUL || *wp->w_p_stl != NUL
1210 # endif 1215 # endif
1211 ) 1216 )
1212 win_redr_status(wp, FALSE); 1217 win_redr_status(wp, FALSE);
1218
1219 #ifdef FEAT_TEXT_PROP
1220 // Display popup windows on top of everything.
1221 update_popups();
1222 #endif
1213 1223
1214 update_finish(); 1224 update_finish();
1215 } 1225 }
1216 #endif 1226 #endif
1217 1227
6793 FOR_ALL_WINDOWS(wp) 6803 FOR_ALL_WINDOWS(wp)
6794 if (wp->w_redr_status) 6804 if (wp->w_redr_status)
6795 win_redr_status(wp, FALSE); 6805 win_redr_status(wp, FALSE);
6796 if (redraw_tabline) 6806 if (redraw_tabline)
6797 draw_tabline(); 6807 draw_tabline();
6808
6809 #ifdef FEAT_TEXT_PROP
6810 // Display popup windows on top of the status lines.
6811 update_popups();
6812 #endif
6798 } 6813 }
6799 6814
6800 #if defined(FEAT_WILDMENU) || defined(PROTO) 6815 #if defined(FEAT_WILDMENU) || defined(PROTO)
6801 /* 6816 /*
6802 * Redraw all status lines at the bottom of frame "frp". 6817 * Redraw all status lines at the bottom of frame "frp".
11099 maketitle(); 11114 maketitle();
11100 #endif 11115 #endif
11101 /* Redraw the tab pages line if needed. */ 11116 /* Redraw the tab pages line if needed. */
11102 if (redraw_tabline) 11117 if (redraw_tabline)
11103 draw_tabline(); 11118 draw_tabline();
11119
11120 #ifdef FEAT_TEXT_PROP
11121 // Display popup windows on top of everything.
11122 update_popups();
11123 #endif
11104 } 11124 }
11105 11125
11106 #ifdef FEAT_CMDL_INFO 11126 #ifdef FEAT_CMDL_INFO
11107 static void 11127 static void
11108 win_redr_ruler(win_T *wp, int always, int ignore_pum) 11128 win_redr_ruler(win_T *wp, int always, int ignore_pum)