Merge branch 'next' into master

[i3/i3] / include / resize.h

diff --git a/include/resize.h b/include/resize.h
index 386341561854fcaeefa240661bf10cc59cef6245..72dffc0f55a5d66c68d376938945832dea936d9e 100644 (file)
--- a/include/resize.h
+++ b/include/resize.h
@@ -13,4 +13,27 @@
 
 bool resize_find_tiling_participants(Con **current, Con **other, direction_t direction, bool both_sides);
 
 
 bool resize_find_tiling_participants(Con **current, Con **other, direction_t direction, bool both_sides);
 

-int resize_graphical_handler(Con *first, Con *second, orientation_t orientation, const xcb_button_press_event_t *event);
+void resize_graphical_handler(Con *first, Con *second, orientation_t orientation, const xcb_button_press_event_t *event);
+
+/**
+ * Resize the two given containers using the given amount of pixels or
+ * percentage points. One of the two needs to be 0. A positive amount means
+ * growing the first container while a negative means shrinking it.
+ * Returns false when the resize would result in one of the two containers
+ * having less than 1 pixel of size.
+ *
+ */
+bool resize_neighboring_cons(Con *first, Con *second, int px, int ppt);
+
+/**
+ * Calculate the minimum percent needed for the given container to be at least 1
+ * pixel.
+ *
+ */
+double percent_for_1px(Con *con);
+
+/**
+ * Calculate the given container's new percent given a change in pixels.
+ *
+ */
+double px_resize_to_percent(Con *con, int px_diff);