mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
We allow fullscreen to fill the requested size, do the same for maximize.
This commit is contained in:
Kristian Høgsberg
2012-10-10 11:41:21 -04:00
parent b7ed4cbbc7
commit b36f7ef99e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/terminal.c
+4 -2
View File
@@ -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)
{ {
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;