From: Orestis Floros <orestisf1993@gmail.com>
Date: Wed, 22 Aug 2018 11:09:05 +0000 (+0300)
Subject: con_border_style: check con->fullscreen_mode directly
X-Git-Tag: 4.16~53^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0ac75bea5a21e9cac6ad2139bc57d44d1a77a6e0;p=i3%2Fi3

con_border_style: check con->fullscreen_mode directly
---

diff --git a/src/con.c b/src/con.c
index 844d9b68..253d1d54 100644
--- a/src/con.c
+++ b/src/con.c
@@ -1711,8 +1711,7 @@ adjacent_t con_adjacent_borders(Con *con) {
  *
  */
 int con_border_style(Con *con) {
-    Con *fs = con_get_fullscreen_con(con->parent, CF_OUTPUT);
-    if (fs == con) {
+    if (con->fullscreen_mode == CF_OUTPUT || con->fullscreen_mode == CF_GLOBAL) {
         DLOG("this one is fullscreen! overriding BS_NONE\n");
         return BS_NONE;
     }