api: add width/height to FloatConfig

1 files changed, 8 insertions, 9 deletions

diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index f8bcaddb36..ba505af87e 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -439,13 +439,12 @@ Boolean nvim_win_is_valid(Window window)
 /// types).
 ///
 /// See documentation at |nvim_open_win()|, for the meaning of parameters. Pass
-/// in -1 for 'witdh' and 'height' to keep exiting size.
+/// in 0 for 'witdh' and 'height' to keep exiting size.
 ///
 /// When reconfiguring a floating window, absent option keys will not be
 /// changed. The following restriction apply: `row`, `col` and `relative`
 /// must be reconfigured together. Only changing a subset of these is an error.
-void nvim_win_set_config(Window window, Integer width, Integer height,
-                         Dictionary options, Error *err)
+void nvim_win_set_config(Window window, Dictionary options, Error *err)
   FUNC_API_SINCE(6)
 {
   win_T *win = find_window_by_handle(window, err);
@@ -453,21 +452,21 @@ void nvim_win_set_config(Window window, Integer width, Integer height,
     return;
   }
   bool new_float = !win->w_floating;
-  width = width > 0 ? width: win->w_width;
-  height = height > 0 ? height : win->w_height;
   // reuse old values, if not overriden
   FloatConfig config = new_float ? FLOAT_CONFIG_INIT : win->w_float_config;
 
   if (!parse_float_config(options, &config, !new_float, err)) {
     return;
   }
+  config.height = config.height > 0 ? config.height : win->w_height;
+  config.width = config.width > 0 ? config.width : win->w_width;
   if (new_float) {
-    if (!win_new_float(win, (int)width, (int)height, config, err)) {
+    if (!win_new_float(win, config, err)) {
       return;
     }
     redraw_later(NOT_VALID);
   } else {
-    win_config_float(win, (int)width, (int)height, config);
+    win_config_float(win, config);
     win->w_pos_changed = true;
   }
 }
@@ -490,8 +489,8 @@ Dictionary nvim_win_get_config(Window window, Error *err)
     return rv;
   }
 
-  PUT(rv, "height", INTEGER_OBJ(wp->w_height));
-  PUT(rv, "width", INTEGER_OBJ(wp->w_width));
+  PUT(rv, "width", INTEGER_OBJ(wp->w_float_config.width));
+  PUT(rv, "height", INTEGER_OBJ(wp->w_float_config.height));
   PUT(rv, "focusable", BOOLEAN_OBJ(wp->w_float_config.focusable));
   PUT(rv, "external", BOOLEAN_OBJ(wp->w_float_config.external));
   PUT(rv, "anchor", STRING_OBJ(cstr_to_string(