Commit b36f7ef9 authored by Kristian Høgsberg's avatar Kristian Høgsberg
Browse files

terminal: Don't snap resize if we're maximized

We allow fullscreen to fill the requested size, do the same for maximize.
parent b7ed4cbb
...@@ -763,7 +763,8 @@ resize_handler(struct widget *widget, ...@@ -763,7 +763,8 @@ resize_handler(struct widget *widget,
columns = (width - m) / (int32_t) terminal->extents.max_x_advance; columns = (width - m) / (int32_t) terminal->extents.max_x_advance;
rows = (height - m) / (int32_t) terminal->extents.height; rows = (height - m) / (int32_t) terminal->extents.height;
if (window_is_fullscreen(terminal->window)) { if (!window_is_fullscreen(terminal->window) &&
!window_is_maximized(terminal->window)) {
width = columns * terminal->extents.max_x_advance + m; width = columns * terminal->extents.max_x_advance + m;
height = rows * terminal->extents.height + m; height = rows * terminal->extents.height + m;
widget_set_size(terminal->widget, width, height); widget_set_size(terminal->widget, width, height);
...@@ -777,7 +778,8 @@ terminal_resize(struct terminal *terminal, int columns, int rows) ...@@ -777,7 +778,8 @@ terminal_resize(struct terminal *terminal, int columns, int rows)
{ {
int32_t width, height, m; int32_t width, height, m;
if (window_is_fullscreen(terminal->window)) if (window_is_fullscreen(terminal->window) ||
window_is_maximized(terminal->window))
return; return;
m = 2 * terminal->margin; m = 2 * terminal->margin;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment