diff options
| author | Cédric Cabessa <ced@ryick.net> | 2018-07-25 17:06:50 +0200 | 
|---|---|---|
| committer | Cédric Cabessa <ced@ryick.net> | 2018-07-25 17:06:50 +0200 | 
| commit | 445a09575ceffbb05b9045ecd0ce89a6c2e173dc (patch) | |
| tree | 18aa3e845dbe44b0bbe245063af591b940126970 /sway | |
| parent | 53dbe2da4bd2563ec69211d0c51fb347109fc70d (diff) | |
| download | sway-445a09575ceffbb05b9045ecd0ce89a6c2e173dc.tar.xz | |
fix #2355: "move workspace to output up" crashes
when using 2 display, if scaling is different
`container_update_textures_recursive` is called when moving workspace on
different display.
We need to call `container_update_title_textures` only for container of type
"CONTAINER" or "VIEW" in order to be consistent with the assert in
`update_title_texture`.
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/tree/container.c | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/sway/tree/container.c b/sway/tree/container.c index b56b4e87..237e1a35 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -68,7 +68,9 @@ void container_create_notify(struct sway_container *container) {  }  static void container_update_textures_recursive(struct sway_container *con) { -	container_update_title_textures(con); +	if (con->type == C_CONTAINER || con->type == C_VIEW) { +		container_update_title_textures(con); +	}  	if (con->type == C_VIEW) {  		view_update_marks_textures(con->sway_view); | 
