aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-28 17:50:15 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-28 17:50:15 +0000
commite7e553ae5b49624bf38adc70e8e3a209d1ef2e5e (patch)
treeba62ff43aeeb847f878f160c09c1af75b2d000f8
parentrender: CSDs: don't render borders (only title bar) in maximized mode (diff)
render: resize: exclude CSD borders when loading default geometry in maximized mode
-rw-r--r--render.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/render.c b/render.c
index db824f17..53bedb75 100644
--- a/render.c
+++ b/render.c
@@ -1198,13 +1198,24 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
width = term->unmaximized_width;
height = term->unmaximized_height;
} else {
- width = term->conf->width * scale;
- height = term->conf->height * scale;
+ width = term->conf->width;
+ height = term->conf->height;
-#if FOOT_CSD_OUTSIDE
- width -= 2 * csd_border;
- height -= 2 * csd_border + csd_title;
-#endif
+ if (term->window->use_csd == CSD_YES) {
+ assert(!term->window->is_fullscreen);
+
+ /* Account for CSDs, to make actual window size match
+ * the configured size */
+ if (!term->window->is_maximized) {
+ width -= 2 * csd_border_size;
+ height -= 2 * csd_border_size + csd_title_size;
+ } else {
+ height -= csd_title_size;
+ }
+ }
+
+ width *= scale;
+ height *= scale;
}
}