aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ui.c
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2022-08-21 23:26:49 -0600
committerJosh Rahm <joshuarahm@gmail.com>2022-08-21 23:26:49 -0600
commit73ede4a508517f8e55c75d710f13851eb8079875 (patch)
treeb4cccc61b70c28b1474d74d2ff4bff856929cdca /src/nvim/ui.c
parent8436383af96dc7afa3596fc22c012d68e76f47f8 (diff)
parent72b03792b6428ca96ca779b53061c6c98f6f930f (diff)
downloadrneovim-73ede4a508517f8e55c75d710f13851eb8079875.tar.gz
rneovim-73ede4a508517f8e55c75d710f13851eb8079875.tar.bz2
rneovim-73ede4a508517f8e55c75d710f13851eb8079875.zip
Merge remote-tracking branch 'upstream/master' into usermarks
Diffstat (limited to 'src/nvim/ui.c')
-rw-r--r--src/nvim/ui.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 4fcfee1192..da671a3ad1 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -13,11 +13,12 @@
#include "nvim/cursor.h"
#include "nvim/cursor_shape.h"
#include "nvim/diff.h"
+#include "nvim/drawscreen.h"
#include "nvim/event/loop.h"
-#include "nvim/ex_cmds2.h"
#include "nvim/ex_getln.h"
#include "nvim/fold.h"
#include "nvim/garray.h"
+#include "nvim/grid.h"
#include "nvim/highlight.h"
#include "nvim/log.h"
#include "nvim/main.h"
@@ -31,8 +32,7 @@
#include "nvim/os/signal.h"
#include "nvim/os/time.h"
#include "nvim/os_unix.h"
-#include "nvim/popupmnu.h"
-#include "nvim/screen.h"
+#include "nvim/popupmenu.h"
#include "nvim/ui.h"
#include "nvim/ui_compositor.h"
#include "nvim/vim.h"
@@ -663,6 +663,6 @@ void ui_grid_resize(handle_T grid_handle, int width, int height, Error *error)
// non-positive indicates no request
wp->w_height_request = MAX(height, 0);
wp->w_width_request = MAX(width, 0);
- win_set_inner_size(wp);
+ win_set_inner_size(wp, true);
}
}