aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/border.c4
-rw-r--r--sway/commands.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sway/border.c b/sway/border.c
index ea29617f..db1a3836 100644
--- a/sway/border.c
+++ b/sway/border.c
@@ -124,7 +124,7 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col
// right border
int right_border = b->size.w - v->size.w - left_border;
if (right_border > 0) {
- if (is_only_child && layout == L_HORIZ) {
+ if (is_only_child && layout == L_HORIZ && !view->is_floating) {
color = colors->indicator;
} else {
color = colors->child_border;
@@ -150,7 +150,7 @@ static void render_borders(swayc_t *view, cairo_t *cr, struct border_colors *col
// bottom border
int bottom_border = b->size.h - (top_border + v->size.h);
if (bottom_border > 0) {
- if (is_only_child && layout == L_VERT) {
+ if (is_only_child && layout == L_VERT && !view->is_floating) {
color = colors->indicator;
} else {
color = colors->child_border;
diff --git a/sway/commands.c b/sway/commands.c
index d93f6591..2b91c43e 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -171,8 +171,8 @@ static struct cmd_handler handlers[] = {
{ "focus", cmd_focus },
{ "focus_follows_mouse", cmd_focus_follows_mouse },
{ "font", cmd_font },
- { "force_focus_wrapping", cmd_force_focus_wrapping },
{ "for_window", cmd_for_window },
+ { "force_focus_wrapping", cmd_force_focus_wrapping },
{ "fullscreen", cmd_fullscreen },
{ "gaps", cmd_gaps },
{ "hide_edge_borders", cmd_hide_edge_borders },
@@ -222,8 +222,8 @@ static struct cmd_handler bar_handlers[] = {
{ "swaybar_command", bar_cmd_swaybar_command },
{ "tray_output", bar_cmd_tray_output },
{ "tray_padding", bar_cmd_tray_padding },
- { "wrap_scroll", bar_cmd_wrap_scroll },
{ "workspace_buttons", bar_cmd_workspace_buttons },
+ { "wrap_scroll", bar_cmd_wrap_scroll },
};
/**