diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-26 16:32:24 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-01 23:14:58 +1000 |
commit | 70f5d6fcf3219f122077b7e8d0b43a464f4e3fd4 (patch) | |
tree | 1364ee0111dd199dd457372b539107ce47d1190f | |
parent | Remove check for if floating view intersects output (diff) | |
download | sway-70f5d6fcf3219f122077b7e8d0b43a464f4e3fd4.tar.gz sway-70f5d6fcf3219f122077b7e8d0b43a464f4e3fd4.tar.zst sway-70f5d6fcf3219f122077b7e8d0b43a464f4e3fd4.zip |
Rename container_set_geometry_from_view
-rw-r--r-- | include/sway/tree/container.h | 2 | ||||
-rw-r--r-- | sway/tree/container.c | 16 | ||||
-rw-r--r-- | sway/tree/view.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 4b686040..38c0f35d 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -238,7 +238,7 @@ size_t container_titlebar_height(void); | |||
238 | 238 | ||
239 | void container_set_floating(struct sway_container *container, bool enable); | 239 | void container_set_floating(struct sway_container *container, bool enable); |
240 | 240 | ||
241 | void container_set_geometry_from_view(struct sway_container *container); | 241 | void container_set_geometry_from_floating_view(struct sway_container *con); |
242 | 242 | ||
243 | /** | 243 | /** |
244 | * Determine if the given container is itself floating. | 244 | * Determine if the given container is itself floating. |
diff --git a/sway/tree/container.c b/sway/tree/container.c index 7928ffc3..7430aebb 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -930,23 +930,23 @@ void container_set_floating(struct sway_container *container, bool enable) { | |||
930 | container_damage_whole(container); | 930 | container_damage_whole(container); |
931 | } | 931 | } |
932 | 932 | ||
933 | void container_set_geometry_from_view(struct sway_container *container) { | 933 | void container_set_geometry_from_floating_view(struct sway_container *con) { |
934 | if (!sway_assert(container->type == C_VIEW, "Expected a view")) { | 934 | if (!sway_assert(con->type == C_VIEW, "Expected a view")) { |
935 | return; | 935 | return; |
936 | } | 936 | } |
937 | if (!sway_assert(container_is_floating(container), | 937 | if (!sway_assert(container_is_floating(con), |
938 | "Expected a floating view")) { | 938 | "Expected a floating view")) { |
939 | return; | 939 | return; |
940 | } | 940 | } |
941 | struct sway_view *view = container->sway_view; | 941 | struct sway_view *view = con->sway_view; |
942 | size_t border_width = view->border_thickness * (view->border != B_NONE); | 942 | size_t border_width = view->border_thickness * (view->border != B_NONE); |
943 | size_t top = | 943 | size_t top = |
944 | view->border == B_NORMAL ? container_titlebar_height() : border_width; | 944 | view->border == B_NORMAL ? container_titlebar_height() : border_width; |
945 | 945 | ||
946 | container->x = view->x - border_width; | 946 | con->x = view->x - border_width; |
947 | container->y = view->y - top; | 947 | con->y = view->y - top; |
948 | container->width = view->width + border_width * 2; | 948 | con->width = view->width + border_width * 2; |
949 | container->height = top + view->height + border_width; | 949 | con->height = top + view->height + border_width; |
950 | } | 950 | } |
951 | 951 | ||
952 | bool container_self_or_parent_floating(struct sway_container *container) { | 952 | bool container_self_or_parent_floating(struct sway_container *container) { |
diff --git a/sway/tree/view.c b/sway/tree/view.c index 065d00db..30d5c7b4 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -567,7 +567,7 @@ void view_update_position(struct sway_view *view, double lx, double ly) { | |||
567 | container_damage_whole(view->swayc); | 567 | container_damage_whole(view->swayc); |
568 | view->x = lx; | 568 | view->x = lx; |
569 | view->y = ly; | 569 | view->y = ly; |
570 | container_set_geometry_from_view(view->swayc); | 570 | container_set_geometry_from_floating_view(view->swayc); |
571 | container_damage_whole(view->swayc); | 571 | container_damage_whole(view->swayc); |
572 | } | 572 | } |
573 | 573 | ||
@@ -579,7 +579,7 @@ void view_update_size(struct sway_view *view, int width, int height) { | |||
579 | view->width = width; | 579 | view->width = width; |
580 | view->height = height; | 580 | view->height = height; |
581 | if (container_is_floating(view->swayc)) { | 581 | if (container_is_floating(view->swayc)) { |
582 | container_set_geometry_from_view(view->swayc); | 582 | container_set_geometry_from_floating_view(view->swayc); |
583 | } | 583 | } |
584 | container_damage_whole(view->swayc); | 584 | container_damage_whole(view->swayc); |
585 | } | 585 | } |