Merge pull request #117 from Luminarys/master

Altered resize command to prevent resizing past min h/w.

sway/commands.c

@@ -497,8 +497,49 @@ static bool cmd_resize(struct sway_config *config, int argc, char **argv) {
 		}
 		sway_log(L_DEBUG, "Found the proper parent: %p. It has %d l conts, and %d r conts", parent->parent, lnumber, rnumber);
 		//TODO: Ensure rounding is done in such a way that there are NO pixel leaks
-		for (i = 0; i < parent->parent->children->length; i++) {
 		bool valid = true;
+		for (i = 0; i < parent->parent->children->length; i++) {
+			sibling = parent->parent->children->items[i];
+			if (sibling->x != focused->x) {
+				if (sibling->x < parent->x) {
+					double pixels = -1 * amount;
+					pixels /= lnumber;
+					if (rnumber) {
+						if ((sibling->width + pixels/2) < min_sane_w) {
+							valid = false;
+							break;
+						}
+					} else {
+						if ((sibling->width + pixels) < min_sane_w) {
+							valid = false;
+							break;
+						}
+					}
+				} else if (sibling->x > parent->x) {
+					double pixels = -1 * amount;
+					pixels /= rnumber;
+					if (lnumber) {
+						if ((sibling->width + pixels/2) < min_sane_w) {
+							valid = false;
+							break;
+						}
+					} else {
+						if ((sibling->width + pixels) < min_sane_w) {
+							valid = false;
+							break;
+						}
+					}
+				}
+			} else {
+				double pixels = amount;
+				if (parent->width + pixels < min_sane_w) {
+					valid = false;
+					break;
+				}
+			}
+		}
+		if (valid) {
+			for (i = 0; i < parent->parent->children->length; i++) {
 				sibling = parent->parent->children->items[i];
 				if (sibling->x != focused->x) {
 					if (sibling->x < parent->x) {
@@ -534,6 +575,7 @@ static bool cmd_resize(struct sway_config *config, int argc, char **argv) {
 			// Recursive resize does not handle positions, let arrange_windows
 			// take care of that.
 			arrange_windows(swayc_active_workspace(), -1, -1);
+		}
 		return true;
 	} else if (strcmp(argv[1], "height") == 0) {
 		int tnumber = 0;
@@ -561,6 +603,48 @@ static bool cmd_resize(struct sway_config *config, int argc, char **argv) {
 		}
 		sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber);
 		//TODO: Ensure rounding is done in such a way that there are NO pixel leaks
+		bool valid = true;
+		for (i = 0; i < parent->parent->children->length; i++) {
+			sibling = parent->parent->children->items[i];
+			if (sibling->y != focused->y) {
+				if (sibling->y < parent->y) {
+					double pixels = -1 * amount;
+					pixels /= bnumber;
+					if (tnumber) {
+						if ((sibling->height + pixels/2) < min_sane_h) {
+							valid = false;
+							break;
+						}
+					} else {
+						if ((sibling->height + pixels) < min_sane_h) {
+							valid = false;
+							break;
+						}
+					}
+				} else if (sibling->y > parent->y) {
+					double pixels = -1 * amount;
+					pixels /= tnumber;
+					if (bnumber) {
+						if ((sibling->height + pixels/2) < min_sane_h) {
+							valid = false;
+							break;
+						}
+					} else {
+						if ((sibling->height + pixels) < min_sane_h) {
+							valid = false;
+							break;
+						}
+					}
+				}
+			} else {
+				double pixels = amount;
+				if (parent->height + pixels < min_sane_h) {
+					valid = false;
+					break;
+				}
+			}
+		}
+		if (valid) {
 			for (i = 0; i < parent->parent->children->length; i++) {
 				sibling = parent->parent->children->items[i];
 				if (sibling->y != focused->y) {
@@ -594,6 +678,7 @@ static bool cmd_resize(struct sway_config *config, int argc, char **argv) {
 				}
 			}
 			arrange_windows(swayc_active_workspace(), -1, -1);
+		}
 		return true;
 	}
 	return true;

sway/handlers.c

@@ -435,7 +435,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct
 				} else if (get_swayc_in_direction(pointer_state.tiling.init_view, MOVE_UP) == view) {
 					pointer_state.tiling.lock_pos.y = pointer_state.tiling.init_view->y + 20;
 					pointer_state.lock.temp_up = true;
-				} else if (get_swayc_in_direction(pointer_state.tiling.init_view, MOVE_UP) == view) {
+				} else if (get_swayc_in_direction(pointer_state.tiling.init_view, MOVE_DOWN) == view) {
 					pointer_state.tiling.lock_pos.y = pointer_state.tiling.init_view->y + pointer_state.tiling.init_view->height - 20;
 					pointer_state.lock.temp_down = true;
 				}