Con *focused_con = con_descend_focused(floating_con);
/* obey size increments */
- if (focused_con->height_increment || focused_con->width_increment) {
+ if (focused_con->window != NULL && (focused_con->window->height_increment || focused_con->window->width_increment)) {
Rect border_rect = con_border_style_rect(focused_con);
/* We have to do the opposite calculations that render_con() do
if (con_border_style(focused_con) == BS_NORMAL)
border_rect.height += render_deco_height();
- if (focused_con->height_increment &&
- floating_con->rect.height >= focused_con->base_height + border_rect.height) {
- floating_con->rect.height -= focused_con->base_height + border_rect.height;
- floating_con->rect.height -= floating_con->rect.height % focused_con->height_increment;
- floating_con->rect.height += focused_con->base_height + border_rect.height;
+ if (focused_con->window->height_increment &&
+ floating_con->rect.height >= focused_con->window->base_height + border_rect.height) {
+ floating_con->rect.height -= focused_con->window->base_height + border_rect.height;
+ floating_con->rect.height -= floating_con->rect.height % focused_con->window->height_increment;
+ floating_con->rect.height += focused_con->window->base_height + border_rect.height;
}
- if (focused_con->width_increment &&
- floating_con->rect.width >= focused_con->base_width + border_rect.width) {
- floating_con->rect.width -= focused_con->base_width + border_rect.width;
- floating_con->rect.width -= floating_con->rect.width % focused_con->width_increment;
- floating_con->rect.width += focused_con->base_width + border_rect.width;
+ if (focused_con->window->width_increment &&
+ floating_con->rect.width >= focused_con->window->base_width + border_rect.width) {
+ floating_con->rect.width -= focused_con->window->base_width + border_rect.width;
+ floating_con->rect.width -= floating_con->rect.width % focused_con->window->width_increment;
+ floating_con->rect.width += focused_con->window->base_width + border_rect.width;
}
}
tree_render();
}
+/*
+ * Sets size of the CT_FLOATING_CON to specified dimensions. Might limit the
+ * actual size with regard to size constraints taken from user settings.
+ * Additionally, the dimensions may be upscaled until they're divisible by the
+ * window's size hints.
+ *
+ */
+void floating_resize(Con *floating_con, int x, int y) {
+ DLOG("floating resize to %dx%d px\n", x, y);
+ Rect *rect = &floating_con->rect;
+ Con *focused_con = con_descend_focused(floating_con);
+ if (focused_con->window == NULL) {
+ DLOG("No window is focused. Not resizing.\n");
+ return;
+ }
+ int wi = focused_con->window->width_increment;
+ int hi = focused_con->window->height_increment;
+ rect->width = x;
+ rect->height = y;
+ if (wi)
+ rect->width += (wi - 1 - rect->width) % wi;
+ if (hi)
+ rect->height += (hi - 1 - rect->height) % hi;
+
+ floating_check_size(floating_con);
+
+ /* If this is a scratchpad window, don't auto center it from now on. */
+ if (floating_con->scratchpad_state == SCRATCHPAD_FRESH)
+ floating_con->scratchpad_state = SCRATCHPAD_CHANGED;
+}
+
/*
* Fixes the coordinates of the floating window whenever the window gets
* reassigned to a different output (or when the output’s rect changes).