diff options
Diffstat (limited to 'sway/desktop/render.c')
-rw-r--r-- | sway/desktop/render.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 1a72f752..cf6da682 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -625,19 +625,19 @@ static void render_containers_linear(struct sway_output *output, | |||
625 | if (view_is_urgent(view)) { | 625 | if (view_is_urgent(view)) { |
626 | colors = &config->border_colors.urgent; | 626 | colors = &config->border_colors.urgent; |
627 | title_texture = child->title_urgent; | 627 | title_texture = child->title_urgent; |
628 | marks_texture = view->marks_urgent; | 628 | marks_texture = child->marks_urgent; |
629 | } else if (state->focused || parent->focused) { | 629 | } else if (state->focused || parent->focused) { |
630 | colors = &config->border_colors.focused; | 630 | colors = &config->border_colors.focused; |
631 | title_texture = child->title_focused; | 631 | title_texture = child->title_focused; |
632 | marks_texture = view->marks_focused; | 632 | marks_texture = child->marks_focused; |
633 | } else if (child == parent->active_child) { | 633 | } else if (child == parent->active_child) { |
634 | colors = &config->border_colors.focused_inactive; | 634 | colors = &config->border_colors.focused_inactive; |
635 | title_texture = child->title_focused_inactive; | 635 | title_texture = child->title_focused_inactive; |
636 | marks_texture = view->marks_focused_inactive; | 636 | marks_texture = child->marks_focused_inactive; |
637 | } else { | 637 | } else { |
638 | colors = &config->border_colors.unfocused; | 638 | colors = &config->border_colors.unfocused; |
639 | title_texture = child->title_unfocused; | 639 | title_texture = child->title_unfocused; |
640 | marks_texture = view->marks_unfocused; | 640 | marks_texture = child->marks_unfocused; |
641 | } | 641 | } |
642 | 642 | ||
643 | if (state->border == B_NORMAL) { | 643 | if (state->border == B_NORMAL) { |
@@ -681,19 +681,19 @@ static void render_containers_tabbed(struct sway_output *output, | |||
681 | if (urgent) { | 681 | if (urgent) { |
682 | colors = &config->border_colors.urgent; | 682 | colors = &config->border_colors.urgent; |
683 | title_texture = child->title_urgent; | 683 | title_texture = child->title_urgent; |
684 | marks_texture = view ? view->marks_urgent : NULL; | 684 | marks_texture = child->marks_urgent; |
685 | } else if (cstate->focused || parent->focused) { | 685 | } else if (cstate->focused || parent->focused) { |
686 | colors = &config->border_colors.focused; | 686 | colors = &config->border_colors.focused; |
687 | title_texture = child->title_focused; | 687 | title_texture = child->title_focused; |
688 | marks_texture = view ? view->marks_focused : NULL; | 688 | marks_texture = child->marks_focused; |
689 | } else if (child == parent->active_child) { | 689 | } else if (child == parent->active_child) { |
690 | colors = &config->border_colors.focused_inactive; | 690 | colors = &config->border_colors.focused_inactive; |
691 | title_texture = child->title_focused_inactive; | 691 | title_texture = child->title_focused_inactive; |
692 | marks_texture = view ? view->marks_focused_inactive : NULL; | 692 | marks_texture = child->marks_focused_inactive; |
693 | } else { | 693 | } else { |
694 | colors = &config->border_colors.unfocused; | 694 | colors = &config->border_colors.unfocused; |
695 | title_texture = child->title_unfocused; | 695 | title_texture = child->title_unfocused; |
696 | marks_texture = view ? view->marks_unfocused : NULL; | 696 | marks_texture = child->marks_unfocused; |
697 | } | 697 | } |
698 | 698 | ||
699 | int x = cstate->con_x + tab_width * i; | 699 | int x = cstate->con_x + tab_width * i; |
@@ -746,19 +746,19 @@ static void render_containers_stacked(struct sway_output *output, | |||
746 | if (urgent) { | 746 | if (urgent) { |
747 | colors = &config->border_colors.urgent; | 747 | colors = &config->border_colors.urgent; |
748 | title_texture = child->title_urgent; | 748 | title_texture = child->title_urgent; |
749 | marks_texture = view ? view->marks_urgent : NULL; | 749 | marks_texture = child->marks_urgent; |
750 | } else if (cstate->focused || parent->focused) { | 750 | } else if (cstate->focused || parent->focused) { |
751 | colors = &config->border_colors.focused; | 751 | colors = &config->border_colors.focused; |
752 | title_texture = child->title_focused; | 752 | title_texture = child->title_focused; |
753 | marks_texture = view ? view->marks_focused : NULL; | 753 | marks_texture = child->marks_focused; |
754 | } else if (child == parent->active_child) { | 754 | } else if (child == parent->active_child) { |
755 | colors = &config->border_colors.focused_inactive; | 755 | colors = &config->border_colors.focused_inactive; |
756 | title_texture = child->title_focused_inactive; | 756 | title_texture = child->title_focused_inactive; |
757 | marks_texture = view ? view->marks_focused_inactive : NULL; | 757 | marks_texture = child->marks_focused_inactive; |
758 | } else { | 758 | } else { |
759 | colors = &config->border_colors.unfocused; | 759 | colors = &config->border_colors.unfocused; |
760 | title_texture = child->title_unfocused; | 760 | title_texture = child->title_unfocused; |
761 | marks_texture = view ? view->marks_unfocused : NULL; | 761 | marks_texture = child->marks_unfocused; |
762 | } | 762 | } |
763 | 763 | ||
764 | int y = parent->box.y + titlebar_height * i; | 764 | int y = parent->box.y + titlebar_height * i; |
@@ -841,15 +841,15 @@ static void render_floating_container(struct sway_output *soutput, | |||
841 | if (view_is_urgent(view)) { | 841 | if (view_is_urgent(view)) { |
842 | colors = &config->border_colors.urgent; | 842 | colors = &config->border_colors.urgent; |
843 | title_texture = con->title_urgent; | 843 | title_texture = con->title_urgent; |
844 | marks_texture = view->marks_urgent; | 844 | marks_texture = con->marks_urgent; |
845 | } else if (con->current.focused) { | 845 | } else if (con->current.focused) { |
846 | colors = &config->border_colors.focused; | 846 | colors = &config->border_colors.focused; |
847 | title_texture = con->title_focused; | 847 | title_texture = con->title_focused; |
848 | marks_texture = view->marks_focused; | 848 | marks_texture = con->marks_focused; |
849 | } else { | 849 | } else { |
850 | colors = &config->border_colors.unfocused; | 850 | colors = &config->border_colors.unfocused; |
851 | title_texture = con->title_unfocused; | 851 | title_texture = con->title_unfocused; |
852 | marks_texture = view->marks_unfocused; | 852 | marks_texture = con->marks_unfocused; |
853 | } | 853 | } |
854 | 854 | ||
855 | if (con->current.border == B_NORMAL) { | 855 | if (con->current.border == B_NORMAL) { |