From 52850e935ecd06364e497eb42d55e8e6e04ff98e Mon Sep 17 00:00:00 2001 From: dcoppa Date: Mon, 27 Aug 2012 09:49:18 +0000 Subject: [PATCH] Fix resizing floating windows by height (upstream git commit 1089b0b201cef30fbfd03620339f5e8a166feded) --- x11/i3/Makefile | 4 ++-- x11/i3/patches/patch-src_commands_c | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/x11/i3/Makefile b/x11/i3/Makefile index e2fc2d80405..1b70362d00f 100644 --- a/x11/i3/Makefile +++ b/x11/i3/Makefile @@ -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 diff --git a/x11/i3/patches/patch-src_commands_c b/x11/i3/patches/patch-src_commands_c index fe5d22779be..834c999b7fe 100644 --- a/x11/i3/patches/patch-src_commands_c +++ b/x11/i3/patches/patch-src_commands_c @@ -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 @@ -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 +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 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 } }