Fix resizing floating windows by height

(upstream git commit 1089b0b201cef30fbfd03620339f5e8a166feded)
This commit is contained in:
dcoppa 2012-08-27 09:49:18 +00:00
parent 4272ee15d5
commit 52850e935e
2 changed files with 18 additions and 4 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.42 2012/08/08 14:33:25 dcoppa Exp $
# $OpenBSD: Makefile,v 1.43 2012/08/27 09:49:18 dcoppa Exp $
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.2
REVISION = 9
REVISION = 10
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_commands_c,v 1.2 2012/08/08 14:33:25 dcoppa Exp $
$OpenBSD: patch-src_commands_c,v 1.3 2012/08/27 09:49:18 dcoppa Exp $
From b88ab981fd0a5725ed886a9f9788a5b1e721534c Mon Sep 17 00:00:00 2001
From: Ondrej Grover <ondrej.grover@gmail.com>
@ -12,6 +12,11 @@ found
also removed the obsolete tree_render() in favor of setting
cmd_output->needs_tree_render to true
From 1089b0b201cef30fbfd03620339f5e8a166feded Mon Sep 17 00:00:00 2001
From: Joel Stemmer <stemmertech@gmail.com>
Date: Sat, 18 Aug 2012 13:25:00 +0000
Subject: fix resizing floating windows by height
From 83dc5d5cb6c71d365cd79b376fcb073e9120144d Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 22 Jul 2012 19:25:38 +0000
@ -27,7 +32,7 @@ we wouldn't allow the user to focus it. We already allow this when
focusing a workspace, for example.
--- src/commands.c.orig Wed Apr 25 23:21:25 2012
+++ src/commands.c Wed Aug 8 16:02:40 2012
+++ src/commands.c Mon Aug 27 11:43:14 2012
@@ -65,6 +65,28 @@ static Output *get_output_from_string(Output *current_
return output;
}
@ -57,6 +62,15 @@ focusing a workspace, for example.
// This code is commented out because we might recycle it for popping up error
// messages on parser errors.
#if 0
@@ -448,7 +470,7 @@ static void cmd_resize_floating(I3_CMD, char *way, cha
if (strcmp(direction, "up") == 0) {
floating_con->rect.y -= px;
floating_con->rect.height += px;
- } else if (strcmp(direction, "down") == 0) {
+ } else if (strcmp(direction, "down") == 0 || strcmp(direction, "height") == 0) {
floating_con->rect.height += px;
} else if (strcmp(direction, "left") == 0) {
floating_con->rect.x -= px;
@@ -458,7 +480,7 @@ static void cmd_resize_floating(I3_CMD, char *way, cha
}
}