diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2023-03-02 16:22:27 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2023-03-02 16:22:27 +0000 |
| commit | 514fcc20a73feec88f9a912a8dedf7eac40ca55b (patch) | |
| tree | 5140a75b65f32d3d61de08424012e3f9b9c488f0 /render.c | |
| parent | render: fix inversed cursor fg color when alpha != 1.0, take #2 (diff) | |
render: resize: call xdg_toplevel_set_min_size()
This is a hint to the compositor, not to set a smaller size than this.
Diffstat (limited to 'render.c')
| -rw-r--r-- | render.c | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -3885,9 +3885,9 @@ maybe_resize(struct terminal *term, int width, int height, bool force) const int min_cols = 2; const int min_rows = 1; - /* Minimum window size */ - const int min_width = min_cols * term->cell_width; - const int min_height = min_rows * term->cell_height; + /* Minimum window size (must be divisible by the scaling factor)*/ + const int min_width = (min_cols * term->cell_width + scale - 1) / scale * scale; + const int min_height = (min_rows * term->cell_height + scale - 1) / scale * scale; width = max(width, min_width); height = max(height, min_height); @@ -4132,12 +4132,6 @@ damage_view: term->stashed_height = term->height; } -#if 0 - /* TODO: doesn't include CSD title bar */ - xdg_toplevel_set_min_size( - term->window->xdg_toplevel, min_width / scale, min_height / scale); -#endif - { const bool title_shown = wayl_win_csd_titlebar_visible(term->window); const bool border_shown = wayl_win_csd_borders_visible(term->window); @@ -4147,6 +4141,11 @@ damage_view: const int border_width = border_shown ? term->conf->csd.border_width_visible : 0; + xdg_toplevel_set_min_size( + term->window->xdg_toplevel, + min_width / scale + 2 * border_width, + min_height / scale + title_height + 2 * border_width); + xdg_surface_set_window_geometry( term->window->xdg_surface, -border_width, |
