thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1123: cannot define a toolbar for a window

Browse Source 
Problem:    Cannot define a toolbar for a window.
Solution:   Add a window-local toolbar.
This commit is contained in:
Bram Moolenaar
2017-09-17 23:03:31 +02:00
parent dde403c2d8
commit 1b9645de3c
20 changed files with 679 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ui.c
View File

@@ -2657,7 +2657,7 @@ retnomove:
}
#if defined(FEAT_CMDWIN) && defined(FEAT_CLIPBOARD)
/* Continue a modeless selection in another window. */
if (cmdwin_type != 0 && row < W_WINROW(curwin))
if (cmdwin_type != 0 && row < curwin->w_winrow)
return IN_OTHER_WIN;
#endif
return IN_BUFFER;
@@ -2692,6 +2692,17 @@ retnomove:
if (wp == NULL)
return IN_UNKNOWN;
dragwin = NULL;
#ifdef FEAT_MENU
if (row == -1)
{
/* A click in the window toolbar does not enter another window or
* change Visual highlighting. */
winbar_click(wp, col);
return IN_OTHER_WIN;
}
#endif
/*
* winpos and height may change in win_enter()!
*/
@@ -2829,7 +2840,7 @@ retnomove:
#if defined(FEAT_CMDWIN) && defined(FEAT_CLIPBOARD)
/* Continue a modeless selection in another window. */
if (cmdwin_type != 0 && row < W_WINROW(curwin))
if (cmdwin_type != 0 && row < curwin->w_winrow)
return IN_OTHER_WIN;
#endif
@@ -3117,7 +3128,12 @@ mouse_find_win(int *rowp, int *colp UNUSED)
* exist. */
FOR_ALL_WINDOWS(wp)
if (wp == fp->fr_win)
{
#ifdef FEAT_MENU
*rowp -= wp->w_winbar_height;
#endif
return wp;
}
return NULL;
}